fix up Grunt based on file restructure