arranged the Gruntfile with the new structure