Better namespacing in main.js