Folder structure corrected