Move the client out of the server module.