Major build and Grunt task refactoring