Reorganized gruntfile and package.json