Change folder structure and Gruntfile.js