Changed structure for new build process with Grunt