some renaming of folders
woops commit the deletes too lol