Move thrift.ThriftClient to thrift.client.ThriftClient