updatede folder structure and gruntfile.js