Folder reorganization to prevent duplication