Folder Structure: corrections