services: move channelz proto into normalized directory structure

diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
index ab285d7..58a4dc1 100644
--- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
@@ -19,7 +19,7 @@
  */
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
-    comments = "Source: io/grpc/channelz.proto")
+    comments = "Source: grpc/channelz/channelz.proto")
 public final class ChannelzGrpc {
 
   private ChannelzGrpc() {}
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/Address.java b/services/src/generated/main/java/io/grpc/channelz/v1/Address.java
index 74bb914..0f88a07 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/Address.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/Address.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/AddressOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/AddressOrBuilder.java
index 15e4164..d21aa5a 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/AddressOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/AddressOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/Channel.java b/services/src/generated/main/java/io/grpc/channelz/v1/Channel.java
index 8807497..e4f44a6 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/Channel.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/Channel.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java
index 3f0c384..7afda6b 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java
index 5186df1..dcf1108 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelOrBuilder.java
index d8dc8a2..1380665 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRef.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRef.java
index 58f64b6..81ba145 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRef.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRef.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRefOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRefOrBuilder.java
index 184d536..9356a63 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRefOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelRefOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java
index 8674301..a0810d4 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTraceOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTraceOrBuilder.java
index 05804db..cc92540 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTraceOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTraceOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
index bbe8c61..f1b8c8a 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
@@ -203,144 +203,144 @@
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026io/grpc/channelz.proto\022\rgrpc.channelz\032" +
-      "\031google/protobuf/any.proto\032\036google/proto" +
-      "buf/duration.proto\032\037google/protobuf/time" +
-      "stamp.proto\032\036google/protobuf/wrappers.pr" +
-      "oto\"\357\001\n\007Channel\022&\n\003ref\030\001 \001(\0132\031.grpc.chan" +
-      "nelz.ChannelRef\022(\n\004data\030\002 \001(\0132\032.grpc.cha" +
-      "nnelz.ChannelData\022.\n\013channel_ref\030\003 \003(\0132\031" +
-      ".grpc.channelz.ChannelRef\0224\n\016subchannel_" +
-      "ref\030\004 \003(\0132\034.grpc.channelz.SubchannelRef\022" +
-      ",\n\nsocket_ref\030\005 \003(\0132\030.grpc.channelz.Sock" +
-      "etRef\"\365\001\n\nSubchannel\022)\n\003ref\030\001 \001(\0132\034.grpc" +
-      ".channelz.SubchannelRef\022(\n\004data\030\002 \001(\0132\032." +
-      "grpc.channelz.ChannelData\022.\n\013channel_ref" +
-      "\030\003 \003(\0132\031.grpc.channelz.ChannelRef\0224\n\016sub" +
-      "channel_ref\030\004 \003(\0132\034.grpc.channelz.Subcha" +
-      "nnelRef\022,\n\nsocket_ref\030\005 \003(\0132\030.grpc.chann" +
-      "elz.SocketRef\"\341\002\n\013ChannelData\022/\n\005state\030\001" +
-      " \001(\0162 .grpc.channelz.ChannelData.State\022\016" +
-      "\n\006target\030\002 \001(\t\022*\n\005trace\030\003 \001(\0132\033.grpc.cha" +
-      "nnelz.ChannelTrace\022\025\n\rcalls_started\030\004 \001(" +
-      "\003\022\027\n\017calls_succeeded\030\005 \001(\003\022\024\n\014calls_fail" +
-      "ed\030\006 \001(\003\022?\n\033last_call_started_timestamp\030" +
-      "\007 \001(\0132\032.google.protobuf.Timestamp\"^\n\005Sta" +
-      "te\022\013\n\007UNKNOWN\020\000\022\010\n\004IDLE\020\001\022\016\n\nCONNECTING\020" +
-      "\002\022\t\n\005READY\020\003\022\025\n\021TRANSIENT_FAILURE\020\004\022\014\n\010S" +
-      "HUTDOWN\020\005\"\016\n\014ChannelTrace\"F\n\nChannelRef\022" +
-      "\022\n\nchannel_id\030\001 \001(\003\022\014\n\004name\030\002 \001(\tJ\004\010\003\020\004J" +
-      "\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007\"X\n\rSubchannelRef\022\025\n\rsu" +
-      "bchannel_id\030\007 \001(\003\022\014\n\004name\030\010 \001(\tJ\004\010\001\020\002J\004\010" +
-      "\002\020\003J\004\010\003\020\004J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007\"P\n\tSocketRef" +
-      "\022\021\n\tsocket_id\030\003 \001(\003\022\014\n\004name\030\004 \001(\tJ\004\010\001\020\002J" +
-      "\004\010\002\020\003J\004\010\005\020\006J\004\010\006\020\007J\004\010\007\020\010J\004\010\010\020\t\"P\n\tServerR" +
-      "ef\022\021\n\tserver_id\030\005 \001(\003\022\014\n\004name\030\006 \001(\tJ\004\010\001\020" +
-      "\002J\004\010\002\020\003J\004\010\003\020\004J\004\010\004\020\005J\004\010\007\020\010J\004\010\010\020\t\"\211\001\n\006Serv" +
-      "er\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz.ServerRe" +
-      "f\022\'\n\004data\030\002 \001(\0132\031.grpc.channelz.ServerDa" +
-      "ta\022/\n\rlisten_socket\030\003 \003(\0132\030.grpc.channel" +
-      "z.SocketRef\"\305\001\n\nServerData\0220\n\005trace\030\001 \001(" +
-      "\0132!.grpc.channelz.ServerChannelTrace\022\025\n\r" +
-      "calls_started\030\002 \001(\003\022\027\n\017calls_succeeded\030\003" +
-      " \001(\003\022\024\n\014calls_failed\030\004 \001(\003\022?\n\033last_call_" +
-      "started_timestamp\030\005 \001(\0132\032.google.protobu" +
-      "f.Timestamp\"\024\n\022ServerChannelTrace\"\347\001\n\006So" +
-      "cket\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz.Socket" +
-      "Ref\022\'\n\004data\030\002 \001(\0132\031.grpc.channelz.Socket" +
-      "Data\022%\n\005local\030\003 \001(\0132\026.grpc.channelz.Addr" +
-      "ess\022&\n\006remote\030\004 \001(\0132\026.grpc.channelz.Addr" +
-      "ess\022)\n\010security\030\005 \001(\0132\027.grpc.channelz.Se" +
-      "curity\022\023\n\013remote_name\030\006 \001(\t\"\353\004\n\nSocketDa" +
-      "ta\022\027\n\017streams_started\030\001 \001(\003\022\031\n\021streams_s" +
-      "ucceeded\030\002 \001(\003\022\026\n\016streams_failed\030\003 \001(\003\022\025" +
-      "\n\rmessages_sent\030\004 \001(\003\022\031\n\021messages_receiv" +
-      "ed\030\005 \001(\003\022\030\n\020keep_alives_sent\030\006 \001(\003\022G\n#la" +
-      "st_local_stream_created_timestamp\030\007 \001(\0132" +
-      "\032.google.protobuf.Timestamp\022H\n$last_remo" +
-      "te_stream_created_timestamp\030\010 \001(\0132\032.goog" +
-      "le.protobuf.Timestamp\022?\n\033last_message_se" +
-      "nt_timestamp\030\t \001(\0132\032.google.protobuf.Tim" +
-      "estamp\022C\n\037last_message_received_timestam" +
-      "p\030\n \001(\0132\032.google.protobuf.Timestamp\022>\n\031l" +
-      "ocal_flow_control_window\030\013 \001(\0132\033.google." +
-      "protobuf.Int64Value\022?\n\032remote_flow_contr" +
-      "ol_window\030\014 \001(\0132\033.google.protobuf.Int64V" +
-      "alue\022+\n\006option\030\r \003(\0132\033.grpc.channelz.Soc" +
-      "ketOption\"\337\002\n\007Address\022<\n\rtcpip_address\030\001" +
-      " \001(\0132#.grpc.channelz.Address.TcpIpAddres" +
-      "sH\000\0228\n\013uds_address\030\002 \001(\0132!.grpc.channelz" +
-      ".Address.UdsAddressH\000\022<\n\rother_address\030\003" +
-      " \001(\0132#.grpc.channelz.Address.OtherAddres" +
-      "sH\000\0320\n\014TcpIpAddress\022\022\n\nip_address\030\001 \001(\014\022" +
-      "\014\n\004port\030\002 \001(\005\032\036\n\nUdsAddress\022\020\n\010filename\030" +
-      "\001 \001(\t\032A\n\014OtherAddress\022\014\n\004name\030\001 \001(\t\022#\n\005v" +
-      "alue\030\002 \001(\0132\024.google.protobuf.AnyB\t\n\007addr" +
-      "ess\"\270\002\n\010Security\022*\n\003tls\030\001 \001(\0132\033.grpc.cha" +
-      "nnelz.Security.TlsH\000\0226\n\005other\030\002 \001(\0132%.gr" +
-      "pc.channelz.Security.OtherSecurityH\000\032{\n\003" +
-      "Tls\022\027\n\rstandard_name\030\001 \001(\tH\000\022\024\n\nother_na" +
-      "me\030\002 \001(\tH\000\022\031\n\021local_certificate\030\003 \001(\014\022\032\n" +
-      "\022remote_certificate\030\004 \001(\014B\016\n\014cipher_suit" +
-      "e\032B\n\rOtherSecurity\022\014\n\004name\030\001 \001(\t\022#\n\005valu" +
-      "e\030\002 \001(\0132\024.google.protobuf.AnyB\007\n\005model\"U" +
-      "\n\014SocketOption\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 " +
-      "\001(\t\022(\n\nadditional\030\003 \001(\0132\024.google.protobu" +
-      "f.Any\"B\n\023SocketOptionTimeout\022+\n\010duration" +
-      "\030\001 \001(\0132\031.google.protobuf.Duration\"Q\n\022Soc" +
-      "ketOptionLinger\022\016\n\006active\030\001 \001(\010\022+\n\010durat" +
-      "ion\030\002 \001(\0132\031.google.protobuf.Duration\"\256\005\n" +
-      "\023SocketOptionTcpInfo\022\022\n\ntcpi_state\030\001 \001(\r" +
-      "\022\025\n\rtcpi_ca_state\030\002 \001(\r\022\030\n\020tcpi_retransm" +
-      "its\030\003 \001(\r\022\023\n\013tcpi_probes\030\004 \001(\r\022\024\n\014tcpi_b" +
-      "ackoff\030\005 \001(\r\022\024\n\014tcpi_options\030\006 \001(\r\022\027\n\017tc" +
-      "pi_snd_wscale\030\007 \001(\r\022\027\n\017tcpi_rcv_wscale\030\010" +
-      " \001(\r\022\020\n\010tcpi_rto\030\t \001(\r\022\020\n\010tcpi_ato\030\n \001(\r" +
-      "\022\024\n\014tcpi_snd_mss\030\013 \001(\r\022\024\n\014tcpi_rcv_mss\030\014" +
-      " \001(\r\022\024\n\014tcpi_unacked\030\r \001(\r\022\023\n\013tcpi_sacke" +
-      "d\030\016 \001(\r\022\021\n\ttcpi_lost\030\017 \001(\r\022\024\n\014tcpi_retra" +
-      "ns\030\020 \001(\r\022\024\n\014tcpi_fackets\030\021 \001(\r\022\033\n\023tcpi_l" +
-      "ast_data_sent\030\022 \001(\r\022\032\n\022tcpi_last_ack_sen" +
-      "t\030\023 \001(\r\022\033\n\023tcpi_last_data_recv\030\024 \001(\r\022\032\n\022" +
-      "tcpi_last_ack_recv\030\025 \001(\r\022\021\n\ttcpi_pmtu\030\026 " +
-      "\001(\r\022\031\n\021tcpi_rcv_ssthresh\030\027 \001(\r\022\020\n\010tcpi_r" +
-      "tt\030\030 \001(\r\022\023\n\013tcpi_rttvar\030\031 \001(\r\022\031\n\021tcpi_sn" +
-      "d_ssthresh\030\032 \001(\r\022\025\n\rtcpi_snd_cwnd\030\033 \001(\r\022" +
-      "\023\n\013tcpi_advmss\030\034 \001(\r\022\027\n\017tcpi_reordering\030" +
-      "\035 \001(\r\",\n\021GetServersRequest\022\027\n\017start_serv" +
-      "er_id\030\001 \001(\003\"H\n\022GetServersResponse\022%\n\006ser" +
-      "ver\030\001 \003(\0132\025.grpc.channelz.Server\022\013\n\003end\030" +
-      "\002 \001(\010\"E\n\027GetServerSocketsRequest\022\021\n\tserv" +
-      "er_id\030\001 \001(\003\022\027\n\017start_socket_id\030\002 \001(\003\"U\n\030" +
-      "GetServerSocketsResponse\022,\n\nsocket_ref\030\001" +
-      " \003(\0132\030.grpc.channelz.SocketRef\022\013\n\003end\030\002 " +
-      "\001(\010\"1\n\025GetTopChannelsRequest\022\030\n\020start_ch" +
-      "annel_id\030\001 \001(\003\"N\n\026GetTopChannelsResponse" +
-      "\022\'\n\007channel\030\001 \003(\0132\026.grpc.channelz.Channe" +
-      "l\022\013\n\003end\030\002 \001(\010\"\'\n\021GetChannelRequest\022\022\n\nc" +
-      "hannel_id\030\001 \001(\003\"=\n\022GetChannelResponse\022\'\n" +
-      "\007channel\030\001 \001(\0132\026.grpc.channelz.Channel\"-" +
-      "\n\024GetSubchannelRequest\022\025\n\rsubchannel_id\030" +
-      "\001 \001(\003\"F\n\025GetSubchannelResponse\022-\n\nsubcha" +
-      "nnel\030\001 \001(\0132\031.grpc.channelz.Subchannel\"%\n" +
-      "\020GetSocketRequest\022\021\n\tsocket_id\030\001 \001(\003\":\n\021" +
-      "GetSocketResponse\022%\n\006socket\030\001 \001(\0132\025.grpc" +
-      ".channelz.Socket2\240\004\n\010Channelz\022]\n\016GetTopC" +
-      "hannels\022$.grpc.channelz.GetTopChannelsRe" +
-      "quest\032%.grpc.channelz.GetTopChannelsResp" +
-      "onse\022Q\n\nGetServers\022 .grpc.channelz.GetSe" +
-      "rversRequest\032!.grpc.channelz.GetServersR" +
-      "esponse\022c\n\020GetServerSockets\022&.grpc.chann" +
-      "elz.GetServerSocketsRequest\032\'.grpc.chann" +
-      "elz.GetServerSocketsResponse\022Q\n\nGetChann" +
-      "el\022 .grpc.channelz.GetChannelRequest\032!.g" +
-      "rpc.channelz.GetChannelResponse\022Z\n\rGetSu" +
-      "bchannel\022#.grpc.channelz.GetSubchannelRe" +
-      "quest\032$.grpc.channelz.GetSubchannelRespo" +
-      "nse\022N\n\tGetSocket\022\037.grpc.channelz.GetSock" +
-      "etRequest\032 .grpc.channelz.GetSocketRespo" +
-      "nseB&\n\023io.grpc.channelz.v1B\rChannelzProt" +
-      "oP\001b\006proto3"
+      "\n\034grpc/channelz/channelz.proto\022\rgrpc.cha" +
+      "nnelz\032\031google/protobuf/any.proto\032\036google" +
+      "/protobuf/duration.proto\032\037google/protobu" +
+      "f/timestamp.proto\032\036google/protobuf/wrapp" +
+      "ers.proto\"\357\001\n\007Channel\022&\n\003ref\030\001 \001(\0132\031.grp" +
+      "c.channelz.ChannelRef\022(\n\004data\030\002 \001(\0132\032.gr" +
+      "pc.channelz.ChannelData\022.\n\013channel_ref\030\003" +
+      " \003(\0132\031.grpc.channelz.ChannelRef\0224\n\016subch" +
+      "annel_ref\030\004 \003(\0132\034.grpc.channelz.Subchann" +
+      "elRef\022,\n\nsocket_ref\030\005 \003(\0132\030.grpc.channel" +
+      "z.SocketRef\"\365\001\n\nSubchannel\022)\n\003ref\030\001 \001(\0132" +
+      "\034.grpc.channelz.SubchannelRef\022(\n\004data\030\002 " +
+      "\001(\0132\032.grpc.channelz.ChannelData\022.\n\013chann" +
+      "el_ref\030\003 \003(\0132\031.grpc.channelz.ChannelRef\022" +
+      "4\n\016subchannel_ref\030\004 \003(\0132\034.grpc.channelz." +
+      "SubchannelRef\022,\n\nsocket_ref\030\005 \003(\0132\030.grpc" +
+      ".channelz.SocketRef\"\341\002\n\013ChannelData\022/\n\005s" +
+      "tate\030\001 \001(\0162 .grpc.channelz.ChannelData.S" +
+      "tate\022\016\n\006target\030\002 \001(\t\022*\n\005trace\030\003 \001(\0132\033.gr" +
+      "pc.channelz.ChannelTrace\022\025\n\rcalls_starte" +
+      "d\030\004 \001(\003\022\027\n\017calls_succeeded\030\005 \001(\003\022\024\n\014call" +
+      "s_failed\030\006 \001(\003\022?\n\033last_call_started_time" +
+      "stamp\030\007 \001(\0132\032.google.protobuf.Timestamp\"" +
+      "^\n\005State\022\013\n\007UNKNOWN\020\000\022\010\n\004IDLE\020\001\022\016\n\nCONNE" +
+      "CTING\020\002\022\t\n\005READY\020\003\022\025\n\021TRANSIENT_FAILURE\020" +
+      "\004\022\014\n\010SHUTDOWN\020\005\"\016\n\014ChannelTrace\"F\n\nChann" +
+      "elRef\022\022\n\nchannel_id\030\001 \001(\003\022\014\n\004name\030\002 \001(\tJ" +
+      "\004\010\003\020\004J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007\"X\n\rSubchannelRef" +
+      "\022\025\n\rsubchannel_id\030\007 \001(\003\022\014\n\004name\030\010 \001(\tJ\004\010" +
+      "\001\020\002J\004\010\002\020\003J\004\010\003\020\004J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007\"P\n\tSoc" +
+      "ketRef\022\021\n\tsocket_id\030\003 \001(\003\022\014\n\004name\030\004 \001(\tJ" +
+      "\004\010\001\020\002J\004\010\002\020\003J\004\010\005\020\006J\004\010\006\020\007J\004\010\007\020\010J\004\010\010\020\t\"P\n\tS" +
+      "erverRef\022\021\n\tserver_id\030\005 \001(\003\022\014\n\004name\030\006 \001(" +
+      "\tJ\004\010\001\020\002J\004\010\002\020\003J\004\010\003\020\004J\004\010\004\020\005J\004\010\007\020\010J\004\010\010\020\t\"\211\001" +
+      "\n\006Server\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz.Se" +
+      "rverRef\022\'\n\004data\030\002 \001(\0132\031.grpc.channelz.Se" +
+      "rverData\022/\n\rlisten_socket\030\003 \003(\0132\030.grpc.c" +
+      "hannelz.SocketRef\"\305\001\n\nServerData\0220\n\005trac" +
+      "e\030\001 \001(\0132!.grpc.channelz.ServerChannelTra" +
+      "ce\022\025\n\rcalls_started\030\002 \001(\003\022\027\n\017calls_succe" +
+      "eded\030\003 \001(\003\022\024\n\014calls_failed\030\004 \001(\003\022?\n\033last" +
+      "_call_started_timestamp\030\005 \001(\0132\032.google.p" +
+      "rotobuf.Timestamp\"\024\n\022ServerChannelTrace\"" +
+      "\347\001\n\006Socket\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz." +
+      "SocketRef\022\'\n\004data\030\002 \001(\0132\031.grpc.channelz." +
+      "SocketData\022%\n\005local\030\003 \001(\0132\026.grpc.channel" +
+      "z.Address\022&\n\006remote\030\004 \001(\0132\026.grpc.channel" +
+      "z.Address\022)\n\010security\030\005 \001(\0132\027.grpc.chann" +
+      "elz.Security\022\023\n\013remote_name\030\006 \001(\t\"\353\004\n\nSo" +
+      "cketData\022\027\n\017streams_started\030\001 \001(\003\022\031\n\021str" +
+      "eams_succeeded\030\002 \001(\003\022\026\n\016streams_failed\030\003" +
+      " \001(\003\022\025\n\rmessages_sent\030\004 \001(\003\022\031\n\021messages_" +
+      "received\030\005 \001(\003\022\030\n\020keep_alives_sent\030\006 \001(\003" +
+      "\022G\n#last_local_stream_created_timestamp\030" +
+      "\007 \001(\0132\032.google.protobuf.Timestamp\022H\n$las" +
+      "t_remote_stream_created_timestamp\030\010 \001(\0132" +
+      "\032.google.protobuf.Timestamp\022?\n\033last_mess" +
+      "age_sent_timestamp\030\t \001(\0132\032.google.protob" +
+      "uf.Timestamp\022C\n\037last_message_received_ti" +
+      "mestamp\030\n \001(\0132\032.google.protobuf.Timestam" +
+      "p\022>\n\031local_flow_control_window\030\013 \001(\0132\033.g" +
+      "oogle.protobuf.Int64Value\022?\n\032remote_flow" +
+      "_control_window\030\014 \001(\0132\033.google.protobuf." +
+      "Int64Value\022+\n\006option\030\r \003(\0132\033.grpc.channe" +
+      "lz.SocketOption\"\337\002\n\007Address\022<\n\rtcpip_add" +
+      "ress\030\001 \001(\0132#.grpc.channelz.Address.TcpIp" +
+      "AddressH\000\0228\n\013uds_address\030\002 \001(\0132!.grpc.ch" +
+      "annelz.Address.UdsAddressH\000\022<\n\rother_add" +
+      "ress\030\003 \001(\0132#.grpc.channelz.Address.Other" +
+      "AddressH\000\0320\n\014TcpIpAddress\022\022\n\nip_address\030" +
+      "\001 \001(\014\022\014\n\004port\030\002 \001(\005\032\036\n\nUdsAddress\022\020\n\010fil" +
+      "ename\030\001 \001(\t\032A\n\014OtherAddress\022\014\n\004name\030\001 \001(" +
+      "\t\022#\n\005value\030\002 \001(\0132\024.google.protobuf.AnyB\t" +
+      "\n\007address\"\270\002\n\010Security\022*\n\003tls\030\001 \001(\0132\033.gr" +
+      "pc.channelz.Security.TlsH\000\0226\n\005other\030\002 \001(" +
+      "\0132%.grpc.channelz.Security.OtherSecurity" +
+      "H\000\032{\n\003Tls\022\027\n\rstandard_name\030\001 \001(\tH\000\022\024\n\not" +
+      "her_name\030\002 \001(\tH\000\022\031\n\021local_certificate\030\003 " +
+      "\001(\014\022\032\n\022remote_certificate\030\004 \001(\014B\016\n\014ciphe" +
+      "r_suite\032B\n\rOtherSecurity\022\014\n\004name\030\001 \001(\t\022#" +
+      "\n\005value\030\002 \001(\0132\024.google.protobuf.AnyB\007\n\005m" +
+      "odel\"U\n\014SocketOption\022\014\n\004name\030\001 \001(\t\022\r\n\005va" +
+      "lue\030\002 \001(\t\022(\n\nadditional\030\003 \001(\0132\024.google.p" +
+      "rotobuf.Any\"B\n\023SocketOptionTimeout\022+\n\010du" +
+      "ration\030\001 \001(\0132\031.google.protobuf.Duration\"" +
+      "Q\n\022SocketOptionLinger\022\016\n\006active\030\001 \001(\010\022+\n" +
+      "\010duration\030\002 \001(\0132\031.google.protobuf.Durati" +
+      "on\"\256\005\n\023SocketOptionTcpInfo\022\022\n\ntcpi_state" +
+      "\030\001 \001(\r\022\025\n\rtcpi_ca_state\030\002 \001(\r\022\030\n\020tcpi_re" +
+      "transmits\030\003 \001(\r\022\023\n\013tcpi_probes\030\004 \001(\r\022\024\n\014" +
+      "tcpi_backoff\030\005 \001(\r\022\024\n\014tcpi_options\030\006 \001(\r" +
+      "\022\027\n\017tcpi_snd_wscale\030\007 \001(\r\022\027\n\017tcpi_rcv_ws" +
+      "cale\030\010 \001(\r\022\020\n\010tcpi_rto\030\t \001(\r\022\020\n\010tcpi_ato" +
+      "\030\n \001(\r\022\024\n\014tcpi_snd_mss\030\013 \001(\r\022\024\n\014tcpi_rcv" +
+      "_mss\030\014 \001(\r\022\024\n\014tcpi_unacked\030\r \001(\r\022\023\n\013tcpi" +
+      "_sacked\030\016 \001(\r\022\021\n\ttcpi_lost\030\017 \001(\r\022\024\n\014tcpi" +
+      "_retrans\030\020 \001(\r\022\024\n\014tcpi_fackets\030\021 \001(\r\022\033\n\023" +
+      "tcpi_last_data_sent\030\022 \001(\r\022\032\n\022tcpi_last_a" +
+      "ck_sent\030\023 \001(\r\022\033\n\023tcpi_last_data_recv\030\024 \001" +
+      "(\r\022\032\n\022tcpi_last_ack_recv\030\025 \001(\r\022\021\n\ttcpi_p" +
+      "mtu\030\026 \001(\r\022\031\n\021tcpi_rcv_ssthresh\030\027 \001(\r\022\020\n\010" +
+      "tcpi_rtt\030\030 \001(\r\022\023\n\013tcpi_rttvar\030\031 \001(\r\022\031\n\021t" +
+      "cpi_snd_ssthresh\030\032 \001(\r\022\025\n\rtcpi_snd_cwnd\030" +
+      "\033 \001(\r\022\023\n\013tcpi_advmss\030\034 \001(\r\022\027\n\017tcpi_reord" +
+      "ering\030\035 \001(\r\",\n\021GetServersRequest\022\027\n\017star" +
+      "t_server_id\030\001 \001(\003\"H\n\022GetServersResponse\022" +
+      "%\n\006server\030\001 \003(\0132\025.grpc.channelz.Server\022\013" +
+      "\n\003end\030\002 \001(\010\"E\n\027GetServerSocketsRequest\022\021" +
+      "\n\tserver_id\030\001 \001(\003\022\027\n\017start_socket_id\030\002 \001" +
+      "(\003\"U\n\030GetServerSocketsResponse\022,\n\nsocket" +
+      "_ref\030\001 \003(\0132\030.grpc.channelz.SocketRef\022\013\n\003" +
+      "end\030\002 \001(\010\"1\n\025GetTopChannelsRequest\022\030\n\020st" +
+      "art_channel_id\030\001 \001(\003\"N\n\026GetTopChannelsRe" +
+      "sponse\022\'\n\007channel\030\001 \003(\0132\026.grpc.channelz." +
+      "Channel\022\013\n\003end\030\002 \001(\010\"\'\n\021GetChannelReques" +
+      "t\022\022\n\nchannel_id\030\001 \001(\003\"=\n\022GetChannelRespo" +
+      "nse\022\'\n\007channel\030\001 \001(\0132\026.grpc.channelz.Cha" +
+      "nnel\"-\n\024GetSubchannelRequest\022\025\n\rsubchann" +
+      "el_id\030\001 \001(\003\"F\n\025GetSubchannelResponse\022-\n\n" +
+      "subchannel\030\001 \001(\0132\031.grpc.channelz.Subchan" +
+      "nel\"%\n\020GetSocketRequest\022\021\n\tsocket_id\030\001 \001" +
+      "(\003\":\n\021GetSocketResponse\022%\n\006socket\030\001 \001(\0132" +
+      "\025.grpc.channelz.Socket2\240\004\n\010Channelz\022]\n\016G" +
+      "etTopChannels\022$.grpc.channelz.GetTopChan" +
+      "nelsRequest\032%.grpc.channelz.GetTopChanne" +
+      "lsResponse\022Q\n\nGetServers\022 .grpc.channelz" +
+      ".GetServersRequest\032!.grpc.channelz.GetSe" +
+      "rversResponse\022c\n\020GetServerSockets\022&.grpc" +
+      ".channelz.GetServerSocketsRequest\032\'.grpc" +
+      ".channelz.GetServerSocketsResponse\022Q\n\nGe" +
+      "tChannel\022 .grpc.channelz.GetChannelReque" +
+      "st\032!.grpc.channelz.GetChannelResponse\022Z\n" +
+      "\rGetSubchannel\022#.grpc.channelz.GetSubcha" +
+      "nnelRequest\032$.grpc.channelz.GetSubchanne" +
+      "lResponse\022N\n\tGetSocket\022\037.grpc.channelz.G" +
+      "etSocketRequest\032 .grpc.channelz.GetSocke" +
+      "tResponseB&\n\023io.grpc.channelz.v1B\rChanne" +
+      "lzProtoP\001b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java
index 862177b..a98c454 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java
index 6c131fe..83250f7 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponse.java
index 99632a4..96cd35f 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponseOrBuilder.java
index 5b8d7c2..773ff30 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetChannelResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java
index 9b77872..c2ed74e 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java
index d9a3bb1..f359e0a 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java
index d675183..39e6647 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java
index 0d618f8..e74d974 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServerSocketsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java
index e516026..5ea5273 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java
index 74e7299..0254b15 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java
index 1ba2588..401147b 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java
index d9db0d0..74918e1 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetServersResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java
index 956523b..8bb0e3c 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java
index 6c09e8f..dc31311 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponse.java
index 7e98024..5613635 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponseOrBuilder.java
index 3767b76..1a3cd88 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSocketResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java
index 130371b..63b6abf 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java
index 1562028..05523a9 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponse.java
index e4a3ea0..8400d20 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponseOrBuilder.java
index 601544e..c26328f 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetSubchannelResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java
index db0cf1f..df856e9 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java
index fef096b..d8092e1 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java
index 7e05fe9..b3e2325 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java
index f56d9eb..b89e281 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/GetTopChannelsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/Security.java b/services/src/generated/main/java/io/grpc/channelz/v1/Security.java
index fc9d252..ba4dbfc 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/Security.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/Security.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SecurityOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SecurityOrBuilder.java
index ed342b9..bd5d747 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SecurityOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SecurityOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/Server.java b/services/src/generated/main/java/io/grpc/channelz/v1/Server.java
index 4c50050..4fdc5a3 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/Server.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/Server.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java
index 602ca87..a667416 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java
index 3cb9656..b1cf281 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java
index eb320df..a872130 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java
index 2996f4a..db80ef9 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerOrBuilder.java
index bcf0a11..c884965 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerRef.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerRef.java
index 47ffb25..f56520e 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerRef.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerRef.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerRefOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerRefOrBuilder.java
index 5200616..3c7593d 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerRefOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerRefOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/Socket.java b/services/src/generated/main/java/io/grpc/channelz/v1/Socket.java
index b013ec0..1a0bb82 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/Socket.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/Socket.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java
index 18bbbfa..a438e94 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketData.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java
index 1fd5620..474bb31 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketDataOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOption.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOption.java
index abe56a6..a5f550b 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOption.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOption.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLinger.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLinger.java
index fbe2cf7..8ada782 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLinger.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLinger.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLingerOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLingerOrBuilder.java
index 9726dca..ed3d3c7 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLingerOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionLingerOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionOrBuilder.java
index f40562b..40e903f 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfo.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfo.java
index a33cb28..aac5d19 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfo.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfo.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfoOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfoOrBuilder.java
index 1dea283..77b7cfc 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfoOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTcpInfoOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeout.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeout.java
index fa876e5..84e8bfa 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeout.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeout.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeoutOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeoutOrBuilder.java
index 385b0df..2762726 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeoutOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOptionTimeoutOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOrBuilder.java
index dd47715..89c7db9 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java
index 7515af0..c246b6b 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRef.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java
index 77f1542..3b8e3fa 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SocketRefOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/Subchannel.java b/services/src/generated/main/java/io/grpc/channelz/v1/Subchannel.java
index bf8c4ea..e5a1182 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/Subchannel.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/Subchannel.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelOrBuilder.java
index ea72761..af9c361 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRef.java b/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRef.java
index 1154ffd..05be43a 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRef.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRef.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRefOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRefOrBuilder.java
index 4b4f311..6f10c4e 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRefOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/SubchannelRefOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: io/grpc/channelz.proto
+// source: grpc/channelz/channelz.proto
 
 package io.grpc.channelz.v1;
 
diff --git a/services/src/main/proto/io/grpc/channelz.proto b/services/src/main/proto/grpc/channelz/channelz.proto
similarity index 100%
rename from services/src/main/proto/io/grpc/channelz.proto
rename to services/src/main/proto/grpc/channelz/channelz.proto