Move ServiceToHostMap into stand-alone class ServiceAddressMap and refactor accordingly