First pass at moving things for configuration service, probably more should move