cleanup gruntfile, reorganize