Grunt restructured and refactored massively