Big update, breakup of Grunt files