Re-arange few files in Gruntfile.js and remove few typos