Folder structure fixed