Folder structure improvements