Folder structure extended