How to build battery pack 9.6v from 18650 batteries?

I would like to create a good battery pack for my dead hilti drill. Originel nc-cd 9.6v battery.
I have some panasonic cgr18650cg batterys here.  But when 3 in series, the voltage is higher. Maybe the drill can work with a higher voltage but I dont know. Will it work, would like to create first a 3S pack and maybe later a 3S2P 
I need a PCB and thinking something like this one :

Or this one?

And how to charge a pack, can I use a common 12v laptop adapter or other adapters or specia li-ion charger? I dont think the original ni-cd charger can be used with pcb's above?

I would just get a 9.6V battery pack and charger from the RC shop of my choice....