Reorganization and cleanup of JS files and Grunt process