Updated grunt
Moved grunt and package.json