Restructure of files for better Grunt integration