Add Grunt to workflow and update project structure