A reorg... still needs more, since app.js is just a big ole mess
Wiped submodules :(