Move some more stuff from ConfServer --> UConf