Folder structure reformat