Folder structure modifications