I have built battery pack for Makita 18v tools out of old laptop cells.
It is external pack connctet to the tool by a cable. It is less compact but cost me almost nothing and good enough (even better) for my uses.
I solderd the cells with heat and connect the pack to a empty original battery.
You cannot use the original charger so either use hobby charger or protection board and 18v li-ion charger