diff --git a/rpc/call.go b/call.go
similarity index 100%
rename from rpc/call.go
rename to call.go
diff --git a/rpc/clientconn.go b/clientconn.go
similarity index 100%
rename from rpc/clientconn.go
rename to clientconn.go
diff --git a/rpc/codes/codes.go b/codes/codes.go
similarity index 100%
rename from rpc/codes/codes.go
rename to codes/codes.go
diff --git a/rpc/compiler/Makefile b/compiler/Makefile
similarity index 100%
rename from rpc/compiler/Makefile
rename to compiler/Makefile
diff --git a/rpc/compiler/README b/compiler/README
similarity index 100%
rename from rpc/compiler/README
rename to compiler/README
diff --git a/rpc/compiler/gen.sh b/compiler/gen.sh
similarity index 100%
rename from rpc/compiler/gen.sh
rename to compiler/gen.sh
diff --git a/rpc/compiler/go_generator.cc b/compiler/go_generator.cc
similarity index 100%
rename from rpc/compiler/go_generator.cc
rename to compiler/go_generator.cc
diff --git a/rpc/compiler/go_generator.h b/compiler/go_generator.h
similarity index 100%
rename from rpc/compiler/go_generator.h
rename to compiler/go_generator.h
diff --git a/rpc/compiler/go_generator.o b/compiler/go_generator.o
similarity index 100%
rename from rpc/compiler/go_generator.o
rename to compiler/go_generator.o
diff --git a/rpc/compiler/go_plugin b/compiler/go_plugin
similarity index 100%
rename from rpc/compiler/go_plugin
rename to compiler/go_plugin
diff --git a/rpc/compiler/go_plugin.cc b/compiler/go_plugin.cc
similarity index 100%
rename from rpc/compiler/go_plugin.cc
rename to compiler/go_plugin.cc
diff --git a/rpc/compiler/go_plugin.o b/compiler/go_plugin.o
similarity index 100%
rename from rpc/compiler/go_plugin.o
rename to compiler/go_plugin.o
diff --git a/rpc/credentials/credentials.go b/credentials/credentials.go
similarity index 100%
rename from rpc/credentials/credentials.go
rename to credentials/credentials.go
diff --git a/rpc/interop/client/client.go b/interop/client/client.go
similarity index 100%
rename from rpc/interop/client/client.go
rename to interop/client/client.go
diff --git a/rpc/interop/client/testdata/ca.pem b/interop/client/testdata/ca.pem
similarity index 100%
rename from rpc/interop/client/testdata/ca.pem
rename to interop/client/testdata/ca.pem
diff --git a/rpc/interop/client/testdata/server1.key b/interop/client/testdata/server1.key
similarity index 100%
rename from rpc/interop/client/testdata/server1.key
rename to interop/client/testdata/server1.key
diff --git a/rpc/interop/client/testdata/server1.pem b/interop/client/testdata/server1.pem
similarity index 100%
rename from rpc/interop/client/testdata/server1.pem
rename to interop/client/testdata/server1.pem
diff --git a/rpc/interop/server/server.go b/interop/server/server.go
similarity index 100%
rename from rpc/interop/server/server.go
rename to interop/server/server.go
diff --git a/rpc/interop/server/testdata/ca.pem b/interop/server/testdata/ca.pem
similarity index 100%
rename from rpc/interop/server/testdata/ca.pem
rename to interop/server/testdata/ca.pem
diff --git a/rpc/interop/server/testdata/server1.key b/interop/server/testdata/server1.key
similarity index 100%
rename from rpc/interop/server/testdata/server1.key
rename to interop/server/testdata/server1.key
diff --git a/rpc/interop/server/testdata/server1.pem b/interop/server/testdata/server1.pem
similarity index 100%
rename from rpc/interop/server/testdata/server1.pem
rename to interop/server/testdata/server1.pem
diff --git a/rpc/interop/testdata/messages.proto b/interop/testdata/messages.proto
similarity index 100%
rename from rpc/interop/testdata/messages.proto
rename to interop/testdata/messages.proto
diff --git a/rpc/interop/testdata/test.proto b/interop/testdata/test.proto
similarity index 100%
rename from rpc/interop/testdata/test.proto
rename to interop/testdata/test.proto
diff --git a/rpc/interop/testdata/test_proto.pb.go b/interop/testdata/test_proto.pb.go
similarity index 100%
rename from rpc/interop/testdata/test_proto.pb.go
rename to interop/testdata/test_proto.pb.go
diff --git a/rpc/interop/testdata/test_proto_grpc.pb.go b/interop/testdata/test_proto_grpc.pb.go
similarity index 100%
rename from rpc/interop/testdata/test_proto_grpc.pb.go
rename to interop/testdata/test_proto_grpc.pb.go
diff --git a/rpc/metadata/metadata.go b/metadata/metadata.go
similarity index 100%
rename from rpc/metadata/metadata.go
rename to metadata/metadata.go
diff --git a/rpc/metadata/metadata_test.go b/metadata/metadata_test.go
similarity index 100%
rename from rpc/metadata/metadata_test.go
rename to metadata/metadata_test.go
diff --git a/rpc/rpc_util.go b/rpc_util.go
similarity index 100%
rename from rpc/rpc_util.go
rename to rpc_util.go
diff --git a/rpc/rpc_util_test.go b/rpc_util_test.go
similarity index 100%
rename from rpc/rpc_util_test.go
rename to rpc_util_test.go
diff --git a/rpc/server.go b/server.go
similarity index 100%
rename from rpc/server.go
rename to server.go
diff --git a/rpc/stream.go b/stream.go
similarity index 100%
rename from rpc/stream.go
rename to stream.go
diff --git a/rpc/test/end2end_test.go b/test/end2end_test.go
similarity index 100%
rename from rpc/test/end2end_test.go
rename to test/end2end_test.go
diff --git a/rpc/test/testdata/ca.pem b/test/testdata/ca.pem
similarity index 100%
rename from rpc/test/testdata/ca.pem
rename to test/testdata/ca.pem
diff --git a/rpc/test/testdata/server1.key b/test/testdata/server1.key
similarity index 100%
rename from rpc/test/testdata/server1.key
rename to test/testdata/server1.key
diff --git a/rpc/test/testdata/server1.pem b/test/testdata/server1.pem
similarity index 100%
rename from rpc/test/testdata/server1.pem
rename to test/testdata/server1.pem
diff --git a/rpc/test/testdata/test.pb.go b/test/testdata/test.pb.go
similarity index 100%
rename from rpc/test/testdata/test.pb.go
rename to test/testdata/test.pb.go
diff --git a/rpc/test/testdata/test.proto b/test/testdata/test.proto
similarity index 100%
rename from rpc/test/testdata/test.proto
rename to test/testdata/test.proto
diff --git a/rpc/test/testdata/test_grpc.pb.go b/test/testdata/test_grpc.pb.go
similarity index 100%
rename from rpc/test/testdata/test_grpc.pb.go
rename to test/testdata/test_grpc.pb.go
diff --git a/rpc/transport/control.go b/transport/control.go
similarity index 100%
rename from rpc/transport/control.go
rename to transport/control.go
diff --git a/rpc/transport/http2_client_transport.go b/transport/http2_client_transport.go
similarity index 100%
rename from rpc/transport/http2_client_transport.go
rename to transport/http2_client_transport.go
diff --git a/rpc/transport/http2_server_transport.go b/transport/http2_server_transport.go
similarity index 100%
rename from rpc/transport/http2_server_transport.go
rename to transport/http2_server_transport.go
diff --git a/rpc/transport/http_util.go b/transport/http_util.go
similarity index 100%
rename from rpc/transport/http_util.go
rename to transport/http_util.go
diff --git a/rpc/transport/http_util_test.go b/transport/http_util_test.go
similarity index 100%
rename from rpc/transport/http_util_test.go
rename to transport/http_util_test.go
diff --git a/rpc/transport/testdata/ca.pem b/transport/testdata/ca.pem
similarity index 100%
rename from rpc/transport/testdata/ca.pem
rename to transport/testdata/ca.pem
diff --git a/rpc/transport/testdata/server1.key b/transport/testdata/server1.key
similarity index 100%
rename from rpc/transport/testdata/server1.key
rename to transport/testdata/server1.key
diff --git a/rpc/transport/testdata/server1.pem b/transport/testdata/server1.pem
similarity index 100%
rename from rpc/transport/testdata/server1.pem
rename to transport/testdata/server1.pem
diff --git a/rpc/transport/transport.go b/transport/transport.go
similarity index 100%
rename from rpc/transport/transport.go
rename to transport/transport.go
diff --git a/rpc/transport/transport_test.go b/transport/transport_test.go
similarity index 100%
rename from rpc/transport/transport_test.go
rename to transport/transport_test.go