Update gruntfile, normalize file structure