Reorganized Gruntfile.js and updated Grunt Packages.