Folder structure reorganization