Update structure to match Grunt config properly