diff --git a/Documentation/dev-guide/api_concurrency_reference_v3.md b/Documentation/dev-guide/api_concurrency_reference_v3.md
index 01059c7c1..a5ae7624c 100644
--- a/Documentation/dev-guide/api_concurrency_reference_v3.md
+++ b/Documentation/dev-guide/api_concurrency_reference_v3.md
@@ -1,6 +1,4 @@
----
-title: etcd concurrency API Reference
----
+### etcd concurrency API Reference
 
 
 This is a generated documentation. Please read the proto files for more.
diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md
index e88906b0e..207800f06 100644
--- a/Documentation/dev-guide/api_reference_v3.md
+++ b/Documentation/dev-guide/api_reference_v3.md
@@ -1,6 +1,4 @@
----
-title: etcd API Reference
----
+### etcd API Reference
 
 
 This is a generated documentation. Please read the proto files for more.
diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go
index 49e261f1f..8de2d175c 100644
--- a/auth/range_perm_cache.go
+++ b/auth/range_perm_cache.go
@@ -15,9 +15,9 @@
 package auth
 
 import (
-	"go.etcd.io/etcd/v3/auth/authpb"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/auth/authpb"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/adt"
 
 	"go.uber.org/zap"
 )
diff --git a/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go
index 5d0fde083..e5baa86b4 100644
--- a/auth/range_perm_cache_test.go
+++ b/auth/range_perm_cache_test.go
@@ -17,8 +17,8 @@ package auth
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/auth/authpb"
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/auth/authpb"
+	"go.etcd.io/etcd/pkg/adt"
 
 	"go.uber.org/zap"
 )
diff --git a/auth/store.go b/auth/store.go
index 9cf477f9d..2e95e0c16 100644
--- a/auth/store.go
+++ b/auth/store.go
@@ -24,10 +24,10 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"go.etcd.io/etcd/v3/auth/authpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/auth/authpb"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/auth/store_test.go b/auth/store_test.go
index 488d4fcee..67e50f23f 100644
--- a/auth/store_test.go
+++ b/auth/store_test.go
@@ -24,10 +24,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/auth/authpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/auth/authpb"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 	"golang.org/x/crypto/bcrypt"
diff --git a/client/client.go b/client/client.go
index 12f79fc8c..6f1270f8a 100644
--- a/client/client.go
+++ b/client/client.go
@@ -29,7 +29,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 )
 
 var (
diff --git a/client/client_test.go b/client/client_test.go
index d3dae8203..2b4ae4d82 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -29,8 +29,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/version"
 )
 
 type actionAssertingHTTPClient struct {
diff --git a/client/discover.go b/client/discover.go
index 7b9868b7f..580c25626 100644
--- a/client/discover.go
+++ b/client/discover.go
@@ -15,7 +15,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/v3/pkg/srv"
+	"go.etcd.io/etcd/pkg/srv"
 )
 
 // Discoverer is an interface that wraps the Discover method.
diff --git a/client/doc.go b/client/doc.go
index 0337e701b..abe5199c3 100644
--- a/client/doc.go
+++ b/client/doc.go
@@ -21,7 +21,7 @@ Create a Config and exchange it for a Client:
 		"net/http"
 		"context"
 
-		"go.etcd.io/etcd/v3/client"
+		"go.etcd.io/etcd/client"
 	)
 
 	cfg := client.Config{
diff --git a/client/example_keys_test.go b/client/example_keys_test.go
index 2dd69a27f..84cbbe791 100644
--- a/client/example_keys_test.go
+++ b/client/example_keys_test.go
@@ -20,7 +20,7 @@ import (
 	"log"
 	"sort"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 func ExampleKeysAPI_directory() {
diff --git a/client/integration/client_test.go b/client/integration/client_test.go
index a83258be2..546b28f24 100644
--- a/client/integration/client_test.go
+++ b/client/integration/client_test.go
@@ -24,9 +24,9 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.
diff --git a/client/integration/main_test.go b/client/integration/main_test.go
index 4dec98da4..c7362dde4 100644
--- a/client/integration/main_test.go
+++ b/client/integration/main_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMain(m *testing.M) {
diff --git a/client/keys.go b/client/keys.go
index 23aafdb19..d0350b8d2 100644
--- a/client/keys.go
+++ b/client/keys.go
@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.etcd.io/etcd/v3/pkg/pathutil"
+	"go.etcd.io/etcd/pkg/pathutil"
 	"net/http"
 	"net/url"
 	"strconv"
diff --git a/client/main_test.go b/client/main_test.go
index af5cbcd17..1fec862e0 100644
--- a/client/main_test.go
+++ b/client/main_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 var exampleEndpoints []string
diff --git a/client/members.go b/client/members.go
index 6a87b1a29..657131ab0 100644
--- a/client/members.go
+++ b/client/members.go
@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"path"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 var (
diff --git a/client/members_test.go b/client/members_test.go
index c75e71d8f..9be03ae54 100644
--- a/client/members_test.go
+++ b/client/members_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 func TestMembersAPIActionList(t *testing.T) {
diff --git a/clientv3/auth.go b/clientv3/auth.go
index 0b8dabb38..921f50f5e 100644
--- a/clientv3/auth.go
+++ b/clientv3/auth.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"strings"
 
-	"go.etcd.io/etcd/v3/auth/authpb"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/auth/authpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"google.golang.org/grpc"
 )
 
diff --git a/clientv3/balancer/balancer.go b/clientv3/balancer/balancer.go
index 0e926502f..54c405b0a 100644
--- a/clientv3/balancer/balancer.go
+++ b/clientv3/balancer/balancer.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
+	"go.etcd.io/etcd/clientv3/balancer/picker"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc/balancer"
diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go
index 31f1fcbab..c31ddbe45 100644
--- a/clientv3/balancer/balancer_test.go
+++ b/clientv3/balancer/balancer_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
-	"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/mock/mockserver"
+	"go.etcd.io/etcd/clientv3/balancer/picker"
+	"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/mock/mockserver"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/clientv3/balancer/config.go b/clientv3/balancer/config.go
index 1821ff4dd..0339a84d0 100644
--- a/clientv3/balancer/config.go
+++ b/clientv3/balancer/config.go
@@ -15,7 +15,7 @@
 package balancer
 
 import (
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
+	"go.etcd.io/etcd/clientv3/balancer/picker"
 
 	"go.uber.org/zap"
 )
diff --git a/clientv3/balancer/grpc1.7-health_test.go b/clientv3/balancer/grpc1.7-health_test.go
index a104e4df8..186de7a36 100644
--- a/clientv3/balancer/grpc1.7-health_test.go
+++ b/clientv3/balancer/grpc1.7-health_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/client.go b/clientv3/client.go
index 0f4780685..f078f6f8e 100644
--- a/clientv3/client.go
+++ b/clientv3/client.go
@@ -27,11 +27,11 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"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/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/clientv3/balancer"
+	"go.etcd.io/etcd/clientv3/balancer/picker"
+	"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/logutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/clientv3/client_test.go b/clientv3/client_test.go
index 7a3c374e6..47544a0da 100644
--- a/clientv3/client_test.go
+++ b/clientv3/client_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/clientv3util/example_key_test.go b/clientv3/clientv3util/example_key_test.go
index 7290b6698..a3506e90c 100644
--- a/clientv3/clientv3util/example_key_test.go
+++ b/clientv3/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/clientv3"
+	"go.etcd.io/etcd/clientv3/clientv3util"
 )
 
 func ExampleKeyMissing() {
diff --git a/clientv3/clientv3util/util.go b/clientv3/clientv3util/util.go
index 984938614..8153f66f8 100644
--- a/clientv3/clientv3util/util.go
+++ b/clientv3/clientv3util/util.go
@@ -16,7 +16,7 @@
 package clientv3util
 
 import (
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 // KeyExists returns a comparison operation that evaluates to true iff the given
diff --git a/clientv3/cluster.go b/clientv3/cluster.go
index 855465b7e..ce97e5c85 100644
--- a/clientv3/cluster.go
+++ b/clientv3/cluster.go
@@ -17,8 +17,8 @@ package clientv3
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/compact_op.go b/clientv3/compact_op.go
index b1b09708a..5779713d3 100644
--- a/clientv3/compact_op.go
+++ b/clientv3/compact_op.go
@@ -15,7 +15,7 @@
 package clientv3
 
 import (
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 // CompactOp represents a compact operation.
diff --git a/clientv3/compact_op_test.go b/clientv3/compact_op_test.go
index c4ddfc89e..991e47a15 100644
--- a/clientv3/compact_op_test.go
+++ b/clientv3/compact_op_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 func TestCompactOp(t *testing.T) {
diff --git a/clientv3/compare.go b/clientv3/compare.go
index 149ab7893..01ed68e94 100644
--- a/clientv3/compare.go
+++ b/clientv3/compare.go
@@ -15,7 +15,7 @@
 package clientv3
 
 import (
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type CompareTarget int
diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go
index 5dadb2e1b..2521db6ac 100644
--- a/clientv3/concurrency/election.go
+++ b/clientv3/concurrency/election.go
@@ -19,9 +19,9 @@ import (
 	"errors"
 	"fmt"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 var (
diff --git a/clientv3/concurrency/election_test.go b/clientv3/concurrency/election_test.go
index a6e032419..0e45d91ed 100644
--- a/clientv3/concurrency/election_test.go
+++ b/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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 )
 
 func TestResumeElection(t *testing.T) {
diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go
index e0a1c3e6e..2514490fd 100644
--- a/clientv3/concurrency/example_election_test.go
+++ b/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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 )
 
 func ExampleElection_Campaign() {
diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go
index 92ad1aff7..a0463d5b5 100644
--- a/clientv3/concurrency/example_mutex_test.go
+++ b/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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 )
 
 func ExampleMutex_Lock() {
diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go
index bdcfab4a1..e0e946f12 100644
--- a/clientv3/concurrency/example_stm_test.go
+++ b/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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 )
 
 // ExampleSTM_apply shows how to use STM with a transactional
diff --git a/clientv3/concurrency/key.go b/clientv3/concurrency/key.go
index 684019ac5..e4cf77517 100644
--- a/clientv3/concurrency/key.go
+++ b/clientv3/concurrency/key.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"fmt"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error {
diff --git a/clientv3/concurrency/main_test.go b/clientv3/concurrency/main_test.go
index 6ffeefddf..0d8b3a41f 100644
--- a/clientv3/concurrency/main_test.go
+++ b/clientv3/concurrency/main_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 var endpoints []string
diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go
index 30d122cdc..013534193 100644
--- a/clientv3/concurrency/mutex.go
+++ b/clientv3/concurrency/mutex.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"sync"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 // Mutex implements the sync Locker interface with etcd
diff --git a/clientv3/concurrency/session.go b/clientv3/concurrency/session.go
index 04a34ed8a..598ec0e4f 100644
--- a/clientv3/concurrency/session.go
+++ b/clientv3/concurrency/session.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/clientv3"
 )
 
 const defaultSessionTTL = 60
diff --git a/clientv3/concurrency/stm.go b/clientv3/concurrency/stm.go
index 908a4bed3..ee1151079 100644
--- a/clientv3/concurrency/stm.go
+++ b/clientv3/concurrency/stm.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"math"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/clientv3"
 )
 
 // STM is an interface for software transactional memory.
diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go
index 0ca4e693e..cabdeed60 100644
--- a/clientv3/example_auth_test.go
+++ b/clientv3/example_auth_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 func ExampleAuth() {
diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go
index bb1807823..6a9a7c2ac 100644
--- a/clientv3/example_cluster_test.go
+++ b/clientv3/example_cluster_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 func ExampleCluster_memberList() {
diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go
index 61e0b45aa..ae552583a 100644
--- a/clientv3/example_kv_test.go
+++ b/clientv3/example_kv_test.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 )
 
 func ExampleKV_put() {
diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go
index 5ddf5f6c3..c065b7def 100644
--- a/clientv3/example_lease_test.go
+++ b/clientv3/example_lease_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 func ExampleLease_grant() {
diff --git a/clientv3/example_maintenance_test.go b/clientv3/example_maintenance_test.go
index d345e3a76..58b10d0b6 100644
--- a/clientv3/example_maintenance_test.go
+++ b/clientv3/example_maintenance_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 func ExampleMaintenance_status() {
diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go
index 007e66a24..5bee0c200 100644
--- a/clientv3/example_metrics_test.go
+++ b/clientv3/example_metrics_test.go
@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 
 	grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/clientv3/example_test.go b/clientv3/example_test.go
index 0c6cb9a21..453f8c916 100644
--- a/clientv3/example_test.go
+++ b/clientv3/example_test.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go
index eceaa6c64..313514fbd 100644
--- a/clientv3/example_watch_test.go
+++ b/clientv3/example_watch_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 func ExampleWatcher_watch() {
diff --git a/clientv3/integration/black_hole_test.go b/clientv3/integration/black_hole_test.go
index 26cf3a3a0..0ff3f73f1 100644
--- a/clientv3/integration/black_hole_test.go
+++ b/clientv3/integration/black_hole_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 	"google.golang.org/grpc"
 )
 
diff --git a/clientv3/integration/cluster_test.go b/clientv3/integration/cluster_test.go
index 489e0c9e4..6e01842bf 100644
--- a/clientv3/integration/cluster_test.go
+++ b/clientv3/integration/cluster_test.go
@@ -20,9 +20,9 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 func TestMemberList(t *testing.T) {
diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go
index ecf1a05dc..5814afbd0 100644
--- a/clientv3/integration/dial_test.go
+++ b/clientv3/integration/dial_test.go
@@ -21,11 +21,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 	"google.golang.org/grpc"
 )
 
diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go
index 6f70a3ad8..b71b98d06 100644
--- a/clientv3/integration/kv_test.go
+++ b/clientv3/integration/kv_test.go
@@ -23,11 +23,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go
index 0e43e7403..6fd8f4306 100644
--- a/clientv3/integration/lease_test.go
+++ b/clientv3/integration/lease_test.go
@@ -22,11 +22,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/integration/leasing_test.go b/clientv3/integration/leasing_test.go
index 12edff0f5..5c4bab1cf 100644
--- a/clientv3/integration/leasing_test.go
+++ b/clientv3/integration/leasing_test.go
@@ -23,11 +23,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/clientv3/leasing"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/clientv3/leasing"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestLeasingPutGet(t *testing.T) {
diff --git a/clientv3/integration/logger_test.go b/clientv3/integration/logger_test.go
index 7fc4ed67f..f36664ec7 100644
--- a/clientv3/integration/logger_test.go
+++ b/clientv3/integration/logger_test.go
@@ -17,7 +17,7 @@ package integration
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/clientv3/integration/main_test.go b/clientv3/integration/main_test.go
index 4dec98da4..c7362dde4 100644
--- a/clientv3/integration/main_test.go
+++ b/clientv3/integration/main_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMain(m *testing.M) {
diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go
index ed52c27cd..4fecaf812 100644
--- a/clientv3/integration/maintenance_test.go
+++ b/clientv3/integration/maintenance_test.go
@@ -27,13 +27,13 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMaintenanceHashKV(t *testing.T) {
diff --git a/clientv3/integration/metrics_test.go b/clientv3/integration/metrics_test.go
index c76bb2ce5..1b73af9d7 100644
--- a/clientv3/integration/metrics_test.go
+++ b/clientv3/integration/metrics_test.go
@@ -25,10 +25,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 
 	grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go
index ae715510c..46b312ff9 100644
--- a/clientv3/integration/mirror_test.go
+++ b/clientv3/integration/mirror_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/mirror"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3/mirror"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMirrorSync(t *testing.T) {
diff --git a/clientv3/integration/namespace_test.go b/clientv3/integration/namespace_test.go
index 959f419e8..3f4344d22 100644
--- a/clientv3/integration/namespace_test.go
+++ b/clientv3/integration/namespace_test.go
@@ -19,11 +19,11 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/namespace"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/namespace"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestNamespacePutGet(t *testing.T) {
diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go
index 2787b4c54..b006f6fe9 100644
--- a/clientv3/integration/network_partition_test.go
+++ b/clientv3/integration/network_partition_test.go
@@ -22,11 +22,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 	"google.golang.org/grpc"
 )
 
diff --git a/clientv3/integration/role_test.go b/clientv3/integration/role_test.go
index f790738f1..cc779575a 100644
--- a/clientv3/integration/role_test.go
+++ b/clientv3/integration/role_test.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestRoleError(t *testing.T) {
diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go
index 4ea1b4b76..f7ce58c36 100644
--- a/clientv3/integration/server_shutdown_test.go
+++ b/clientv3/integration/server_shutdown_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/clientv3/integration/txn_test.go b/clientv3/integration/txn_test.go
index f26a63544..af994adbe 100644
--- a/clientv3/integration/txn_test.go
+++ b/clientv3/integration/txn_test.go
@@ -20,11 +20,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestTxnError(t *testing.T) {
diff --git a/clientv3/integration/user_test.go b/clientv3/integration/user_test.go
index bda3c2475..cff6c58bf 100644
--- a/clientv3/integration/user_test.go
+++ b/clientv3/integration/user_test.go
@@ -19,10 +19,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 	"google.golang.org/grpc"
 )
 
diff --git a/clientv3/integration/util.go b/clientv3/integration/util.go
index 12e0fd1e5..939c7884e 100644
--- a/clientv3/integration/util.go
+++ b/clientv3/integration/util.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint).
diff --git a/clientv3/integration/watch_fragment_test.go b/clientv3/integration/watch_fragment_test.go
index 34ec3049b..e22540d9e 100644
--- a/clientv3/integration/watch_fragment_test.go
+++ b/clientv3/integration/watch_fragment_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestWatchFragmentDisable ensures that large watch
diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go
index 01ec2fa5e..bf751d679 100644
--- a/clientv3/integration/watch_test.go
+++ b/clientv3/integration/watch_test.go
@@ -23,12 +23,12 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/integration"
-	mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/integration"
+	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc/metadata"
 )
diff --git a/clientv3/kv.go b/clientv3/kv.go
index 0628ed0f1..2b7864ad8 100644
--- a/clientv3/kv.go
+++ b/clientv3/kv.go
@@ -17,7 +17,7 @@ package clientv3
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/lease.go b/clientv3/lease.go
index 5a26709c4..c2796fc96 100644
--- a/clientv3/lease.go
+++ b/clientv3/lease.go
@@ -19,8 +19,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go
index 541a43d1d..f4870c1fb 100644
--- a/clientv3/leasing/cache.go
+++ b/clientv3/leasing/cache.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 const revokeBackoff = 2 * time.Second
diff --git a/clientv3/leasing/kv.go b/clientv3/leasing/kv.go
index 804eeb2cf..ecfaedfc2 100644
--- a/clientv3/leasing/kv.go
+++ b/clientv3/leasing/kv.go
@@ -20,11 +20,11 @@ import (
 	"sync"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/clientv3/leasing/txn.go b/clientv3/leasing/txn.go
index a9e4ed4a6..96703ecc6 100644
--- a/clientv3/leasing/txn.go
+++ b/clientv3/leasing/txn.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"strings"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type txnLeasing struct {
diff --git a/clientv3/leasing/util.go b/clientv3/leasing/util.go
index f72e1bcf4..f4f9a372e 100644
--- a/clientv3/leasing/util.go
+++ b/clientv3/leasing/util.go
@@ -17,8 +17,8 @@ package leasing
 import (
 	"bytes"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 func compareInt64(a, b int64) int {
diff --git a/clientv3/logger.go b/clientv3/logger.go
index 0e0bfc8aa..f5ae0109d 100644
--- a/clientv3/logger.go
+++ b/clientv3/logger.go
@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/logutil"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/clientv3/main_test.go b/clientv3/main_test.go
index 5b0f39232..972abff1f 100644
--- a/clientv3/main_test.go
+++ b/clientv3/main_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestMain sets up an etcd cluster if running the examples.
diff --git a/clientv3/maintenance.go b/clientv3/maintenance.go
index 6164ef66a..744455a3b 100644
--- a/clientv3/maintenance.go
+++ b/clientv3/maintenance.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"io"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/mirror/syncer.go b/clientv3/mirror/syncer.go
index 38d6838bb..e00af70ee 100644
--- a/clientv3/mirror/syncer.go
+++ b/clientv3/mirror/syncer.go
@@ -18,7 +18,7 @@ package mirror
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 const (
diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go
index 9899222a5..aadeb6fd7 100644
--- a/clientv3/namespace/kv.go
+++ b/clientv3/namespace/kv.go
@@ -17,9 +17,9 @@ package namespace
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type kvPrefix struct {
diff --git a/clientv3/namespace/lease.go b/clientv3/namespace/lease.go
index f7596d0aa..fa210ee16 100644
--- a/clientv3/namespace/lease.go
+++ b/clientv3/namespace/lease.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 type leasePrefix struct {
diff --git a/clientv3/namespace/watch.go b/clientv3/namespace/watch.go
index 8dc28380a..d5dfef54c 100644
--- a/clientv3/namespace/watch.go
+++ b/clientv3/namespace/watch.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 type watcherPrefix struct {
diff --git a/clientv3/naming/doc.go b/clientv3/naming/doc.go
index 98987d8fd..b55cc49ad 100644
--- a/clientv3/naming/doc.go
+++ b/clientv3/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/clientv3"
+//		etcdnaming "go.etcd.io/etcd/clientv3/naming"
 //
 //		"google.golang.org/grpc"
 //		"google.golang.org/grpc/naming"
diff --git a/clientv3/naming/grpc.go b/clientv3/naming/grpc.go
index b680274bb..7eed84bfb 100644
--- a/clientv3/naming/grpc.go
+++ b/clientv3/naming/grpc.go
@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	etcd "go.etcd.io/etcd/v3/clientv3"
+	etcd "go.etcd.io/etcd/clientv3"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/naming"
diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go
index 8f1a38c46..66a1feae0 100644
--- a/clientv3/naming/grpc_test.go
+++ b/clientv3/naming/grpc_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	etcd "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	etcd "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc/naming"
 )
diff --git a/clientv3/op.go b/clientv3/op.go
index 1041af4dc..085dd28ab 100644
--- a/clientv3/op.go
+++ b/clientv3/op.go
@@ -14,7 +14,7 @@
 
 package clientv3
 
-import pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+import pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 type opType int
 
diff --git a/clientv3/op_test.go b/clientv3/op_test.go
index cb0feb59e..468893dd4 100644
--- a/clientv3/op_test.go
+++ b/clientv3/op_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 // TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified,
diff --git a/clientv3/ordering/kv.go b/clientv3/ordering/kv.go
index d62f2c891..951bd10ab 100644
--- a/clientv3/ordering/kv.go
+++ b/clientv3/ordering/kv.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 // kvOrdering ensures that serialized requests do not return
diff --git a/clientv3/ordering/kv_test.go b/clientv3/ordering/kv_test.go
index e10db9693..01a80fc52 100644
--- a/clientv3/ordering/kv_test.go
+++ b/clientv3/ordering/kv_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestDetectKvOrderViolation(t *testing.T) {
diff --git a/clientv3/ordering/logger_test.go b/clientv3/ordering/logger_test.go
index ef857ce4e..6ee25f004 100644
--- a/clientv3/ordering/logger_test.go
+++ b/clientv3/ordering/logger_test.go
@@ -17,7 +17,7 @@ package ordering
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/clientv3/ordering/util.go b/clientv3/ordering/util.go
index a321ede55..f08740cb4 100644
--- a/clientv3/ordering/util.go
+++ b/clientv3/ordering/util.go
@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error
diff --git a/clientv3/ordering/util_test.go b/clientv3/ordering/util_test.go
index b75ad5900..f903baae8 100644
--- a/clientv3/ordering/util_test.go
+++ b/clientv3/ordering/util_test.go
@@ -19,9 +19,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestEndpointSwitchResolvesViolation(t *testing.T) {
diff --git a/clientv3/retry.go b/clientv3/retry.go
index df69e918d..6da7abf47 100644
--- a/clientv3/retry.go
+++ b/clientv3/retry.go
@@ -17,8 +17,8 @@ package clientv3
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go
index ca6be773a..e48a00367 100644
--- a/clientv3/retry_interceptor.go
+++ b/clientv3/retry_interceptor.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/clientv3/snapshot/member_test.go b/clientv3/snapshot/member_test.go
index 1260eccda..a42066a56 100644
--- a/clientv3/snapshot/member_test.go
+++ b/clientv3/snapshot/member_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members
diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go
index 1617c17ce..70f8c3a8d 100644
--- a/clientv3/snapshot/v3_snapshot.go
+++ b/clientv3/snapshot/v3_snapshot.go
@@ -28,21 +28,21 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
diff --git a/clientv3/snapshot/v3_snapshot_test.go b/clientv3/snapshot/v3_snapshot_test.go
index b5495a0ec..8d2ee9d6a 100644
--- a/clientv3/snapshot/v3_snapshot_test.go
+++ b/clientv3/snapshot/v3_snapshot_test.go
@@ -25,10 +25,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"go.uber.org/zap"
 )
diff --git a/clientv3/txn.go b/clientv3/txn.go
index e4cac1521..c19715da4 100644
--- a/clientv3/txn.go
+++ b/clientv3/txn.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/clientv3/txn_test.go b/clientv3/txn_test.go
index 3028b52bf..46a4971ff 100644
--- a/clientv3/txn_test.go
+++ b/clientv3/txn_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestTxnPanics(t *testing.T) {
diff --git a/clientv3/watch.go b/clientv3/watch.go
index f41aec506..d50acbca3 100644
--- a/clientv3/watch.go
+++ b/clientv3/watch.go
@@ -21,9 +21,9 @@ import (
 	"sync"
 	"time"
 
-	v3rpc "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go
index 2efe81076..a22858bc7 100644
--- a/clientv3/watch_test.go
+++ b/clientv3/watch_test.go
@@ -17,7 +17,7 @@ package clientv3
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 func TestEvent(t *testing.T) {
diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go
index 17390f9cb..dc3e246e2 100644
--- a/clientv3/yaml/config.go
+++ b/clientv3/yaml/config.go
@@ -22,8 +22,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/tlsutil"
 )
 
 type yamlConfig struct {
diff --git a/contrib/raftexample/httpapi.go b/contrib/raftexample/httpapi.go
index 3e1c585b5..75f5d616f 100644
--- a/contrib/raftexample/httpapi.go
+++ b/contrib/raftexample/httpapi.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // Handler for a http based key-value store backed by raft
diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go
index 77e42594b..b057501a4 100644
--- a/contrib/raftexample/kvstore.go
+++ b/contrib/raftexample/kvstore.go
@@ -21,7 +21,7 @@ import (
 	"log"
 	"sync"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/api/snap"
 )
 
 // a key-value store backed by raft
diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go
index 775ea7b99..6b6f064a3 100644
--- a/contrib/raftexample/main.go
+++ b/contrib/raftexample/main.go
@@ -18,7 +18,7 @@ import (
 	"flag"
 	"strings"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func main() {
diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go
index f2607cd6c..ca290388b 100644
--- a/contrib/raftexample/raft.go
+++ b/contrib/raftexample/raft.go
@@ -24,15 +24,15 @@ import (
 	"strconv"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )
diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go
index 7314289b0..91c1f34f0 100644
--- a/contrib/raftexample/raftexample_test.go
+++ b/contrib/raftexample/raftexample_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 type cluster struct {
diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go
index 0f82b9833..5ab4817c7 100644
--- a/contrib/recipes/barrier.go
+++ b/contrib/recipes/barrier.go
@@ -17,8 +17,8 @@ package recipe
 import (
 	"context"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // 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 d97d0303f..e0c02e67d 100644
--- a/contrib/recipes/client.go
+++ b/contrib/recipes/client.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	spb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	spb "go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 var (
diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go
index 393b22a20..90189ba7c 100644
--- a/contrib/recipes/double_barrier.go
+++ b/contrib/recipes/double_barrier.go
@@ -17,9 +17,9 @@ package recipe
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // 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..891ff7d69 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/clientv3"
+	"go.etcd.io/etcd/clientv3/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 cd7b9ecf0..4116a8702 100644
--- a/contrib/recipes/priority_queue.go
+++ b/contrib/recipes/priority_queue.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"fmt"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // PriorityQueue implements a multi-reader, multi-writer distributed queue.
diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go
index ef609965b..e374f000d 100644
--- a/contrib/recipes/queue.go
+++ b/contrib/recipes/queue.go
@@ -17,8 +17,8 @@ package recipe
 import (
 	"context"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // Queue implements a multi-reader, multi-writer distributed queue.
diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go
index 6b3a96473..97a24c749 100644
--- a/contrib/recipes/rwmutex.go
+++ b/contrib/recipes/rwmutex.go
@@ -17,9 +17,9 @@ package recipe
 import (
 	"context"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type RWMutex struct {
diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go
index 0ef394cd7..f8c2ab772 100644
--- a/contrib/recipes/watch.go
+++ b/contrib/recipes/watch.go
@@ -17,8 +17,8 @@ package recipe
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // WaitEvents waits on a key until it observes the given events and returns the final one.
diff --git a/embed/config.go b/embed/config.go
index 7af64a39f..0480acae3 100644
--- a/embed/config.go
+++ b/embed/config.go
@@ -27,14 +27,14 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3compactor"
-	"go.etcd.io/etcd/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/netutil"
-	"go.etcd.io/etcd/v3/pkg/srv"
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3compactor"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/netutil"
+	"go.etcd.io/etcd/pkg/srv"
+	"go.etcd.io/etcd/pkg/tlsutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
 
 	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
diff --git a/embed/config_logging.go b/embed/config_logging.go
index 391f0599a..bddaacabe 100644
--- a/embed/config_logging.go
+++ b/embed/config_logging.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/logutil"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/embed/config_logging_journal_unix.go b/embed/config_logging_journal_unix.go
index db70ab9d4..44a51d677 100644
--- a/embed/config_logging_journal_unix.go
+++ b/embed/config_logging_journal_unix.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/logutil"
 
 	"go.uber.org/zap/zapcore"
 )
diff --git a/embed/config_test.go b/embed/config_test.go
index 648248646..eacf181ba 100644
--- a/embed/config_test.go
+++ b/embed/config_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"sigs.k8s.io/yaml"
 )
diff --git a/embed/doc.go b/embed/doc.go
index d8aaf33f6..4811bb634 100644
--- a/embed/doc.go
+++ b/embed/doc.go
@@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults:
 		"log"
 		"time"
 
-		"go.etcd.io/etcd/v3/embed"
+		"go.etcd.io/etcd/embed"
 	)
 
 	func main() {
diff --git a/embed/etcd.go b/embed/etcd.go
index 71f48cbe5..d32adbd15 100644
--- a/embed/etcd.go
+++ b/embed/etcd.go
@@ -29,18 +29,18 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2v3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	"go.etcd.io/etcd/v3/pkg/debugutil"
-	runtimeutil "go.etcd.io/etcd/v3/pkg/runtime"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/v2http"
+	"go.etcd.io/etcd/etcdserver/api/v2v3"
+	"go.etcd.io/etcd/etcdserver/api/v3client"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	"go.etcd.io/etcd/pkg/debugutil"
+	runtimeutil "go.etcd.io/etcd/pkg/runtime"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/pkg/capnslog"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
diff --git a/embed/serve.go b/embed/serve.go
index df66808bd..8e6e7b769 100644
--- a/embed/serve.go
+++ b/embed/serve.go
@@ -23,19 +23,19 @@ import (
 	"net/http"
 	"strings"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
-	v3electiongw "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb/gw"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
-	v3lockgw "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb/gw"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	etcdservergw "go.etcd.io/etcd/v3/etcdserver/etcdserverpb/gw"
-	"go.etcd.io/etcd/v3/pkg/debugutil"
-	"go.etcd.io/etcd/v3/pkg/httputil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3client"
+	"go.etcd.io/etcd/etcdserver/api/v3election"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	v3electiongw "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb/gw"
+	"go.etcd.io/etcd/etcdserver/api/v3lock"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	v3lockgw "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb/gw"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	etcdservergw "go.etcd.io/etcd/etcdserver/etcdserverpb/gw"
+	"go.etcd.io/etcd/pkg/debugutil"
+	"go.etcd.io/etcd/pkg/httputil"
+	"go.etcd.io/etcd/pkg/transport"
 
 	gw "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/soheilhy/cmux"
diff --git a/embed/serve_test.go b/embed/serve_test.go
index d2a909d79..388564567 100644
--- a/embed/serve_test.go
+++ b/embed/serve_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/auth"
+	"go.etcd.io/etcd/auth"
 )
 
 // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error.
diff --git a/embed/util.go b/embed/util.go
index 4d8164093..40f3ce9d5 100644
--- a/embed/util.go
+++ b/embed/util.go
@@ -17,7 +17,7 @@ package embed
 import (
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/wal"
+	"go.etcd.io/etcd/wal"
 )
 
 func isMemberInitialized(cfg *Config) bool {
diff --git a/etcdctl/ctlv2/command/auth_commands.go b/etcdctl/ctlv2/command/auth_commands.go
index 25ea55838..75823b203 100644
--- a/etcdctl/ctlv2/command/auth_commands.go
+++ b/etcdctl/ctlv2/command/auth_commands.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 func NewAuthCommands() cli.Command {
diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go
index 3b6e0c576..c6efa2711 100644
--- a/etcdctl/ctlv2/command/backup_command.go
+++ b/etcdctl/ctlv2/command/backup_command.go
@@ -23,15 +23,15 @@ import (
 	"regexp"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/idutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/idutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"github.com/urfave/cli"
 	bolt "go.etcd.io/bbolt"
diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go
index d4e2b382b..bfe8d698f 100644
--- a/etcdctl/ctlv2/command/cluster_health.go
+++ b/etcdctl/ctlv2/command/cluster_health.go
@@ -24,7 +24,7 @@ import (
 	"os/signal"
 	"time"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 
 	"github.com/urfave/cli"
 )
diff --git a/etcdctl/ctlv2/command/error.go b/etcdctl/ctlv2/command/error.go
index 1035518ce..ca4f1e9b8 100644
--- a/etcdctl/ctlv2/command/error.go
+++ b/etcdctl/ctlv2/command/error.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 const (
diff --git a/etcdctl/ctlv2/command/exec_watch_command.go b/etcdctl/ctlv2/command/exec_watch_command.go
index 8dae21647..4cc859820 100644
--- a/etcdctl/ctlv2/command/exec_watch_command.go
+++ b/etcdctl/ctlv2/command/exec_watch_command.go
@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"os/signal"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 
 	"github.com/urfave/cli"
 )
diff --git a/etcdctl/ctlv2/command/format.go b/etcdctl/ctlv2/command/format.go
index b75fa2562..5e15554a1 100644
--- a/etcdctl/ctlv2/command/format.go
+++ b/etcdctl/ctlv2/command/format.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // printResponseKey only supports to print key correctly.
diff --git a/etcdctl/ctlv2/command/get_command.go b/etcdctl/ctlv2/command/get_command.go
index 19420d411..fa87498ce 100644
--- a/etcdctl/ctlv2/command/get_command.go
+++ b/etcdctl/ctlv2/command/get_command.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewGetCommand returns the CLI command for "get".
diff --git a/etcdctl/ctlv2/command/ls_command.go b/etcdctl/ctlv2/command/ls_command.go
index 0b2047c71..f81bcbf8a 100644
--- a/etcdctl/ctlv2/command/ls_command.go
+++ b/etcdctl/ctlv2/command/ls_command.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 func NewLsCommand() cli.Command {
diff --git a/etcdctl/ctlv2/command/mk_command.go b/etcdctl/ctlv2/command/mk_command.go
index b0df56b1b..74d21c9f7 100644
--- a/etcdctl/ctlv2/command/mk_command.go
+++ b/etcdctl/ctlv2/command/mk_command.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewMakeCommand returns the CLI command for "mk".
diff --git a/etcdctl/ctlv2/command/mkdir_command.go b/etcdctl/ctlv2/command/mkdir_command.go
index 7ebeb59c3..04178a025 100644
--- a/etcdctl/ctlv2/command/mkdir_command.go
+++ b/etcdctl/ctlv2/command/mkdir_command.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewMakeDirCommand returns the CLI command for "mkdir".
diff --git a/etcdctl/ctlv2/command/rm_command.go b/etcdctl/ctlv2/command/rm_command.go
index 9cae4808e..86ade29f0 100644
--- a/etcdctl/ctlv2/command/rm_command.go
+++ b/etcdctl/ctlv2/command/rm_command.go
@@ -18,7 +18,7 @@ import (
 	"errors"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewRemoveCommand returns the CLI command for "rm".
diff --git a/etcdctl/ctlv2/command/rmdir_command.go b/etcdctl/ctlv2/command/rmdir_command.go
index b46036d31..5565bf1fe 100644
--- a/etcdctl/ctlv2/command/rmdir_command.go
+++ b/etcdctl/ctlv2/command/rmdir_command.go
@@ -18,7 +18,7 @@ import (
 	"errors"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewRemoveDirCommand returns the CLI command for "rmdir".
diff --git a/etcdctl/ctlv2/command/role_commands.go b/etcdctl/ctlv2/command/role_commands.go
index 6a5213d43..0a008a9e5 100644
--- a/etcdctl/ctlv2/command/role_commands.go
+++ b/etcdctl/ctlv2/command/role_commands.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/pathutil"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/pkg/pathutil"
 )
 
 func NewRoleCommands() cli.Command {
diff --git a/etcdctl/ctlv2/command/set_command.go b/etcdctl/ctlv2/command/set_command.go
index 3ce9c481b..7eb5ae6a5 100644
--- a/etcdctl/ctlv2/command/set_command.go
+++ b/etcdctl/ctlv2/command/set_command.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewSetCommand returns the CLI command for "set".
diff --git a/etcdctl/ctlv2/command/set_dir_command.go b/etcdctl/ctlv2/command/set_dir_command.go
index fc463133c..a65f92230 100644
--- a/etcdctl/ctlv2/command/set_dir_command.go
+++ b/etcdctl/ctlv2/command/set_dir_command.go
@@ -16,7 +16,7 @@ package command
 
 import (
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewSetDirCommand returns the CLI command for "setDir".
diff --git a/etcdctl/ctlv2/command/update_command.go b/etcdctl/ctlv2/command/update_command.go
index d5aa3026a..7c20fcb88 100644
--- a/etcdctl/ctlv2/command/update_command.go
+++ b/etcdctl/ctlv2/command/update_command.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewUpdateCommand returns the CLI command for "update".
diff --git a/etcdctl/ctlv2/command/update_dir_command.go b/etcdctl/ctlv2/command/update_dir_command.go
index e5ed1b8e2..3783d919d 100644
--- a/etcdctl/ctlv2/command/update_dir_command.go
+++ b/etcdctl/ctlv2/command/update_dir_command.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 // NewUpdateDirCommand returns the CLI command for "updatedir".
diff --git a/etcdctl/ctlv2/command/user_commands.go b/etcdctl/ctlv2/command/user_commands.go
index f509ec3c4..73ebb4d50 100644
--- a/etcdctl/ctlv2/command/user_commands.go
+++ b/etcdctl/ctlv2/command/user_commands.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/bgentry/speakeasy"
 	"github.com/urfave/cli"
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 func NewUserCommands() cli.Command {
diff --git a/etcdctl/ctlv2/command/util.go b/etcdctl/ctlv2/command/util.go
index 498c9df3b..c178abd9d 100644
--- a/etcdctl/ctlv2/command/util.go
+++ b/etcdctl/ctlv2/command/util.go
@@ -28,8 +28,8 @@ import (
 	"syscall"
 	"time"
 
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"github.com/bgentry/speakeasy"
 	"github.com/urfave/cli"
diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go
index 147c56c53..dc0fe2d11 100644
--- a/etcdctl/ctlv2/command/watch_command.go
+++ b/etcdctl/ctlv2/command/watch_command.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"os/signal"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 
 	"github.com/urfave/cli"
 )
diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go
index 06adec2ab..9cbf0c55a 100644
--- a/etcdctl/ctlv2/ctl.go
+++ b/etcdctl/ctlv2/ctl.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdctl/ctlv2/command"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdctl/ctlv2/command"
+	"go.etcd.io/etcd/version"
 
 	"github.com/urfave/cli"
 )
diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go
index 2a82127f0..42b85bb29 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/clientv3"
 )
 
 // NewAlarmCommand returns the cobra command for "alarm".
diff --git a/etcdctl/ctlv3/command/auth_command.go b/etcdctl/ctlv3/command/auth_command.go
index e99d76a05..9255f175b 100644
--- a/etcdctl/ctlv3/command/auth_command.go
+++ b/etcdctl/ctlv3/command/auth_command.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 )
 
 // NewAuthCommand returns the cobra command for "auth".
diff --git a/etcdctl/ctlv3/command/check.go b/etcdctl/ctlv3/command/check.go
index ec748a256..d13953d99 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"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..4262056ae 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/clientv3"
 )
 
 var compactPhysical bool
diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go
index 141071912..5bbb39dd7 100644
--- a/etcdctl/ctlv3/command/defrag_command.go
+++ b/etcdctl/ctlv3/command/defrag_command.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/backend"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go
index 391f48eb9..1c28868ee 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/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go
index 819a63201..cd67a07b9 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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go
index 99ae1a756..b04285927 100644
--- a/etcdctl/ctlv3/command/ep_command.go
+++ b/etcdctl/ctlv3/command/ep_command.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/pkg/flags"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/flags"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/error.go b/etcdctl/ctlv3/command/error.go
index 86d343773..220d50b6d 100644
--- a/etcdctl/ctlv3/command/error.go
+++ b/etcdctl/ctlv3/command/error.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 const (
diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go
index 6bd102799..753d75ba7 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/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go
index c448a78ce..49a220379 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/srv"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/srv"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"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..ab13b4600 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/clientv3"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go
index 6eef22caf..9b117b175 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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go
index 5e8136738..243aacea4 100644
--- a/etcdctl/ctlv3/command/make_mirror_command.go
+++ b/etcdctl/ctlv3/command/make_mirror_command.go
@@ -22,10 +22,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/mirror"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/mirror"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/member_command.go b/etcdctl/ctlv3/command/member_command.go
index 8a2c05278..182ff8ef7 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/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go
index 12620d136..bef384fbf 100644
--- a/etcdctl/ctlv3/command/migrate_command.go
+++ b/etcdctl/ctlv3/command/migrate_command.go
@@ -24,22 +24,22 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/spf13/cobra"
diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go
index 0df8668f2..7c8010c96 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/clientv3"
 )
 
 // NewMoveLeaderCommand returns the cobra command for "move-leader".
diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go
index 5e844f150..2793c5fa4 100644
--- a/etcdctl/ctlv3/command/printer.go
+++ b/etcdctl/ctlv3/command/printer.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"strings"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"github.com/dustin/go-humanize"
 )
diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go
index 38f5c7d93..d0c699980 100644
--- a/etcdctl/ctlv3/command/printer_fields.go
+++ b/etcdctl/ctlv3/command/printer_fields.go
@@ -17,10 +17,10 @@ package command
 import (
 	"fmt"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	spb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	spb "go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type fieldsPrinter struct{ printer }
diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go
index 2a6ea9f21..95b2a7f4e 100644
--- a/etcdctl/ctlv3/command/printer_json.go
+++ b/etcdctl/ctlv3/command/printer_json.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
+	"go.etcd.io/etcd/clientv3/snapshot"
 )
 
 type jsonPrinter struct{ printer }
diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go
index 9c2446c84..909fffe58 100644
--- a/etcdctl/ctlv3/command/printer_protobuf.go
+++ b/etcdctl/ctlv3/command/printer_protobuf.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"os"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type pbPrinter struct{ printer }
diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go
index 8223e87da..b321f850b 100644
--- a/etcdctl/ctlv3/command/printer_simple.go
+++ b/etcdctl/ctlv3/command/printer_simple.go
@@ -19,10 +19,10 @@ import (
 	"os"
 	"strings"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 type simplePrinter struct {
diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go
index c58024393..4a84b7472 100644
--- a/etcdctl/ctlv3/command/printer_table.go
+++ b/etcdctl/ctlv3/command/printer_table.go
@@ -17,8 +17,8 @@ package command
 import (
 	"os"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
 
 	"github.com/olekukonko/tablewriter"
 )
diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go
index 41d101675..0839cadc0 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/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go
index ad6883246..682b3bf19 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/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go
index 06eb33112..32bcd7a61 100644
--- a/etcdctl/ctlv3/command/snapshot_command.go
+++ b/etcdctl/ctlv3/command/snapshot_command.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
+	"go.etcd.io/etcd/clientv3/snapshot"
 
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go
index a04a06f7e..67f6d1818 100644
--- a/etcdctl/ctlv3/command/txn_command.go
+++ b/etcdctl/ctlv3/command/txn_command.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go
index f256ef01b..2a90ed927 100644
--- a/etcdctl/ctlv3/command/util.go
+++ b/etcdctl/ctlv3/command/util.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/mvcc/mvccpb"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go
index e59c64ca0..77c21fecb 100644
--- a/etcdctl/ctlv3/command/version_command.go
+++ b/etcdctl/ctlv3/command/version_command.go
@@ -17,7 +17,7 @@ package command
 import (
 	"fmt"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go
index ab96644ba..ce8425cbe 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/clientv3"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go
index 7d25744c7..40154a5da 100644
--- a/etcdctl/ctlv3/ctl.go
+++ b/etcdctl/ctlv3/ctl.go
@@ -18,7 +18,7 @@ package ctlv3
 import (
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdctl/ctlv3/command"
+	"go.etcd.io/etcd/etcdctl/ctlv3/command"
 
 	"github.com/spf13/cobra"
 )
diff --git a/etcdctl/ctlv3/ctl_cov.go b/etcdctl/ctlv3/ctl_cov.go
index 5ca7a513b..b5b0c42c3 100644
--- a/etcdctl/ctlv3/ctl_cov.go
+++ b/etcdctl/ctlv3/ctl_cov.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"strings"
 
-	"go.etcd.io/etcd/v3/etcdctl/ctlv3/command"
+	"go.etcd.io/etcd/etcdctl/ctlv3/command"
 )
 
 func Start() {
diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go
index 2d6e04808..e9567a398 100644
--- a/etcdctl/ctlv3/ctl_nocov.go
+++ b/etcdctl/ctlv3/ctl_nocov.go
@@ -16,7 +16,7 @@
 
 package ctlv3
 
-import "go.etcd.io/etcd/v3/etcdctl/ctlv3/command"
+import "go.etcd.io/etcd/etcdctl/ctlv3/command"
 
 func Start() {
 	rootCmd.SetUsageFunc(usageFunc)
diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go
index 229d02092..3b9691150 100644
--- a/etcdctl/ctlv3/help.go
+++ b/etcdctl/ctlv3/help.go
@@ -25,7 +25,7 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/etcdctl/main.go b/etcdctl/main.go
index 1ae3ee8e4..8bb4fc096 100644
--- a/etcdctl/main.go
+++ b/etcdctl/main.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/etcdctl/ctlv2"
-	"go.etcd.io/etcd/v3/etcdctl/ctlv3"
+	"go.etcd.io/etcd/etcdctl/ctlv2"
+	"go.etcd.io/etcd/etcdctl/ctlv3"
 )
 
 const (
diff --git a/etcdmain/config.go b/etcdmain/config.go
index e70f7df1b..814aa3951 100644
--- a/etcdmain/config.go
+++ b/etcdmain/config.go
@@ -26,10 +26,10 @@ import (
 	"runtime"
 	"strings"
 
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/version"
 
 	"go.uber.org/zap"
 	"sigs.k8s.io/yaml"
diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go
index bfe28c3c4..de646e370 100644
--- a/etcdmain/config_test.go
+++ b/etcdmain/config_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/embed"
+	"go.etcd.io/etcd/embed"
 	"sigs.k8s.io/yaml"
 )
 
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index d13ac0df5..7d1c6337c 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -26,17 +26,17 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2discovery"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	pkgioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/osutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/proxy/httpproxy"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/v2discovery"
+	"go.etcd.io/etcd/pkg/fileutil"
+	pkgioutil "go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/pkg/osutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/proxy/httpproxy"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/etcdmain/gateway.go b/etcdmain/gateway.go
index 8f45e7169..fece05f1c 100644
--- a/etcdmain/gateway.go
+++ b/etcdmain/gateway.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/v3/proxy/tcpproxy"
+	"go.etcd.io/etcd/proxy/tcpproxy"
 
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go
index 37617a01a..eb18ec337 100644
--- a/etcdmain/grpc_proxy.go
+++ b/etcdmain/grpc_proxy.go
@@ -29,17 +29,17 @@ import (
 	"path/filepath"
 	"time"
 
-	"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/etcdserver/api/v3election/v3electionpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/debugutil"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/proxy/grpcproxy"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/leasing"
+	"go.etcd.io/etcd/clientv3/namespace"
+	"go.etcd.io/etcd/clientv3/ordering"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/debugutil"
+	"go.etcd.io/etcd/pkg/logutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/proxy/grpcproxy"
 
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/soheilhy/cmux"
diff --git a/etcdmain/help.go b/etcdmain/help.go
index 2b55f72da..8ef6c457a 100644
--- a/etcdmain/help.go
+++ b/etcdmain/help.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"go.etcd.io/etcd/v3/embed"
+	"go.etcd.io/etcd/embed"
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/etcdmain/util.go b/etcdmain/util.go
index 3df12dcb0..463ada65b 100644
--- a/etcdmain/util.go
+++ b/etcdmain/util.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/srv"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/srv"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go
index b134a4726..ec0d600e8 100644
--- a/etcdserver/api/capability.go
+++ b/etcdserver/api/capability.go
@@ -17,7 +17,7 @@ package api
 import (
 	"sync"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 	"go.uber.org/zap"
 
 	"github.com/coreos/go-semver/semver"
diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go
index d8109272a..901be9d85 100644
--- a/etcdserver/api/cluster.go
+++ b/etcdserver/api/cluster.go
@@ -15,8 +15,8 @@
 package api
 
 import (
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 )
diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go
index 1e244eed6..c9df62ea8 100644
--- a/etcdserver/api/etcdhttp/base.go
+++ b/etcdserver/api/etcdhttp/base.go
@@ -21,12 +21,12 @@ import (
 	"net/http"
 	"strings"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/pkg/logutil"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go
index 539a7ddfb..f455e40a7 100644
--- a/etcdserver/api/etcdhttp/metrics.go
+++ b/etcdserver/api/etcdhttp/metrics.go
@@ -20,9 +20,9 @@ import (
 	"net/http"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/raft"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go
index 34890eb49..9f3eac352 100644
--- a/etcdserver/api/etcdhttp/peer.go
+++ b/etcdserver/api/etcdhttp/peer.go
@@ -18,10 +18,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/lease/leasehttp"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/lease/leasehttp"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go
index ac60fe6bd..095aa5da8 100644
--- a/etcdserver/api/etcdhttp/peer_test.go
+++ b/etcdserver/api/etcdhttp/peer_test.go
@@ -26,10 +26,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/coreos/go-semver/semver"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 type fakeCluster struct {
diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go
index 63271c704..c60907072 100644
--- a/etcdserver/api/etcdhttp/version_test.go
+++ b/etcdserver/api/etcdhttp/version_test.go
@@ -20,7 +20,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 )
 
 func TestServeVersion(t *testing.T) {
diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go
index d5019f7f0..6250d9b09 100644
--- a/etcdserver/api/membership/cluster.go
+++ b/etcdserver/api/membership/cluster.go
@@ -27,13 +27,13 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/netutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/netutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/prometheus/client_golang/prometheus"
diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go
index d501d40e5..558738b6f 100644
--- a/etcdserver/api/membership/cluster_test.go
+++ b/etcdserver/api/membership/cluster_test.go
@@ -21,11 +21,11 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/mock/mockstore"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/pkg/mock/mockstore"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/membership/errors.go b/etcdserver/api/membership/errors.go
index c682ad5fd..6c8b033ca 100644
--- a/etcdserver/api/membership/errors.go
+++ b/etcdserver/api/membership/errors.go
@@ -17,7 +17,7 @@ package membership
 import (
 	"errors"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
 )
 
 var (
diff --git a/etcdserver/api/membership/member.go b/etcdserver/api/membership/member.go
index 8e45d8042..896cb36aa 100644
--- a/etcdserver/api/membership/member.go
+++ b/etcdserver/api/membership/member.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/coreos/pkg/capnslog"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 var (
diff --git a/etcdserver/api/membership/member_test.go b/etcdserver/api/membership/member_test.go
index c67eb0a6d..e9de530ee 100644
--- a/etcdserver/api/membership/member_test.go
+++ b/etcdserver/api/membership/member_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 func timeParse(value string) *time.Time {
diff --git a/etcdserver/api/membership/store.go b/etcdserver/api/membership/store.go
index ef057b57b..14ab1190e 100644
--- a/etcdserver/api/membership/store.go
+++ b/etcdserver/api/membership/store.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"path"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 )
diff --git a/etcdserver/api/rafthttp/coder.go b/etcdserver/api/rafthttp/coder.go
index f06f070b3..12c3e4424 100644
--- a/etcdserver/api/rafthttp/coder.go
+++ b/etcdserver/api/rafthttp/coder.go
@@ -14,7 +14,7 @@
 
 package rafthttp
 
-import "go.etcd.io/etcd/v3/raft/raftpb"
+import "go.etcd.io/etcd/raft/raftpb"
 
 type encoder interface {
 	// encode encodes the given message to an output stream.
diff --git a/etcdserver/api/rafthttp/functional_test.go b/etcdserver/api/rafthttp/functional_test.go
index 796f44982..83de44478 100644
--- a/etcdserver/api/rafthttp/functional_test.go
+++ b/etcdserver/api/rafthttp/functional_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestSendMessage(t *testing.T) {
diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go
index 5f637508b..18e9c53f2 100644
--- a/etcdserver/api/rafthttp/http.go
+++ b/etcdserver/api/rafthttp/http.go
@@ -24,11 +24,11 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	pioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	pioutil "go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go
index 5cb248c65..fd5e24563 100644
--- a/etcdserver/api/rafthttp/http_test.go
+++ b/etcdserver/api/rafthttp/http_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/rafthttp/msg_codec.go b/etcdserver/api/rafthttp/msg_codec.go
index bf522c273..2417d222e 100644
--- a/etcdserver/api/rafthttp/msg_codec.go
+++ b/etcdserver/api/rafthttp/msg_codec.go
@@ -19,8 +19,8 @@ import (
 	"errors"
 	"io"
 
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // messageEncoder is a encoder that can encode all kinds of messages.
diff --git a/etcdserver/api/rafthttp/msg_codec_test.go b/etcdserver/api/rafthttp/msg_codec_test.go
index d2ea66fb4..883fc8ef8 100644
--- a/etcdserver/api/rafthttp/msg_codec_test.go
+++ b/etcdserver/api/rafthttp/msg_codec_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestMessage(t *testing.T) {
diff --git a/etcdserver/api/rafthttp/msgappv2_codec.go b/etcdserver/api/rafthttp/msgappv2_codec.go
index 5e7149d96..1fa36deb3 100644
--- a/etcdserver/api/rafthttp/msgappv2_codec.go
+++ b/etcdserver/api/rafthttp/msgappv2_codec.go
@@ -20,10 +20,10 @@ import (
 	"io"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 const (
diff --git a/etcdserver/api/rafthttp/msgappv2_codec_test.go b/etcdserver/api/rafthttp/msgappv2_codec_test.go
index 4f4804e16..48fd28992 100644
--- a/etcdserver/api/rafthttp/msgappv2_codec_test.go
+++ b/etcdserver/api/rafthttp/msgappv2_codec_test.go
@@ -19,9 +19,9 @@ import (
 	"reflect"
 	"testing"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestMsgAppV2(t *testing.T) {
diff --git a/etcdserver/api/rafthttp/peer.go b/etcdserver/api/rafthttp/peer.go
index cf45e9d96..8130c4a96 100644
--- a/etcdserver/api/rafthttp/peer.go
+++ b/etcdserver/api/rafthttp/peer.go
@@ -19,11 +19,11 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/etcdserver/api/rafthttp/peer_status.go b/etcdserver/api/rafthttp/peer_status.go
index adfdf03dc..66149ff67 100644
--- a/etcdserver/api/rafthttp/peer_status.go
+++ b/etcdserver/api/rafthttp/peer_status.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/rafthttp/peer_test.go b/etcdserver/api/rafthttp/peer_test.go
index a0b29dad3..29ef70fc6 100644
--- a/etcdserver/api/rafthttp/peer_test.go
+++ b/etcdserver/api/rafthttp/peer_test.go
@@ -17,7 +17,7 @@ package rafthttp
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestPeerPick(t *testing.T) {
diff --git a/etcdserver/api/rafthttp/pipeline.go b/etcdserver/api/rafthttp/pipeline.go
index 8916d4c20..70f92575d 100644
--- a/etcdserver/api/rafthttp/pipeline.go
+++ b/etcdserver/api/rafthttp/pipeline.go
@@ -22,11 +22,11 @@ import (
 	"sync"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go
index 0f8388ce8..231c768db 100644
--- a/etcdserver/api/rafthttp/pipeline_test.go
+++ b/etcdserver/api/rafthttp/pipeline_test.go
@@ -24,11 +24,11 @@ import (
 	"testing"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/rafthttp/remote.go b/etcdserver/api/rafthttp/remote.go
index 1c1e04e1f..1ef2493ed 100644
--- a/etcdserver/api/rafthttp/remote.go
+++ b/etcdserver/api/rafthttp/remote.go
@@ -15,8 +15,8 @@
 package rafthttp
 
 import (
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/rafthttp/snapshot_sender.go b/etcdserver/api/rafthttp/snapshot_sender.go
index 793ac3fd0..85abaeaa4 100644
--- a/etcdserver/api/rafthttp/snapshot_sender.go
+++ b/etcdserver/api/rafthttp/snapshot_sender.go
@@ -22,11 +22,11 @@ import (
 	"net/http"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/httputil"
-	pioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/pkg/httputil"
+	pioutil "go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
 
 	"github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go
index 03ee21d81..504a8ff64 100644
--- a/etcdserver/api/rafthttp/snapshot_test.go
+++ b/etcdserver/api/rafthttp/snapshot_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go
index 8c0d246d3..dcb2223ca 100644
--- a/etcdserver/api/rafthttp/stream.go
+++ b/etcdserver/api/rafthttp/stream.go
@@ -25,12 +25,12 @@ import (
 	"sync"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/httputil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/httputil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go
index 483852a97..56b3e7fe0 100644
--- a/etcdserver/api/rafthttp/stream_test.go
+++ b/etcdserver/api/rafthttp/stream_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go
index 353758f3a..d6e55091c 100644
--- a/etcdserver/api/rafthttp/transport.go
+++ b/etcdserver/api/rafthttp/transport.go
@@ -20,13 +20,13 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/logutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"github.com/coreos/pkg/capnslog"
 	"github.com/xiang90/probing"
diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go
index e2db71282..9e6aabd4f 100644
--- a/etcdserver/api/rafthttp/transport_bench_test.go
+++ b/etcdserver/api/rafthttp/transport_bench_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func BenchmarkSendingMsgApp(b *testing.B) {
diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go
index 72da65a81..7c8641fec 100644
--- a/etcdserver/api/rafthttp/transport_test.go
+++ b/etcdserver/api/rafthttp/transport_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"github.com/xiang90/probing"
 )
diff --git a/etcdserver/api/rafthttp/urlpick.go b/etcdserver/api/rafthttp/urlpick.go
index 33eb7e96f..61ef46864 100644
--- a/etcdserver/api/rafthttp/urlpick.go
+++ b/etcdserver/api/rafthttp/urlpick.go
@@ -18,7 +18,7 @@ import (
 	"net/url"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 type urlPicker struct {
diff --git a/etcdserver/api/rafthttp/urlpick_test.go b/etcdserver/api/rafthttp/urlpick_test.go
index 730b4f3fc..230730de5 100644
--- a/etcdserver/api/rafthttp/urlpick_test.go
+++ b/etcdserver/api/rafthttp/urlpick_test.go
@@ -18,7 +18,7 @@ import (
 	"net/url"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestURLPickerPickTwice tests that pick returns a possible url,
diff --git a/etcdserver/api/rafthttp/util.go b/etcdserver/api/rafthttp/util.go
index 314d3c9d5..20938647c 100644
--- a/etcdserver/api/rafthttp/util.go
+++ b/etcdserver/api/rafthttp/util.go
@@ -23,9 +23,9 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 )
diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go
index 41e1256c6..17a385ed1 100644
--- a/etcdserver/api/rafthttp/util_test.go
+++ b/etcdserver/api/rafthttp/util_test.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 )
diff --git a/etcdserver/api/snap/db.go b/etcdserver/api/snap/db.go
index 67747eea2..3002ccdcc 100644
--- a/etcdserver/api/snap/db.go
+++ b/etcdserver/api/snap/db.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go
index 9e626eb07..c1151e27e 100644
--- a/etcdserver/api/snap/message.go
+++ b/etcdserver/api/snap/message.go
@@ -17,8 +17,8 @@ package snap
 import (
 	"io"
 
-	"go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // Message is a struct that contains a raft Message and a ReadCloser. The type
diff --git a/etcdserver/api/snap/snapshotter.go b/etcdserver/api/snap/snapshotter.go
index c458d51e0..7e7933374 100644
--- a/etcdserver/api/snap/snapshotter.go
+++ b/etcdserver/api/snap/snapshotter.go
@@ -25,11 +25,11 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap/snappb"
-	pioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/snap/snappb"
+	pioutil "go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/snap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go
index c44de6ae8..00e3e21dc 100644
--- a/etcdserver/api/snap/snapshotter_test.go
+++ b/etcdserver/api/snap/snapshotter_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v2auth/auth.go b/etcdserver/api/v2auth/auth.go
index 23820aa12..b438074a4 100644
--- a/etcdserver/api/v2auth/auth.go
+++ b/etcdserver/api/v2auth/auth.go
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go
index 5f13bd620..d6574ecca 100644
--- a/etcdserver/api/v2auth/auth_requests.go
+++ b/etcdserver/api/v2auth/auth_requests.go
@@ -19,9 +19,9 @@ import (
 	"encoding/json"
 	"path"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go
index 6fdac203d..5c1564b25 100644
--- a/etcdserver/api/v2auth/auth_test.go
+++ b/etcdserver/api/v2auth/auth_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v2discovery/discovery.go b/etcdserver/api/v2discovery/discovery.go
index 7807b3228..cf770b378 100644
--- a/etcdserver/api/v2discovery/discovery.go
+++ b/etcdserver/api/v2discovery/discovery.go
@@ -29,9 +29,9 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/pkg/capnslog"
 	"github.com/jonboulle/clockwork"
diff --git a/etcdserver/api/v2discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go
index 1443f5fff..c1eff8823 100644
--- a/etcdserver/api/v2discovery/discovery_test.go
+++ b/etcdserver/api/v2discovery/discovery_test.go
@@ -28,7 +28,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 
 	"github.com/jonboulle/clockwork"
 )
diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go
index 9da24fb46..ed6c456d0 100644
--- a/etcdserver/api/v2http/capability.go
+++ b/etcdserver/api/v2http/capability.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
 )
 
 func authCapabilityHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc {
diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go
index 4b6fa9f86..1d1e592b2 100644
--- a/etcdserver/api/v2http/client.go
+++ b/etcdserver/api/v2http/client.go
@@ -27,17 +27,17 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/v2auth"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go
index 15c928a13..d8d6a883a 100644
--- a/etcdserver/api/v2http/client_auth.go
+++ b/etcdserver/api/v2http/client_auth.go
@@ -20,9 +20,9 @@ import (
 	"path"
 	"strings"
 
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/v2auth"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go
index 2350eb87e..22dfafa8f 100644
--- a/etcdserver/api/v2http/client_auth_test.go
+++ b/etcdserver/api/v2http/client_auth_test.go
@@ -30,8 +30,8 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/v2auth"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go
index 89407097c..5bab6c45f 100644
--- a/etcdserver/api/v2http/client_test.go
+++ b/etcdserver/api/v2http/client_test.go
@@ -29,16 +29,16 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/jonboulle/clockwork"
diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go
index 5df1afe1a..c6956893e 100644
--- a/etcdserver/api/v2http/http.go
+++ b/etcdserver/api/v2http/http.go
@@ -20,10 +20,10 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/v2auth"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/pkg/logutil"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go
index a5cdbcad4..f93071048 100644
--- a/etcdserver/api/v2http/http_test.go
+++ b/etcdserver/api/v2http/http_test.go
@@ -22,12 +22,12 @@ import (
 	"sort"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v2http/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go
index fefe6a020..95fd443ff 100644
--- a/etcdserver/api/v2http/httptypes/member.go
+++ b/etcdserver/api/v2http/httptypes/member.go
@@ -19,7 +19,7 @@ package httptypes
 import (
 	"encoding/json"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 type Member struct {
diff --git a/etcdserver/api/v2http/httptypes/member_test.go b/etcdserver/api/v2http/httptypes/member_test.go
index ea95550b2..a13efbc14 100644
--- a/etcdserver/api/v2http/httptypes/member_test.go
+++ b/etcdserver/api/v2http/httptypes/member_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 func TestMemberUnmarshal(t *testing.T) {
diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go
index 03ca58b96..14f7da0fe 100644
--- a/etcdserver/api/v2http/metrics.go
+++ b/etcdserver/api/v2http/metrics.go
@@ -20,9 +20,9 @@ import (
 
 	"net/http"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/etcdserver/api/v2stats/server.go b/etcdserver/api/v2stats/server.go
index 21987d2b6..c4accc735 100644
--- a/etcdserver/api/v2stats/server.go
+++ b/etcdserver/api/v2stats/server.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/raft"
 )
 
 // ServerStats encapsulates various statistics about an EtcdServer and its
diff --git a/etcdserver/api/v2store/event_history.go b/etcdserver/api/v2store/event_history.go
index 18aa8a17f..e4a969f37 100644
--- a/etcdserver/api/v2store/event_history.go
+++ b/etcdserver/api/v2store/event_history.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"sync"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
 )
 
 type EventHistory struct {
diff --git a/etcdserver/api/v2store/event_test.go b/etcdserver/api/v2store/event_test.go
index b37e0ad33..7de87035c 100644
--- a/etcdserver/api/v2store/event_test.go
+++ b/etcdserver/api/v2store/event_test.go
@@ -17,7 +17,7 @@ package v2store
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
 )
 
 // TestEventQueue tests a queue with capacity = 100
diff --git a/etcdserver/api/v2store/node.go b/etcdserver/api/v2store/node.go
index 50316ec4c..38a6984fb 100644
--- a/etcdserver/api/v2store/node.go
+++ b/etcdserver/api/v2store/node.go
@@ -19,7 +19,7 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
 
 	"github.com/jonboulle/clockwork"
 )
diff --git a/etcdserver/api/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go
index 0a99048f8..df7e725f3 100644
--- a/etcdserver/api/v2store/node_extern_test.go
+++ b/etcdserver/api/v2store/node_extern_test.go
@@ -20,7 +20,7 @@ import (
 	"time"
 	"unsafe"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestNodeExternClone(t *testing.T) {
diff --git a/etcdserver/api/v2store/stats_test.go b/etcdserver/api/v2store/stats_test.go
index 3793d8f6d..65dbf3622 100644
--- a/etcdserver/api/v2store/stats_test.go
+++ b/etcdserver/api/v2store/stats_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // Ensure that a successful Get is recorded in the stats.
diff --git a/etcdserver/api/v2store/store.go b/etcdserver/api/v2store/store.go
index 8a912dbdf..ce940436e 100644
--- a/etcdserver/api/v2store/store.go
+++ b/etcdserver/api/v2store/store.go
@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/jonboulle/clockwork"
 )
diff --git a/etcdserver/api/v2store/store_test.go b/etcdserver/api/v2store/store_test.go
index 76ec02d4e..451d9bec6 100644
--- a/etcdserver/api/v2store/store_test.go
+++ b/etcdserver/api/v2store/store_test.go
@@ -18,9 +18,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 type StoreCloser interface {
diff --git a/etcdserver/api/v2store/store_ttl_test.go b/etcdserver/api/v2store/store_ttl_test.go
index 792f6165a..94c7493f0 100644
--- a/etcdserver/api/v2store/store_ttl_test.go
+++ b/etcdserver/api/v2store/store_ttl_test.go
@@ -18,8 +18,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"github.com/jonboulle/clockwork"
 )
diff --git a/etcdserver/api/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go
index e165094db..d327fd32d 100644
--- a/etcdserver/api/v2store/store_v2_test.go
+++ b/etcdserver/api/v2store/store_v2_test.go
@@ -19,8 +19,8 @@ package v2store_test
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 type v2TestStore struct {
diff --git a/etcdserver/api/v2store/store_v2v3_test.go b/etcdserver/api/v2store/store_v2v3_test.go
index b7d4b26c9..d0350393a 100644
--- a/etcdserver/api/v2store/store_v2v3_test.go
+++ b/etcdserver/api/v2store/store_v2v3_test.go
@@ -20,10 +20,10 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2v3"
-	"go.etcd.io/etcd/v3/integration"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/api/v2v3"
+	"go.etcd.io/etcd/integration"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/etcdserver/api/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go
index 3b3e7f103..a452e7e95 100644
--- a/etcdserver/api/v2store/watcher_hub.go
+++ b/etcdserver/api/v2store/watcher_hub.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
 )
 
 // A watcherHub contains all subscribed watchers
diff --git a/etcdserver/api/v2v3/cluster.go b/etcdserver/api/v2v3/cluster.go
index 51e2b6534..a22e4afad 100644
--- a/etcdserver/api/v2v3/cluster.go
+++ b/etcdserver/api/v2v3/cluster.go
@@ -15,8 +15,8 @@
 package v2v3
 
 import (
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 )
diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go
index 0093f6e0a..5ff9b96c0 100644
--- a/etcdserver/api/v2v3/server.go
+++ b/etcdserver/api/v2v3/server.go
@@ -19,12 +19,12 @@ import (
 	"net/http"
 	"time"
 
-	"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"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go
index e446ceda1..f1c7ab378 100644
--- a/etcdserver/api/v2v3/store.go
+++ b/etcdserver/api/v2v3/store.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // store implements the Store interface for V2 using
diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go
index b17ffa427..e8a3557c1 100644
--- a/etcdserver/api/v2v3/watcher.go
+++ b/etcdserver/api/v2v3/watcher.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
 )
 
 func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) {
diff --git a/etcdserver/api/v3alarm/alarms.go b/etcdserver/api/v3alarm/alarms.go
index c9b50b984..2b085a8e7 100644
--- a/etcdserver/api/v3alarm/alarms.go
+++ b/etcdserver/api/v3alarm/alarms.go
@@ -18,9 +18,9 @@ package v3alarm
 import (
 	"sync"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/types"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/coreos/pkg/capnslog"
 )
diff --git a/etcdserver/api/v3client/doc.go b/etcdserver/api/v3client/doc.go
index 7adbec97b..47922c433 100644
--- a/etcdserver/api/v3client/doc.go
+++ b/etcdserver/api/v3client/doc.go
@@ -19,8 +19,8 @@
 //	import (
 //		"context"
 //
-//		"go.etcd.io/etcd/v3/embed"
-//		"go.etcd.io/etcd/v3/etcdserver/api/v3client"
+//		"go.etcd.io/etcd/embed"
+//		"go.etcd.io/etcd/etcdserver/api/v3client"
 //	)
 //
 //	...
diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go
index f2a401224..d2031213c 100644
--- a/etcdserver/api/v3client/v3client.go
+++ b/etcdserver/api/v3client/v3client.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	"go.etcd.io/etcd/v3/proxy/grpcproxy/adapter"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	"go.etcd.io/etcd/proxy/grpcproxy/adapter"
 )
 
 // New creates a clientv3 client that wraps an in-process EtcdServer. Instead
diff --git a/etcdserver/api/v3compactor/compactor.go b/etcdserver/api/v3compactor/compactor.go
index c41c7276f..73a96842d 100644
--- a/etcdserver/api/v3compactor/compactor.go
+++ b/etcdserver/api/v3compactor/compactor.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"github.com/coreos/pkg/capnslog"
 	"github.com/jonboulle/clockwork"
diff --git a/etcdserver/api/v3compactor/compactor_test.go b/etcdserver/api/v3compactor/compactor_test.go
index c10a39858..76a11aeaf 100644
--- a/etcdserver/api/v3compactor/compactor_test.go
+++ b/etcdserver/api/v3compactor/compactor_test.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"sync/atomic"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 type fakeCompactable struct {
diff --git a/etcdserver/api/v3compactor/periodic.go b/etcdserver/api/v3compactor/periodic.go
index fee0c79dd..ab64cb706 100644
--- a/etcdserver/api/v3compactor/periodic.go
+++ b/etcdserver/api/v3compactor/periodic.go
@@ -19,8 +19,8 @@ import (
 	"sync"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go
index c876ab408..b9d49afa6 100644
--- a/etcdserver/api/v3compactor/periodic_test.go
+++ b/etcdserver/api/v3compactor/periodic_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go
index be31eefac..cf8ac4301 100644
--- a/etcdserver/api/v3compactor/revision.go
+++ b/etcdserver/api/v3compactor/revision.go
@@ -19,8 +19,8 @@ import (
 	"sync"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go
index 80c714d06..fcd01066f 100644
--- a/etcdserver/api/v3compactor/revision_test.go
+++ b/etcdserver/api/v3compactor/revision_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"
diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go
index 7a2058b06..f5a3be3b2 100644
--- a/etcdserver/api/v3election/election.go
+++ b/etcdserver/api/v3election/election.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"errors"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
 )
 
 // ErrMissingLeaderKey is returned when election API request
diff --git a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go
index b66a1cfbf..23551b54b 100644
--- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go
+++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go
@@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs.
 package gw
 
 import (
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
 	"io"
 	"net/http"
 
diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go
index 05e62fc50..1fc1bce44 100644
--- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go
+++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go
@@ -29,9 +29,9 @@ import (
 
 	_ "github.com/gogo/protobuf/gogoproto"
 
-	etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
-	mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
 
 	context "golang.org/x/net/context"
 
diff --git a/etcdserver/api/v3election/v3electionpb/v3election.proto b/etcdserver/api/v3election/v3electionpb/v3election.proto
index 3f87db4ee..918f39fa8 100644
--- a/etcdserver/api/v3election/v3electionpb/v3election.proto
+++ b/etcdserver/api/v3election/v3electionpb/v3election.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 package v3electionpb;
 
 import "gogoproto/gogo.proto";
-import "etcd/v3/etcdserver/etcdserverpb/rpc.proto";
-import "etcd/v3/mvcc/mvccpb/kv.proto";
+import "etcd/etcdserver/etcdserverpb/rpc.proto";
+import "etcd/mvcc/mvccpb/kv.proto";
 
 // for grpc-gateway
 import "google/api/annotations.proto";
diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go
index ec3fb407e..5a17c86fc 100644
--- a/etcdserver/api/v3lock/lock.go
+++ b/etcdserver/api/v3lock/lock.go
@@ -17,9 +17,9 @@ package v3lock
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
 )
 
 type lockServer struct {
diff --git a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go
index 09405e1cd..1eeeff185 100644
--- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go
+++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go
@@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs.
 package gw
 
 import (
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
 	"io"
 	"net/http"
 
diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go
index ad139c1c8..36ebdd90f 100644
--- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go
+++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go
@@ -24,7 +24,7 @@ import (
 
 	_ "github.com/gogo/protobuf/gogoproto"
 
-	etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	context "golang.org/x/net/context"
 
diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.proto b/etcdserver/api/v3lock/v3lockpb/v3lock.proto
index 14a79ddbf..7220c7f0a 100644
--- a/etcdserver/api/v3lock/v3lockpb/v3lock.proto
+++ b/etcdserver/api/v3lock/v3lockpb/v3lock.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 package v3lockpb;
 
 import "gogoproto/gogo.proto";
-import "etcd/v3/etcdserver/etcdserverpb/rpc.proto";
+import "etcd/etcdserver/etcdserverpb/rpc.proto";
 
 // for grpc-gateway
 import "google/api/annotations.proto";
diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go
index 71f068b62..62ce757be 100644
--- a/etcdserver/api/v3rpc/auth.go
+++ b/etcdserver/api/v3rpc/auth.go
@@ -17,8 +17,8 @@ package v3rpc
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type AuthServer struct {
diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go
index ecb11ca00..957c81895 100644
--- a/etcdserver/api/v3rpc/grpc.go
+++ b/etcdserver/api/v3rpc/grpc.go
@@ -18,8 +18,8 @@ import (
 	"crypto/tls"
 	"math"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware"
 	"github.com/grpc-ecosystem/go-grpc-prometheus"
diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go
index 9a359fced..f23b6a738 100644
--- a/etcdserver/api/v3rpc/header.go
+++ b/etcdserver/api/v3rpc/header.go
@@ -15,8 +15,8 @@
 package v3rpc
 
 import (
-	"go.etcd.io/etcd/v3/etcdserver"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type header struct {
diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go
index 8d20207fb..e6fe0a7f0 100644
--- a/etcdserver/api/v3rpc/interceptor.go
+++ b/etcdserver/api/v3rpc/interceptor.go
@@ -19,14 +19,14 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
 
 	"github.com/coreos/pkg/capnslog"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go
index 6fd1b381d..fdb002e0d 100644
--- a/etcdserver/api/v3rpc/key.go
+++ b/etcdserver/api/v3rpc/key.go
@@ -18,10 +18,10 @@ package v3rpc
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/adt"
 
 	"github.com/coreos/pkg/capnslog"
 )
diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go
index c6e7da6b8..7441beedf 100644
--- a/etcdserver/api/v3rpc/lease.go
+++ b/etcdserver/api/v3rpc/lease.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"io"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go
index bc5453f70..c51271ac0 100644
--- a/etcdserver/api/v3rpc/maintenance.go
+++ b/etcdserver/api/v3rpc/maintenance.go
@@ -19,14 +19,14 @@ import (
 	"crypto/sha256"
 	"io"
 
-	"go.etcd.io/etcd/v3/auth"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/auth"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/version"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go
index d749f47db..b2ebc9898 100644
--- a/etcdserver/api/v3rpc/member.go
+++ b/etcdserver/api/v3rpc/member.go
@@ -18,12 +18,12 @@ import (
 	"context"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 type ClusterServer struct {
diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go
index b40edbdfc..a145b8b09 100644
--- a/etcdserver/api/v3rpc/quota.go
+++ b/etcdserver/api/v3rpc/quota.go
@@ -17,10 +17,10 @@ package v3rpc
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 type quotaKVServer struct {
diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go
index 446d02bc5..b6d8c43c9 100644
--- a/etcdserver/api/v3rpc/util.go
+++ b/etcdserver/api/v3rpc/util.go
@@ -18,13 +18,13 @@ import (
 	"context"
 	"strings"
 
-	"go.etcd.io/etcd/v3/auth"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
+	"go.etcd.io/etcd/auth"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/etcdserver/api/v3rpc/util_test.go b/etcdserver/api/v3rpc/util_test.go
index b84a267d5..e83144b96 100644
--- a/etcdserver/api/v3rpc/util_test.go
+++ b/etcdserver/api/v3rpc/util_test.go
@@ -19,8 +19,8 @@ import (
 	"errors"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/mvcc"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/mvcc"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
index 1679f13a9..7848cdd04 100644
--- a/etcdserver/api/v3rpc/watch.go
+++ b/etcdserver/api/v3rpc/watch.go
@@ -21,12 +21,12 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/auth"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/auth"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/api/v3rpc/watch_test.go b/etcdserver/api/v3rpc/watch_test.go
index f507f5eab..66f584a06 100644
--- a/etcdserver/api/v3rpc/watch_test.go
+++ b/etcdserver/api/v3rpc/watch_test.go
@@ -19,8 +19,8 @@ import (
 	"math"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 func TestSendFragment(t *testing.T) {
diff --git a/etcdserver/apply.go b/etcdserver/apply.go
index ac5a8dcf2..1f06ad0dd 100644
--- a/etcdserver/apply.go
+++ b/etcdserver/apply.go
@@ -21,12 +21,12 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/v3/auth"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/auth"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go
index 8761dbac3..4b094ad5d 100644
--- a/etcdserver/apply_auth.go
+++ b/etcdserver/apply_auth.go
@@ -17,10 +17,10 @@ package etcdserver
 import (
 	"sync"
 
-	"go.etcd.io/etcd/v3/auth"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
+	"go.etcd.io/etcd/auth"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
 )
 
 type authApplierV3 struct {
diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go
index 30c396c50..c77df1970 100644
--- a/etcdserver/apply_v2.go
+++ b/etcdserver/apply_v2.go
@@ -19,10 +19,10 @@ import (
 	"path"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/pkg/pbutil"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/backend.go b/etcdserver/backend.go
index af95da98e..7fd8d17b5 100644
--- a/etcdserver/backend.go
+++ b/etcdserver/backend.go
@@ -19,11 +19,11 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go
index bc01cf60a..eecb890e6 100644
--- a/etcdserver/cluster_util.go
+++ b/etcdserver/cluster_util.go
@@ -22,9 +22,9 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go
index de90d6039..8a36a548b 100644
--- a/etcdserver/cluster_util_test.go
+++ b/etcdserver/cluster_util_test.go
@@ -18,8 +18,8 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/version"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"
diff --git a/etcdserver/config.go b/etcdserver/config.go
index 88d4c7e77..b0eaf18e7 100644
--- a/etcdserver/config.go
+++ b/etcdserver/config.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/netutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/netutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
 
 	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go
index e91b5fe3b..1d4157dc4 100644
--- a/etcdserver/config_test.go
+++ b/etcdserver/config_test.go
@@ -18,7 +18,7 @@ import (
 	"net/url"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go
index b170b376e..32678a7c5 100644
--- a/etcdserver/corrupt.go
+++ b/etcdserver/corrupt.go
@@ -19,11 +19,11 @@ import (
 	"fmt"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/pkg/types"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go
index a6a4768b2..904c32187 100644
--- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go
+++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go
@@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs.
 package gw
 
 import (
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"io"
 	"net/http"
 
diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go
index 9f6fac9e5..6d728a59c 100644
--- a/etcdserver/etcdserverpb/rpc.pb.go
+++ b/etcdserver/etcdserverpb/rpc.pb.go
@@ -12,9 +12,9 @@ import (
 
 	_ "github.com/gogo/protobuf/gogoproto"
 
-	mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
+	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
 
-	authpb "go.etcd.io/etcd/v3/auth/authpb"
+	authpb "go.etcd.io/etcd/auth/authpb"
 
 	context "golang.org/x/net/context"
 
diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto
index 78ecd48ad..6fbf08d3c 100644
--- a/etcdserver/etcdserverpb/rpc.proto
+++ b/etcdserver/etcdserverpb/rpc.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 package etcdserverpb;
 
 import "gogoproto/gogo.proto";
-import "etcd/v3/mvcc/mvccpb/kv.proto";
-import "etcd/v3/auth/authpb/auth.proto";
+import "etcd/mvcc/mvccpb/kv.proto";
+import "etcd/auth/authpb/auth.proto";
 
 // for grpc-gateway
 import "google/api/annotations.proto";
diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go
index a3b20981a..748e7edb5 100644
--- a/etcdserver/metrics.go
+++ b/etcdserver/metrics.go
@@ -18,8 +18,8 @@ import (
 	goruntime "runtime"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/runtime"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/pkg/runtime"
+	"go.etcd.io/etcd/version"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
diff --git a/etcdserver/quota.go b/etcdserver/quota.go
index 63f5c7bd6..6d70430e7 100644
--- a/etcdserver/quota.go
+++ b/etcdserver/quota.go
@@ -17,7 +17,7 @@ package etcdserver
 import (
 	"sync"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/etcdserver/raft.go b/etcdserver/raft.go
index 219be44cd..c03d2a7b8 100644
--- a/etcdserver/raft.go
+++ b/etcdserver/raft.go
@@ -23,17 +23,17 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/contention"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/contention"
+	"go.etcd.io/etcd/pkg/logutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go
index 1ca7971d7..9d731c688 100644
--- a/etcdserver/raft_test.go
+++ b/etcdserver/raft_test.go
@@ -21,12 +21,12 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/mock/mockstorage"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/pkg/mock/mockstorage"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 6e9a9cdb4..fd6c6ca00 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -29,33 +29,33 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/v3/auth"
-	"go.etcd.io/etcd/v3/etcdserver/api"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2discovery"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
-	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3alarm"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3compactor"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/lease/leasehttp"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/idutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/runtime"
-	"go.etcd.io/etcd/v3/pkg/schedule"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/pkg/wait"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/version"
-	"go.etcd.io/etcd/v3/wal"
+	"go.etcd.io/etcd/auth"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/api/v2discovery"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/api/v3alarm"
+	"go.etcd.io/etcd/etcdserver/api/v3compactor"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/lease/leasehttp"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/idutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/runtime"
+	"go.etcd.io/etcd/pkg/schedule"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/pkg/wait"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/version"
+	"go.etcd.io/etcd/wal"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/coreos/pkg/capnslog"
diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go
index 0ba62e076..5122a8ade 100644
--- a/etcdserver/server_test.go
+++ b/etcdserver/server_test.go
@@ -30,25 +30,25 @@ import (
 
 	"go.uber.org/zap"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/idutil"
-	"go.etcd.io/etcd/v3/pkg/mock/mockstorage"
-	"go.etcd.io/etcd/v3/pkg/mock/mockstore"
-	"go.etcd.io/etcd/v3/pkg/mock/mockwait"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/pkg/wait"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/idutil"
+	"go.etcd.io/etcd/pkg/mock/mockstorage"
+	"go.etcd.io/etcd/pkg/mock/mockstore"
+	"go.etcd.io/etcd/pkg/mock/mockwait"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/pkg/wait"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // TestDoLocalAction tests requests which do not need to go through raft to be applied,
diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go
index f901f5fe9..417776813 100644
--- a/etcdserver/snapshot_merge.go
+++ b/etcdserver/snapshot_merge.go
@@ -17,9 +17,9 @@ package etcdserver
 import (
 	"io"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/raft/raftpb"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/etcdserver/storage.go b/etcdserver/storage.go
index 6701442c1..d57b6f9a5 100644
--- a/etcdserver/storage.go
+++ b/etcdserver/storage.go
@@ -17,13 +17,13 @@ package etcdserver
 import (
 	"io"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/util.go b/etcdserver/util.go
index ffb36c7a6..fe5024ef0 100644
--- a/etcdserver/util.go
+++ b/etcdserver/util.go
@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 
 	"go.uber.org/zap"
 )
diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go
index 3c4ee7ee9..6ec87bc89 100644
--- a/etcdserver/util_test.go
+++ b/etcdserver/util_test.go
@@ -21,11 +21,11 @@ import (
 
 	"go.uber.org/zap"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestLongestConnected(t *testing.T) {
diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go
index cf6bc05d6..9238b2dc5 100644
--- a/etcdserver/v2_server.go
+++ b/etcdserver/v2_server.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type RequestV2 pb.Request
diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
index bd406a956..74d980961 100644
--- a/etcdserver/v3_server.go
+++ b/etcdserver/v3_server.go
@@ -20,13 +20,13 @@ import (
 	"encoding/binary"
 	"time"
 
-	"go.etcd.io/etcd/v3/auth"
-	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/lease/leasehttp"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/auth"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/lease/leasehttp"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/raft"
 
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
diff --git a/functional/agent/handler.go b/functional/agent/handler.go
index cd7c4c361..f1000624b 100644
--- a/functional/agent/handler.go
+++ b/functional/agent/handler.go
@@ -25,10 +25,10 @@ import (
 	"syscall"
 	"time"
 
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/proxy"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/proxy"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/agent/server.go b/functional/agent/server.go
index 49aa71d5f..a39f28e76 100644
--- a/functional/agent/server.go
+++ b/functional/agent/server.go
@@ -21,9 +21,9 @@ import (
 	"os/exec"
 	"strings"
 
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/pkg/proxy"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/pkg/proxy"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/functional/agent/utils.go b/functional/agent/utils.go
index 683df6e6c..c0dd92fc5 100644
--- a/functional/agent/utils.go
+++ b/functional/agent/utils.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 )
 
 // TODO: support separate WAL directory
diff --git a/functional/cmd/etcd-agent/main.go b/functional/cmd/etcd-agent/main.go
index 2ccdcaa07..87ab6ee7d 100644
--- a/functional/cmd/etcd-agent/main.go
+++ b/functional/cmd/etcd-agent/main.go
@@ -18,7 +18,7 @@ package main
 import (
 	"flag"
 
-	"go.etcd.io/etcd/v3/functional/agent"
+	"go.etcd.io/etcd/functional/agent"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/cmd/etcd-proxy/main.go b/functional/cmd/etcd-proxy/main.go
index 5695e91b8..56ca78eef 100644
--- a/functional/cmd/etcd-proxy/main.go
+++ b/functional/cmd/etcd-proxy/main.go
@@ -28,7 +28,7 @@ import (
 	"syscall"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/proxy"
+	"go.etcd.io/etcd/pkg/proxy"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/cmd/etcd-runner/main.go b/functional/cmd/etcd-runner/main.go
index d776bd01d..f9e82766d 100644
--- a/functional/cmd/etcd-runner/main.go
+++ b/functional/cmd/etcd-runner/main.go
@@ -16,7 +16,7 @@
 // against a fault injected cluster.
 package main
 
-import "go.etcd.io/etcd/v3/functional/runner"
+import "go.etcd.io/etcd/functional/runner"
 
 func main() {
 	runner.Start()
diff --git a/functional/cmd/etcd-tester/main.go b/functional/cmd/etcd-tester/main.go
index 0d3116e37..fdf391fe8 100644
--- a/functional/cmd/etcd-tester/main.go
+++ b/functional/cmd/etcd-tester/main.go
@@ -18,7 +18,7 @@ package main
 import (
 	"flag"
 
-	"go.etcd.io/etcd/v3/functional/tester"
+	"go.etcd.io/etcd/functional/tester"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/rpcpb/etcd_config.go b/functional/rpcpb/etcd_config.go
index b6cfe22f5..feec424a8 100644
--- a/functional/rpcpb/etcd_config.go
+++ b/functional/rpcpb/etcd_config.go
@@ -19,9 +19,9 @@ import (
 	"reflect"
 	"strings"
 
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 var etcdFields = []string{
diff --git a/functional/rpcpb/etcd_config_test.go b/functional/rpcpb/etcd_config_test.go
index c87a03be4..a96b81f34 100644
--- a/functional/rpcpb/etcd_config_test.go
+++ b/functional/rpcpb/etcd_config_test.go
@@ -18,8 +18,8 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/embed"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 func TestEtcd(t *testing.T) {
diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go
index c9a88e701..5b400bdc9 100644
--- a/functional/rpcpb/member.go
+++ b/functional/rpcpb/member.go
@@ -22,10 +22,10 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/functional/runner/election_command.go b/functional/runner/election_command.go
index 1cec694e2..0ced37546 100644
--- a/functional/runner/election_command.go
+++ b/functional/runner/election_command.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/clientv3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/functional/runner/error.go b/functional/runner/error.go
index 39b325a8a..403990539 100644
--- a/functional/runner/error.go
+++ b/functional/runner/error.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/client"
+	"go.etcd.io/etcd/client"
 )
 
 const (
diff --git a/functional/runner/global.go b/functional/runner/global.go
index b99466caf..f2f0dacea 100644
--- a/functional/runner/global.go
+++ b/functional/runner/global.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/functional/runner/help.go b/functional/runner/help.go
index 06196a89e..394cec840 100644
--- a/functional/runner/help.go
+++ b/functional/runner/help.go
@@ -25,7 +25,7 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/functional/runner/lease_renewer_command.go b/functional/runner/lease_renewer_command.go
index 6418ef0db..78a65729d 100644
--- a/functional/runner/lease_renewer_command.go
+++ b/functional/runner/lease_renewer_command.go
@@ -21,7 +21,7 @@ import (
 	"log"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
diff --git a/functional/runner/lock_racer_command.go b/functional/runner/lock_racer_command.go
index ffde9f5f4..cb98668cc 100644
--- a/functional/runner/lock_racer_command.go
+++ b/functional/runner/lock_racer_command.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/clientv3/concurrency"
 
 	"github.com/spf13/cobra"
 )
diff --git a/functional/runner/watch_command.go b/functional/runner/watch_command.go
index c9e36dc00..cd3f202af 100644
--- a/functional/runner/watch_command.go
+++ b/functional/runner/watch_command.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/stringutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/stringutil"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/functional/tester/case.go b/functional/tester/case.go
index 739749775..ce3e00f12 100644
--- a/functional/tester/case.go
+++ b/functional/tester/case.go
@@ -19,7 +19,7 @@ import (
 	"math/rand"
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/case_external.go b/functional/tester/case_external.go
index a4e1c8846..8b22197ad 100644
--- a/functional/tester/case_external.go
+++ b/functional/tester/case_external.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 )
 
 type caseExternal struct {
diff --git a/functional/tester/case_failpoints.go b/functional/tester/case_failpoints.go
index 9c3deb4a3..084630840 100644
--- a/functional/tester/case_failpoints.go
+++ b/functional/tester/case_failpoints.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"sync"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 )
 
 type failpointStats struct {
diff --git a/functional/tester/case_network_blackhole.go b/functional/tester/case_network_blackhole.go
index d9f056291..feee3b27a 100644
--- a/functional/tester/case_network_blackhole.go
+++ b/functional/tester/case_network_blackhole.go
@@ -14,7 +14,7 @@
 
 package tester
 
-import "go.etcd.io/etcd/v3/functional/rpcpb"
+import "go.etcd.io/etcd/functional/rpcpb"
 
 func inject_BLACKHOLE_PEER_PORT_TX_RX(clus *Cluster, idx int) error {
 	return clus.sendOp(idx, rpcpb.Operation_BLACKHOLE_PEER_PORT_TX_RX)
diff --git a/functional/tester/case_network_delay.go b/functional/tester/case_network_delay.go
index 0eabe1621..60da43378 100644
--- a/functional/tester/case_network_delay.go
+++ b/functional/tester/case_network_delay.go
@@ -17,7 +17,7 @@ package tester
 import (
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/case_no_fail.go b/functional/tester/case_no_fail.go
index 726a6a335..f78fee85a 100644
--- a/functional/tester/case_no_fail.go
+++ b/functional/tester/case_no_fail.go
@@ -17,7 +17,7 @@ package tester
 import (
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/case_sigquit_remove.go b/functional/tester/case_sigquit_remove.go
index c201cc2dc..6c3a79515 100644
--- a/functional/tester/case_sigquit_remove.go
+++ b/functional/tester/case_sigquit_remove.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/case_sigquit_remove_quorum.go b/functional/tester/case_sigquit_remove_quorum.go
index 47117902c..5fc78cdd3 100644
--- a/functional/tester/case_sigquit_remove_quorum.go
+++ b/functional/tester/case_sigquit_remove_quorum.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/case_sigterm.go b/functional/tester/case_sigterm.go
index 5c96a4608..a8c99bc85 100644
--- a/functional/tester/case_sigterm.go
+++ b/functional/tester/case_sigterm.go
@@ -14,7 +14,7 @@
 
 package tester
 
-import "go.etcd.io/etcd/v3/functional/rpcpb"
+import "go.etcd.io/etcd/functional/rpcpb"
 
 func inject_SIGTERM_ETCD(clus *Cluster, idx int) error {
 	return clus.sendOp(idx, rpcpb.Operation_SIGTERM_ETCD)
diff --git a/functional/tester/checker.go b/functional/tester/checker.go
index 3ee78f935..7515bc93a 100644
--- a/functional/tester/checker.go
+++ b/functional/tester/checker.go
@@ -14,7 +14,7 @@
 
 package tester
 
-import "go.etcd.io/etcd/v3/functional/rpcpb"
+import "go.etcd.io/etcd/functional/rpcpb"
 
 // Checker checks cluster consistency.
 type Checker interface {
diff --git a/functional/tester/checker_kv_hash.go b/functional/tester/checker_kv_hash.go
index 534f90fa9..698367d25 100644
--- a/functional/tester/checker_kv_hash.go
+++ b/functional/tester/checker_kv_hash.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/checker_lease_expire.go b/functional/tester/checker_lease_expire.go
index 668ee41dc..9a19e327b 100644
--- a/functional/tester/checker_lease_expire.go
+++ b/functional/tester/checker_lease_expire.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/functional/tester/checker_no_check.go b/functional/tester/checker_no_check.go
index 7697aac85..aa0a4dcb8 100644
--- a/functional/tester/checker_no_check.go
+++ b/functional/tester/checker_no_check.go
@@ -14,7 +14,7 @@
 
 package tester
 
-import "go.etcd.io/etcd/v3/functional/rpcpb"
+import "go.etcd.io/etcd/functional/rpcpb"
 
 type noCheck struct{}
 
diff --git a/functional/tester/checker_runner.go b/functional/tester/checker_runner.go
index 42f6160a0..ea966540c 100644
--- a/functional/tester/checker_runner.go
+++ b/functional/tester/checker_runner.go
@@ -14,7 +14,7 @@
 
 package tester
 
-import "go.etcd.io/etcd/v3/functional/rpcpb"
+import "go.etcd.io/etcd/functional/rpcpb"
 
 type runnerChecker struct {
 	ctype              rpcpb.Checker
diff --git a/functional/tester/cluster.go b/functional/tester/cluster.go
index f9d0e27c9..6dfb3085b 100644
--- a/functional/tester/cluster.go
+++ b/functional/tester/cluster.go
@@ -29,9 +29,9 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/pkg/debugutil"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/pkg/debugutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
diff --git a/functional/tester/cluster_read_config.go b/functional/tester/cluster_read_config.go
index 7fc3b330f..4ce9d076e 100644
--- a/functional/tester/cluster_read_config.go
+++ b/functional/tester/cluster_read_config.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 	yaml "gopkg.in/yaml.v2"
diff --git a/functional/tester/cluster_run.go b/functional/tester/cluster_run.go
index 64fb19a26..f4091e0d8 100644
--- a/functional/tester/cluster_run.go
+++ b/functional/tester/cluster_run.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/pkg/fileutil"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/cluster_test.go b/functional/tester/cluster_test.go
index 3f04f7d47..7c7b25f2a 100644
--- a/functional/tester/cluster_test.go
+++ b/functional/tester/cluster_test.go
@@ -19,7 +19,7 @@ import (
 	"sort"
 	"testing"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/stresser.go b/functional/tester/stresser.go
index 79e6687f4..9a65eaa8b 100644
--- a/functional/tester/stresser.go
+++ b/functional/tester/stresser.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"time"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 )
diff --git a/functional/tester/stresser_key.go b/functional/tester/stresser_key.go
index 3d8c2dcf1..7feec4637 100644
--- a/functional/tester/stresser_key.go
+++ b/functional/tester/stresser_key.go
@@ -23,11 +23,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/raft"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go
index a727d4faf..e54d9f5f1 100644
--- a/functional/tester/stresser_lease.go
+++ b/functional/tester/stresser_lease.go
@@ -22,9 +22,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/functional/tester/stresser_runner.go b/functional/tester/stresser_runner.go
index 55f791ddb..e8e2bd1f8 100644
--- a/functional/tester/stresser_runner.go
+++ b/functional/tester/stresser_runner.go
@@ -20,7 +20,7 @@ import (
 	"os/exec"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/functional/rpcpb"
+	"go.etcd.io/etcd/functional/rpcpb"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
diff --git a/integration/bridge.go b/integration/bridge.go
index cedd16d35..483ee5829 100644
--- a/integration/bridge.go
+++ b/integration/bridge.go
@@ -21,7 +21,7 @@ import (
 	"net"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 // bridge creates a unix socket bridge to another unix socket, making it possible
diff --git a/integration/cluster.go b/integration/cluster.go
index 5973903eb..9a3c8d46a 100644
--- a/integration/cluster.go
+++ b/integration/cluster.go
@@ -33,25 +33,25 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/client"
-	"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"
-	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election"
-	epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock"
-	lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/v2http"
+	"go.etcd.io/etcd/etcdserver/api/v3client"
+	"go.etcd.io/etcd/etcdserver/api/v3election"
+	epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3lock"
+	lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/logutil"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/tlsutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
 
 	"github.com/soheilhy/cmux"
 	"go.uber.org/zap"
diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go
index 600cabe30..8dd4d0370 100644
--- a/integration/cluster_direct.go
+++ b/integration/cluster_direct.go
@@ -17,10 +17,10 @@
 package integration
 
 import (
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 func toGRPC(c *clientv3.Client) grpcAPI {
diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go
index 3c13bb4b9..055a73883 100644
--- a/integration/cluster_proxy.go
+++ b/integration/cluster_proxy.go
@@ -19,10 +19,10 @@ package integration
 import (
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/namespace"
-	"go.etcd.io/etcd/v3/proxy/grpcproxy"
-	"go.etcd.io/etcd/v3/proxy/grpcproxy/adapter"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/namespace"
+	"go.etcd.io/etcd/proxy/grpcproxy"
+	"go.etcd.io/etcd/proxy/grpcproxy/adapter"
 )
 
 var (
diff --git a/integration/cluster_test.go b/integration/cluster_test.go
index c305d6faa..c1681da69 100644
--- a/integration/cluster_test.go
+++ b/integration/cluster_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func init() {
diff --git a/integration/embed_test.go b/integration/embed_test.go
index a792681ac..c95d78d35 100644
--- a/integration/embed_test.go
+++ b/integration/embed_test.go
@@ -28,8 +28,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/embed"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
 )
 
 func TestEmbedEtcd(t *testing.T) {
diff --git a/integration/logger_test.go b/integration/logger_test.go
index 7fc4ed67f..f36664ec7 100644
--- a/integration/logger_test.go
+++ b/integration/logger_test.go
@@ -17,7 +17,7 @@ package integration
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/integration/main_test.go b/integration/main_test.go
index 4dec98da4..c7362dde4 100644
--- a/integration/main_test.go
+++ b/integration/main_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMain(m *testing.M) {
diff --git a/integration/member_test.go b/integration/member_test.go
index dbffedb4a..87a70dda0 100644
--- a/integration/member_test.go
+++ b/integration/member_test.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestPauseMember(t *testing.T) {
diff --git a/integration/metrics_test.go b/integration/metrics_test.go
index 313991a0d..19547102b 100644
--- a/integration/metrics_test.go
+++ b/integration/metrics_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/etcdserver"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 // TestMetricDbSizeBoot checks that the db size metric is set on boot.
diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go
index b9786c60a..e815d6842 100644
--- a/integration/network_partition_test.go
+++ b/integration/network_partition_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) {
diff --git a/integration/util_test.go b/integration/util_test.go
index 399c25db2..616988e5e 100644
--- a/integration/util_test.go
+++ b/integration/util_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 // copyTLSFiles clones certs files to dst directory.
diff --git a/integration/v2_http_kv_test.go b/integration/v2_http_kv_test.go
index 9e40e6576..c42e5a873 100644
--- a/integration/v2_http_kv_test.go
+++ b/integration/v2_http_kv_test.go
@@ -26,8 +26,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 func TestV2Set(t *testing.T) {
diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go
index f06a86e7a..7d9adf956 100644
--- a/integration/v3_alarm_test.go
+++ b/integration/v3_alarm_test.go
@@ -22,11 +22,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"go.uber.org/zap"
 )
diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go
index 7c4342a9e..76c73b0ec 100644
--- a/integration/v3_auth_test.go
+++ b/integration/v3_auth_test.go
@@ -21,11 +21,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/auth/authpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/auth/authpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error.
diff --git a/integration/v3_barrier_test.go b/integration/v3_barrier_test.go
index ef409cb5b..54fa3be66 100644
--- a/integration/v3_barrier_test.go
+++ b/integration/v3_barrier_test.go
@@ -18,9 +18,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/contrib/recipes"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/contrib/recipes"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestBarrierSingleNode(t *testing.T) {
diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go
index 9284de531..dc5acd84c 100644
--- a/integration/v3_double_barrier_test.go
+++ b/integration/v3_double_barrier_test.go
@@ -18,8 +18,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/contrib/recipes"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/contrib/recipes"
 )
 
 func TestDoubleBarrier(t *testing.T) {
diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go
index 4e74a404d..459844800 100644
--- a/integration/v3_election_test.go
+++ b/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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 )
 
 // TestElectionWait tests if followers can correctly wait for elections.
diff --git a/integration/v3_grpc_inflight_test.go b/integration/v3_grpc_inflight_test.go
index 4671ef733..1a0a11a8e 100644
--- a/integration/v3_grpc_inflight_test.go
+++ b/integration/v3_grpc_inflight_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go
index 0915be6ae..331f2bc60 100644
--- a/integration/v3_grpc_test.go
+++ b/integration/v3_grpc_test.go
@@ -25,11 +25,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go
index 6ec98b9d4..c5788fd12 100644
--- a/integration/v3_health_test.go
+++ b/integration/v3_health_test.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 )
diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go
index d3bc03b16..29818113a 100644
--- a/integration/v3_leadership_test.go
+++ b/integration/v3_leadership_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMoveLeader(t *testing.T)        { testMoveLeader(t, true) }
diff --git a/integration/v3_lease_test.go b/integration/v3_lease_test.go
index e8f44a2e6..7b378f0c9 100644
--- a/integration/v3_lease_test.go
+++ b/integration/v3_lease_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go
index 1524ed161..10b501eaf 100644
--- a/integration/v3_lock_test.go
+++ b/integration/v3_lock_test.go
@@ -21,11 +21,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/contrib/recipes"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/contrib/recipes"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestMutexSingleNode(t *testing.T) {
diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go
index 0f85f9a74..c7349fd84 100644
--- a/integration/v3_queue_test.go
+++ b/integration/v3_queue_test.go
@@ -20,7 +20,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"go.etcd.io/etcd/v3/contrib/recipes"
+	"go.etcd.io/etcd/contrib/recipes"
 )
 
 const (
diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go
index e62f8f7cb..25a1fd6c6 100644
--- a/integration/v3_stm_test.go
+++ b/integration/v3_stm_test.go
@@ -21,9 +21,9 @@ import (
 	"strconv"
 	"testing"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestSTMConflict tests that conflicts are retried.
diff --git a/integration/v3_tls_test.go b/integration/v3_tls_test.go
index 2c78eaddf..324ce49df 100644
--- a/integration/v3_tls_test.go
+++ b/integration/v3_tls_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 )
diff --git a/integration/v3_watch_restore_test.go b/integration/v3_watch_restore_test.go
index fd5ff26b6..c5dcb12c1 100644
--- a/integration/v3_watch_restore_test.go
+++ b/integration/v3_watch_restore_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 // TestV3WatchRestoreSnapshotUnsync tests whether slow follower can restore
diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go
index 22a3ea763..da255d569 100644
--- a/integration/v3_watch_test.go
+++ b/integration/v3_watch_test.go
@@ -24,10 +24,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestV3WatchFromCurrentRevision tests Watch APIs from current revision.
diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go
index 623172582..d49ad24fc 100644
--- a/integration/v3election_grpc_test.go
+++ b/integration/v3election_grpc_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestV3ElectionCampaign checks that Campaign will not give
diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go
index 6ccc3ccaf..05276669f 100644
--- a/integration/v3lock_grpc_test.go
+++ b/integration/v3lock_grpc_test.go
@@ -19,9 +19,9 @@ import (
 	"testing"
 	"time"
 
-	lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // TestV3LockLockWaiter tests that a client will wait for a lock, then acquire it
diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go
index 27f042bb4..67e916dba 100644
--- a/lease/leasehttp/http.go
+++ b/lease/leasehttp/http.go
@@ -23,10 +23,10 @@ import (
 	"net/http"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/lease/leasepb"
-	"go.etcd.io/etcd/v3/pkg/httputil"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/lease/leasepb"
+	"go.etcd.io/etcd/pkg/httputil"
 )
 
 var (
diff --git a/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go
index b57409541..0802515d5 100644
--- a/lease/leasehttp/http_test.go
+++ b/lease/leasehttp/http_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 	"go.uber.org/zap"
 )
 
diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go
index 5253d1f0d..16637ee7e 100644
--- a/lease/leasepb/lease.pb.go
+++ b/lease/leasepb/lease.pb.go
@@ -23,7 +23,7 @@ import (
 
 	_ "github.com/gogo/protobuf/gogoproto"
 
-	etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	io "io"
 )
diff --git a/lease/leasepb/lease.proto b/lease/leasepb/lease.proto
index 698a88eb8..1169d9f10 100644
--- a/lease/leasepb/lease.proto
+++ b/lease/leasepb/lease.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 package leasepb;
 
 import "gogoproto/gogo.proto";
-import "etcd/v3/etcdserver/etcdserverpb/rpc.proto";
+import "etcd/etcdserver/etcdserverpb/rpc.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.sizer_all) = true;
diff --git a/lease/lessor.go b/lease/lessor.go
index 702f6ab99..a208c82ea 100644
--- a/lease/lessor.go
+++ b/lease/lessor.go
@@ -24,9 +24,9 @@ import (
 	"sync"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/lease/leasepb"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/lease/leasepb"
+	"go.etcd.io/etcd/mvcc/backend"
 	"go.uber.org/zap"
 )
 
diff --git a/lease/lessor_bench_test.go b/lease/lessor_bench_test.go
index 821032314..4f14654a5 100644
--- a/lease/lessor_bench_test.go
+++ b/lease/lessor_bench_test.go
@@ -18,7 +18,7 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/backend"
 	"go.uber.org/zap"
 )
 
diff --git a/lease/lessor_test.go b/lease/lessor_test.go
index 14b0fecab..f1330ed7e 100644
--- a/lease/lessor_test.go
+++ b/lease/lessor_test.go
@@ -26,8 +26,8 @@ import (
 	"testing"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc/backend"
 	"go.uber.org/zap"
 )
 
diff --git a/main.go b/main.go
index 2284ebdcb..c03c49d1e 100644
--- a/main.go
+++ b/main.go
@@ -22,7 +22,7 @@
 //
 package main
 
-import "go.etcd.io/etcd/v3/etcdmain"
+import "go.etcd.io/etcd/etcdmain"
 
 func main() {
 	etcdmain.Main()
diff --git a/mvcc/kv.go b/mvcc/kv.go
index ba8b94f5d..8e898a5ad 100644
--- a/mvcc/kv.go
+++ b/mvcc/kv.go
@@ -15,9 +15,9 @@
 package mvcc
 
 import (
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type RangeOptions struct {
diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go
index 803562e0f..2c02ec089 100644
--- a/mvcc/kv_test.go
+++ b/mvcc/kv_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go
index cab130591..bd2e77729 100644
--- a/mvcc/kv_view.go
+++ b/mvcc/kv_view.go
@@ -14,7 +14,7 @@
 
 package mvcc
 
-import "go.etcd.io/etcd/v3/lease"
+import "go.etcd.io/etcd/lease"
 
 type readView struct{ kv KV }
 
diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go
index 5e105cb21..187f94029 100644
--- a/mvcc/kvstore.go
+++ b/mvcc/kvstore.go
@@ -25,10 +25,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/schedule"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/schedule"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go
index 71012ca72..0467ee7b1 100644
--- a/mvcc/kvstore_bench_test.go
+++ b/mvcc/kvstore_bench_test.go
@@ -18,8 +18,8 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go
index aed92b140..dde51db8a 100644
--- a/mvcc/kvstore_compaction_test.go
+++ b/mvcc/kvstore_compaction_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go
index f83014cfb..911839699 100644
--- a/mvcc/kvstore_test.go
+++ b/mvcc/kvstore_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/schedule"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/schedule"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go
index 4f51fbe45..088ea7341 100644
--- a/mvcc/kvstore_txn.go
+++ b/mvcc/kvstore_txn.go
@@ -15,9 +15,9 @@
 package mvcc
 
 import (
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go
index 4a43bdb97..b4a29bc95 100644
--- a/mvcc/metrics_txn.go
+++ b/mvcc/metrics_txn.go
@@ -14,7 +14,7 @@
 
 package mvcc
 
-import "go.etcd.io/etcd/v3/lease"
+import "go.etcd.io/etcd/lease"
 
 type metricsTxnWrite struct {
 	TxnWrite
diff --git a/mvcc/util.go b/mvcc/util.go
index 86d4805fe..032621aed 100644
--- a/mvcc/util.go
+++ b/mvcc/util.go
@@ -18,8 +18,8 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 func UpdateConsistentIndex(be backend.Backend, index uint64) {
diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go
index 960bc358a..46a9af5ed 100644
--- a/mvcc/watchable_store.go
+++ b/mvcc/watchable_store.go
@@ -18,9 +18,9 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go
index 05cc2bc30..07b8f351a 100644
--- a/mvcc/watchable_store_bench_test.go
+++ b/mvcc/watchable_store_bench_test.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go
index 54176c4f1..167315f1c 100644
--- a/mvcc/watchable_store_test.go
+++ b/mvcc/watchable_store_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go
index fcfd7cd84..3bcfa4d75 100644
--- a/mvcc/watchable_store_txn.go
+++ b/mvcc/watchable_store_txn.go
@@ -14,7 +14,7 @@
 
 package mvcc
 
-import "go.etcd.io/etcd/v3/mvcc/mvccpb"
+import "go.etcd.io/etcd/mvcc/mvccpb"
 
 func (tw *watchableStoreTxnWrite) End() {
 	changes := tw.Changes()
diff --git a/mvcc/watcher.go b/mvcc/watcher.go
index 2a3cb4ada..2846d62a5 100644
--- a/mvcc/watcher.go
+++ b/mvcc/watcher.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"sync"
 
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // AutoWatchID is the watcher ID passed in WatchStream.Watch when no
diff --git a/mvcc/watcher_bench_test.go b/mvcc/watcher_bench_test.go
index 3fe3bc9d5..8a2ba61df 100644
--- a/mvcc/watcher_bench_test.go
+++ b/mvcc/watcher_bench_test.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go
index 2dcb69e5c..07029335a 100644
--- a/mvcc/watcher_group.go
+++ b/mvcc/watcher_group.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"math"
 
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/adt"
 )
 
 var (
diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go
index 12fa47798..cb4e13b18 100644
--- a/mvcc/watcher_test.go
+++ b/mvcc/watcher_test.go
@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go
index 7a7f98d71..e3edf225c 100644
--- a/pkg/adt/example_test.go
+++ b/pkg/adt/example_test.go
@@ -17,7 +17,7 @@ package adt_test
 import (
 	"fmt"
 
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/pkg/adt"
 )
 
 func Example() {
diff --git a/pkg/flags/unique_urls.go b/pkg/flags/unique_urls.go
index 6eea99f0e..9b4178c3a 100644
--- a/pkg/flags/unique_urls.go
+++ b/pkg/flags/unique_urls.go
@@ -20,7 +20,7 @@ import (
 	"sort"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 // UniqueURLs contains unique URLs
diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go
index 48aef30bf..ca90970c2 100644
--- a/pkg/flags/urls.go
+++ b/pkg/flags/urls.go
@@ -19,7 +19,7 @@ import (
 	"net/url"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 // URLsValue wraps "types.URLs".
diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go
index cf0b360af..6a6746e0b 100644
--- a/pkg/ioutil/util.go
+++ b/pkg/ioutil/util.go
@@ -18,7 +18,7 @@ import (
 	"io"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 )
 
 // WriteAndSyncFile behaves just like ioutil.WriteFile in the standard library,
diff --git a/pkg/logutil/logger_test.go b/pkg/logutil/logger_test.go
index 9ec21da88..312066500 100644
--- a/pkg/logutil/logger_test.go
+++ b/pkg/logutil/logger_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/logutil"
 
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/pkg/logutil/package_logger_test.go b/pkg/logutil/package_logger_test.go
index 3a8f1b818..fa9887126 100644
--- a/pkg/logutil/package_logger_test.go
+++ b/pkg/logutil/package_logger_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/logutil"
 
 	"github.com/coreos/pkg/capnslog"
 )
diff --git a/pkg/logutil/zap_journal.go b/pkg/logutil/zap_journal.go
index 11b509115..fcd390381 100644
--- a/pkg/logutil/zap_journal.go
+++ b/pkg/logutil/zap_journal.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/systemd"
+	"go.etcd.io/etcd/pkg/systemd"
 
 	"github.com/coreos/go-systemd/journal"
 	"go.uber.org/zap/zapcore"
diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go
index 85f270fdc..e92cba04c 100644
--- a/pkg/logutil/zap_raft.go
+++ b/pkg/logutil/zap_raft.go
@@ -17,7 +17,7 @@ package logutil
 import (
 	"errors"
 
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/raft"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
diff --git a/pkg/mock/mockserver/mockserver.go b/pkg/mock/mockserver/mockserver.go
index c68cb3c2c..59c543eaf 100644
--- a/pkg/mock/mockserver/mockserver.go
+++ b/pkg/mock/mockserver/mockserver.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"sync"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/resolver"
diff --git a/pkg/mock/mockstorage/storage_recorder.go b/pkg/mock/mockstorage/storage_recorder.go
index e1fa7f9fd..d05413e62 100644
--- a/pkg/mock/mockstorage/storage_recorder.go
+++ b/pkg/mock/mockstorage/storage_recorder.go
@@ -15,9 +15,9 @@
 package mockstorage
 
 import (
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 type storageRecorder struct {
diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go
index 386b266bf..2f4bf45db 100644
--- a/pkg/mock/mockstore/store_recorder.go
+++ b/pkg/mock/mockstore/store_recorder.go
@@ -17,8 +17,8 @@ package mockstore
 import (
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 // StoreRecorder provides a Store interface with a testutil.Recorder
diff --git a/pkg/mock/mockwait/wait_recorder.go b/pkg/mock/mockwait/wait_recorder.go
index f6bd657d4..eff1a4766 100644
--- a/pkg/mock/mockwait/wait_recorder.go
+++ b/pkg/mock/mockwait/wait_recorder.go
@@ -15,8 +15,8 @@
 package mockwait
 
 import (
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/wait"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/wait"
 )
 
 type WaitRecorder struct {
diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
index f18bbe0c7..faef6466e 100644
--- a/pkg/netutil/netutil.go
+++ b/pkg/netutil/netutil.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 
 	"go.uber.org/zap"
 )
diff --git a/pkg/netutil/routes_linux.go b/pkg/netutil/routes_linux.go
index b87ef9d05..5118d3dac 100644
--- a/pkg/netutil/routes_linux.go
+++ b/pkg/netutil/routes_linux.go
@@ -24,7 +24,7 @@ import (
 	"sort"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/pkg/cpuutil"
+	"go.etcd.io/etcd/pkg/cpuutil"
 )
 
 var errNoDefaultRoute = fmt.Errorf("could not find default route")
diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go
index ef22ea2ff..6e037ec5d 100644
--- a/pkg/proxy/server.go
+++ b/pkg/proxy/server.go
@@ -26,7 +26,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"
diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go
index b82af8a31..1ca0b6878 100644
--- a/pkg/proxy/server_test.go
+++ b/pkg/proxy/server_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"go.uber.org/zap"
 )
diff --git a/pkg/srv/srv.go b/pkg/srv/srv.go
index 5e20f4099..c3560026d 100644
--- a/pkg/srv/srv.go
+++ b/pkg/srv/srv.go
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 var (
diff --git a/pkg/srv/srv_test.go b/pkg/srv/srv_test.go
index 26f2dddba..24a7cf22d 100644
--- a/pkg/srv/srv_test.go
+++ b/pkg/srv/srv_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestSRVGetCluster(t *testing.T) {
diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go
index 74a0ebbe5..27eaa36d2 100644
--- a/pkg/testutil/leak.go
+++ b/pkg/testutil/leak.go
@@ -21,7 +21,7 @@ CheckLeakedGoroutine verifies tests do not leave any leaky
 goroutines. It returns true when there are goroutines still
 running(leaking) after all tests.
 
-	import "go.etcd.io/etcd/v3/pkg/testutil"
+	import "go.etcd.io/etcd/pkg/testutil"
 
 	func TestMain(m *testing.M) {
 		v := m.Run()
@@ -125,8 +125,8 @@ func interestingGoroutines() (gs []string) {
 			strings.Contains(stack, "created by testing.RunTests") ||
 			strings.Contains(stack, "testing.Main(") ||
 			strings.Contains(stack, "runtime.goexit") ||
-			strings.Contains(stack, "go.etcd.io/etcd/v3/pkg/testutil.interestingGoroutines") ||
-			strings.Contains(stack, "go.etcd.io/etcd/v3/pkg/logutil.(*MergeLogger).outputLoop") ||
+			strings.Contains(stack, "go.etcd.io/etcd/pkg/testutil.interestingGoroutines") ||
+			strings.Contains(stack, "go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop") ||
 			strings.Contains(stack, "github.com/golang/glog.(*loggingT).flushDaemon") ||
 			strings.Contains(stack, "created by runtime.gc") ||
 			strings.Contains(stack, "runtime.MHeap_Scavenger") {
diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go
index 5cd9758fb..0c593e8e2 100644
--- a/pkg/transport/listener.go
+++ b/pkg/transport/listener.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
+	"go.etcd.io/etcd/pkg/tlsutil"
 
 	"go.uber.org/zap"
 )
diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go
index 98a698ff7..268cb8b16 100644
--- a/pkg/types/urls_test.go
+++ b/pkg/types/urls_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestNewURLs(t *testing.T) {
diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go
index 8ffd06240..35f34ab7c 100644
--- a/pkg/types/urlsmap_test.go
+++ b/pkg/types/urlsmap_test.go
@@ -15,7 +15,7 @@
 package types
 
 import (
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 	"reflect"
 	"testing"
 )
diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go
index 3bebc586d..59dbe6b0e 100644
--- a/proxy/grpcproxy/adapter/auth_client_adapter.go
+++ b/proxy/grpcproxy/adapter/auth_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	grpc "google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/cluster_client_adapter.go b/proxy/grpcproxy/adapter/cluster_client_adapter.go
index b5dab26ca..73a6fdfcb 100644
--- a/proxy/grpcproxy/adapter/cluster_client_adapter.go
+++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/election_client_adapter.go b/proxy/grpcproxy/adapter/election_client_adapter.go
index 06ebcc9ef..4722be040 100644
--- a/proxy/grpcproxy/adapter/election_client_adapter.go
+++ b/proxy/grpcproxy/adapter/election_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/kv_client_adapter.go b/proxy/grpcproxy/adapter/kv_client_adapter.go
index cc08e09d0..b1a782099 100644
--- a/proxy/grpcproxy/adapter/kv_client_adapter.go
+++ b/proxy/grpcproxy/adapter/kv_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	grpc "google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/lease_client_adapter.go b/proxy/grpcproxy/adapter/lease_client_adapter.go
index e2c9518c5..a58408f9f 100644
--- a/proxy/grpcproxy/adapter/lease_client_adapter.go
+++ b/proxy/grpcproxy/adapter/lease_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/lock_client_adapter.go b/proxy/grpcproxy/adapter/lock_client_adapter.go
index eb2a3d641..65b5641d3 100644
--- a/proxy/grpcproxy/adapter/lock_client_adapter.go
+++ b/proxy/grpcproxy/adapter/lock_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/maintenance_client_adapter.go b/proxy/grpcproxy/adapter/maintenance_client_adapter.go
index 76fb75cea..4a8781b13 100644
--- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go
+++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go
@@ -17,7 +17,7 @@ package adapter
 import (
 	"context"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/adapter/watch_client_adapter.go b/proxy/grpcproxy/adapter/watch_client_adapter.go
index 5bede2594..2f629cc15 100644
--- a/proxy/grpcproxy/adapter/watch_client_adapter.go
+++ b/proxy/grpcproxy/adapter/watch_client_adapter.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"errors"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"google.golang.org/grpc"
 )
 
diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go
index 9d86d157c..e2c7f8c4b 100644
--- a/proxy/grpcproxy/auth.go
+++ b/proxy/grpcproxy/auth.go
@@ -17,8 +17,8 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type AuthProxy struct {
diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go
index 050a8b720..1f9688b89 100644
--- a/proxy/grpcproxy/cache/store.go
+++ b/proxy/grpcproxy/cache/store.go
@@ -21,9 +21,9 @@ import (
 	"sync"
 
 	"github.com/golang/groupcache/lru"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/adt"
 )
 
 var (
diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go
index b47218126..7e5059cfb 100644
--- a/proxy/grpcproxy/cluster.go
+++ b/proxy/grpcproxy/cluster.go
@@ -21,10 +21,10 @@ import (
 	"os"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/naming"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/naming"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"golang.org/x/time/rate"
 	gnaming "google.golang.org/grpc/naming"
diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go
index a0fa04465..778681744 100644
--- a/proxy/grpcproxy/cluster_test.go
+++ b/proxy/grpcproxy/cluster_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go
index 49421b6ea..8a80809d2 100644
--- a/proxy/grpcproxy/election.go
+++ b/proxy/grpcproxy/election.go
@@ -17,8 +17,8 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
 )
 
 type electionProxy struct {
diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go
index 6f7e478ea..4756cff2e 100644
--- a/proxy/grpcproxy/health.go
+++ b/proxy/grpcproxy/health.go
@@ -19,9 +19,9 @@ import (
 	"net/http"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 )
 
 // HandleHealth registers health handler on '/health'.
diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go
index 7340326f5..d3a350994 100644
--- a/proxy/grpcproxy/kv.go
+++ b/proxy/grpcproxy/kv.go
@@ -17,9 +17,9 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/proxy/grpcproxy/cache"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/proxy/grpcproxy/cache"
 )
 
 type kvProxy struct {
diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go
index 49ee69863..a1d29e179 100644
--- a/proxy/grpcproxy/kv_test.go
+++ b/proxy/grpcproxy/kv_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"
 )
diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go
index ea0115c4e..bba2b9703 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/clientv3"
 
 	"golang.org/x/time/rate"
 )
diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go
index 10b5e2ef3..a688d429a 100644
--- a/proxy/grpcproxy/lease.go
+++ b/proxy/grpcproxy/lease.go
@@ -21,9 +21,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go
index 4a903b743..9e1543d83 100644
--- a/proxy/grpcproxy/lock.go
+++ b/proxy/grpcproxy/lock.go
@@ -17,8 +17,8 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
 )
 
 type lockProxy struct {
diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go
index ab35b47f1..5e1e75176 100644
--- a/proxy/grpcproxy/maintenance.go
+++ b/proxy/grpcproxy/maintenance.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"io"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 type maintenanceProxy struct {
diff --git a/proxy/grpcproxy/metrics.go b/proxy/grpcproxy/metrics.go
index 5992df78b..fcab53d84 100644
--- a/proxy/grpcproxy/metrics.go
+++ b/proxy/grpcproxy/metrics.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
 )
 
 var (
diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go
index 27595842d..ba628c3eb 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/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/clientv3/naming"
 
 	"golang.org/x/time/rate"
 	gnaming "google.golang.org/grpc/naming"
diff --git a/proxy/grpcproxy/register_test.go b/proxy/grpcproxy/register_test.go
index 2bca490f3..33b01547c 100644
--- a/proxy/grpcproxy/register_test.go
+++ b/proxy/grpcproxy/register_test.go
@@ -18,10 +18,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/naming"
-	"go.etcd.io/etcd/v3/integration"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/naming"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	gnaming "google.golang.org/grpc/naming"
 )
diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go
index f33479c24..266ae7d72 100644
--- a/proxy/grpcproxy/util.go
+++ b/proxy/grpcproxy/util.go
@@ -17,7 +17,7 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go
index 91baf831f..639bf8e2d 100644
--- a/proxy/grpcproxy/watch.go
+++ b/proxy/grpcproxy/watch.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go
index d43112ec8..f9d2b148a 100644
--- a/proxy/grpcproxy/watch_broadcast.go
+++ b/proxy/grpcproxy/watch_broadcast.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 // watchBroadcast broadcasts a server watcher to many client watchers.
diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go
index b994ec2f7..0068a69e5 100644
--- a/proxy/grpcproxy/watcher.go
+++ b/proxy/grpcproxy/watcher.go
@@ -17,10 +17,10 @@ package grpcproxy
 import (
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type watchRange struct {
diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go
index c74a837fe..edbeaaa97 100644
--- a/proxy/httpproxy/reverse.go
+++ b/proxy/httpproxy/reverse.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/coreos/pkg/capnslog"
-	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
 )
 
 var (
diff --git a/raft/example_test.go b/raft/example_test.go
index 11934b23c..b56d2a28f 100644
--- a/raft/example_test.go
+++ b/raft/example_test.go
@@ -15,7 +15,7 @@
 package raft
 
 import (
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 func applyToStore(ents []pb.Entry)    {}
diff --git a/raft/log.go b/raft/log.go
index f9ed4dc5d..77eedfccb 100644
--- a/raft/log.go
+++ b/raft/log.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"log"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 type raftLog struct {
diff --git a/raft/log_test.go b/raft/log_test.go
index 6db6f8d91..a9ee6ce06 100644
--- a/raft/log_test.go
+++ b/raft/log_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestFindConflict(t *testing.T) {
diff --git a/raft/log_unstable.go b/raft/log_unstable.go
index 253c8efee..1005bf65c 100644
--- a/raft/log_unstable.go
+++ b/raft/log_unstable.go
@@ -14,7 +14,7 @@
 
 package raft
 
-import pb "go.etcd.io/etcd/v3/raft/raftpb"
+import pb "go.etcd.io/etcd/raft/raftpb"
 
 // unstable.entries[i] has raft log position i+unstable.offset.
 // Note that unstable.offset may be less than the highest log
diff --git a/raft/log_unstable_test.go b/raft/log_unstable_test.go
index 9393edc0c..2821a1e77 100644
--- a/raft/log_unstable_test.go
+++ b/raft/log_unstable_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestUnstableMaybeFirstIndex(t *testing.T) {
diff --git a/raft/node.go b/raft/node.go
index 5b2600fde..396007df9 100644
--- a/raft/node.go
+++ b/raft/node.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"errors"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 type SnapshotStatus int
diff --git a/raft/node_test.go b/raft/node_test.go
index b873779e3..641a5ca2f 100644
--- a/raft/node_test.go
+++ b/raft/node_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // readyWithTimeout selects from n.Ready() with a 1-second timeout. It
diff --git a/raft/raft.go b/raft/raft.go
index 24a6c0178..4619a53d0 100644
--- a/raft/raft.go
+++ b/raft/raft.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 // None is a placeholder node ID used when there is no leader.
diff --git a/raft/raft_flow_control_test.go b/raft/raft_flow_control_test.go
index 01d4dd7a6..699bb5b07 100644
--- a/raft/raft_flow_control_test.go
+++ b/raft/raft_flow_control_test.go
@@ -17,7 +17,7 @@ package raft
 import (
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 // TestMsgAppFlowControlFull ensures:
diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go
index 3b767b4fa..cf7b192f4 100644
--- a/raft/raft_paper_test.go
+++ b/raft/raft_paper_test.go
@@ -32,7 +32,7 @@ import (
 	"sort"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestFollowerUpdateTermFromMessage(t *testing.T) {
diff --git a/raft/raft_snap_test.go b/raft/raft_snap_test.go
index 358c85b8e..145473824 100644
--- a/raft/raft_snap_test.go
+++ b/raft/raft_snap_test.go
@@ -17,7 +17,7 @@ package raft
 import (
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 var (
diff --git a/raft/raft_test.go b/raft/raft_test.go
index 93c61735c..13a59f728 100644
--- a/raft/raft_test.go
+++ b/raft/raft_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 // nextEnts returns the appliable entries and updates the applied index
diff --git a/raft/rafttest/network.go b/raft/rafttest/network.go
index 1a46c67de..ee30fc0c4 100644
--- a/raft/rafttest/network.go
+++ b/raft/rafttest/network.go
@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // a network interface
diff --git a/raft/rafttest/network_test.go b/raft/rafttest/network_test.go
index a176c95fb..cbfae9605 100644
--- a/raft/rafttest/network_test.go
+++ b/raft/rafttest/network_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestNetworkDrop(t *testing.T) {
diff --git a/raft/rafttest/node.go b/raft/rafttest/node.go
index d97522937..add21da0b 100644
--- a/raft/rafttest/node.go
+++ b/raft/rafttest/node.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 type node struct {
diff --git a/raft/rafttest/node_bench_test.go b/raft/rafttest/node_bench_test.go
index 2b505d8ef..f28744ae8 100644
--- a/raft/rafttest/node_bench_test.go
+++ b/raft/rafttest/node_bench_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/raft"
 )
 
 func BenchmarkProposal3Nodes(b *testing.B) {
diff --git a/raft/rafttest/node_test.go b/raft/rafttest/node_test.go
index 3c466367b..455f56591 100644
--- a/raft/rafttest/node_test.go
+++ b/raft/rafttest/node_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/raft"
+	"go.etcd.io/etcd/raft"
 )
 
 func TestBasicProgress(t *testing.T) {
diff --git a/raft/rawnode.go b/raft/rawnode.go
index 139a08421..d31de6e7d 100644
--- a/raft/rawnode.go
+++ b/raft/rawnode.go
@@ -17,7 +17,7 @@ package raft
 import (
 	"errors"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 // ErrStepLocalMsg is returned when try to step a local raft message
diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go
index 2752433f2..f44907dd9 100644
--- a/raft/rawnode_test.go
+++ b/raft/rawnode_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 // TestRawNodeStep ensures that RawNode.Step ignore local message.
diff --git a/raft/read_only.go b/raft/read_only.go
index 955fe7986..39eb2b065 100644
--- a/raft/read_only.go
+++ b/raft/read_only.go
@@ -14,7 +14,7 @@
 
 package raft
 
-import pb "go.etcd.io/etcd/v3/raft/raftpb"
+import pb "go.etcd.io/etcd/raft/raftpb"
 
 // ReadState provides state for read only query.
 // It's caller's responsibility to call ReadIndex first before getting
diff --git a/raft/status.go b/raft/status.go
index f894716e1..197a6820d 100644
--- a/raft/status.go
+++ b/raft/status.go
@@ -17,7 +17,7 @@ package raft
 import (
 	"fmt"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 type Status struct {
diff --git a/raft/storage.go b/raft/storage.go
index cb35ddff1..14ad68608 100644
--- a/raft/storage.go
+++ b/raft/storage.go
@@ -18,7 +18,7 @@ import (
 	"errors"
 	"sync"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 // ErrCompacted is returned by Storage.Entries/Compact when a requested
diff --git a/raft/storage_test.go b/raft/storage_test.go
index 4e7100b95..6d075eafd 100644
--- a/raft/storage_test.go
+++ b/raft/storage_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 func TestStorageTerm(t *testing.T) {
diff --git a/raft/util.go b/raft/util.go
index abc760f36..c145d26dd 100644
--- a/raft/util.go
+++ b/raft/util.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"fmt"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 func (st StateType) MarshalJSON() ([]byte, error) {
diff --git a/raft/util_test.go b/raft/util_test.go
index 4c49a61ba..52853892f 100644
--- a/raft/util_test.go
+++ b/raft/util_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/raft/raftpb"
+	pb "go.etcd.io/etcd/raft/raftpb"
 )
 
 var testFormatter EntryFormatter = func(data []byte) string {
diff --git a/tests/e2e/cluster_proxy_test.go b/tests/e2e/cluster_proxy_test.go
index 078c93f41..f9028ae2b 100644
--- a/tests/e2e/cluster_proxy_test.go
+++ b/tests/e2e/cluster_proxy_test.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 type proxyEtcdProcess struct {
diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go
index 38cc973de..57663f2c5 100644
--- a/tests/e2e/cluster_test.go
+++ b/tests/e2e/cluster_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"strings"
 
-	"go.etcd.io/etcd/v3/etcdserver"
+	"go.etcd.io/etcd/etcdserver"
 )
 
 const etcdProcessBasePort = 20000
diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go
index 7ce9072c5..cbea2a3d8 100644
--- a/tests/e2e/ctl_v2_test.go
+++ b/tests/e2e/ctl_v2_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestCtlV2Set(t *testing.T)          { testCtlV2Set(t, &configNoTLS, false) }
diff --git a/tests/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go
index 4d3df2a93..a8bc38483 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/clientv3"
 )
 
 func TestCtlV3Alarm(t *testing.T) {
diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go
index 22832c718..e47660ac8 100644
--- a/tests/e2e/ctl_v3_auth_test.go
+++ b/tests/e2e/ctl_v3_auth_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/clientv3"
 )
 
 func TestCtlV3AuthEnable(t *testing.T)              { testCtl(t, authEnableTest) }
diff --git a/tests/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go
index d0dc6fa4f..354953138 100644
--- a/tests/e2e/ctl_v3_elect_test.go
+++ b/tests/e2e/ctl_v3_elect_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 func TestCtlV3Elect(t *testing.T) {
diff --git a/tests/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go
index 7d1416bdf..23070ba88 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/clientv3"
 )
 
 func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) }
diff --git a/tests/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go
index 2d79bc2a3..e27ccdea7 100644
--- a/tests/e2e/ctl_v3_lock_test.go
+++ b/tests/e2e/ctl_v3_lock_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 func TestCtlV3Lock(t *testing.T) {
diff --git a/tests/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go
index 06da3b0f7..61961c9f6 100644
--- a/tests/e2e/ctl_v3_member_test.go
+++ b/tests/e2e/ctl_v3_member_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 func TestCtlV3MemberList(t *testing.T)          { testCtl(t, memberListTest) }
diff --git a/tests/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go
index 021e785b8..1ecffe589 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 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 521820eac..f603ad34a 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 func TestCtlV3MoveLeaderSecure(t *testing.T) {
diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go
index 9941cb1f0..94929c089 100644
--- a/tests/e2e/ctl_v3_snapshot_test.go
+++ b/tests/e2e/ctl_v3_snapshot_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
-	"go.etcd.io/etcd/v3/pkg/expect"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	"go.etcd.io/etcd/pkg/expect"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) }
diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go
index 25735087c..04f5a6570 100644
--- a/tests/e2e/ctl_v3_test.go
+++ b/tests/e2e/ctl_v3_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/version"
 )
 
 func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) }
diff --git a/tests/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go
index 8135dd6ba..7c660b03e 100644
--- a/tests/e2e/etcd_config_test.go
+++ b/tests/e2e/etcd_config_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 const exampleConfigFile = "../../etcd.conf.yml.sample"
diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go
index f5aed150c..5fb355578 100644
--- a/tests/e2e/etcd_corrupt_test.go
+++ b/tests/e2e/etcd_corrupt_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 
 	bolt "go.etcd.io/bbolt"
 )
diff --git a/tests/e2e/etcd_process.go b/tests/e2e/etcd_process.go
index c6a03ecef..3ff7022cf 100644
--- a/tests/e2e/etcd_process.go
+++ b/tests/e2e/etcd_process.go
@@ -19,8 +19,8 @@ import (
 	"net/url"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/expect"
+	"go.etcd.io/etcd/pkg/fileutil"
 )
 
 var (
diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go
index e9abf480d..6a8e5b13a 100644
--- a/tests/e2e/etcd_release_upgrade_test.go
+++ b/tests/e2e/etcd_release_upgrade_test.go
@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/version"
 )
 
 // TestReleaseUpgrade ensures that changes to master branch does not affect
diff --git a/tests/e2e/etcd_spawn_cov.go b/tests/e2e/etcd_spawn_cov.go
index f845490d4..cbdb2e66a 100644
--- a/tests/e2e/etcd_spawn_cov.go
+++ b/tests/e2e/etcd_spawn_cov.go
@@ -24,9 +24,9 @@ import (
 	"syscall"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/flags"
+	"go.etcd.io/etcd/pkg/expect"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/flags"
 )
 
 const noOutputLineCount = 2 // cov-enabled binaries emit PASS and coverage count lines
diff --git a/tests/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go
index 88e91733f..33f49ffa4 100644
--- a/tests/e2e/etcd_spawn_nocov.go
+++ b/tests/e2e/etcd_spawn_nocov.go
@@ -19,7 +19,7 @@ package e2e
 import (
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 const noOutputLineCount = 0 // regular binaries emit no extra lines
diff --git a/tests/e2e/gateway_test.go b/tests/e2e/gateway_test.go
index fb0857a28..ee7c415b0 100644
--- a/tests/e2e/gateway_test.go
+++ b/tests/e2e/gateway_test.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 var (
diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go
index 59ad4e3f1..6a608c6c9 100644
--- a/tests/e2e/main_test.go
+++ b/tests/e2e/main_test.go
@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 var (
diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go
index db36bd5db..7a32f0031 100644
--- a/tests/e2e/metrics_test.go
+++ b/tests/e2e/metrics_test.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 )
 
 func TestV3MetricsSecure(t *testing.T) {
diff --git a/tests/e2e/util.go b/tests/e2e/util.go
index de73e511a..ce7289ae9 100644
--- a/tests/e2e/util.go
+++ b/tests/e2e/util.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/expect"
+	"go.etcd.io/etcd/pkg/expect"
 )
 
 func waitReadyExpectProc(exproc *expect.ExpectProcess, readyStrs []string) error {
diff --git a/tests/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go
index 7e710525e..e1288066d 100644
--- a/tests/e2e/v2_curl_test.go
+++ b/tests/e2e/v2_curl_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/testutil"
 )
 
 func TestV2CurlNoTLS(t *testing.T)      { testCurlPutGet(t, &configNoTLS) }
diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go
index 9b0548878..501dc28e1 100644
--- a/tests/e2e/v3_cipher_suite_test.go
+++ b/tests/e2e/v3_cipher_suite_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"go.etcd.io/etcd/v3/version"
+	"go.etcd.io/etcd/version"
 )
 
 func TestV3CurlCipherSuitesValid(t *testing.T)    { testV3CurlCipherSuites(t, true) }
diff --git a/tests/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go
index 91e59243c..47d150a7a 100644
--- a/tests/e2e/v3_curl_lease_test.go
+++ b/tests/e2e/v3_curl_lease_test.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"testing"
 
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 func TestV3CurlLeaseGrantNoTLS(t *testing.T) {
diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go
index 21f5e3d02..60f2baf10 100644
--- a/tests/e2e/v3_curl_test.go
+++ b/tests/e2e/v3_curl_test.go
@@ -22,10 +22,10 @@ import (
 	"strconv"
 	"testing"
 
-	epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
-	pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 )
diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go
index c8ed1e43b..8104390c9 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/cheggaaa/pb.v1"
diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go
index 0507c71cc..026693efe 100644
--- a/tools/benchmark/cmd/mvcc-put.go
+++ b/tools/benchmark/cmd/mvcc-put.go
@@ -21,8 +21,8 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/pkg/report"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/spf13/cobra"
 )
diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go
index 797a92f16..742ffe9cf 100644
--- a/tools/benchmark/cmd/mvcc.go
+++ b/tools/benchmark/cmd/mvcc.go
@@ -20,9 +20,9 @@ import (
 
 	"go.uber.org/zap"
 
-	"go.etcd.io/etcd/v3/lease"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"github.com/spf13/cobra"
 )
diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go
index dbbbf98db..4f99d5c57 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go
index c46b90d5a..a24cce318 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go
index 7ee50aad8..83d96f5d4 100644
--- a/tools/benchmark/cmd/root.go
+++ b/tools/benchmark/cmd/root.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/cheggaaa/pb.v1"
diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go
index 0372d628b..f8df5398d 100644
--- a/tools/benchmark/cmd/stm.go
+++ b/tools/benchmark/cmd/stm.go
@@ -23,10 +23,10 @@ import (
 	"os"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	v3sync "go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	v3sync "go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go
index 0b69eeb06..e042aacf6 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go
index 8d4783bdd..ba2c9a7ba 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 	"google.golang.org/grpc/grpclog"
 )
 
diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go
index 9cea4884c..d217a39c8 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"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 3cc20fe74..c6def95fb 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"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 9025f98fb..fc48ea2f3 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/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
diff --git a/tools/benchmark/main.go b/tools/benchmark/main.go
index 97c03141f..4e70b8125 100644
--- a/tools/benchmark/main.go
+++ b/tools/benchmark/main.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/tools/benchmark/cmd"
+	"go.etcd.io/etcd/tools/benchmark/cmd"
 )
 
 func main() {
diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go
index 6d719d8a6..4ad0aa5dd 100644
--- a/tools/etcd-dump-db/backend.go
+++ b/tools/etcd-dump-db/backend.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/lease/leasepb"
-	"go.etcd.io/etcd/v3/mvcc"
-	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease/leasepb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 
 	bolt "go.etcd.io/bbolt"
 )
diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go
index 9190f36b6..f1b6b631c 100644
--- a/tools/etcd-dump-logs/etcd-dump-log_test.go
+++ b/tools/etcd-dump-logs/etcd-dump-log_test.go
@@ -24,12 +24,12 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/auth/authpb"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
+	"go.etcd.io/etcd/auth/authpb"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go
index 506ea2a90..6bb589296 100644
--- a/tools/etcd-dump-logs/main.go
+++ b/tools/etcd-dump-logs/main.go
@@ -28,13 +28,13 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )
diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go
index b0e4bbfb8..2939b60c2 100644
--- a/tools/etcd-dump-metrics/etcd.go
+++ b/tools/etcd-dump-metrics/etcd.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/embed"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
 
 	"go.uber.org/zap"
 )
diff --git a/tools/etcd-dump-metrics/install_darwin.go b/tools/etcd-dump-metrics/install_darwin.go
index dab338676..4d545b240 100644
--- a/tools/etcd-dump-metrics/install_darwin.go
+++ b/tools/etcd-dump-metrics/install_darwin.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 )
 
 const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-darwin-amd64.zip`
diff --git a/tools/etcd-dump-metrics/install_linux.go b/tools/etcd-dump-metrics/install_linux.go
index 68adcaaea..0c6fc9707 100644
--- a/tools/etcd-dump-metrics/install_linux.go
+++ b/tools/etcd-dump-metrics/install_linux.go
@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 )
 
 const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-linux-amd64.tar.gz`
diff --git a/tools/etcd-dump-metrics/main.go b/tools/etcd-dump-metrics/main.go
index ba2c843dc..0648c8b2b 100644
--- a/tools/etcd-dump-metrics/main.go
+++ b/tools/etcd-dump-metrics/main.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.etcd.io/etcd/v3/embed"
+	"go.etcd.io/etcd/embed"
 
 	"go.uber.org/zap"
 )
diff --git a/tools/etcd-dump-metrics/metrics.go b/tools/etcd-dump-metrics/metrics.go
index dfc66622a..3840b20fb 100644
--- a/tools/etcd-dump-metrics/metrics.go
+++ b/tools/etcd-dump-metrics/metrics.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"go.uber.org/zap"
 )
diff --git a/wal/decoder.go b/wal/decoder.go
index 9d6c20253..f2f01fd88 100644
--- a/wal/decoder.go
+++ b/wal/decoder.go
@@ -21,10 +21,10 @@ import (
 	"io"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/crc"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/pkg/crc"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal/walpb"
 )
 
 const minSectorSize = 512
diff --git a/wal/encoder.go b/wal/encoder.go
index fb52182c4..d3877ed5c 100644
--- a/wal/encoder.go
+++ b/wal/encoder.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/crc"
-	"go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/pkg/crc"
+	"go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/wal/walpb"
 )
 
 // walPageBytes is the alignment for flushing records to the backing Writer.
diff --git a/wal/file_pipeline.go b/wal/file_pipeline.go
index 1b60684f3..e1e1c557b 100644
--- a/wal/file_pipeline.go
+++ b/wal/file_pipeline.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 
 	"go.uber.org/zap"
 )
diff --git a/wal/record_test.go b/wal/record_test.go
index 428bd2532..b725151a5 100644
--- a/wal/record_test.go
+++ b/wal/record_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/wal/walpb"
 )
 
 var (
diff --git a/wal/repair.go b/wal/repair.go
index 6debd8b81..15afed017 100644
--- a/wal/repair.go
+++ b/wal/repair.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )
diff --git a/wal/repair_test.go b/wal/repair_test.go
index ae6747b6b..b2a215bca 100644
--- a/wal/repair_test.go
+++ b/wal/repair_test.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )
diff --git a/wal/util.go b/wal/util.go
index f035ef83f..a3f314bb1 100644
--- a/wal/util.go
+++ b/wal/util.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/fileutil"
 
 	"go.uber.org/zap"
 )
diff --git a/wal/wal.go b/wal/wal.go
index c01e36964..5f6f21e3a 100644
--- a/wal/wal.go
+++ b/wal/wal.go
@@ -25,11 +25,11 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
diff --git a/wal/wal_bench_test.go b/wal/wal_bench_test.go
index 607d02afc..20bed171d 100644
--- a/wal/wal_bench_test.go
+++ b/wal/wal_bench_test.go
@@ -21,7 +21,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/raft/raftpb"
 )
 
 func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) }
diff --git a/wal/wal_test.go b/wal/wal_test.go
index 6e79a03fe..d2709d042 100644
--- a/wal/wal_test.go
+++ b/wal/wal_test.go
@@ -27,10 +27,10 @@ import (
 	"regexp"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/raft/raftpb"
-	"go.etcd.io/etcd/v3/wal/walpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal/walpb"
 
 	"go.uber.org/zap"
 )