REFACTOR Build to Grunt compat