Renaming the folders and restructuring