Changed sturcture for Gruntfile
Merge master: Add Gruntfile and change structure