If ever I get around to doing my conversion I plan to 3D print 18650 battery holders to fit all the available spaces creating my own units.
Working on the tightest of budgets (i.e. free is expensive) I plan to use second hand cells from used laptop batteries.