Folder rework