Update project structure
Update Gruntfile
Update Gruntfile