Improve structure and Gruntfile
Change Gruntfile