index.js Cleanup and Adding Modules