Reorganization of Grunt files