Revised directory and rewrote Gruntfile.js