Use the refactored endpoint/client classes in the actual client/server.