restructure files, remove cruft from gruntfile