Gruntfile structure changes