diff --git a/clientv3/README.md b/client/v3/README.md
similarity index 100%
rename from clientv3/README.md
rename to client/v3/README.md
diff --git a/clientv3/auth.go b/client/v3/auth.go
similarity index 100%
rename from clientv3/auth.go
rename to client/v3/auth.go
diff --git a/clientv3/balancer/balancer.go b/client/v3/balancer/balancer.go
similarity index 100%
rename from clientv3/balancer/balancer.go
rename to client/v3/balancer/balancer.go
diff --git a/clientv3/balancer/balancer_test.go b/client/v3/balancer/balancer_test.go
similarity index 100%
rename from clientv3/balancer/balancer_test.go
rename to client/v3/balancer/balancer_test.go
diff --git a/clientv3/balancer/connectivity/connectivity.go b/client/v3/balancer/connectivity/connectivity.go
similarity index 100%
rename from clientv3/balancer/connectivity/connectivity.go
rename to client/v3/balancer/connectivity/connectivity.go
diff --git a/clientv3/balancer/picker/doc.go b/client/v3/balancer/picker/doc.go
similarity index 100%
rename from clientv3/balancer/picker/doc.go
rename to client/v3/balancer/picker/doc.go
diff --git a/clientv3/balancer/picker/err.go b/client/v3/balancer/picker/err.go
similarity index 100%
rename from clientv3/balancer/picker/err.go
rename to client/v3/balancer/picker/err.go
diff --git a/clientv3/balancer/picker/picker.go b/client/v3/balancer/picker/picker.go
similarity index 100%
rename from clientv3/balancer/picker/picker.go
rename to client/v3/balancer/picker/picker.go
diff --git a/clientv3/balancer/picker/roundrobin_balanced.go b/client/v3/balancer/picker/roundrobin_balanced.go
similarity index 100%
rename from clientv3/balancer/picker/roundrobin_balanced.go
rename to client/v3/balancer/picker/roundrobin_balanced.go
diff --git a/clientv3/balancer/resolver/endpoint/endpoint.go b/client/v3/balancer/resolver/endpoint/endpoint.go
similarity index 100%
rename from clientv3/balancer/resolver/endpoint/endpoint.go
rename to client/v3/balancer/resolver/endpoint/endpoint.go
diff --git a/clientv3/balancer/utils.go b/client/v3/balancer/utils.go
similarity index 100%
rename from clientv3/balancer/utils.go
rename to client/v3/balancer/utils.go
diff --git a/clientv3/balancer/utils_test.go b/client/v3/balancer/utils_test.go
similarity index 100%
rename from clientv3/balancer/utils_test.go
rename to client/v3/balancer/utils_test.go
diff --git a/clientv3/client.go b/client/v3/client.go
similarity index 100%
rename from clientv3/client.go
rename to client/v3/client.go
diff --git a/clientv3/client_test.go b/client/v3/client_test.go
similarity index 100%
rename from clientv3/client_test.go
rename to client/v3/client_test.go
diff --git a/clientv3/clientv3util/example_key_test.go b/client/v3/clientv3util/example_key_test.go
similarity index 100%
rename from clientv3/clientv3util/example_key_test.go
rename to client/v3/clientv3util/example_key_test.go
diff --git a/clientv3/clientv3util/util.go b/client/v3/clientv3util/util.go
similarity index 100%
rename from clientv3/clientv3util/util.go
rename to client/v3/clientv3util/util.go
diff --git a/clientv3/cluster.go b/client/v3/cluster.go
similarity index 100%
rename from clientv3/cluster.go
rename to client/v3/cluster.go
diff --git a/clientv3/compact_op.go b/client/v3/compact_op.go
similarity index 100%
rename from clientv3/compact_op.go
rename to client/v3/compact_op.go
diff --git a/clientv3/compact_op_test.go b/client/v3/compact_op_test.go
similarity index 100%
rename from clientv3/compact_op_test.go
rename to client/v3/compact_op_test.go
diff --git a/clientv3/compare.go b/client/v3/compare.go
similarity index 100%
rename from clientv3/compare.go
rename to client/v3/compare.go
diff --git a/clientv3/concurrency/doc.go b/client/v3/concurrency/doc.go
similarity index 100%
rename from clientv3/concurrency/doc.go
rename to client/v3/concurrency/doc.go
diff --git a/clientv3/concurrency/election.go b/client/v3/concurrency/election.go
similarity index 100%
rename from clientv3/concurrency/election.go
rename to client/v3/concurrency/election.go
diff --git a/client/v3/concurrency/example_election_test.go b/client/v3/concurrency/example_election_test.go
new file mode 120000
index 000000000..a76f0a7f4
--- /dev/null
+++ b/client/v3/concurrency/example_election_test.go
@@ -0,0 +1 @@
+../../../tests/integration/clientv3/concurrency/example_election_test.go
\ No newline at end of file
diff --git a/client/v3/concurrency/example_mutex_test.go b/client/v3/concurrency/example_mutex_test.go
new file mode 120000
index 000000000..053eb74ad
--- /dev/null
+++ b/client/v3/concurrency/example_mutex_test.go
@@ -0,0 +1 @@
+../../../tests/integration/clientv3/concurrency/example_mutex_test.go
\ No newline at end of file
diff --git a/client/v3/concurrency/example_stm_test.go b/client/v3/concurrency/example_stm_test.go
new file mode 120000
index 000000000..d63639ecc
--- /dev/null
+++ b/client/v3/concurrency/example_stm_test.go
@@ -0,0 +1 @@
+../../../tests/integration/clientv3/concurrency/example_stm_test.go
\ No newline at end of file
diff --git a/clientv3/concurrency/key.go b/client/v3/concurrency/key.go
similarity index 100%
rename from clientv3/concurrency/key.go
rename to client/v3/concurrency/key.go
diff --git a/clientv3/concurrency/main_test.go b/client/v3/concurrency/main_test.go
similarity index 100%
rename from clientv3/concurrency/main_test.go
rename to client/v3/concurrency/main_test.go
diff --git a/clientv3/concurrency/mutex.go b/client/v3/concurrency/mutex.go
similarity index 100%
rename from clientv3/concurrency/mutex.go
rename to client/v3/concurrency/mutex.go
diff --git a/clientv3/concurrency/session.go b/client/v3/concurrency/session.go
similarity index 100%
rename from clientv3/concurrency/session.go
rename to client/v3/concurrency/session.go
diff --git a/clientv3/concurrency/stm.go b/client/v3/concurrency/stm.go
similarity index 100%
rename from clientv3/concurrency/stm.go
rename to client/v3/concurrency/stm.go
diff --git a/clientv3/config.go b/client/v3/config.go
similarity index 100%
rename from clientv3/config.go
rename to client/v3/config.go
diff --git a/clientv3/credentials/credentials.go b/client/v3/credentials/credentials.go
similarity index 100%
rename from clientv3/credentials/credentials.go
rename to client/v3/credentials/credentials.go
diff --git a/clientv3/ctx.go b/client/v3/ctx.go
similarity index 100%
rename from clientv3/ctx.go
rename to client/v3/ctx.go
diff --git a/clientv3/ctx_test.go b/client/v3/ctx_test.go
similarity index 100%
rename from clientv3/ctx_test.go
rename to client/v3/ctx_test.go
diff --git a/clientv3/doc.go b/client/v3/doc.go
similarity index 100%
rename from clientv3/doc.go
rename to client/v3/doc.go
diff --git a/client/v3/example_auth_test.go b/client/v3/example_auth_test.go
new file mode 120000
index 000000000..7a25cc2a0
--- /dev/null
+++ b/client/v3/example_auth_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_auth_test.go
\ No newline at end of file
diff --git a/client/v3/example_cluster_test.go b/client/v3/example_cluster_test.go
new file mode 120000
index 000000000..302451f81
--- /dev/null
+++ b/client/v3/example_cluster_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_cluster_test.go
\ No newline at end of file
diff --git a/client/v3/example_kv_test.go b/client/v3/example_kv_test.go
new file mode 120000
index 000000000..0b3bd875e
--- /dev/null
+++ b/client/v3/example_kv_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_kv_test.go
\ No newline at end of file
diff --git a/client/v3/example_lease_test.go b/client/v3/example_lease_test.go
new file mode 120000
index 000000000..d1cf744bb
--- /dev/null
+++ b/client/v3/example_lease_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_lease_test.go
\ No newline at end of file
diff --git a/client/v3/example_maintenance_test.go b/client/v3/example_maintenance_test.go
new file mode 120000
index 000000000..d8bcb642a
--- /dev/null
+++ b/client/v3/example_maintenance_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_maintenance_test.go
\ No newline at end of file
diff --git a/client/v3/example_metrics_test.go b/client/v3/example_metrics_test.go
new file mode 120000
index 000000000..a363c3c4f
--- /dev/null
+++ b/client/v3/example_metrics_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_metrics_test.go
\ No newline at end of file
diff --git a/client/v3/example_test.go b/client/v3/example_test.go
new file mode 120000
index 000000000..ddacab0d6
--- /dev/null
+++ b/client/v3/example_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_test.go
\ No newline at end of file
diff --git a/client/v3/example_watch_test.go b/client/v3/example_watch_test.go
new file mode 120000
index 000000000..fb748bed5
--- /dev/null
+++ b/client/v3/example_watch_test.go
@@ -0,0 +1 @@
+../../tests/integration/clientv3/examples/example_watch_test.go
\ No newline at end of file
diff --git a/clientv3/kv.go b/client/v3/kv.go
similarity index 100%
rename from clientv3/kv.go
rename to client/v3/kv.go
diff --git a/clientv3/lease.go b/client/v3/lease.go
similarity index 100%
rename from clientv3/lease.go
rename to client/v3/lease.go
diff --git a/clientv3/leasing/cache.go b/client/v3/leasing/cache.go
similarity index 100%
rename from clientv3/leasing/cache.go
rename to client/v3/leasing/cache.go
diff --git a/clientv3/leasing/doc.go b/client/v3/leasing/doc.go
similarity index 100%
rename from clientv3/leasing/doc.go
rename to client/v3/leasing/doc.go
diff --git a/clientv3/leasing/kv.go b/client/v3/leasing/kv.go
similarity index 100%
rename from clientv3/leasing/kv.go
rename to client/v3/leasing/kv.go
diff --git a/clientv3/leasing/txn.go b/client/v3/leasing/txn.go
similarity index 100%
rename from clientv3/leasing/txn.go
rename to client/v3/leasing/txn.go
diff --git a/clientv3/leasing/util.go b/client/v3/leasing/util.go
similarity index 100%
rename from clientv3/leasing/util.go
rename to client/v3/leasing/util.go
diff --git a/clientv3/logger.go b/client/v3/logger.go
similarity index 100%
rename from clientv3/logger.go
rename to client/v3/logger.go
diff --git a/clientv3/main_test.go b/client/v3/main_test.go
similarity index 100%
rename from clientv3/main_test.go
rename to client/v3/main_test.go
diff --git a/clientv3/maintenance.go b/client/v3/maintenance.go
similarity index 100%
rename from clientv3/maintenance.go
rename to client/v3/maintenance.go
diff --git a/clientv3/mirror/syncer.go b/client/v3/mirror/syncer.go
similarity index 100%
rename from clientv3/mirror/syncer.go
rename to client/v3/mirror/syncer.go
diff --git a/client/mock/mockserver/doc.go b/client/v3/mock/mockserver/doc.go
similarity index 100%
rename from client/mock/mockserver/doc.go
rename to client/v3/mock/mockserver/doc.go
diff --git a/client/mock/mockserver/mockserver.go b/client/v3/mock/mockserver/mockserver.go
similarity index 100%
rename from client/mock/mockserver/mockserver.go
rename to client/v3/mock/mockserver/mockserver.go
diff --git a/clientv3/namespace/doc.go b/client/v3/namespace/doc.go
similarity index 100%
rename from clientv3/namespace/doc.go
rename to client/v3/namespace/doc.go
diff --git a/clientv3/namespace/kv.go b/client/v3/namespace/kv.go
similarity index 100%
rename from clientv3/namespace/kv.go
rename to client/v3/namespace/kv.go
diff --git a/clientv3/namespace/lease.go b/client/v3/namespace/lease.go
similarity index 100%
rename from clientv3/namespace/lease.go
rename to client/v3/namespace/lease.go
diff --git a/clientv3/namespace/util.go b/client/v3/namespace/util.go
similarity index 100%
rename from clientv3/namespace/util.go
rename to client/v3/namespace/util.go
diff --git a/clientv3/namespace/util_test.go b/client/v3/namespace/util_test.go
similarity index 100%
rename from clientv3/namespace/util_test.go
rename to client/v3/namespace/util_test.go
diff --git a/clientv3/namespace/watch.go b/client/v3/namespace/watch.go
similarity index 100%
rename from clientv3/namespace/watch.go
rename to client/v3/namespace/watch.go
diff --git a/clientv3/naming/doc.go b/client/v3/naming/doc.go
similarity index 100%
rename from clientv3/naming/doc.go
rename to client/v3/naming/doc.go
diff --git a/clientv3/naming/grpc.go b/client/v3/naming/grpc.go
similarity index 100%
rename from clientv3/naming/grpc.go
rename to client/v3/naming/grpc.go
diff --git a/clientv3/op.go b/client/v3/op.go
similarity index 100%
rename from clientv3/op.go
rename to client/v3/op.go
diff --git a/clientv3/op_test.go b/client/v3/op_test.go
similarity index 100%
rename from clientv3/op_test.go
rename to client/v3/op_test.go
diff --git a/clientv3/options.go b/client/v3/options.go
similarity index 100%
rename from clientv3/options.go
rename to client/v3/options.go
diff --git a/clientv3/ordering/doc.go b/client/v3/ordering/doc.go
similarity index 100%
rename from clientv3/ordering/doc.go
rename to client/v3/ordering/doc.go
diff --git a/clientv3/ordering/kv.go b/client/v3/ordering/kv.go
similarity index 100%
rename from clientv3/ordering/kv.go
rename to client/v3/ordering/kv.go
diff --git a/clientv3/ordering/kv_test.go b/client/v3/ordering/kv_test.go
similarity index 100%
rename from clientv3/ordering/kv_test.go
rename to client/v3/ordering/kv_test.go
diff --git a/clientv3/ordering/logger_test.go b/client/v3/ordering/logger_test.go
similarity index 100%
rename from clientv3/ordering/logger_test.go
rename to client/v3/ordering/logger_test.go
diff --git a/clientv3/ordering/util.go b/client/v3/ordering/util.go
similarity index 100%
rename from clientv3/ordering/util.go
rename to client/v3/ordering/util.go
diff --git a/clientv3/retry.go b/client/v3/retry.go
similarity index 100%
rename from clientv3/retry.go
rename to client/v3/retry.go
diff --git a/clientv3/retry_interceptor.go b/client/v3/retry_interceptor.go
similarity index 100%
rename from clientv3/retry_interceptor.go
rename to client/v3/retry_interceptor.go
diff --git a/clientv3/snapshot/doc.go b/client/v3/snapshot/doc.go
similarity index 100%
rename from clientv3/snapshot/doc.go
rename to client/v3/snapshot/doc.go
diff --git a/clientv3/snapshot/v3_snapshot.go b/client/v3/snapshot/v3_snapshot.go
similarity index 100%
rename from clientv3/snapshot/v3_snapshot.go
rename to client/v3/snapshot/v3_snapshot.go
diff --git a/clientv3/sort.go b/client/v3/sort.go
similarity index 100%
rename from clientv3/sort.go
rename to client/v3/sort.go
diff --git a/clientv3/txn.go b/client/v3/txn.go
similarity index 100%
rename from clientv3/txn.go
rename to client/v3/txn.go
diff --git a/clientv3/txn_test.go b/client/v3/txn_test.go
similarity index 100%
rename from clientv3/txn_test.go
rename to client/v3/txn_test.go
diff --git a/clientv3/utils.go b/client/v3/utils.go
similarity index 100%
rename from clientv3/utils.go
rename to client/v3/utils.go
diff --git a/clientv3/watch.go b/client/v3/watch.go
similarity index 100%
rename from clientv3/watch.go
rename to client/v3/watch.go
diff --git a/clientv3/watch_test.go b/client/v3/watch_test.go
similarity index 100%
rename from clientv3/watch_test.go
rename to client/v3/watch_test.go
diff --git a/clientv3/yaml/config.go b/client/v3/yaml/config.go
similarity index 100%
rename from clientv3/yaml/config.go
rename to client/v3/yaml/config.go
diff --git a/clientv3/yaml/config_test.go b/client/v3/yaml/config_test.go
similarity index 100%
rename from clientv3/yaml/config_test.go
rename to client/v3/yaml/config_test.go
diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go
deleted file mode 120000
index 6ae1dffe2..000000000
--- a/clientv3/concurrency/example_election_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../../tests/integration/clientv3/concurrency/example_election_test.go
\ No newline at end of file
diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go
deleted file mode 120000
index 2968b42d4..000000000
--- a/clientv3/concurrency/example_mutex_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../../tests/integration/clientv3/concurrency/example_mutex_test.go
\ No newline at end of file
diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go
deleted file mode 120000
index b1f22c258..000000000
--- a/clientv3/concurrency/example_stm_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../../tests/integration/clientv3/concurrency/example_stm_test.go
\ No newline at end of file
diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go
deleted file mode 120000
index d01e01cbb..000000000
--- a/clientv3/example_auth_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_auth_test.go
\ No newline at end of file
diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go
deleted file mode 120000
index 303ab5f09..000000000
--- a/clientv3/example_cluster_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_cluster_test.go
\ No newline at end of file
diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go
deleted file mode 120000
index db886dbbd..000000000
--- a/clientv3/example_kv_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_kv_test.go
\ No newline at end of file
diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go
deleted file mode 120000
index c7b6c90d2..000000000
--- a/clientv3/example_lease_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_lease_test.go
\ No newline at end of file
diff --git a/clientv3/example_maintenance_test.go b/clientv3/example_maintenance_test.go
deleted file mode 120000
index c2c4035c4..000000000
--- a/clientv3/example_maintenance_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_maintenance_test.go
\ No newline at end of file
diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go
deleted file mode 120000
index 868acb33e..000000000
--- a/clientv3/example_metrics_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_metrics_test.go
\ No newline at end of file
diff --git a/clientv3/example_test.go b/clientv3/example_test.go
deleted file mode 120000
index 2c85ca955..000000000
--- a/clientv3/example_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_test.go
\ No newline at end of file
diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go
deleted file mode 120000
index 662d28083..000000000
--- a/clientv3/example_watch_test.go
+++ /dev/null
@@ -1 +0,0 @@
-../tests/integration/clientv3/examples/example_watch_test.go
\ No newline at end of file