Folder management rework