re-organize Gruntfile
Merge pull request #2614 from SergioCrisostomo/refactor-gruntfile

re-organize Gruntfile