Properly pull in the JP version.
Move the JS templates
Nuke the extra modules array.