Folder tidy-up take 2.