Gruntfile fix and rename main dir