Updated Gruntfile.js and Sass file structure