Modding a Skyray 3x XML

This my first time mod of any flashlight. Im no electronics expert what so ever but Im learning vvvery slowly. I want to be able to run the light of an external battery pack that I shall make up with four trustfire 3000 18650 with 2 in series and 2 in parallel. This will acheive the 7.2v but with more capacity ( hope this is correct). I will disregard the tube that held the 2 batteries and simply connect the switch to the main head unit with the wire entering from the battery pack somewhere on the join.

Now this battery pack will I beable to charge it with my ultrafire double charger with making contact with the terminals......if so just as the single contacts or all four contacts. Can't quite get my head around this problem

If anyone has done this mod......help would be appreciated

Thanks

looking at the 6 cells below the top green semi circles connects the 3 pairs in their own individual series pairs. on the bottom youd connect all the plusses and all the minuses. then the red plus to head positive and minus black to switch negative. you can probably get a four cell carrier and rewire it so you can individually charge the cells or get a hobby charger to charge the pack as an 8.4v pack with double the capacity

http://www.inlandhobby.com/v/vspfiles/files/battery_pack/building_rc_battery_packs.htm