Restructure folders and gruntfile