Refactorization
Grunt integration