Gruntfile updated for new folder structure