moved MFR things to match their declared location