Restructured angularjs folder structure and modifications to Grunfile.js