Updated Gruntfile organization