Refactoring for GRUNT

Updated Gruntfile.js and reshuffled my source folders