Folder structure cleanup