Trying to decouple the v2 client from SRV code. Can't move into discovery/ since that creates a circular dependency. So, give up and move all the SRV code into a new package.