Conversion of SoR to remove srvfsect from used code base.