Folders' reorganization