diff --git a/Documentation/learning/lock/client/client.go b/Documentation/learning/lock/client/client.go
index ab5a9649f..b5c42f0cb 100644
--- a/Documentation/learning/lock/client/client.go
+++ b/Documentation/learning/lock/client/client.go
@@ -26,8 +26,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"io/ioutil"
 	"net/http"
 	"os"
diff --git a/client/v3/balancer/balancer.go b/client/v3/balancer/balancer.go
index 3eecb9d1d..3e63d6091 100644
--- a/client/v3/balancer/balancer.go
+++ b/client/v3/balancer/balancer.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/balancer/connectivity"
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
+	"go.etcd.io/etcd/client/v3/balancer/connectivity"
+	"go.etcd.io/etcd/client/v3/balancer/picker"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc/balancer"
diff --git a/client/v3/balancer/balancer_test.go b/client/v3/balancer/balancer_test.go
index 0ccd2abaa..5a70b35c3 100644
--- a/client/v3/balancer/balancer_test.go
+++ b/client/v3/balancer/balancer_test.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/client/mock/mockserver"
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
-	"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
+	"go.etcd.io/etcd/client/v3/balancer/picker"
+	"go.etcd.io/etcd/client/v3/balancer/resolver/endpoint"
+	"go.etcd.io/etcd/client/v3/mock/mockserver"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/client/v3/client.go b/client/v3/client.go
index 123e35b3e..9a037d7b4 100644
--- a/client/v3/client.go
+++ b/client/v3/client.go
@@ -27,11 +27,11 @@ import (
 
 	"github.com/google/uuid"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3/balancer"
+	"go.etcd.io/etcd/client/v3/balancer/picker"
+	"go.etcd.io/etcd/client/v3/balancer/resolver/endpoint"
+	"go.etcd.io/etcd/client/v3/credentials"
 	"go.etcd.io/etcd/pkg/v3/logutil"
-	"go.etcd.io/etcd/v3/clientv3/balancer"
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
-	"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
-	"go.etcd.io/etcd/v3/clientv3/credentials"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/client/v3/clientv3util/example_key_test.go b/client/v3/clientv3util/example_key_test.go
index 7290b6698..0d7cd3d19 100644
--- a/client/v3/clientv3util/example_key_test.go
+++ b/client/v3/clientv3util/example_key_test.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/clientv3util"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/clientv3util"
 )
 
 func ExampleKeyMissing() {
diff --git a/client/v3/clientv3util/util.go b/client/v3/clientv3util/util.go
index 984938614..c8d5098a5 100644
--- a/client/v3/clientv3util/util.go
+++ b/client/v3/clientv3util/util.go
@@ -16,7 +16,7 @@
 package clientv3util
 
 import (
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // KeyExists returns a comparison operation that evaluates to true iff the given
diff --git a/client/v3/concurrency/election.go b/client/v3/concurrency/election.go
index 7e7821579..31e93d242 100644
--- a/client/v3/concurrency/election.go
+++ b/client/v3/concurrency/election.go
@@ -21,7 +21,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/client/v3/concurrency/key.go b/client/v3/concurrency/key.go
index 61f2abe5a..20825950f 100644
--- a/client/v3/concurrency/key.go
+++ b/client/v3/concurrency/key.go
@@ -20,7 +20,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error {
diff --git a/client/v3/concurrency/mutex.go b/client/v3/concurrency/mutex.go
index 22ecf2d1f..c3800d628 100644
--- a/client/v3/concurrency/mutex.go
+++ b/client/v3/concurrency/mutex.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // ErrLocked is returned by TryLock when Mutex is already locked by another session.
diff --git a/client/v3/concurrency/session.go b/client/v3/concurrency/session.go
index 7c747183a..7143cc474 100644
--- a/client/v3/concurrency/session.go
+++ b/client/v3/concurrency/session.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 const defaultSessionTTL = 60
diff --git a/client/v3/concurrency/stm.go b/client/v3/concurrency/stm.go
index 908a4bed3..ba7303d09 100644
--- a/client/v3/concurrency/stm.go
+++ b/client/v3/concurrency/stm.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"math"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // STM is an interface for software transactional memory.
diff --git a/client/v3/leasing/cache.go b/client/v3/leasing/cache.go
index d2683a549..214ee2fc1 100644
--- a/client/v3/leasing/cache.go
+++ b/client/v3/leasing/cache.go
@@ -22,7 +22,7 @@ import (
 
 	v3pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 const revokeBackoff = 2 * time.Second
diff --git a/client/v3/leasing/kv.go b/client/v3/leasing/kv.go
index d7bf95fe8..f0cded20f 100644
--- a/client/v3/leasing/kv.go
+++ b/client/v3/leasing/kv.go
@@ -23,8 +23,8 @@ import (
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/client/v3/leasing/txn.go b/client/v3/leasing/txn.go
index db34e48cb..30c6aa2e4 100644
--- a/client/v3/leasing/txn.go
+++ b/client/v3/leasing/txn.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	v3pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 type txnLeasing struct {
diff --git a/client/v3/leasing/util.go b/client/v3/leasing/util.go
index 5ab191d49..b6a520f03 100644
--- a/client/v3/leasing/util.go
+++ b/client/v3/leasing/util.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 
 	v3pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 func compareInt64(a, b int64) int {
diff --git a/client/v3/mirror/syncer.go b/client/v3/mirror/syncer.go
index 86e03c106..c25ee9b0c 100644
--- a/client/v3/mirror/syncer.go
+++ b/client/v3/mirror/syncer.go
@@ -18,7 +18,7 @@ package mirror
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 const (
diff --git a/client/v3/namespace/kv.go b/client/v3/namespace/kv.go
index 35fe5858a..f745225ca 100644
--- a/client/v3/namespace/kv.go
+++ b/client/v3/namespace/kv.go
@@ -19,7 +19,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type kvPrefix struct {
diff --git a/client/v3/namespace/lease.go b/client/v3/namespace/lease.go
index f7596d0aa..f274de5e9 100644
--- a/client/v3/namespace/lease.go
+++ b/client/v3/namespace/lease.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type leasePrefix struct {
diff --git a/client/v3/namespace/watch.go b/client/v3/namespace/watch.go
index 8dc28380a..12362856d 100644
--- a/client/v3/namespace/watch.go
+++ b/client/v3/namespace/watch.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type watcherPrefix struct {
diff --git a/client/v3/naming/doc.go b/client/v3/naming/doc.go
index 98987d8fd..df141f41a 100644
--- a/client/v3/naming/doc.go
+++ b/client/v3/naming/doc.go
@@ -17,8 +17,8 @@
 // To use, first import the packages:
 //
 //	import (
-//		"go.etcd.io/etcd/v3/clientv3"
-//		etcdnaming "go.etcd.io/etcd/v3/clientv3/naming"
+//		"go.etcd.io/etcd/client/v3"
+//		etcdnaming "go.etcd.io/etcd/client/v3/naming"
 //
 //		"google.golang.org/grpc"
 //		"google.golang.org/grpc/naming"
diff --git a/client/v3/naming/grpc.go b/client/v3/naming/grpc.go
index b680274bb..d12e7e2b8 100644
--- a/client/v3/naming/grpc.go
+++ b/client/v3/naming/grpc.go
@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	etcd "go.etcd.io/etcd/v3/clientv3"
+	etcd "go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/naming"
diff --git a/client/v3/ordering/kv.go b/client/v3/ordering/kv.go
index d62f2c891..7914fc4b9 100644
--- a/client/v3/ordering/kv.go
+++ b/client/v3/ordering/kv.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // kvOrdering ensures that serialized requests do not return
diff --git a/client/v3/ordering/kv_test.go b/client/v3/ordering/kv_test.go
index a349f6019..9b5c8ab2c 100644
--- a/client/v3/ordering/kv_test.go
+++ b/client/v3/ordering/kv_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type mockKV struct {
diff --git a/client/v3/ordering/logger_test.go b/client/v3/ordering/logger_test.go
index ef857ce4e..8804ddb4a 100644
--- a/client/v3/ordering/logger_test.go
+++ b/client/v3/ordering/logger_test.go
@@ -17,7 +17,7 @@ package ordering
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/client/v3/ordering/util.go b/client/v3/ordering/util.go
index a321ede55..bd9d31f5c 100644
--- a/client/v3/ordering/util.go
+++ b/client/v3/ordering/util.go
@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error
diff --git a/client/v3/snapshot/v3_snapshot.go b/client/v3/snapshot/v3_snapshot.go
index c5e931774..51139b5b8 100644
--- a/client/v3/snapshot/v3_snapshot.go
+++ b/client/v3/snapshot/v3_snapshot.go
@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/fileutil"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.uber.org/zap"
 )
 
diff --git a/client/v3/yaml/config.go b/client/v3/yaml/config.go
index 858172802..015d06f35 100644
--- a/client/v3/yaml/config.go
+++ b/client/v3/yaml/config.go
@@ -22,8 +22,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/tlsutil"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 type yamlConfig struct {
diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go
index 95d1ca866..7e950a3e3 100644
--- a/contrib/recipes/barrier.go
+++ b/contrib/recipes/barrier.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // Barrier creates a key in etcd to block processes, then deletes the key to
diff --git a/contrib/recipes/client.go b/contrib/recipes/client.go
index cdaf15553..6dd5b13a6 100644
--- a/contrib/recipes/client.go
+++ b/contrib/recipes/client.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	spb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go
index ba6cf3d29..eac5d4f7f 100644
--- a/contrib/recipes/double_barrier.go
+++ b/contrib/recipes/double_barrier.go
@@ -18,8 +18,8 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 // DoubleBarrier blocks processes on Enter until an expected count enters, then
diff --git a/contrib/recipes/key.go b/contrib/recipes/key.go
index 3a634a3fb..10362c18f 100644
--- a/contrib/recipes/key.go
+++ b/contrib/recipes/key.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 // RemoteKV is a key/revision pair created by the client and stored on etcd
diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go
index 2c4e916aa..1b2606746 100644
--- a/contrib/recipes/priority_queue.go
+++ b/contrib/recipes/priority_queue.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // PriorityQueue implements a multi-reader, multi-writer distributed queue.
diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go
index b71ba1b0e..9c6b0378e 100644
--- a/contrib/recipes/queue.go
+++ b/contrib/recipes/queue.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // Queue implements a multi-reader, multi-writer distributed queue.
diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go
index ce6ff2a82..9f520baf4 100644
--- a/contrib/recipes/rwmutex.go
+++ b/contrib/recipes/rwmutex.go
@@ -18,8 +18,8 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 type RWMutex struct {
diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go
index 339fb2e0e..fd4a8717a 100644
--- a/contrib/recipes/watch.go
+++ b/contrib/recipes/watch.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // WaitEvents waits on a key until it observes the given events and returns the final one.
diff --git a/embed/serve.go b/embed/serve.go
index 5818435a2..9086b8b04 100644
--- a/embed/serve.go
+++ b/embed/serve.go
@@ -24,10 +24,10 @@ import (
 	"strings"
 
 	etcdservergw "go.etcd.io/etcd/api/v3/etcdserverpb/gw"
+	"go.etcd.io/etcd/client/v3/credentials"
 	"go.etcd.io/etcd/pkg/v3/debugutil"
 	"go.etcd.io/etcd/pkg/v3/httputil"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3/credentials"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election"
diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go
index 2a82127f0..454e76930 100644
--- a/etcdctl/ctlv3/command/alarm_command.go
+++ b/etcdctl/ctlv3/command/alarm_command.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // NewAlarmCommand returns the cobra command for "alarm".
diff --git a/etcdctl/ctlv3/command/check.go b/etcdctl/ctlv3/command/check.go
index becd46b7a..bc2f6036b 100644
--- a/etcdctl/ctlv3/command/check.go
+++ b/etcdctl/ctlv3/command/check.go
@@ -25,8 +25,8 @@ import (
 	"sync"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go
index 33820b6e8..9f1c1db0c 100644
--- a/etcdctl/ctlv3/command/compaction_command.go
+++ b/etcdctl/ctlv3/command/compaction_command.go
@@ -19,7 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var compactPhysical bool
diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go
index 391f48eb9..644ea0463 100644
--- a/etcdctl/ctlv3/command/del_command.go
+++ b/etcdctl/ctlv3/command/del_command.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go
index 819a63201..e1445cfec 100644
--- a/etcdctl/ctlv3/command/elect_command.go
+++ b/etcdctl/ctlv3/command/elect_command.go
@@ -21,8 +21,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go
index 76d5be637..bc86b4aa6 100644
--- a/etcdctl/ctlv3/command/ep_command.go
+++ b/etcdctl/ctlv3/command/ep_command.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/flags"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go
index 4f1b2826b..d9ac7004a 100644
--- a/etcdctl/ctlv3/command/get_command.go
+++ b/etcdctl/ctlv3/command/get_command.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go
index daf73c0c4..97889c688 100644
--- a/etcdctl/ctlv3/command/global.go
+++ b/etcdctl/ctlv3/command/global.go
@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"github.com/bgentry/speakeasy"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/flags"
 	"go.etcd.io/etcd/pkg/v3/srv"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go
index b15cee8d6..e9ee8714e 100644
--- a/etcdctl/ctlv3/command/lease_command.go
+++ b/etcdctl/ctlv3/command/lease_command.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strconv"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go
index 6eef22caf..a78a8799b 100644
--- a/etcdctl/ctlv3/command/lock_command.go
+++ b/etcdctl/ctlv3/command/lock_command.go
@@ -23,8 +23,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go
index 9b69077bf..4f031d080 100644
--- a/etcdctl/ctlv3/command/make_mirror_command.go
+++ b/etcdctl/ctlv3/command/make_mirror_command.go
@@ -25,8 +25,8 @@ import (
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/mirror"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/mirror"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/member_command.go b/etcdctl/ctlv3/command/member_command.go
index c621d361e..729af73a1 100644
--- a/etcdctl/ctlv3/command/member_command.go
+++ b/etcdctl/ctlv3/command/member_command.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go
index 0df8668f2..1aee99b24 100644
--- a/etcdctl/ctlv3/command/move_leader_command.go
+++ b/etcdctl/ctlv3/command/move_leader_command.go
@@ -19,7 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // NewMoveLeaderCommand returns the cobra command for "move-leader".
diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go
index fab26eb0d..fc703bafb 100644
--- a/etcdctl/ctlv3/command/printer.go
+++ b/etcdctl/ctlv3/command/printer.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 
 	"github.com/dustin/go-humanize"
diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go
index c52e02982..abb873ae4 100644
--- a/etcdctl/ctlv3/command/printer_fields.go
+++ b/etcdctl/ctlv3/command/printer_fields.go
@@ -19,7 +19,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	spb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 )
 
diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go
index 560621375..93f365580 100644
--- a/etcdctl/ctlv3/command/printer_json.go
+++ b/etcdctl/ctlv3/command/printer_json.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"strconv"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 )
 
diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go
index 8dd04e39d..ee6c413ff 100644
--- a/etcdctl/ctlv3/command/printer_protobuf.go
+++ b/etcdctl/ctlv3/command/printer_protobuf.go
@@ -20,7 +20,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	mvccpb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 type pbPrinter struct{ printer }
diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go
index e9a529008..33d285c5f 100644
--- a/etcdctl/ctlv3/command/printer_simple.go
+++ b/etcdctl/ctlv3/command/printer_simple.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/types"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 )
 
diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go
index 9478892ad..3fdaaf608 100644
--- a/etcdctl/ctlv3/command/printer_table.go
+++ b/etcdctl/ctlv3/command/printer_table.go
@@ -17,7 +17,7 @@ package command
 import (
 	"os"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 
 	"github.com/olekukonko/tablewriter"
diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go
index 41d101675..2877510c6 100644
--- a/etcdctl/ctlv3/command/put_command.go
+++ b/etcdctl/ctlv3/command/put_command.go
@@ -20,7 +20,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go
index ad6883246..21b1031be 100644
--- a/etcdctl/ctlv3/command/role_command.go
+++ b/etcdctl/ctlv3/command/role_command.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go
index a56ea00ee..82d7bd86e 100644
--- a/etcdctl/ctlv3/command/txn_command.go
+++ b/etcdctl/ctlv3/command/txn_command.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/user_command.go b/etcdctl/ctlv3/command/user_command.go
index 876c1010c..6a763395f 100644
--- a/etcdctl/ctlv3/command/user_command.go
+++ b/etcdctl/ctlv3/command/user_command.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/bgentry/speakeasy"
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go
index 5c572f069..a05e8d669 100644
--- a/etcdctl/ctlv3/command/util.go
+++ b/etcdctl/ctlv3/command/util.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go
index edfecd922..1697511f5 100644
--- a/etcdctl/ctlv3/command/watch_command.go
+++ b/etcdctl/ctlv3/command/watch_command.go
@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/snapshot/v3_snapshot.go b/etcdctl/snapshot/v3_snapshot.go
index 411fc98d4..865a95d43 100644
--- a/etcdctl/snapshot/v3_snapshot.go
+++ b/etcdctl/snapshot/v3_snapshot.go
@@ -29,13 +29,13 @@ import (
 
 	bolt "go.etcd.io/bbolt"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/snapshot"
 	"go.etcd.io/etcd/pkg/v3/fileutil"
 	"go.etcd.io/etcd/pkg/v3/traceutil"
 	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/raft/v3"
 	"go.etcd.io/etcd/raft/v3/raftpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go
index c5dfe42f3..c8e927582 100644
--- a/etcdmain/grpc_proxy.go
+++ b/etcdmain/grpc_proxy.go
@@ -30,13 +30,13 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/leasing"
+	"go.etcd.io/etcd/client/v3/namespace"
+	"go.etcd.io/etcd/client/v3/ordering"
 	"go.etcd.io/etcd/pkg/v3/debugutil"
 	"go.etcd.io/etcd/pkg/v3/logutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/leasing"
-	"go.etcd.io/etcd/v3/clientv3/namespace"
-	"go.etcd.io/etcd/v3/clientv3/ordering"
 	"go.etcd.io/etcd/v3/embed"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go
index 19446affa..2b3471bcf 100644
--- a/etcdserver/api/v2v3/server.go
+++ b/etcdserver/api/v2v3/server.go
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/types"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go
index d225181b4..65e4255a8 100644
--- a/etcdserver/api/v2v3/store.go
+++ b/etcdserver/api/v2v3/store.go
@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
 )
diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go
index 201fb783e..b75b75fba 100644
--- a/etcdserver/api/v2v3/watcher.go
+++ b/etcdserver/api/v2v3/watcher.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
 )
diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go
index 5a8107b9f..1b269b4a2 100644
--- a/etcdserver/api/v3client/v3client.go
+++ b/etcdserver/api/v3client/v3client.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy/adapter"
diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go
index 7a2058b06..edfebd3dc 100644
--- a/etcdserver/api/v3election/election.go
+++ b/etcdserver/api/v3election/election.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 )
 
diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go
index ec3fb407e..80cb6b573 100644
--- a/etcdserver/api/v3lock/lock.go
+++ b/etcdserver/api/v3lock/lock.go
@@ -17,8 +17,8 @@ package v3lock
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
 )
 
diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go
index f3c973d7b..46a44b56d 100644
--- a/etcdserver/api/v3rpc/grpc.go
+++ b/etcdserver/api/v3rpc/grpc.go
@@ -23,7 +23,7 @@ import (
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
-	"go.etcd.io/etcd/v3/clientv3/credentials"
+	"go.etcd.io/etcd/client/v3/credentials"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go
index be699d9ca..0cabfc146 100644
--- a/proxy/grpcproxy/auth.go
+++ b/proxy/grpcproxy/auth.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type AuthProxy struct {
diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go
index 5f3ab7658..58e1a9e4a 100644
--- a/proxy/grpcproxy/cluster.go
+++ b/proxy/grpcproxy/cluster.go
@@ -23,8 +23,8 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/naming"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/naming"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go
index 49421b6ea..ba7387c8d 100644
--- a/proxy/grpcproxy/election.go
+++ b/proxy/grpcproxy/election.go
@@ -17,7 +17,7 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 )
 
diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go
index a546dadae..85c8659e1 100644
--- a/proxy/grpcproxy/health.go
+++ b/proxy/grpcproxy/health.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
 	"go.uber.org/zap"
 )
diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go
index 6fbbedf00..af5a0700e 100644
--- a/proxy/grpcproxy/kv.go
+++ b/proxy/grpcproxy/kv.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy/cache"
 )
 
diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go
index ea0115c4e..c078c89bb 100644
--- a/proxy/grpcproxy/leader.go
+++ b/proxy/grpcproxy/leader.go
@@ -19,7 +19,7 @@ import (
 	"math"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"golang.org/x/time/rate"
 )
diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go
index 5fb3cad4a..1f3ef552f 100644
--- a/proxy/grpcproxy/lease.go
+++ b/proxy/grpcproxy/lease.go
@@ -23,7 +23,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go
index 4a903b743..ebadfba80 100644
--- a/proxy/grpcproxy/lock.go
+++ b/proxy/grpcproxy/lock.go
@@ -17,7 +17,7 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
 )
 
diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go
index 82cc53616..3e8165625 100644
--- a/proxy/grpcproxy/maintenance.go
+++ b/proxy/grpcproxy/maintenance.go
@@ -19,7 +19,7 @@ import (
 	"io"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type maintenanceProxy struct {
diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go
index e74cd5ca9..dcd7d4d86 100644
--- a/proxy/grpcproxy/register.go
+++ b/proxy/grpcproxy/register.go
@@ -18,9 +18,9 @@ import (
 	"encoding/json"
 	"os"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/clientv3/naming"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
+	"go.etcd.io/etcd/client/v3/naming"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go
index e884d9bd1..0ee6b5b96 100644
--- a/proxy/grpcproxy/watch.go
+++ b/proxy/grpcproxy/watch.go
@@ -20,7 +20,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
 
 	"go.uber.org/zap"
diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go
index e7d901e53..fb49fedf0 100644
--- a/proxy/grpcproxy/watch_broadcast.go
+++ b/proxy/grpcproxy/watch_broadcast.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"go.uber.org/zap"
 )
diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go
index 881fe030c..fcc2fc970 100644
--- a/proxy/grpcproxy/watcher.go
+++ b/proxy/grpcproxy/watcher.go
@@ -19,7 +19,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/mvcc"
 )
 
diff --git a/raft/go.sum b/raft/go.sum
index eeb4cc223..efb3c59bd 100644
--- a/raft/go.sum
+++ b/raft/go.sum
@@ -52,9 +52,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
diff --git a/tests/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go
index a6ef5e398..e4f500604 100644
--- a/tests/e2e/ctl_v3_alarm_test.go
+++ b/tests/e2e/ctl_v3_alarm_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestCtlV3Alarm(t *testing.T) {
diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go
index e37ba96ad..c892b6d37 100644
--- a/tests/e2e/ctl_v3_auth_test.go
+++ b/tests/e2e/ctl_v3_auth_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestCtlV3AuthEnable(t *testing.T)              { testCtl(t, authEnableTest) }
diff --git a/tests/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go
index 7d1416bdf..3c4e7d72b 100644
--- a/tests/e2e/ctl_v3_endpoint_test.go
+++ b/tests/e2e/ctl_v3_endpoint_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) }
diff --git a/tests/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go
index 07eeef135..a034c2625 100644
--- a/tests/e2e/ctl_v3_migrate_test.go
+++ b/tests/e2e/ctl_v3_migrate_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 func TestCtlV3Migrate(t *testing.T) {
diff --git a/tests/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go
index 43a0b3ce4..adb0c7c0e 100644
--- a/tests/e2e/ctl_v3_move_leader_test.go
+++ b/tests/e2e/ctl_v3_move_leader_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/pkg/v3/types"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 func TestCtlV3MoveLeaderSecure(t *testing.T) {
diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go
index 78f448662..4a7dea9c5 100644
--- a/tests/e2e/etcd_corrupt_test.go
+++ b/tests/e2e/etcd_corrupt_test.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	bolt "go.etcd.io/bbolt"
 )
diff --git a/tests/functional/rpcpb/member.go b/tests/functional/rpcpb/member.go
index 6fbd44e14..68e23184c 100644
--- a/tests/functional/rpcpb/member.go
+++ b/tests/functional/rpcpb/member.go
@@ -23,9 +23,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/logutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 
 	"github.com/dustin/go-humanize"
diff --git a/tests/functional/runner/election_command.go b/tests/functional/runner/election_command.go
index 1cec694e2..4a0d194bd 100644
--- a/tests/functional/runner/election_command.go
+++ b/tests/functional/runner/election_command.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/tests/functional/runner/global.go b/tests/functional/runner/global.go
index b99466caf..902baac66 100644
--- a/tests/functional/runner/global.go
+++ b/tests/functional/runner/global.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tests/functional/runner/lease_renewer_command.go b/tests/functional/runner/lease_renewer_command.go
index 6418ef0db..e7b147d75 100644
--- a/tests/functional/runner/lease_renewer_command.go
+++ b/tests/functional/runner/lease_renewer_command.go
@@ -21,7 +21,7 @@ import (
 	"log"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
diff --git a/tests/functional/runner/lock_racer_command.go b/tests/functional/runner/lock_racer_command.go
index ffde9f5f4..c6f1b9410 100644
--- a/tests/functional/runner/lock_racer_command.go
+++ b/tests/functional/runner/lock_racer_command.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/tests/functional/runner/watch_command.go b/tests/functional/runner/watch_command.go
index 32f074bc3..d3a7e11e9 100644
--- a/tests/functional/runner/watch_command.go
+++ b/tests/functional/runner/watch_command.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/stringutil"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tests/functional/tester/case_sigquit_remove.go b/tests/functional/tester/case_sigquit_remove.go
index e1cf5ca95..add3b572b 100644
--- a/tests/functional/tester/case_sigquit_remove.go
+++ b/tests/functional/tester/case_sigquit_remove.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 )
diff --git a/tests/functional/tester/case_sigquit_remove_quorum.go b/tests/functional/tester/case_sigquit_remove_quorum.go
index 545be7f75..401cfbeca 100644
--- a/tests/functional/tester/case_sigquit_remove_quorum.go
+++ b/tests/functional/tester/case_sigquit_remove_quorum.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 )
diff --git a/tests/functional/tester/checker_lease_expire.go b/tests/functional/tester/checker_lease_expire.go
index edd03bfe8..daed56024 100644
--- a/tests/functional/tester/checker_lease_expire.go
+++ b/tests/functional/tester/checker_lease_expire.go
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/tests/functional/tester/stresser_key.go b/tests/functional/tester/stresser_key.go
index 4741fb989..df5c342ef 100644
--- a/tests/functional/tester/stresser_key.go
+++ b/tests/functional/tester/stresser_key.go
@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/raft/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver"
 
 	"go.uber.org/zap"
diff --git a/tests/functional/tester/stresser_lease.go b/tests/functional/tester/stresser_lease.go
index 9fca573c3..2ce2b6aa3 100644
--- a/tests/functional/tester/stresser_lease.go
+++ b/tests/functional/tester/stresser_lease.go
@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/tests/integration/clientv3/black_hole_test.go b/tests/integration/clientv3/black_hole_test.go
index bcb8d7943..0e5d71c60 100644
--- a/tests/integration/clientv3/black_hole_test.go
+++ b/tests/integration/clientv3/black_hole_test.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"google.golang.org/grpc"
 )
 
diff --git a/tests/integration/clientv3/concurrency/election_test.go b/tests/integration/clientv3/concurrency/election_test.go
index ab0cb6709..fd518e3b5 100644
--- a/tests/integration/clientv3/concurrency/election_test.go
+++ b/tests/integration/clientv3/concurrency/election_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 func TestResumeElection(t *testing.T) {
diff --git a/tests/integration/clientv3/concurrency/example_election_test.go b/tests/integration/clientv3/concurrency/example_election_test.go
index 1d6864cfb..7c9e968eb 100644
--- a/tests/integration/clientv3/concurrency/example_election_test.go
+++ b/tests/integration/clientv3/concurrency/example_election_test.go
@@ -21,8 +21,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 func mockElection_Campaign() {
diff --git a/tests/integration/clientv3/concurrency/example_mutex_test.go b/tests/integration/clientv3/concurrency/example_mutex_test.go
index 357806663..671f464d7 100644
--- a/tests/integration/clientv3/concurrency/example_mutex_test.go
+++ b/tests/integration/clientv3/concurrency/example_mutex_test.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 func mockMutex_TryLock() {
diff --git a/tests/integration/clientv3/concurrency/example_stm_test.go b/tests/integration/clientv3/concurrency/example_stm_test.go
index a66fbabe2..59dcf5357 100644
--- a/tests/integration/clientv3/concurrency/example_stm_test.go
+++ b/tests/integration/clientv3/concurrency/example_stm_test.go
@@ -21,8 +21,8 @@ import (
 	"math/rand"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 func mockSTM_apply() {
diff --git a/tests/integration/clientv3/concurrency/mutex_test.go b/tests/integration/clientv3/concurrency/mutex_test.go
index e6b3c3466..7180b9ab8 100644
--- a/tests/integration/clientv3/concurrency/mutex_test.go
+++ b/tests/integration/clientv3/concurrency/mutex_test.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"testing"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 func TestMutexLockSessionExpired(t *testing.T) {
diff --git a/tests/integration/clientv3/dial_test.go b/tests/integration/clientv3/dial_test.go
index dd63442d5..dcb8c662c 100644
--- a/tests/integration/clientv3/dial_test.go
+++ b/tests/integration/clientv3/dial_test.go
@@ -22,10 +22,10 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"google.golang.org/grpc"
 )
 
diff --git a/tests/integration/clientv3/examples/example_auth_test.go b/tests/integration/clientv3/examples/example_auth_test.go
index afb35736b..29ed4b61c 100644
--- a/tests/integration/clientv3/examples/example_auth_test.go
+++ b/tests/integration/clientv3/examples/example_auth_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func mockAuth() {
diff --git a/tests/integration/clientv3/examples/example_cluster_test.go b/tests/integration/clientv3/examples/example_cluster_test.go
index e7c4f22a8..933e7fc5a 100644
--- a/tests/integration/clientv3/examples/example_cluster_test.go
+++ b/tests/integration/clientv3/examples/example_cluster_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func mockCluster_memberList() {
diff --git a/tests/integration/clientv3/examples/example_kv_test.go b/tests/integration/clientv3/examples/example_kv_test.go
index 23ba4a968..6fa6b23dd 100644
--- a/tests/integration/clientv3/examples/example_kv_test.go
+++ b/tests/integration/clientv3/examples/example_kv_test.go
@@ -20,7 +20,7 @@ import (
 	"log"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func mockKV_put() {}
diff --git a/tests/integration/clientv3/examples/example_lease_test.go b/tests/integration/clientv3/examples/example_lease_test.go
index 63346762c..7fe7949b8 100644
--- a/tests/integration/clientv3/examples/example_lease_test.go
+++ b/tests/integration/clientv3/examples/example_lease_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func mockLease_grant() {
diff --git a/tests/integration/clientv3/examples/example_maintenance_test.go b/tests/integration/clientv3/examples/example_maintenance_test.go
index 80759a37f..0426ea553 100644
--- a/tests/integration/clientv3/examples/example_maintenance_test.go
+++ b/tests/integration/clientv3/examples/example_maintenance_test.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func mockMaintenance_status() {}
diff --git a/tests/integration/clientv3/examples/example_metrics_test.go b/tests/integration/clientv3/examples/example_metrics_test.go
index 10d2e06b3..cdcd91854 100644
--- a/tests/integration/clientv3/examples/example_metrics_test.go
+++ b/tests/integration/clientv3/examples/example_metrics_test.go
@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/tests/integration/clientv3/examples/example_test.go b/tests/integration/clientv3/examples/example_test.go
index 41831c7fc..f93308acc 100644
--- a/tests/integration/clientv3/examples/example_test.go
+++ b/tests/integration/clientv3/examples/example_test.go
@@ -16,8 +16,8 @@ package clientv3_test
 
 import (
 	"context"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3"
 	"log"
 )
 
diff --git a/tests/integration/clientv3/examples/example_watch_test.go b/tests/integration/clientv3/examples/example_watch_test.go
index f60286ede..b5c9e808a 100644
--- a/tests/integration/clientv3/examples/example_watch_test.go
+++ b/tests/integration/clientv3/examples/example_watch_test.go
@@ -20,7 +20,7 @@ import (
 	"log"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func mockWatcher_watch() {
diff --git a/tests/integration/clientv3/grpc_test.go b/tests/integration/clientv3/grpc_test.go
index b5ca13b3d..d2c13afab 100644
--- a/tests/integration/clientv3/grpc_test.go
+++ b/tests/integration/clientv3/grpc_test.go
@@ -20,10 +20,10 @@ import (
 	"reflect"
 	"testing"
 
+	etcd "go.etcd.io/etcd/client/v3"
+	namingv3 "go.etcd.io/etcd/client/v3/naming"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	etcd "go.etcd.io/etcd/v3/clientv3"
-	namingv3 "go.etcd.io/etcd/v3/clientv3/naming"
 
 	"google.golang.org/grpc/naming"
 )
diff --git a/tests/integration/clientv3/kv_test.go b/tests/integration/clientv3/kv_test.go
index 34a560644..1b87515ea 100644
--- a/tests/integration/clientv3/kv_test.go
+++ b/tests/integration/clientv3/kv_test.go
@@ -28,9 +28,9 @@ import (
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/tests/integration/clientv3/lease_test.go b/tests/integration/clientv3/lease_test.go
index 411935a17..c86d63fa0 100644
--- a/tests/integration/clientv3/lease_test.go
+++ b/tests/integration/clientv3/lease_test.go
@@ -24,10 +24,10 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
 )
 
 func TestLeaseNotFoundError(t *testing.T) {
diff --git a/tests/integration/clientv3/leasing_test.go b/tests/integration/clientv3/leasing_test.go
index c75083b47..b0edc3be9 100644
--- a/tests/integration/clientv3/leasing_test.go
+++ b/tests/integration/clientv3/leasing_test.go
@@ -23,11 +23,11 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
+	"go.etcd.io/etcd/client/v3/leasing"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/clientv3/leasing"
 )
 
 func TestLeasingPutGet(t *testing.T) {
diff --git a/tests/integration/clientv3/logger_test.go b/tests/integration/clientv3/logger_test.go
index 0d85287d2..f80968b47 100644
--- a/tests/integration/clientv3/logger_test.go
+++ b/tests/integration/clientv3/logger_test.go
@@ -17,7 +17,7 @@ package clientv3test
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/tests/integration/clientv3/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go
index bc19f9cc3..53f864830 100644
--- a/tests/integration/clientv3/maintenance_test.go
+++ b/tests/integration/clientv3/maintenance_test.go
@@ -29,9 +29,9 @@ import (
 	"google.golang.org/grpc"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/lease"
 	"go.etcd.io/etcd/v3/mvcc"
 	"go.etcd.io/etcd/v3/mvcc/backend"
diff --git a/tests/integration/clientv3/metrics_test.go b/tests/integration/clientv3/metrics_test.go
index c89f03af7..c051a75b3 100644
--- a/tests/integration/clientv3/metrics_test.go
+++ b/tests/integration/clientv3/metrics_test.go
@@ -25,10 +25,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/tests/integration/clientv3/mirror_test.go b/tests/integration/clientv3/mirror_test.go
index 782c02be0..bce951d1f 100644
--- a/tests/integration/clientv3/mirror_test.go
+++ b/tests/integration/clientv3/mirror_test.go
@@ -23,9 +23,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
+	"go.etcd.io/etcd/client/v3/mirror"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3/mirror"
 )
 
 func TestMirrorSync(t *testing.T) {
diff --git a/tests/integration/clientv3/namespace_test.go b/tests/integration/clientv3/namespace_test.go
index c1af9e131..3e46ff411 100644
--- a/tests/integration/clientv3/namespace_test.go
+++ b/tests/integration/clientv3/namespace_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/namespace"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/namespace"
 )
 
 func TestNamespacePutGet(t *testing.T) {
diff --git a/tests/integration/clientv3/network_partition_test.go b/tests/integration/clientv3/network_partition_test.go
index 129057161..af2927b13 100644
--- a/tests/integration/clientv3/network_partition_test.go
+++ b/tests/integration/clientv3/network_partition_test.go
@@ -24,9 +24,9 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"google.golang.org/grpc"
 )
 
diff --git a/tests/integration/clientv3/ordering_kv_test.go b/tests/integration/clientv3/ordering_kv_test.go
index 8c8251826..5338313c9 100644
--- a/tests/integration/clientv3/ordering_kv_test.go
+++ b/tests/integration/clientv3/ordering_kv_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/ordering"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/ordering"
 )
 
 func TestDetectKvOrderViolation(t *testing.T) {
diff --git a/tests/integration/clientv3/ordering_util_test.go b/tests/integration/clientv3/ordering_util_test.go
index 780ecacad..efce2bb0d 100644
--- a/tests/integration/clientv3/ordering_util_test.go
+++ b/tests/integration/clientv3/ordering_util_test.go
@@ -19,10 +19,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/ordering"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/ordering"
 )
 
 func TestEndpointSwitchResolvesViolation(t *testing.T) {
diff --git a/tests/integration/clientv3/server_shutdown_test.go b/tests/integration/clientv3/server_shutdown_test.go
index a3e7ceac4..32d6bb877 100644
--- a/tests/integration/clientv3/server_shutdown_test.go
+++ b/tests/integration/clientv3/server_shutdown_test.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/tests/integration/clientv3/snapshot/v3_snapshot_test.go b/tests/integration/clientv3/snapshot/v3_snapshot_test.go
index 8f8382615..e42cf608d 100644
--- a/tests/integration/clientv3/snapshot/v3_snapshot_test.go
+++ b/tests/integration/clientv3/snapshot/v3_snapshot_test.go
@@ -24,10 +24,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/snapshot"
 	"go.etcd.io/etcd/pkg/v3/fileutil"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
 	"go.etcd.io/etcd/v3/embed"
 
 	"go.uber.org/zap"
diff --git a/tests/integration/clientv3/txn_test.go b/tests/integration/clientv3/txn_test.go
index 9d32c62ba..50802064b 100644
--- a/tests/integration/clientv3/txn_test.go
+++ b/tests/integration/clientv3/txn_test.go
@@ -21,9 +21,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/embed"
 )
 
diff --git a/tests/integration/clientv3/user_test.go b/tests/integration/clientv3/user_test.go
index 12910e90e..b775b5959 100644
--- a/tests/integration/clientv3/user_test.go
+++ b/tests/integration/clientv3/user_test.go
@@ -20,9 +20,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"google.golang.org/grpc"
 )
 
diff --git a/tests/integration/clientv3/util.go b/tests/integration/clientv3/util.go
index 9be209a8d..10df3b872 100644
--- a/tests/integration/clientv3/util.go
+++ b/tests/integration/clientv3/util.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint).
diff --git a/tests/integration/clientv3/watch_fragment_test.go b/tests/integration/clientv3/watch_fragment_test.go
index 8804ce00d..483a5d7cd 100644
--- a/tests/integration/clientv3/watch_fragment_test.go
+++ b/tests/integration/clientv3/watch_fragment_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 // TestWatchFragmentDisable ensures that large watch
diff --git a/tests/integration/clientv3/watch_test.go b/tests/integration/clientv3/watch_test.go
index 30e4a590f..2418b7119 100644
--- a/tests/integration/clientv3/watch_test.go
+++ b/tests/integration/clientv3/watch_test.go
@@ -27,9 +27,9 @@ import (
 	mvccpb "go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
 
 	"google.golang.org/grpc/metadata"
diff --git a/tests/integration/cluster.go b/tests/integration/cluster.go
index 5885eb4ac..55e46de28 100644
--- a/tests/integration/cluster.go
+++ b/tests/integration/cluster.go
@@ -35,12 +35,12 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/v2"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/logutil"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/tlsutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/pkg/v3/types"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/embed"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
diff --git a/tests/integration/cluster_direct.go b/tests/integration/cluster_direct.go
index c0b15908b..b5dc397fe 100644
--- a/tests/integration/cluster_direct.go
+++ b/tests/integration/cluster_direct.go
@@ -18,7 +18,7 @@ package integration
 
 import (
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
 )
diff --git a/tests/integration/cluster_proxy.go b/tests/integration/cluster_proxy.go
index 5d439b29a..7a5a9236f 100644
--- a/tests/integration/cluster_proxy.go
+++ b/tests/integration/cluster_proxy.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/namespace"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/namespace"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy/adapter"
 
diff --git a/tests/integration/embed/embed_test.go b/tests/integration/embed/embed_test.go
index 8c6a3887a..a8b11859c 100644
--- a/tests/integration/embed/embed_test.go
+++ b/tests/integration/embed/embed_test.go
@@ -29,9 +29,9 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/embed"
 )
 
diff --git a/tests/integration/logger_test.go b/tests/integration/logger_test.go
index 7fc4ed67f..a9fd53b26 100644
--- a/tests/integration/logger_test.go
+++ b/tests/integration/logger_test.go
@@ -17,7 +17,7 @@ package integration
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/tests/integration/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go
index c6311152b..6632f9926 100644
--- a/tests/integration/proxy/grpcproxy/cluster_test.go
+++ b/tests/integration/proxy/grpcproxy/cluster_test.go
@@ -21,9 +21,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy"
 
 	"go.uber.org/zap"
diff --git a/tests/integration/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go
index 50d8943a2..fc1f94f1a 100644
--- a/tests/integration/proxy/grpcproxy/kv_test.go
+++ b/tests/integration/proxy/grpcproxy/kv_test.go
@@ -21,9 +21,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy"
 
 	"google.golang.org/grpc"
diff --git a/tests/integration/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go
index fe76d0585..84473dc79 100644
--- a/tests/integration/proxy/grpcproxy/register_test.go
+++ b/tests/integration/proxy/grpcproxy/register_test.go
@@ -18,10 +18,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/naming"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/naming"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy"
 
 	"go.uber.org/zap"
diff --git a/tests/integration/snapshot/member_test.go b/tests/integration/snapshot/member_test.go
index e2c609ad5..eaa107f86 100644
--- a/tests/integration/snapshot/member_test.go
+++ b/tests/integration/snapshot/member_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/embed"
 	"go.etcd.io/etcd/v3/etcdserver"
 )
diff --git a/tests/integration/snapshot/v3_snapshot_test.go b/tests/integration/snapshot/v3_snapshot_test.go
index b37bf5dc2..40a4e32db 100644
--- a/tests/integration/snapshot/v3_snapshot_test.go
+++ b/tests/integration/snapshot/v3_snapshot_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/embed"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 
diff --git a/tests/integration/v2store/store_tag_v2v3_test.go b/tests/integration/v2store/store_tag_v2v3_test.go
index b0c05b0bc..0ea609315 100644
--- a/tests/integration/v2store/store_tag_v2v3_test.go
+++ b/tests/integration/v2store/store_tag_v2v3_test.go
@@ -20,8 +20,8 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2v3"
 
diff --git a/tests/integration/v2store/store_v2v3_test.go b/tests/integration/v2store/store_v2v3_test.go
index 6d6269360..bf125ccf5 100644
--- a/tests/integration/v2store/store_v2v3_test.go
+++ b/tests/integration/v2store/store_v2v3_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2v3"
 )
diff --git a/tests/integration/v3_auth_test.go b/tests/integration/v3_auth_test.go
index 39103b653..dc186824d 100644
--- a/tests/integration/v3_auth_test.go
+++ b/tests/integration/v3_auth_test.go
@@ -24,8 +24,8 @@ import (
 	"go.etcd.io/etcd/api/v3/authpb"
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error.
diff --git a/tests/integration/v3_barrier_test.go b/tests/integration/v3_barrier_test.go
index c209cdae7..bba58633b 100644
--- a/tests/integration/v3_barrier_test.go
+++ b/tests/integration/v3_barrier_test.go
@@ -18,8 +18,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 	recipe "go.etcd.io/etcd/v3/contrib/recipes"
 )
 
diff --git a/tests/integration/v3_double_barrier_test.go b/tests/integration/v3_double_barrier_test.go
index 77f12f2e6..da234d595 100644
--- a/tests/integration/v3_double_barrier_test.go
+++ b/tests/integration/v3_double_barrier_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	recipe "go.etcd.io/etcd/v3/contrib/recipes"
 )
 
diff --git a/tests/integration/v3_election_test.go b/tests/integration/v3_election_test.go
index 31c867a8f..cef981e45 100644
--- a/tests/integration/v3_election_test.go
+++ b/tests/integration/v3_election_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 // TestElectionWait tests if followers can correctly wait for elections.
diff --git a/tests/integration/v3_grpc_test.go b/tests/integration/v3_grpc_test.go
index c42ba8b89..3cd94c70e 100644
--- a/tests/integration/v3_grpc_test.go
+++ b/tests/integration/v3_grpc_test.go
@@ -27,9 +27,9 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/tests/integration/v3_kv_test.go b/tests/integration/v3_kv_test.go
index f989e84f4..68bdeaf95 100644
--- a/tests/integration/v3_kv_test.go
+++ b/tests/integration/v3_kv_test.go
@@ -2,9 +2,9 @@ package integration
 
 import (
 	"context"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/namespace"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/namespace"
 	"go.etcd.io/etcd/v3/embed"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
 	"io/ioutil"
diff --git a/tests/integration/v3_lock_test.go b/tests/integration/v3_lock_test.go
index 89614332c..89a219d68 100644
--- a/tests/integration/v3_lock_test.go
+++ b/tests/integration/v3_lock_test.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
 	recipe "go.etcd.io/etcd/v3/contrib/recipes"
 )
 
diff --git a/tests/integration/v3_stm_test.go b/tests/integration/v3_stm_test.go
index 0d6a21a1c..dc3085b83 100644
--- a/tests/integration/v3_stm_test.go
+++ b/tests/integration/v3_stm_test.go
@@ -21,9 +21,9 @@ import (
 	"strconv"
 	"testing"
 
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
 )
 
 // TestSTMConflict tests that conflicts are retried.
diff --git a/tests/integration/v3_tls_test.go b/tests/integration/v3_tls_test.go
index 0c22f0425..7a050964a 100644
--- a/tests/integration/v3_tls_test.go
+++ b/tests/integration/v3_tls_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"google.golang.org/grpc"
 )
diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go
index 5350b08bb..a5de62b45 100644
--- a/tools/benchmark/cmd/lease.go
+++ b/tools/benchmark/cmd/lease.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/cheggaaa/pb.v1"
diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go
index 1b0f1447f..a83d57081 100644
--- a/tools/benchmark/cmd/put.go
+++ b/tools/benchmark/cmd/put.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go
index b8279bb80..fc503b71b 100644
--- a/tools/benchmark/cmd/range.go
+++ b/tools/benchmark/cmd/range.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go
index 6ebb80984..b20c3910a 100644
--- a/tools/benchmark/cmd/stm.go
+++ b/tools/benchmark/cmd/stm.go
@@ -23,9 +23,9 @@ import (
 	"os"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
+	v3sync "go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	v3sync "go.etcd.io/etcd/v3/clientv3/concurrency"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
 
 	"github.com/spf13/cobra"
diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go
index 33a95026b..7558054c5 100644
--- a/tools/benchmark/cmd/txn_put.go
+++ b/tools/benchmark/cmd/txn_put.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go
index 45bf017ca..725975983 100644
--- a/tools/benchmark/cmd/util.go
+++ b/tools/benchmark/cmd/util.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/bgentry/speakeasy"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	"go.etcd.io/etcd/v3/clientv3"
 	"google.golang.org/grpc/grpclog"
 )
 
diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go
index e7570b542..e25ee41ec 100644
--- a/tools/benchmark/cmd/watch.go
+++ b/tools/benchmark/cmd/watch.go
@@ -23,8 +23,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go
index 3b42c37fe..31ada8a7c 100644
--- a/tools/benchmark/cmd/watch_get.go
+++ b/tools/benchmark/cmd/watch_get.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/cheggaaa/pb.v1"
diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go
index 0593f9849..ed46c065d 100644
--- a/tools/benchmark/cmd/watch_latency.go
+++ b/tools/benchmark/cmd/watch_latency.go
@@ -21,8 +21,8 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/report"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go
index 4b47757e1..6d4dd6cbf 100644
--- a/tools/etcd-dump-metrics/etcd.go
+++ b/tools/etcd-dump-metrics/etcd.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/embed"
 
 	"go.uber.org/zap"