Move things around, fix files and folders with the same name