Restruct marckup folder & edit gruntfile.js