Folder-structure improvements.