Refactor ServerClient -> Client, because that just made no sense otherwise.