Gruntfile refactoring
Gruntfile almost fully done