clean up gruntfile and naming conventions