Folder structure cleanup.