Changes to File System and Grunt Workflow
Additional Changes to Grunt