Updates to file structure and gruntfile