Moved client.client to client.impl.client