Folder restructuring and scheme renaming