XRFMC related changes.
Relocate EPDL97
Relocate XRFMC