Move js into .js's
Because whitespace is cheap
Refactor for DRYness, readability, namespacing