Reorganized project with Grunt