Restructure files and enhancement Gruntfile.js