organized into folders, renamed some stuff