Move service providers to more logical spots.