Continued coversion

Still broken:
Continued reorganization of JavaScript files