Added Grunt build tasks and reorganized to accommodate

Also includes fixes to pass linting and tests