Redo folder structure.