Merge legacy and new main JS files

This will save a request. \o/