Grunt cleanup

This PR cleans up the grunt structure and build process.