Restructuring codebase and renaming some files. Using grunt.js for build