Move Xservice to XServiceManager from XBase.