Move some classes to MFR