Refactored Grunt build system