Folder reorganisation