Redesign for grunt build stage 1