Grunt tasks refactoring and restructiring complete