Fixing directory stucture/grunt integration