updated folder structure and names, updated gruntfile to follow new structure