Remapped some old files (these had turned red in Xcode because Xcode had incorrect legacy paths for these files).