Grunt refactoring - build