Folder restructuring