diff --git a/auth/authpb/auth.pb.go b/api/authpb/auth.pb.go
similarity index 100%
rename from auth/authpb/auth.pb.go
rename to api/authpb/auth.pb.go
diff --git a/auth/authpb/auth.proto b/api/authpb/auth.proto
similarity index 100%
rename from auth/authpb/auth.proto
rename to api/authpb/auth.proto
diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/api/etcdserverpb/etcdserver.pb.go
similarity index 100%
rename from etcdserver/etcdserverpb/etcdserver.pb.go
rename to api/etcdserverpb/etcdserver.pb.go
diff --git a/etcdserver/etcdserverpb/etcdserver.proto b/api/etcdserverpb/etcdserver.proto
similarity index 100%
rename from etcdserver/etcdserverpb/etcdserver.proto
rename to api/etcdserverpb/etcdserver.proto
diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/api/etcdserverpb/gw/rpc.pb.gw.go
similarity index 100%
rename from etcdserver/etcdserverpb/gw/rpc.pb.gw.go
rename to api/etcdserverpb/gw/rpc.pb.gw.go
diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/api/etcdserverpb/raft_internal.pb.go
similarity index 100%
rename from etcdserver/etcdserverpb/raft_internal.pb.go
rename to api/etcdserverpb/raft_internal.pb.go
diff --git a/etcdserver/etcdserverpb/raft_internal.proto b/api/etcdserverpb/raft_internal.proto
similarity index 100%
rename from etcdserver/etcdserverpb/raft_internal.proto
rename to api/etcdserverpb/raft_internal.proto
diff --git a/etcdserver/etcdserverpb/raft_internal_stringer.go b/api/etcdserverpb/raft_internal_stringer.go
similarity index 100%
rename from etcdserver/etcdserverpb/raft_internal_stringer.go
rename to api/etcdserverpb/raft_internal_stringer.go
diff --git a/etcdserver/etcdserverpb/raft_internal_stringer_test.go b/api/etcdserverpb/raft_internal_stringer_test.go
similarity index 100%
rename from etcdserver/etcdserverpb/raft_internal_stringer_test.go
rename to api/etcdserverpb/raft_internal_stringer_test.go
diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/api/etcdserverpb/rpc.pb.go
similarity index 100%
rename from etcdserver/etcdserverpb/rpc.pb.go
rename to api/etcdserverpb/rpc.pb.go
diff --git a/etcdserver/etcdserverpb/rpc.proto b/api/etcdserverpb/rpc.proto
similarity index 100%
rename from etcdserver/etcdserverpb/rpc.proto
rename to api/etcdserverpb/rpc.proto
diff --git a/etcdserver/api/membership/membershippb/membership.pb.go b/api/membershippb/membership.pb.go
similarity index 100%
rename from etcdserver/api/membership/membershippb/membership.pb.go
rename to api/membershippb/membership.pb.go
diff --git a/etcdserver/api/membership/membershippb/membership.proto b/api/membershippb/membership.proto
similarity index 100%
rename from etcdserver/api/membership/membershippb/membership.proto
rename to api/membershippb/membership.proto
diff --git a/mvcc/mvccpb/kv.pb.go b/api/mvccpb/kv.pb.go
similarity index 100%
rename from mvcc/mvccpb/kv.pb.go
rename to api/mvccpb/kv.pb.go
diff --git a/mvcc/mvccpb/kv.proto b/api/mvccpb/kv.proto
similarity index 100%
rename from mvcc/mvccpb/kv.proto
rename to api/mvccpb/kv.proto
diff --git a/etcdserver/api/v3rpc/rpctypes/doc.go b/api/v3rpc/rpctypes/doc.go
similarity index 100%
rename from etcdserver/api/v3rpc/rpctypes/doc.go
rename to api/v3rpc/rpctypes/doc.go
diff --git a/etcdserver/api/v3rpc/rpctypes/error.go b/api/v3rpc/rpctypes/error.go
similarity index 100%
rename from etcdserver/api/v3rpc/rpctypes/error.go
rename to api/v3rpc/rpctypes/error.go
diff --git a/etcdserver/api/v3rpc/rpctypes/error_test.go b/api/v3rpc/rpctypes/error_test.go
similarity index 100%
rename from etcdserver/api/v3rpc/rpctypes/error_test.go
rename to api/v3rpc/rpctypes/error_test.go
diff --git a/etcdserver/api/v3rpc/rpctypes/md.go b/api/v3rpc/rpctypes/md.go
similarity index 100%
rename from etcdserver/api/v3rpc/rpctypes/md.go
rename to api/v3rpc/rpctypes/md.go
diff --git a/etcdserver/api/v3rpc/rpctypes/metadatafields.go b/api/v3rpc/rpctypes/metadatafields.go
similarity index 100%
rename from etcdserver/api/v3rpc/rpctypes/metadatafields.go
rename to api/v3rpc/rpctypes/metadatafields.go
diff --git a/version/version.go b/api/version/version.go
similarity index 100%
rename from version/version.go
rename to api/version/version.go