Folder structure fixed again