[Grunt] Refactoring V1
[Grunt] Refactor V2