Grunt reorganization