Moved everything into a new set of services for converged infrastructure