Minor restructuring of the Gruntfile