From 2a4f38b9e71315e74a0000338094d968249228dd Mon Sep 17 00:00:00 2001
From: Oliver Gould <ver@buoyant.io>
Date: Thu, 14 Jun 2018 14:03:00 -0700
Subject: [PATCH] proto: Use explicit `go_package` option (#1120)

protobuf has a `go_package` option that can be used to explicitly name
Go packages such that they can be imported without additional rewrites.

This allows us to store proto files without additional, redundant
directories (which were used for packaging hints, previously).

This change adds an explicit `go_package` to all .proto files and
updates `bin/protoc-go.sh` to ensure these packages are output into
$GOPATH (so that the go_package can be absolute). This removes the need
to manually rewrite imports in bin/protoc-go.sh.
---
 bin/protoc-go.sh                              |  32 +--
 controller/gen/common/common.pb.go            | 135 +++++++------
 .../gen/common/healthcheck/healthcheck.pb.go  |  50 ++---
 controller/gen/controller/tap/tap.pb.go       |  38 ++--
 .../gen/proxy/destination/destination.pb.go   |  85 ++++----
 controller/gen/proxy/tap/tap.pb.go            |  92 ++++-----
 .../gen/public/{api.pb.go => public.pb.go}    | 191 +++++++++---------
 proto/{common => }/common.proto               |   2 +
 .../{healthcheck => }/healthcheck.proto       |   2 +
 proto/controller/{tap => }/tap.proto          |   6 +-
 .../proxy/{destination => }/destination.proto |   4 +-
 proto/proxy/{tap => }/tap.proto               |   4 +-
 proto/{public/api.proto => public.proto}      |   6 +-
 proxy/Dockerfile                              |   2 +-
 proxy/controller-grpc/build.rs                |   6 +-
 15 files changed, 338 insertions(+), 317 deletions(-)
 rename controller/gen/public/{api.pb.go => public.pb.go} (86%)
 rename proto/{common => }/common.proto (96%)
 rename proto/common/{healthcheck => }/healthcheck.proto (80%)
 rename proto/controller/{tap => }/tap.proto (65%)
 rename proto/proxy/{destination => }/destination.proto (97%)
 rename proto/proxy/{tap => }/tap.proto (94%)
 rename proto/{public/api.proto => public.proto} (97%)

diff --git a/bin/protoc-go.sh b/bin/protoc-go.sh
index 5d5753131..395172a85 100755
--- a/bin/protoc-go.sh
+++ b/bin/protoc-go.sh
@@ -2,21 +2,21 @@
 
 set -eu
 
+gen() {
+    find controller/gen -name \*.pb.go -exec git rm -f '{}' +
+
+    for f in $@; do
+        bin/protoc -I proto --go_out="plugins=grpc:$GOPATH/src" "$f"
+    done
+
+    git add controller/gen
+}
+
 go install ./vendor/github.com/golang/protobuf/protoc-gen-go
 
-rm -rf controller/gen
-mkdir controller/gen
-bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/public/api.proto
-bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/common/common.proto
-bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/common/healthcheck/healthcheck.proto
-bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/proxy/destination/destination.proto
-bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/proxy/tap/tap.proto
-bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/controller/tap/tap.proto
-
-# Manually fix imports
-find controller/gen -type f -exec sed -i.bak 's:"common":"github.com\/runconduit\/conduit\/controller\/gen\/common":g' {} +
-find controller/gen -type f -exec sed -i.bak 's:"common/healthcheck":"github.com\/runconduit\/conduit\/controller\/gen\/common\/healthcheck":g' {} +
-find controller/gen -type f -exec sed -i.bak 's:"proxy/tap":"github.com\/runconduit\/conduit\/controller\/gen\/proxy\/tap":g' {} +
-find controller/gen -type f -exec sed -i.bak 's:"controller/tap":"github.com\/runconduit\/conduit\/controller\/gen\/controller\/tap":g' {} +
-find controller/gen -type f -exec sed -i.bak 's:"public":"github.com\/runconduit\/conduit\/controller\/gen\/public":g' {} +
-find controller/gen -name '*.bak' -delete
+gen proto/public.proto \
+    proto/common.proto \
+    proto/common/healthcheck.proto \
+    proto/controller/tap.proto \
+    proto/proxy/destination.proto \
+    proto/proxy/tap.proto
diff --git a/controller/gen/common/common.pb.go b/controller/gen/common/common.pb.go
index 50ff95c09..af02d0d6e 100644
--- a/controller/gen/common/common.pb.go
+++ b/controller/gen/common/common.pb.go
@@ -1,11 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: common/common.proto
+// source: common.proto
 
 /*
-Package conduit_common is a generated protocol buffer package.
+Package common is a generated protocol buffer package.
 
 It is generated from these files:
-	common/common.proto
+	common.proto
 
 It has these top-level messages:
 	HttpMethod
@@ -17,7 +17,7 @@ It has these top-level messages:
 	Eos
 	TapEvent
 */
-package conduit_common
+package common
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -1088,69 +1088,70 @@ func init() {
 	proto.RegisterEnum("conduit.common.Scheme_Registered", Scheme_Registered_name, Scheme_Registered_value)
 }
 
-func init() { proto.RegisterFile("common/common.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("common.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 962 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcf, 0x6e, 0xe3, 0xb6,
-	0x13, 0xb6, 0xfe, 0x58, 0x8e, 0x47, 0x4e, 0x7e, 0xfa, 0x31, 0xc1, 0x22, 0x35, 0xba, 0x6d, 0xd6,
-	0x68, 0x8a, 0x24, 0x07, 0xa5, 0xf5, 0x16, 0x46, 0xb7, 0xe8, 0x25, 0x76, 0x84, 0xd8, 0xe8, 0x6e,
-	0xa2, 0xd2, 0xea, 0xd9, 0x90, 0x2d, 0x6e, 0x2c, 0xd4, 0x16, 0x55, 0x92, 0x0e, 0xe0, 0xf7, 0xe8,
-	0xad, 0x40, 0xaf, 0xbd, 0xf6, 0x7d, 0xfa, 0x18, 0x45, 0xef, 0x05, 0x29, 0x5a, 0x56, 0xb2, 0xbb,
-	0xd9, 0x45, 0x7b, 0xe8, 0x49, 0x9c, 0xe1, 0x37, 0x9f, 0xbe, 0xe1, 0x70, 0x86, 0xb0, 0x3f, 0xa3,
-	0xcb, 0x25, 0xcd, 0xce, 0x8b, 0x8f, 0x9f, 0x33, 0x2a, 0x28, 0xda, 0x9b, 0xd1, 0x2c, 0x59, 0xa5,
-	0xc2, 0x2f, 0xbc, 0xed, 0x4f, 0x6e, 0x29, 0xbd, 0x5d, 0x90, 0x73, 0xb5, 0x3b, 0x5d, 0xbd, 0x3e,
-	0x4f, 0x56, 0x2c, 0x16, 0xe9, 0x06, 0xdf, 0xf9, 0xd3, 0x00, 0x18, 0x0a, 0x91, 0xbf, 0x22, 0x62,
-	0x4e, 0x13, 0x74, 0x05, 0xc0, 0xc8, 0x6d, 0xca, 0x05, 0x61, 0x24, 0x39, 0x34, 0x8e, 0x8c, 0x93,
-	0xbd, 0xee, 0xb1, 0x7f, 0x9f, 0xd3, 0xdf, 0xe2, 0x7d, 0x5c, 0x82, 0x87, 0x35, 0x5c, 0x09, 0x45,
-	0x9f, 0x41, 0x6b, 0x95, 0x55, 0xa8, 0xcc, 0x23, 0xe3, 0xa4, 0x39, 0xac, 0xe1, 0x7b, 0xde, 0x4e,
-	0x06, 0xb0, 0x65, 0x40, 0x0d, 0xb0, 0xae, 0x82, 0xc8, 0xab, 0xa1, 0x1d, 0xb0, 0xc3, 0x9b, 0x71,
-	0xe4, 0x19, 0xd2, 0x15, 0xfe, 0x10, 0x79, 0x26, 0x02, 0x70, 0x2e, 0x83, 0x97, 0x41, 0x14, 0x78,
-	0x16, 0x6a, 0x42, 0x3d, 0xbc, 0x88, 0x06, 0x43, 0xcf, 0x46, 0x2e, 0x34, 0x6e, 0xc2, 0x68, 0x74,
-	0x73, 0x3d, 0xf6, 0xea, 0xd2, 0x18, 0xdc, 0x5c, 0x5f, 0x07, 0x83, 0xc8, 0x73, 0x24, 0xc7, 0x30,
-	0xb8, 0xb8, 0xf4, 0x1a, 0x12, 0x1e, 0xe1, 0x8b, 0x41, 0xe0, 0xed, 0xf4, 0x1d, 0xb0, 0xc5, 0x3a,
-	0x27, 0x9d, 0x5f, 0x0d, 0x70, 0xc6, 0xb3, 0x39, 0x59, 0x12, 0x34, 0x78, 0x4b, 0xc6, 0xcf, 0x1e,
-	0x66, 0x5c, 0x60, 0xff, 0x6d, 0xb6, 0xcf, 0xee, 0x65, 0x2b, 0x05, 0x46, 0x51, 0xe8, 0xd5, 0xa4,
-	0x40, 0xb9, 0x1a, 0x7b, 0x46, 0x29, 0x70, 0x0c, 0xcd, 0x51, 0x78, 0x91, 0x24, 0x8c, 0x70, 0x8e,
-	0x0e, 0xc0, 0x4e, 0xf3, 0xbb, 0xaf, 0x94, 0xb8, 0xc6, 0xb0, 0x86, 0x95, 0x85, 0xce, 0x94, 0xb7,
-	0xa7, 0xfe, 0xe5, 0x76, 0x0f, 0x1e, 0x4a, 0x1e, 0x85, 0x77, 0x3d, 0x8d, 0xed, 0xf5, 0x6d, 0x30,
-	0xd3, 0xbc, 0xf3, 0x05, 0xd8, 0xd2, 0x8b, 0x0e, 0xa0, 0xfe, 0x3a, 0x65, 0x5c, 0x28, 0x42, 0x07,
-	0x17, 0x06, 0x42, 0x60, 0x2f, 0x62, 0x2e, 0x14, 0x9f, 0x83, 0xd5, 0xba, 0xf3, 0x1d, 0x40, 0x34,
-	0xcb, 0x37, 0x3a, 0x4e, 0x25, 0x8b, 0x0a, 0x72, 0xbb, 0x1f, 0xbd, 0xf9, 0x3f, 0x0d, 0xc3, 0x66,
-	0x9a, 0x4b, 0xb2, 0x9c, 0xb2, 0x82, 0x6c, 0x17, 0xab, 0x75, 0xe7, 0x05, 0xb8, 0x97, 0x84, 0x8b,
-	0x34, 0x53, 0xf7, 0x0f, 0x3d, 0x01, 0x87, 0xab, 0x63, 0x55, 0x8c, 0x4d, 0xac, 0x2d, 0x15, 0x1a,
-	0x8b, 0x79, 0x71, 0x86, 0x58, 0xad, 0x3b, 0x09, 0x58, 0x01, 0xe5, 0xe8, 0x0c, 0xbc, 0x5b, 0x96,
-	0xcf, 0x26, 0x5c, 0xc4, 0x62, 0xc5, 0x27, 0x33, 0x9a, 0x14, 0xc1, 0xbb, 0xc3, 0x1a, 0xde, 0x93,
-	0x3b, 0x63, 0xb5, 0x31, 0xa0, 0x09, 0x91, 0x58, 0x46, 0x38, 0x11, 0x13, 0xc2, 0x18, 0x65, 0x05,
-	0xd6, 0xdc, 0x60, 0xd5, 0x4e, 0x20, 0x37, 0x24, 0xb6, 0x5f, 0x07, 0x8b, 0x64, 0x49, 0xe7, 0x17,
-	0x17, 0x76, 0xa2, 0x38, 0x0f, 0xee, 0x48, 0x26, 0x50, 0x17, 0x1c, 0x4e, 0x57, 0x6c, 0x46, 0x74,
-	0xc2, 0xed, 0x87, 0x09, 0x6f, 0x0f, 0x06, 0x6b, 0x24, 0xfa, 0x16, 0xdc, 0x64, 0x9b, 0xa1, 0xae,
-	0xcc, 0x63, 0x81, 0x55, 0x38, 0x0a, 0xc1, 0xab, 0x98, 0x93, 0x25, 0x11, 0xf1, 0xa1, 0xad, 0x28,
-	0xde, 0xe8, 0xc0, 0x8d, 0x4a, 0x3f, 0xc8, 0x92, 0x9c, 0xa6, 0x99, 0x78, 0x45, 0x44, 0x8c, 0xff,
-	0x57, 0x09, 0x97, 0x0e, 0xf4, 0x1c, 0xec, 0xb9, 0x10, 0xf9, 0xa1, 0xa5, 0x58, 0x9e, 0xbe, 0x93,
-	0x45, 0x36, 0xb4, 0xbc, 0x2b, 0x12, 0xdc, 0xfe, 0xd9, 0x80, 0x56, 0x95, 0x16, 0x8d, 0xc0, 0x59,
-	0xc4, 0x53, 0xb2, 0xe0, 0x87, 0xc6, 0x91, 0x75, 0xe2, 0x76, 0xbf, 0xfc, 0x20, 0x35, 0xfe, 0x4b,
-	0x15, 0x13, 0x64, 0x82, 0xad, 0xb1, 0x26, 0x68, 0xbf, 0x00, 0xb7, 0xe2, 0x46, 0x1e, 0x58, 0x3f,
-	0x92, 0xb5, 0xae, 0xbf, 0x5c, 0xca, 0xab, 0x79, 0x17, 0x2f, 0x56, 0x44, 0x57, 0xbf, 0x30, 0xbe,
-	0x31, 0xbf, 0x36, 0xda, 0x7f, 0x35, 0xc0, 0x96, 0x3a, 0xd1, 0x35, 0xb4, 0x18, 0xf9, 0x69, 0x45,
-	0xb8, 0x98, 0xa4, 0x59, 0x2a, 0x74, 0x79, 0x4e, 0x1f, 0x4d, 0xce, 0xc7, 0x45, 0xc4, 0x28, 0x4b,
-	0xc5, 0xb0, 0x86, 0x5d, 0xb6, 0x35, 0xd1, 0xf7, 0xb0, 0xcb, 0x08, 0xcf, 0x69, 0xc6, 0x49, 0x41,
-	0x58, 0x94, 0xed, 0xec, 0x7d, 0x84, 0x45, 0x88, 0x66, 0x6c, 0xb1, 0x8a, 0x5d, 0x48, 0xd4, 0x94,
-	0x24, 0x4b, 0xf4, 0xf9, 0x9f, 0x7e, 0x18, 0x63, 0x90, 0x25, 0x85, 0xc4, 0xd2, 0x6c, 0xf7, 0x60,
-	0x67, 0x2c, 0x18, 0x89, 0x97, 0xa3, 0x44, 0xb6, 0xc7, 0x34, 0xe6, 0xfa, 0xde, 0x63, 0xb5, 0x56,
-	0xad, 0xa4, 0xf6, 0x95, 0x76, 0x1b, 0x6b, 0xab, 0xfd, 0x87, 0x01, 0x6e, 0x25, 0x73, 0xd4, 0x03,
-	0x33, 0x4d, 0xf4, 0x81, 0x7d, 0xfe, 0xb8, 0x9a, 0xcd, 0xff, 0xb0, 0x99, 0x26, 0xb2, 0x17, 0x96,
-	0x6a, 0xde, 0xbf, 0xeb, 0x4a, 0x6f, 0x5f, 0x04, 0xac, 0x91, 0xc8, 0x2f, 0xdb, 0xbb, 0xc8, 0xfe,
-	0xc9, 0xdb, 0x67, 0x6a, 0xd9, 0xf6, 0x1f, 0x43, 0x33, 0x5e, 0x89, 0x39, 0x65, 0xa9, 0x58, 0xab,
-	0x6b, 0xdf, 0xc4, 0x5b, 0x47, 0x39, 0x14, 0xea, 0xdb, 0xa1, 0xd0, 0xfe, 0xdd, 0x80, 0x56, 0xb5,
-	0x0c, 0xff, 0x38, 0xbd, 0x2b, 0x40, 0x3c, 0xcd, 0x66, 0x64, 0x72, 0xef, 0x5e, 0x99, 0x7a, 0xce,
-	0x15, 0x0f, 0xa8, 0xbf, 0x79, 0x40, 0xfd, 0x4b, 0xfd, 0x80, 0x62, 0x4f, 0x05, 0x55, 0xcf, 0xf7,
-	0x53, 0x70, 0x65, 0x0b, 0xe9, 0xf9, 0xa4, 0x12, 0xdf, 0xc5, 0x20, 0x5d, 0xc5, 0x60, 0x6a, 0xff,
-	0x66, 0xca, 0x82, 0x94, 0x85, 0xfd, 0xef, 0x15, 0x8f, 0x60, 0x7f, 0x43, 0x54, 0x6d, 0x01, 0xeb,
-	0x7d, 0x4c, 0xff, 0xd7, 0x4c, 0x95, 0xd3, 0x3f, 0x86, 0xbd, 0x92, 0x64, 0xba, 0x16, 0x84, 0xab,
-	0x2a, 0xda, 0xb8, 0xec, 0xae, 0xbe, 0x74, 0xa2, 0x63, 0xb0, 0x08, 0xe5, 0xaa, 0x90, 0x6e, 0x77,
-	0xff, 0x61, 0xce, 0x01, 0xe5, 0x58, 0xee, 0xf7, 0x1b, 0x50, 0x27, 0x32, 0xf9, 0x72, 0x71, 0xf6,
-	0x14, 0x76, 0x42, 0xa9, 0x63, 0x46, 0x17, 0x95, 0xb7, 0xb3, 0x01, 0x56, 0x34, 0x08, 0x3d, 0x63,
-	0xea, 0x28, 0x91, 0xcf, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x49, 0x72, 0x40, 0x16, 0x09,
-	0x00, 0x00,
+	// 989 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0x41, 0x6f, 0xe3, 0x44,
+	0x14, 0x8e, 0x13, 0xc7, 0x69, 0x9e, 0xd3, 0x62, 0x66, 0xab, 0x55, 0x89, 0x58, 0xe8, 0x46, 0x14,
+	0xb5, 0x3d, 0x38, 0x90, 0x42, 0xc5, 0x22, 0x2e, 0x4d, 0x6a, 0x35, 0x11, 0xbb, 0xad, 0x99, 0x98,
+	0x0b, 0x97, 0xc8, 0x89, 0x67, 0x13, 0x8b, 0xc4, 0x63, 0x66, 0xc6, 0x95, 0xf2, 0x3f, 0xb8, 0x21,
+	0x71, 0xe5, 0xca, 0xff, 0xe1, 0x67, 0x20, 0xee, 0x68, 0xc6, 0x13, 0xc7, 0xed, 0xee, 0x76, 0x57,
+	0x70, 0xd8, 0x93, 0xe7, 0xbd, 0x79, 0xef, 0xf3, 0xf7, 0xcd, 0x9b, 0xf7, 0x06, 0x5a, 0x33, 0xba,
+	0x5a, 0xd1, 0xc4, 0x4d, 0x19, 0x15, 0x14, 0xed, 0xcd, 0x68, 0x12, 0x65, 0xb1, 0x70, 0x73, 0x6f,
+	0xfb, 0x93, 0x39, 0xa5, 0xf3, 0x25, 0xe9, 0xaa, 0xdd, 0x69, 0xf6, 0xb2, 0x1b, 0x65, 0x2c, 0x14,
+	0xf1, 0x26, 0xbe, 0xf3, 0xb7, 0x01, 0x30, 0x14, 0x22, 0x7d, 0x41, 0xc4, 0x82, 0x46, 0xe8, 0x0a,
+	0x80, 0x91, 0x79, 0xcc, 0x05, 0x61, 0x24, 0x3a, 0x30, 0x0e, 0x8d, 0xe3, 0xbd, 0xde, 0x91, 0x7b,
+	0x17, 0xd3, 0xdd, 0xc6, 0xbb, 0xb8, 0x08, 0x1e, 0x56, 0x70, 0x29, 0x15, 0x7d, 0x06, 0xad, 0x2c,
+	0x29, 0x41, 0x55, 0x0f, 0x8d, 0xe3, 0xe6, 0xb0, 0x82, 0xef, 0x78, 0x3b, 0x09, 0xc0, 0x16, 0x01,
+	0x35, 0xa0, 0x76, 0xe5, 0x05, 0x4e, 0x05, 0xed, 0x80, 0xe9, 0xdf, 0x8c, 0x03, 0xc7, 0x90, 0x2e,
+	0xff, 0xc7, 0xc0, 0xa9, 0x22, 0x00, 0xeb, 0xd2, 0x7b, 0xee, 0x05, 0x9e, 0x53, 0x43, 0x4d, 0xa8,
+	0xfb, 0x17, 0xc1, 0x60, 0xe8, 0x98, 0xc8, 0x86, 0xc6, 0x8d, 0x1f, 0x8c, 0x6e, 0xae, 0xc7, 0x4e,
+	0x5d, 0x1a, 0x83, 0x9b, 0xeb, 0x6b, 0x6f, 0x10, 0x38, 0x96, 0xc4, 0x18, 0x7a, 0x17, 0x97, 0x4e,
+	0x43, 0x86, 0x07, 0xf8, 0x62, 0xe0, 0x39, 0x3b, 0x7d, 0x0b, 0x4c, 0xb1, 0x4e, 0x49, 0xe7, 0x77,
+	0x03, 0xac, 0xf1, 0x6c, 0x41, 0x56, 0x04, 0x0d, 0x5e, 0xa3, 0xf8, 0xe9, 0x7d, 0xc5, 0x79, 0xec,
+	0xff, 0x55, 0xfb, 0xf4, 0x8e, 0x5a, 0x49, 0x30, 0x08, 0x7c, 0xa7, 0x22, 0x09, 0xca, 0xd5, 0xd8,
+	0x31, 0x0a, 0x82, 0x63, 0x68, 0x8e, 0xfc, 0x8b, 0x28, 0x62, 0x84, 0x73, 0xb4, 0x0f, 0x66, 0x9c,
+	0xde, 0x7e, 0xa5, 0xc8, 0x35, 0x86, 0x15, 0xac, 0x2c, 0x74, 0xaa, 0xbc, 0xe7, 0xea, 0x5f, 0x76,
+	0x6f, 0xff, 0x3e, 0xe5, 0x91, 0x7f, 0x7b, 0xae, 0x63, 0xcf, 0xfb, 0x26, 0x54, 0xe3, 0xb4, 0xf3,
+	0x05, 0x98, 0xd2, 0x8b, 0xf6, 0xa1, 0xfe, 0x32, 0x66, 0x5c, 0x28, 0x40, 0x0b, 0xe7, 0x06, 0x42,
+	0x60, 0x2e, 0x43, 0x2e, 0x14, 0x9e, 0x85, 0xd5, 0xba, 0xf3, 0x3d, 0x40, 0x30, 0x4b, 0x37, 0x3c,
+	0x4e, 0x24, 0x8a, 0x4a, 0xb2, 0x7b, 0x1f, 0xbd, 0xfa, 0x3f, 0x1d, 0x86, 0xab, 0x71, 0x2a, 0xc1,
+	0x52, 0xca, 0x72, 0xb0, 0x5d, 0xac, 0xd6, 0x9d, 0x67, 0x60, 0x5f, 0x12, 0x2e, 0xe2, 0x44, 0xdd,
+	0x3f, 0xf4, 0x18, 0x2c, 0xae, 0x8e, 0x55, 0x21, 0x36, 0xb1, 0xb6, 0x54, 0x6a, 0x28, 0x16, 0xf9,
+	0x19, 0x62, 0xb5, 0xee, 0x44, 0x50, 0xf3, 0x28, 0x47, 0xa7, 0xe0, 0xcc, 0x59, 0x3a, 0x9b, 0x70,
+	0x11, 0x8a, 0x8c, 0x4f, 0x66, 0x34, 0xca, 0x93, 0x77, 0x87, 0x15, 0xbc, 0x27, 0x77, 0xc6, 0x6a,
+	0x63, 0x40, 0x23, 0x22, 0x63, 0x19, 0xe1, 0x44, 0x4c, 0x08, 0x63, 0x94, 0xe5, 0xb1, 0xd5, 0x4d,
+	0xac, 0xda, 0xf1, 0xe4, 0x86, 0x8c, 0xed, 0xd7, 0xa1, 0x46, 0x92, 0xa8, 0xf3, 0x9b, 0x0d, 0x3b,
+	0x41, 0x98, 0x7a, 0xb7, 0x24, 0x11, 0xa8, 0x07, 0x16, 0xa7, 0x19, 0x9b, 0x11, 0x2d, 0xb8, 0x7d,
+	0x5f, 0xf0, 0xf6, 0x60, 0xb0, 0x8e, 0x44, 0xdf, 0x81, 0x1d, 0x6d, 0x15, 0xea, 0xca, 0x3c, 0x94,
+	0x58, 0x0e, 0x47, 0x3e, 0x38, 0x25, 0x73, 0xb2, 0x22, 0x22, 0x3c, 0x30, 0x15, 0xc4, 0x2b, 0x1d,
+	0xb8, 0x61, 0xe9, 0x7a, 0x49, 0x94, 0xd2, 0x38, 0x11, 0x2f, 0x88, 0x08, 0xf1, 0x07, 0xa5, 0x74,
+	0xe9, 0x40, 0x67, 0x60, 0x2e, 0x84, 0x48, 0x0f, 0x6a, 0x0a, 0xe5, 0xc9, 0x1b, 0x51, 0x64, 0x43,
+	0xcb, 0xbb, 0x22, 0x83, 0xdb, 0xbf, 0x1a, 0xd0, 0x2a, 0xc3, 0xa2, 0x11, 0x58, 0xcb, 0x70, 0x4a,
+	0x96, 0xfc, 0xc0, 0x38, 0xac, 0x1d, 0xdb, 0xbd, 0x2f, 0xdf, 0x89, 0x8d, 0xfb, 0x5c, 0xe5, 0x78,
+	0x89, 0x60, 0x6b, 0xac, 0x01, 0xda, 0xcf, 0xc0, 0x2e, 0xb9, 0x91, 0x03, 0xb5, 0x9f, 0xc9, 0x5a,
+	0xd7, 0x5f, 0x2e, 0xe5, 0xd5, 0xbc, 0x0d, 0x97, 0x19, 0xd1, 0xd5, 0xcf, 0x8d, 0x6f, 0xab, 0xdf,
+	0x18, 0xed, 0x7f, 0x1a, 0x60, 0x4a, 0x9e, 0xe8, 0x1a, 0x5a, 0x8c, 0xfc, 0x92, 0x11, 0x2e, 0x26,
+	0x71, 0x12, 0x0b, 0x5d, 0x9e, 0x93, 0x07, 0xc5, 0xb9, 0x38, 0xcf, 0x18, 0x25, 0xb1, 0x18, 0x56,
+	0xb0, 0xcd, 0xb6, 0x26, 0xfa, 0x01, 0x76, 0x19, 0xe1, 0x29, 0x4d, 0x38, 0xc9, 0x01, 0xf3, 0xb2,
+	0x9d, 0xbe, 0x0d, 0x30, 0x4f, 0xd1, 0x88, 0x2d, 0x56, 0xb2, 0x73, 0x8a, 0x1a, 0x92, 0x24, 0x91,
+	0x3e, 0xff, 0x93, 0x77, 0x43, 0xf4, 0x92, 0x28, 0xa7, 0x58, 0x98, 0xed, 0x73, 0xd8, 0x19, 0x0b,
+	0x46, 0xc2, 0xd5, 0x28, 0x92, 0xed, 0x31, 0x0d, 0xb9, 0xbe, 0xf7, 0x58, 0xad, 0x55, 0x2b, 0xa9,
+	0x7d, 0xc5, 0xdd, 0xc4, 0xda, 0x6a, 0xff, 0x65, 0x80, 0x5d, 0x52, 0x8e, 0xce, 0xa1, 0x1a, 0x47,
+	0xfa, 0xc0, 0x3e, 0x7f, 0x98, 0xcd, 0xe6, 0x7f, 0xb8, 0x1a, 0x47, 0xb2, 0x17, 0x56, 0x6a, 0xde,
+	0xbf, 0xe9, 0x4a, 0x6f, 0x5f, 0x04, 0xac, 0x23, 0x91, 0x5b, 0xb4, 0x77, 0xae, 0xfe, 0xf1, 0xeb,
+	0x67, 0x6a, 0xd1, 0xf6, 0x1f, 0x43, 0x33, 0xcc, 0xc4, 0x82, 0xb2, 0x58, 0xac, 0xd5, 0xb5, 0x6f,
+	0xe2, 0xad, 0xa3, 0x18, 0x0a, 0xf5, 0xed, 0x50, 0x68, 0xff, 0x69, 0x40, 0xab, 0x5c, 0x86, 0xff,
+	0x2c, 0xef, 0x0a, 0x10, 0x8f, 0x93, 0x19, 0x99, 0xdc, 0xb9, 0x57, 0x55, 0x3d, 0xe7, 0xf2, 0x07,
+	0xd4, 0xdd, 0x3c, 0xa0, 0xee, 0xa5, 0x7e, 0x40, 0xb1, 0xa3, 0x92, 0xca, 0xe7, 0xfb, 0x29, 0xd8,
+	0xb2, 0x85, 0xf4, 0x7c, 0x52, 0xc2, 0x77, 0x31, 0x48, 0x57, 0x3e, 0x98, 0xda, 0x7f, 0x54, 0x65,
+	0x41, 0x8a, 0xc2, 0xbe, 0x7f, 0xc6, 0x23, 0x78, 0xb4, 0x01, 0x2a, 0xb7, 0x40, 0xed, 0x6d, 0x48,
+	0x1f, 0x6a, 0xa4, 0xd2, 0xe9, 0x1f, 0xc1, 0x5e, 0x01, 0x32, 0x5d, 0x0b, 0xc2, 0x55, 0x15, 0x4d,
+	0x5c, 0x74, 0x57, 0x5f, 0x3a, 0xd1, 0x11, 0xd4, 0x08, 0xe5, 0xaa, 0x90, 0x76, 0xef, 0xd1, 0x7d,
+	0xcd, 0x1e, 0xe5, 0x58, 0xee, 0xf7, 0x1b, 0x50, 0x27, 0x52, 0x7c, 0xb1, 0x38, 0x7d, 0x02, 0x3b,
+	0xbe, 0xe4, 0x31, 0xa3, 0xcb, 0xd2, 0xdb, 0xd9, 0x80, 0x5a, 0x30, 0xf0, 0x1d, 0xa3, 0xff, 0xf5,
+	0x4f, 0x67, 0xf3, 0x58, 0x2c, 0xb2, 0xa9, 0x84, 0xea, 0xb2, 0x2c, 0xd1, 0xc8, 0xdd, 0xd2, 0x57,
+	0x30, 0xba, 0x5c, 0x12, 0xd6, 0x9d, 0x93, 0xa4, 0x9b, 0xff, 0x70, 0x6a, 0x29, 0x6d, 0x67, 0xff,
+	0x06, 0x00, 0x00, 0xff, 0xff, 0x65, 0xd9, 0x8b, 0xf2, 0x46, 0x09, 0x00, 0x00,
 }
diff --git a/controller/gen/common/healthcheck/healthcheck.pb.go b/controller/gen/common/healthcheck/healthcheck.pb.go
index f82b8cb38..0ca30ea5f 100644
--- a/controller/gen/common/healthcheck/healthcheck.pb.go
+++ b/controller/gen/common/healthcheck/healthcheck.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: common/healthcheck/healthcheck.proto
+// source: common/healthcheck.proto
 
 /*
-Package conduit_common_healthcheck is a generated protocol buffer package.
+Package healthcheck is a generated protocol buffer package.
 
 It is generated from these files:
-	common/healthcheck/healthcheck.proto
+	common/healthcheck.proto
 
 It has these top-level messages:
 	CheckResult
 	SelfCheckRequest
 	SelfCheckResponse
 */
-package conduit_common_healthcheck
+package healthcheck
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -124,26 +124,28 @@ func init() {
 	proto.RegisterEnum("conduit.common.healthcheck.CheckStatus", CheckStatus_name, CheckStatus_value)
 }
 
-func init() { proto.RegisterFile("common/healthcheck/healthcheck.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("common/healthcheck.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 276 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4b, 0xfb, 0x40,
-	0x10, 0xc5, 0xbf, 0x9b, 0xf6, 0x1b, 0xed, 0x14, 0x25, 0x2e, 0x08, 0xc1, 0x53, 0x08, 0x05, 0x43,
-	0x0e, 0x11, 0xd4, 0xbb, 0x14, 0xb5, 0x20, 0xfe, 0x28, 0x6c, 0xd4, 0x7b, 0x9a, 0x8e, 0x26, 0x98,
-	0x64, 0xe3, 0xce, 0xee, 0xa1, 0xff, 0xa8, 0x7f, 0x8f, 0xb8, 0x89, 0x10, 0x51, 0xc1, 0xdb, 0xf0,
-	0xf6, 0x7d, 0xd8, 0x37, 0x6f, 0x60, 0x96, 0xcb, 0xba, 0x96, 0xcd, 0x51, 0x81, 0x59, 0xa5, 0x8b,
-	0xbc, 0xc0, 0xfc, 0x65, 0x38, 0x27, 0xad, 0x92, 0x5a, 0xf2, 0x83, 0x5c, 0x36, 0x6b, 0x53, 0xea,
-	0xa4, 0x73, 0x27, 0x03, 0x47, 0xf8, 0xc6, 0x60, 0x7a, 0xfe, 0x31, 0x09, 0x24, 0x53, 0x69, 0x3e,
-	0x83, 0x9d, 0xd4, 0xac, 0x68, 0x43, 0x1a, 0xeb, 0xbb, 0xac, 0x46, 0x9f, 0x05, 0x2c, 0x9a, 0x88,
-	0xaf, 0x22, 0x8f, 0xc1, 0xb3, 0xd0, 0x05, 0x52, 0xae, 0xca, 0x56, 0x97, 0xb2, 0xf1, 0x1d, 0x6b,
-	0xfc, 0xa6, 0xf3, 0x33, 0x70, 0x53, 0x9d, 0x69, 0x43, 0xfe, 0x28, 0x60, 0xd1, 0xee, 0xf1, 0x61,
-	0xf2, 0x7b, 0x9c, 0xc4, 0xd2, 0x9d, 0x5d, 0xf4, 0x18, 0x3f, 0x85, 0xfd, 0x85, 0x2a, 0xb1, 0x59,
-	0x57, 0x9b, 0x5b, 0x24, 0xca, 0x9e, 0xf1, 0x5e, 0x3e, 0x10, 0x2a, 0x7f, 0x6c, 0x7f, 0xfc, 0xf9,
-	0x31, 0xe4, 0xe0, 0xa5, 0x58, 0x3d, 0xf5, 0xbb, 0xbd, 0x1a, 0x24, 0x1d, 0x3e, 0xc2, 0xde, 0x40,
-	0xa3, 0x56, 0x36, 0x84, 0x7c, 0x0e, 0x5b, 0xca, 0xee, 0x4e, 0x3e, 0x0b, 0x46, 0xd1, 0xf4, 0x0f,
-	0x01, 0xbb, 0xae, 0xc4, 0x27, 0x17, 0xc7, 0x7d, 0x87, 0x7d, 0x60, 0x17, 0x9c, 0xe5, 0xb5, 0xf7,
-	0x8f, 0x6f, 0xc3, 0x78, 0x31, 0xbf, 0xba, 0xf1, 0x18, 0x9f, 0xc0, 0xff, 0x4b, 0x21, 0x96, 0xc2,
-	0x73, 0x56, 0xae, 0xbd, 0xc9, 0xc9, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x5a, 0xd6, 0x5e,
-	0xbb, 0x01, 0x00, 0x00,
+	// 305 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x4d, 0x4b, 0x3b, 0x31,
+	0x10, 0xc6, 0xff, 0x69, 0xfb, 0xaf, 0x76, 0x8a, 0xb2, 0x06, 0x84, 0xe0, 0xa9, 0x14, 0xc1, 0xd2,
+	0xc3, 0x2e, 0xa8, 0xf7, 0x52, 0x5f, 0x0a, 0xe2, 0x4b, 0x21, 0x55, 0x0f, 0xde, 0xb6, 0xdb, 0xb1,
+	0xbb, 0x98, 0x4d, 0x6a, 0x26, 0x39, 0xf4, 0x8b, 0xfa, 0x79, 0xa4, 0xe9, 0x0a, 0x95, 0x2a, 0x78,
+	0x4a, 0x78, 0xf2, 0xfc, 0x32, 0xcf, 0xcc, 0x80, 0xc8, 0x4c, 0x59, 0x1a, 0x9d, 0xe4, 0x98, 0x2a,
+	0x97, 0x67, 0x39, 0x66, 0x6f, 0xf1, 0xc2, 0x1a, 0x67, 0xf8, 0x51, 0x66, 0xf4, 0xcc, 0x17, 0x2e,
+	0x5e, 0x3b, 0xe2, 0x0d, 0x47, 0xf7, 0x83, 0x41, 0xfb, 0x72, 0x75, 0x93, 0x48, 0x5e, 0x39, 0x7e,
+	0x0c, 0x7b, 0x13, 0x3f, 0xa5, 0x25, 0x39, 0x2c, 0x1f, 0xd2, 0x12, 0x05, 0xeb, 0xb0, 0x5e, 0x4b,
+	0x7e, 0x17, 0x79, 0x1f, 0xa2, 0x00, 0x5d, 0x21, 0x65, 0xb6, 0x58, 0xb8, 0xc2, 0x68, 0x51, 0x0b,
+	0xc6, 0x2d, 0x9d, 0x0f, 0xa0, 0x39, 0x71, 0xa9, 0xf3, 0x24, 0xea, 0x1d, 0xd6, 0xdb, 0x3f, 0x3d,
+	0x89, 0x7f, 0x8f, 0x13, 0x07, 0x7a, 0x6d, 0x97, 0x15, 0xc6, 0xcf, 0xe1, 0x70, 0x64, 0x0b, 0xd4,
+	0x33, 0xb5, 0xbc, 0x47, 0xa2, 0x74, 0x8e, 0x8f, 0xe6, 0x89, 0xd0, 0x8a, 0x46, 0xa8, 0xf8, 0xf3,
+	0x63, 0x97, 0x43, 0x34, 0x41, 0xf5, 0x5a, 0xf5, 0xf6, 0xee, 0x91, 0x5c, 0xf7, 0x19, 0x0e, 0x36,
+	0x34, 0x5a, 0x18, 0x4d, 0xc8, 0x87, 0xb0, 0x63, 0x43, 0xef, 0x24, 0x58, 0xa7, 0xde, 0x6b, 0xff,
+	0x21, 0xe0, 0x7a, 0x56, 0xf2, 0x8b, 0xeb, 0xf7, 0xab, 0x19, 0x56, 0x81, 0x9b, 0x50, 0x1b, 0xdf,
+	0x46, 0xff, 0xf8, 0x2e, 0x34, 0x46, 0xc3, 0x9b, 0xbb, 0x88, 0xf1, 0x16, 0xfc, 0xbf, 0x96, 0x72,
+	0x2c, 0xa3, 0xda, 0xc5, 0xf0, 0x65, 0x30, 0x2f, 0x5c, 0xee, 0xa7, 0xab, 0xdf, 0x13, 0xeb, 0x75,
+	0x55, 0x2c, 0xd9, 0x38, 0x9d, 0x35, 0x4a, 0xa1, 0x4d, 0xe6, 0xa8, 0x93, 0xed, 0xad, 0x4e, 0x9b,
+	0x61, 0xad, 0x67, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x93, 0x2a, 0xb7, 0x43, 0xf2, 0x01, 0x00,
+	0x00,
 }
diff --git a/controller/gen/controller/tap/tap.pb.go b/controller/gen/controller/tap/tap.pb.go
index 98f869d6f..37a30ec67 100644
--- a/controller/gen/controller/tap/tap.pb.go
+++ b/controller/gen/controller/tap/tap.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: controller/tap/tap.proto
+// source: controller/tap.proto
 
 /*
-Package conduit_controller_tap is a generated protocol buffer package.
+Package tap is a generated protocol buffer package.
 
 It is generated from these files:
-	controller/tap/tap.proto
+	controller/tap.proto
 
 It has these top-level messages:
 */
-package conduit_controller_tap
+package tap
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -189,22 +189,24 @@ var _Tap_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "controller/tap/tap.proto",
+	Metadata: "controller/tap.proto",
 }
 
-func init() { proto.RegisterFile("controller/tap/tap.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("controller/tap.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 175 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xce, 0xcf, 0x2b,
-	0x29, 0xca, 0xcf, 0xc9, 0x49, 0x2d, 0xd2, 0x2f, 0x49, 0x2c, 0x00, 0x61, 0xbd, 0x82, 0xa2, 0xfc,
-	0x92, 0x7c, 0x21, 0xb1, 0xe4, 0xfc, 0xbc, 0x94, 0xd2, 0xcc, 0x12, 0x3d, 0x84, 0x0a, 0xbd, 0x92,
-	0xc4, 0x02, 0x29, 0xe1, 0xe4, 0xfc, 0xdc, 0xdc, 0xfc, 0x3c, 0x7d, 0x08, 0x05, 0x51, 0x2c, 0x25,
-	0x50, 0x50, 0x9a, 0x94, 0x93, 0x99, 0xac, 0x9f, 0x58, 0x90, 0x09, 0x11, 0x31, 0x9a, 0xc7, 0xc8,
-	0xc5, 0x1c, 0x92, 0x58, 0x20, 0xe4, 0x04, 0xa1, 0xa4, 0xf4, 0x60, 0xc6, 0x41, 0x54, 0xea, 0x85,
-	0x24, 0x16, 0x04, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x48, 0x49, 0xe8, 0x21, 0xac, 0x02, 0x9b,
-	0x19, 0x92, 0x58, 0xe0, 0x5a, 0x96, 0x9a, 0x57, 0xa2, 0xc4, 0xdc, 0xc1, 0xc4, 0x68, 0xc0, 0x28,
-	0x14, 0xcc, 0xc5, 0x1b, 0x92, 0x58, 0xe0, 0x54, 0x19, 0x94, 0x5a, 0x9c, 0x5f, 0x5a, 0x94, 0x9c,
-	0x2a, 0xa4, 0x82, 0xc5, 0x34, 0x84, 0x34, 0x61, 0x73, 0x19, 0x0c, 0x18, 0x93, 0xd8, 0xc0, 0xee,
-	0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x8b, 0x2f, 0xad, 0x02, 0x01, 0x00, 0x00,
+	// 195 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0xce, 0xcf, 0x2b,
+	0x29, 0xca, 0xcf, 0xc9, 0x49, 0x2d, 0xd2, 0x2f, 0x49, 0x2c, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
+	0x17, 0x12, 0x4b, 0xce, 0xcf, 0x4b, 0x29, 0xcd, 0x2c, 0xd1, 0x43, 0xc8, 0xea, 0x95, 0x24, 0x16,
+	0x48, 0xf1, 0x24, 0xe7, 0xe7, 0xe6, 0xe6, 0xe7, 0x41, 0x54, 0x49, 0xf1, 0x14, 0x94, 0x26, 0xe5,
+	0x64, 0x26, 0x43, 0x78, 0x46, 0xf3, 0x18, 0xb9, 0x98, 0x43, 0x12, 0x0b, 0x84, 0x9c, 0x20, 0x94,
+	0x94, 0x1e, 0xcc, 0x0c, 0xa8, 0xaa, 0x90, 0xc4, 0x82, 0xa0, 0xd4, 0xc2, 0xd2, 0xd4, 0xe2, 0x12,
+	0x29, 0x09, 0x3d, 0x84, 0xf9, 0x60, 0xf3, 0x42, 0x12, 0x0b, 0x5c, 0xcb, 0x52, 0xf3, 0x4a, 0x94,
+	0x98, 0x3b, 0x98, 0x18, 0x0d, 0x18, 0x85, 0x82, 0xb9, 0x78, 0x43, 0x12, 0x0b, 0x9c, 0x2a, 0x83,
+	0x52, 0x8b, 0xf3, 0x4b, 0x8b, 0x92, 0x53, 0x85, 0x54, 0xb0, 0x98, 0x86, 0x90, 0x26, 0x6c, 0x2e,
+	0x83, 0x01, 0xa3, 0x93, 0x6d, 0x94, 0x75, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x12, 0x48, 0x56, 0xbf,
+	0xa8, 0x34, 0x0f, 0xaa, 0x58, 0x1f, 0x89, 0x86, 0x05, 0x45, 0x7a, 0x6a, 0x9e, 0x3e, 0x6a, 0xc8,
+	0x24, 0xb1, 0x81, 0xbd, 0x69, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x7b, 0x24, 0xcc, 0x32,
+	0x01, 0x00, 0x00,
 }
diff --git a/controller/gen/proxy/destination/destination.pb.go b/controller/gen/proxy/destination/destination.pb.go
index 9b7338be9..e169a0f67 100644
--- a/controller/gen/proxy/destination/destination.pb.go
+++ b/controller/gen/proxy/destination/destination.pb.go
@@ -1,11 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proxy/destination/destination.proto
+// source: proxy/destination.proto
 
 /*
-Package conduit_proxy_destination is a generated protocol buffer package.
+Package destination is a generated protocol buffer package.
 
 It is generated from these files:
-	proxy/destination/destination.proto
+	proxy/destination.proto
 
 It has these top-level messages:
 	Update
@@ -15,7 +15,7 @@ It has these top-level messages:
 	TlsIdentity
 	NoEndpoints
 */
-package conduit_proxy_destination
+package destination
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -521,46 +521,47 @@ var _Destination_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "proxy/destination/destination.proto",
+	Metadata: "proxy/destination.proto",
 }
 
-func init() { proto.RegisterFile("proxy/destination/destination.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("proxy/destination.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 548 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xdd, 0x6e, 0xd3, 0x30,
-	0x18, 0x6d, 0xda, 0x2d, 0x6b, 0xbf, 0xb4, 0x2a, 0x33, 0x3f, 0xca, 0xca, 0xcd, 0xc8, 0x04, 0x4c,
-	0x5c, 0x64, 0x53, 0x91, 0x50, 0x81, 0x01, 0x62, 0x62, 0xa2, 0xd5, 0xa0, 0x42, 0x66, 0x08, 0xae,
-	0x88, 0xbc, 0xd8, 0xda, 0xa2, 0x26, 0x76, 0x64, 0xbb, 0x63, 0x7d, 0x3d, 0xde, 0x83, 0x07, 0xe0,
-	0x9e, 0x07, 0x40, 0x75, 0x5c, 0x9a, 0x15, 0xd1, 0x55, 0xe2, 0x2a, 0xfe, 0xac, 0x73, 0x8e, 0xbf,
-	0x73, 0x3e, 0xc7, 0xb0, 0x93, 0x4b, 0x71, 0x39, 0xd9, 0xa3, 0x4c, 0xe9, 0x84, 0x13, 0x9d, 0x08,
-	0x5e, 0x5e, 0x87, 0xb9, 0x14, 0x5a, 0xa0, 0xad, 0x58, 0x70, 0x3a, 0x4e, 0x74, 0x68, 0xc0, 0x61,
-	0x09, 0xd0, 0xb9, 0x19, 0x8b, 0x2c, 0x13, 0x7c, 0xaf, 0xf8, 0x14, 0xf8, 0xe0, 0x87, 0x03, 0xee,
-	0xa7, 0x9c, 0x12, 0xcd, 0xd0, 0x4b, 0xa8, 0x11, 0x4a, 0x7d, 0x67, 0xdb, 0xd9, 0xf5, 0xba, 0x8f,
-	0xc2, 0x7f, 0x0a, 0x85, 0x9f, 0x59, 0x72, 0x76, 0xae, 0x19, 0x7d, 0x4d, 0xa9, 0xfc, 0xc8, 0x74,
-	0xbf, 0x82, 0xa7, 0x44, 0x74, 0x00, 0xae, 0x64, 0x99, 0xb8, 0x60, 0x7e, 0xd5, 0x48, 0x04, 0x4b,
-	0x24, 0xe6, 0x54, 0xcb, 0x41, 0xc7, 0xd0, 0xe4, 0x22, 0x62, 0x9c, 0xe6, 0x22, 0xe1, 0x5a, 0xf9,
-	0x35, 0xa3, 0xf1, 0x60, 0x89, 0xc6, 0x50, 0x1c, 0xcd, 0xd0, 0xfd, 0x0a, 0xf6, 0xf8, 0xbc, 0x3c,
-	0xac, 0x83, 0x3b, 0x36, 0xa6, 0x82, 0xe7, 0xb0, 0x61, 0xcf, 0x42, 0xfb, 0xb0, 0x4e, 0x28, 0x95,
-	0xca, 0x77, 0xb6, 0x6b, 0xbb, 0x5e, 0xb7, 0xf3, 0x47, 0xda, 0x06, 0x72, 0x12, 0xe7, 0x53, 0x28,
-	0x53, 0x0a, 0x17, 0xc0, 0xe0, 0x97, 0x03, 0xed, 0x05, 0xb3, 0xe8, 0xc5, 0x55, 0x95, 0x87, 0x2b,
-	0xe6, 0x64, 0x25, 0x11, 0x81, 0x56, 0xc6, 0xb4, 0x4c, 0xe2, 0x28, 0x25, 0xa7, 0x2c, 0x55, 0x7e,
-	0xd5, 0xc8, 0x1c, 0xac, 0x1e, 0x77, 0xf8, 0xde, 0xf0, 0xdf, 0x19, 0xfa, 0x11, 0xd7, 0x72, 0x82,
-	0x9b, 0x59, 0x69, 0xab, 0xf3, 0x0a, 0x36, 0xff, 0x82, 0xa0, 0x1b, 0x50, 0x1b, 0xb1, 0x89, 0x19,
-	0x6e, 0x03, 0x4f, 0x97, 0xe8, 0x16, 0xac, 0x5f, 0x90, 0x74, 0x5c, 0x4c, 0xab, 0x81, 0x8b, 0xe2,
-	0x59, 0xb5, 0xe7, 0x04, 0xdf, 0xab, 0xd0, 0x2c, 0x1f, 0x8a, 0x42, 0x58, 0x9b, 0x76, 0x6f, 0xaf,
-	0xc6, 0xb2, 0xe0, 0x0c, 0x0e, 0xdd, 0x01, 0xf7, 0x9b, 0xe1, 0x9b, 0x29, 0xb6, 0xb0, 0xad, 0xd0,
-	0xd7, 0x45, 0xf3, 0x6b, 0xc6, 0xfc, 0xd3, 0x15, 0xcd, 0x5f, 0xe7, 0x1c, 0x0d, 0xa0, 0xa9, 0x53,
-	0x15, 0x25, 0x94, 0x71, 0x9d, 0xe8, 0x89, 0xbf, 0x7e, 0xed, 0x1d, 0x3a, 0x49, 0xd5, 0xc0, 0xa2,
-	0xb1, 0xa7, 0xe7, 0xc5, 0xff, 0x87, 0xf8, 0xd3, 0x01, 0xaf, 0xa4, 0x8e, 0x28, 0x6c, 0x8e, 0x7a,
-	0x2a, 0xca, 0x05, 0x8d, 0x38, 0xc9, 0x98, 0xca, 0x49, 0xcc, 0x6c, 0xa0, 0x4f, 0x56, 0x6b, 0x30,
-	0x3c, 0xee, 0xa9, 0x0f, 0x82, 0x0e, 0x67, 0xec, 0x7e, 0x05, 0xb7, 0x47, 0x57, 0xb7, 0x3a, 0xe7,
-	0xd0, 0x5e, 0x40, 0xa1, 0x1d, 0x68, 0xc5, 0x82, 0x6b, 0x29, 0xd2, 0x94, 0xc9, 0x88, 0x2b, 0xdb,
-	0x7e, 0x73, 0xbe, 0x39, 0x54, 0xe8, 0x36, 0xb8, 0xa6, 0x33, 0x35, 0x33, 0x92, 0x0b, 0x3a, 0x54,
-	0x68, 0x0b, 0xea, 0xb3, 0x86, 0xcd, 0x28, 0x1b, 0x78, 0x23, 0x2f, 0xb4, 0x0f, 0x01, 0xea, 0x4a,
-	0x4b, 0xa2, 0xd9, 0xd9, 0x24, 0xb8, 0x0f, 0x5e, 0xe9, 0x67, 0x9c, 0x8e, 0x9f, 0x5d, 0x26, 0x4a,
-	0x17, 0x47, 0xd5, 0xb1, 0xad, 0xba, 0x5f, 0xc0, 0x7b, 0x33, 0xb7, 0x86, 0x06, 0x50, 0x7b, 0xcb,
-	0x34, 0xba, 0xbb, 0x78, 0x9d, 0x4a, 0x98, 0xce, 0xbd, 0x25, 0xd1, 0x14, 0xcf, 0x56, 0x50, 0xd9,
-	0x77, 0x4e, 0x5d, 0xf3, 0x98, 0x3d, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x60, 0xc3, 0x5a, 0x03,
-	0x23, 0x05, 0x00, 0x00,
+	// 571 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x5d, 0x6f, 0xd3, 0x30,
+	0x14, 0x6d, 0xda, 0x35, 0x6b, 0x6f, 0x52, 0x95, 0x59, 0x7c, 0x64, 0xe5, 0x65, 0x04, 0x01, 0x13,
+	0x0f, 0xe9, 0x54, 0x24, 0x54, 0x60, 0x0c, 0xa8, 0x98, 0x68, 0x35, 0xa8, 0x50, 0x18, 0x02, 0xf1,
+	0x40, 0x94, 0xc6, 0x56, 0x1b, 0x35, 0xb1, 0xa3, 0xd8, 0x1d, 0xeb, 0xdf, 0xe3, 0x7f, 0xf0, 0x03,
+	0x78, 0xe7, 0x07, 0xa0, 0x38, 0x2e, 0xcd, 0x3a, 0xd1, 0x55, 0xda, 0x53, 0x7b, 0xad, 0x73, 0x8e,
+	0xef, 0x39, 0xd7, 0xb9, 0x70, 0x27, 0x49, 0xd9, 0xf9, 0xbc, 0x8d, 0x09, 0x17, 0x21, 0xf5, 0x45,
+	0xc8, 0xa8, 0x93, 0xa4, 0x4c, 0x30, 0xb4, 0x1b, 0x30, 0x8a, 0x67, 0xa1, 0x70, 0x24, 0xc0, 0x29,
+	0x00, 0x5a, 0x66, 0xc0, 0xe2, 0x78, 0x01, 0xb4, 0x7f, 0x69, 0xa0, 0x7f, 0x4e, 0xb0, 0x2f, 0x08,
+	0x3a, 0x82, 0x8a, 0x8f, 0xb1, 0xa5, 0xed, 0x69, 0xfb, 0x46, 0xe7, 0xb1, 0xf3, 0x5f, 0x05, 0xe7,
+	0x0b, 0x09, 0xc7, 0x13, 0x41, 0xf0, 0x1b, 0x8c, 0xd3, 0x4f, 0x44, 0xf4, 0x4b, 0x6e, 0x46, 0x44,
+	0x87, 0xa0, 0xa7, 0x24, 0x66, 0x67, 0xc4, 0x2a, 0x4b, 0x09, 0x7b, 0x8d, 0xc4, 0x92, 0xaa, 0x38,
+	0xe8, 0x04, 0x4c, 0xca, 0x3c, 0x42, 0x71, 0xc2, 0x42, 0x2a, 0xb8, 0x55, 0x91, 0x1a, 0x0f, 0xd7,
+	0x68, 0x0c, 0xd9, 0xf1, 0x02, 0xdd, 0x2f, 0xb9, 0x06, 0x5d, 0x96, 0xbd, 0x1a, 0xe8, 0x33, 0x69,
+	0xca, 0x7e, 0x01, 0xdb, 0xea, 0x2e, 0x74, 0x00, 0x55, 0x1f, 0xe3, 0x94, 0x5b, 0xda, 0x5e, 0x65,
+	0xdf, 0xe8, 0xb4, 0xfe, 0x49, 0xab, 0x40, 0x4e, 0x83, 0x24, 0x83, 0x12, 0xce, 0xdd, 0x1c, 0x68,
+	0xff, 0xd1, 0xa0, 0xb9, 0x62, 0x16, 0xbd, 0xbc, 0xa8, 0xf2, 0x68, 0xc3, 0x9c, 0x94, 0x24, 0xf2,
+	0xa1, 0x11, 0x13, 0x91, 0x86, 0x81, 0x17, 0xf9, 0x23, 0x12, 0x71, 0xab, 0x2c, 0x65, 0x0e, 0x37,
+	0x8f, 0xdb, 0xf9, 0x20, 0xf9, 0xef, 0x25, 0xfd, 0x98, 0x8a, 0x74, 0xee, 0x9a, 0x71, 0xe1, 0xa8,
+	0xf5, 0x0a, 0x76, 0x2e, 0x41, 0xd0, 0x0d, 0xa8, 0x4c, 0xc9, 0x5c, 0x0e, 0xb7, 0xee, 0x66, 0x7f,
+	0xd1, 0x4d, 0xa8, 0x9e, 0xf9, 0xd1, 0x2c, 0x9f, 0x56, 0xdd, 0xcd, 0x8b, 0xe7, 0xe5, 0xae, 0x66,
+	0xff, 0x2c, 0x83, 0x59, 0xbc, 0x14, 0x39, 0xb0, 0x95, 0x75, 0xaf, 0x9e, 0xc6, 0xba, 0xe0, 0x24,
+	0x0e, 0xdd, 0x06, 0xfd, 0x87, 0xe4, 0xcb, 0x29, 0x36, 0x5c, 0x55, 0xa1, 0xef, 0xab, 0xe6, 0xb7,
+	0xa4, 0xf9, 0x67, 0x1b, 0x9a, 0xbf, 0xca, 0x39, 0x1a, 0x80, 0x29, 0x22, 0xee, 0x85, 0x98, 0x50,
+	0x11, 0x8a, 0xb9, 0x55, 0xbd, 0xf2, 0x0d, 0x9d, 0x46, 0x7c, 0xa0, 0xd0, 0xae, 0x21, 0x96, 0xc5,
+	0xf5, 0x43, 0xfc, 0xad, 0x81, 0x51, 0x50, 0x47, 0x18, 0x76, 0xa6, 0x5d, 0xee, 0x25, 0x0c, 0x7b,
+	0xd4, 0x8f, 0x09, 0x4f, 0xfc, 0x80, 0xa8, 0x40, 0x9f, 0x6e, 0xd6, 0xa0, 0x73, 0xd2, 0xe5, 0x1f,
+	0x19, 0x1e, 0x2e, 0xd8, 0xfd, 0x92, 0xdb, 0x9c, 0x5e, 0x3c, 0x6a, 0x4d, 0xa0, 0xb9, 0x82, 0x42,
+	0xf7, 0xa1, 0x11, 0x30, 0x2a, 0x52, 0x16, 0x45, 0x24, 0xf5, 0x28, 0x57, 0xed, 0x9b, 0xcb, 0xc3,
+	0x21, 0x47, 0xb7, 0x40, 0x97, 0x9d, 0xf1, 0x85, 0x91, 0x84, 0xe1, 0x21, 0x47, 0xbb, 0x50, 0x5b,
+	0x34, 0x2c, 0x47, 0x59, 0x77, 0xb7, 0x93, 0x5c, 0xbb, 0x07, 0x50, 0xe3, 0x22, 0xf5, 0x05, 0x19,
+	0xcf, 0xed, 0x07, 0x60, 0x14, 0x3e, 0xc6, 0x6c, 0xfc, 0xe4, 0x3c, 0xe4, 0x22, 0xbf, 0xaa, 0xe6,
+	0xaa, 0xaa, 0xf3, 0x15, 0x8c, 0xb7, 0x4b, 0x6b, 0x68, 0x00, 0x95, 0x77, 0x44, 0xa0, 0xbb, 0xab,
+	0xcf, 0xa9, 0x80, 0x69, 0xdd, 0x5b, 0x13, 0x4d, 0xbe, 0xb6, 0xec, 0xd2, 0x81, 0xd6, 0x7b, 0xfd,
+	0xed, 0x68, 0x1c, 0x8a, 0xc9, 0x6c, 0x94, 0x69, 0xb4, 0xd3, 0x19, 0x55, 0xac, 0x76, 0xe1, 0x57,
+	0x99, 0x6d, 0x8f, 0x09, 0x6d, 0x5f, 0x5a, 0x9b, 0x23, 0x5d, 0xae, 0xc3, 0x27, 0x7f, 0x03, 0x00,
+	0x00, 0xff, 0xff, 0xa6, 0xd5, 0x62, 0x19, 0x52, 0x05, 0x00, 0x00,
 }
diff --git a/controller/gen/proxy/tap/tap.pb.go b/controller/gen/proxy/tap/tap.pb.go
index 0c7006fdf..8be4d9e8b 100644
--- a/controller/gen/proxy/tap/tap.pb.go
+++ b/controller/gen/proxy/tap/tap.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proxy/tap/tap.proto
+// source: proxy/tap.proto
 
 /*
-Package conduit_proxy_tap is a generated protocol buffer package.
+Package tap is a generated protocol buffer package.
 
 It is generated from these files:
-	proxy/tap/tap.proto
+	proxy/tap.proto
 
 It has these top-level messages:
 	ObserveRequest
 */
-package conduit_proxy_tap
+package tap
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -952,49 +952,51 @@ var _Tap_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "proxy/tap/tap.proto",
+	Metadata: "proxy/tap.proto",
 }
 
-func init() { proto.RegisterFile("proxy/tap/tap.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("proxy/tap.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 606 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0x93, 0x38, 0x4e, 0x94, 0x89, 0x40, 0xed, 0x14, 0x55, 0xc6, 0xa7, 0xd2, 0x0b, 0x45,
-	0x80, 0x53, 0xb5, 0x20, 0x21, 0x21, 0x84, 0x5a, 0xa9, 0x92, 0x41, 0xf4, 0x0f, 0x9b, 0x1c, 0x38,
-	0x20, 0xa1, 0xad, 0xb3, 0xd4, 0x56, 0xed, 0xdd, 0xad, 0x3d, 0xa9, 0x9a, 0x17, 0xe0, 0x31, 0xb8,
-	0xf3, 0x6c, 0xbc, 0x04, 0xda, 0xf5, 0xa6, 0x84, 0xf6, 0x40, 0x0d, 0x87, 0x28, 0xb3, 0xbb, 0xf3,
-	0xfd, 0x3c, 0x1e, 0x7f, 0xb3, 0xb0, 0xa6, 0x4b, 0x75, 0x35, 0x1f, 0x11, 0xd7, 0xe6, 0x17, 0xe9,
-	0x52, 0x91, 0xc2, 0xd5, 0x44, 0xc9, 0xe9, 0x2c, 0xa3, 0xc8, 0x1e, 0x46, 0xc4, 0x75, 0xb8, 0x96,
-	0xa8, 0xa2, 0x50, 0x72, 0x54, 0xff, 0xd5, 0x79, 0x9b, 0xdf, 0x86, 0x70, 0xff, 0xf8, 0xb4, 0x12,
-	0xe5, 0xa5, 0x60, 0xe2, 0x62, 0x26, 0x2a, 0xc2, 0x07, 0xe0, 0xe7, 0x59, 0x91, 0x51, 0xd0, 0xde,
-	0x68, 0x6f, 0xdd, 0x63, 0xf5, 0x02, 0xdf, 0x80, 0x5f, 0x70, 0x4a, 0xd2, 0xa0, 0xb3, 0xd1, 0xde,
-	0x1a, 0xee, 0x3c, 0x8e, 0x6e, 0x3d, 0x20, 0xfa, 0x93, 0x13, 0x1d, 0x9a, 0x74, 0x56, 0xab, 0xc2,
-	0xef, 0x00, 0xbe, 0xdd, 0xc0, 0xb7, 0xe0, 0xf1, 0x3c, 0xb7, 0xf0, 0xe1, 0xce, 0xd3, 0x3b, 0x62,
-	0xa2, 0xb1, 0xb8, 0x88, 0x5b, 0xcc, 0x28, 0x2d, 0x40, 0xce, 0x5d, 0x1d, 0x8d, 0x01, 0x72, 0x8e,
-	0xaf, 0xc1, 0x93, 0x8a, 0x02, 0xaf, 0xd1, 0x8b, 0x18, 0xb1, 0x54, 0x84, 0x07, 0xd0, 0xab, 0xd4,
-	0xac, 0x4c, 0x44, 0xd0, 0x6d, 0x56, 0xc0, 0x24, 0xd1, 0x71, 0x8b, 0x39, 0x31, 0x1e, 0xc3, 0x70,
-	0x2a, 0x2a, 0xca, 0x24, 0xa7, 0x4c, 0xc9, 0xc0, 0xff, 0x17, 0xd6, 0x32, 0x01, 0xf7, 0xa1, 0x9b,
-	0x12, 0xe9, 0xa0, 0x67, 0x49, 0xcf, 0xee, 0x4a, 0x8a, 0x89, 0x0c, 0xca, 0x6a, 0xf1, 0x33, 0xac,
-	0x2e, 0x21, 0xbf, 0xe4, 0xfc, 0x54, 0xe4, 0x41, 0xdf, 0x02, 0x9f, 0xdf, 0x15, 0xf8, 0xc1, 0x88,
-	0xe2, 0x16, 0x5b, 0x59, 0x22, 0xd9, 0xbd, 0x30, 0x06, 0x6f, 0x2c, 0x2e, 0x70, 0x0f, 0xfa, 0xd6,
-	0x12, 0xa2, 0x0a, 0xda, 0x1b, 0x5e, 0x13, 0x2b, 0x2d, 0x74, 0xe1, 0x08, 0x7c, 0x8b, 0xc4, 0x15,
-	0xf0, 0xce, 0xc5, 0xdc, 0x7a, 0x69, 0xc0, 0x4c, 0x68, 0xcc, 0x7b, 0xc9, 0xf3, 0x99, 0xb0, 0xf6,
-	0x18, 0xb0, 0x7a, 0x11, 0xfe, 0xe8, 0x80, 0x37, 0x49, 0x34, 0x1e, 0x43, 0x5f, 0x0a, 0x2a, 0x78,
-	0x75, 0xee, 0xfc, 0xb7, 0xdb, 0xa0, 0xe3, 0xd1, 0x51, 0x2d, 0x8d, 0x5b, 0x6c, 0x41, 0xc1, 0x43,
-	0xf0, 0xb5, 0x2a, 0xa9, 0x72, 0x66, 0x7a, 0xd9, 0x04, 0x77, 0xa2, 0x4a, 0x62, 0x5c, 0x9e, 0x89,
-	0xb8, 0xc5, 0x6a, 0x4a, 0x18, 0x43, 0xdf, 0x3d, 0x04, 0x9f, 0x40, 0x27, 0xd3, 0xae, 0xca, 0x87,
-	0xd7, 0x58, 0x37, 0xbb, 0xef, 0x4e, 0xf6, 0xa6, 0xd3, 0x52, 0x54, 0x15, 0xeb, 0x64, 0x1a, 0x11,
-	0xba, 0xf6, 0x95, 0x3a, 0x76, 0x5e, 0x6d, 0x1c, 0x8e, 0x60, 0x70, 0xcd, 0x37, 0x6d, 0x2a, 0x32,
-	0xe9, 0xe6, 0xd9, 0x84, 0x76, 0x87, 0x5f, 0x39, 0x85, 0x09, 0xf7, 0xfb, 0x6e, 0xbe, 0xc3, 0x9f,
-	0x1d, 0xe8, 0x1a, 0x57, 0xe0, 0x36, 0xf4, 0xaa, 0x24, 0x15, 0x85, 0x70, 0x55, 0xac, 0xdf, 0xac,
-	0x62, 0x6c, 0x4f, 0xad, 0xa9, 0x6d, 0x84, 0x2f, 0xa0, 0x57, 0x08, 0x4a, 0xd5, 0xd4, 0xb5, 0x23,
-	0xbc, 0xa9, 0x30, 0xdc, 0x43, 0x9b, 0x61, 0x54, 0x75, 0x2e, 0x7e, 0x82, 0x01, 0x9f, 0x51, 0xaa,
-	0xca, 0x8c, 0x16, 0x53, 0xfd, 0xaa, 0x89, 0x7d, 0xa3, 0x31, 0x95, 0x99, 0x3c, 0x5b, 0x4c, 0xe9,
-	0x6f, 0x18, 0x1e, 0x41, 0x57, 0x73, 0x4a, 0xdd, 0xa4, 0xfe, 0x0f, 0xd4, 0x72, 0xc2, 0x18, 0x86,
-	0x4b, 0xdb, 0xb8, 0x0e, 0xbe, 0xb8, 0xe2, 0x49, 0x7d, 0x51, 0x0e, 0xcc, 0x57, 0xb4, 0x4b, 0x0c,
-	0xa0, 0xa7, 0x4b, 0xf1, 0x35, 0xab, 0xfb, 0x6b, 0x0e, 0xdc, 0xfa, 0xba, 0xc9, 0xb7, 0x83, 0x9d,
-	0x8f, 0xe0, 0x4d, 0xb8, 0xc6, 0xf7, 0xd0, 0x77, 0x35, 0xe1, 0xa3, 0xbf, 0xd6, 0x1b, 0x06, 0x37,
-	0x1b, 0x3c, 0xe1, 0xfa, 0xe0, 0x52, 0x48, 0xda, 0x6c, 0x6d, 0xb7, 0x4f, 0x7b, 0xf6, 0x8a, 0xdf,
-	0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0x72, 0xb2, 0x8e, 0x8f, 0x21, 0x06, 0x00, 0x00,
+	// 633 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcf, 0x6e, 0xd3, 0x4e,
+	0x10, 0xc7, 0x93, 0x38, 0x4e, 0x94, 0xc9, 0xef, 0x07, 0xed, 0x0a, 0x55, 0xc6, 0xa7, 0xd2, 0x0b,
+	0x45, 0x80, 0x5d, 0xb5, 0x80, 0x2a, 0x21, 0x84, 0x5a, 0xa9, 0x92, 0x41, 0xf4, 0x0f, 0x4e, 0x0e,
+	0x08, 0x21, 0xa1, 0x8d, 0xb3, 0xc4, 0x56, 0xed, 0xdd, 0xed, 0x7a, 0x5c, 0x35, 0x2f, 0xc0, 0x63,
+	0x70, 0xe7, 0xd9, 0x78, 0x09, 0xb4, 0xeb, 0x4d, 0x08, 0xed, 0x81, 0x1a, 0x4e, 0x99, 0xdd, 0x99,
+	0xef, 0x27, 0xe3, 0xc9, 0x77, 0x62, 0xb8, 0x2b, 0x95, 0xb8, 0x9a, 0x87, 0x48, 0x65, 0x20, 0x95,
+	0x40, 0x41, 0xd6, 0x13, 0xc1, 0xa7, 0x55, 0x86, 0x81, 0x49, 0x04, 0x48, 0xa5, 0xff, 0x5f, 0x22,
+	0x8a, 0x42, 0xf0, 0xba, 0x60, 0xeb, 0xeb, 0x10, 0xee, 0x9c, 0x4e, 0x4a, 0xa6, 0x2e, 0x59, 0xcc,
+	0x2e, 0x2a, 0x56, 0x22, 0xb9, 0x07, 0x6e, 0x9e, 0x15, 0x19, 0x7a, 0xed, 0xcd, 0xf6, 0xf6, 0xff,
+	0x71, 0x7d, 0x20, 0xaf, 0xc0, 0x2d, 0x28, 0x26, 0xa9, 0xd7, 0xd9, 0x6c, 0x6f, 0x0f, 0x77, 0x1f,
+	0x06, 0x37, 0xc8, 0xc1, 0xef, 0x9c, 0xe0, 0x58, 0x97, 0xc7, 0xb5, 0xca, 0xff, 0x06, 0xe0, 0x9a,
+	0x0b, 0xf2, 0x1a, 0x1c, 0x9a, 0xe7, 0x06, 0x3e, 0xdc, 0x7d, 0x7c, 0x4b, 0x4c, 0x30, 0x62, 0x17,
+	0x51, 0x2b, 0xd6, 0x4a, 0x03, 0xe0, 0x73, 0xdb, 0x47, 0x63, 0x00, 0x9f, 0x93, 0x97, 0xe0, 0x70,
+	0x81, 0x9e, 0xd3, 0xe8, 0x41, 0xb4, 0x98, 0x0b, 0x24, 0x47, 0xd0, 0x2b, 0x45, 0xa5, 0x12, 0xe6,
+	0x75, 0x9b, 0x35, 0x30, 0x4e, 0x64, 0xd4, 0x8a, 0xad, 0x98, 0x9c, 0xc2, 0x70, 0xca, 0x4a, 0xcc,
+	0x38, 0xc5, 0x4c, 0x70, 0xcf, 0xfd, 0x1b, 0xd6, 0x2a, 0x81, 0x1c, 0x42, 0x37, 0x45, 0x94, 0x5e,
+	0xcf, 0x90, 0x9e, 0xdc, 0x96, 0x14, 0x21, 0x6a, 0x94, 0xd1, 0x92, 0x4f, 0xb0, 0xbe, 0x82, 0xfc,
+	0x9c, 0xd3, 0x09, 0xcb, 0xbd, 0xbe, 0x01, 0x3e, 0xbd, 0x2d, 0xf0, 0x9d, 0x16, 0x45, 0xad, 0x78,
+	0x6d, 0x85, 0x64, 0xee, 0xfc, 0x08, 0x9c, 0x11, 0xbb, 0x20, 0x07, 0xd0, 0x37, 0x96, 0x60, 0xa5,
+	0xd7, 0xde, 0x74, 0x9a, 0x58, 0x69, 0xa1, 0xf3, 0x43, 0x70, 0x0d, 0x92, 0xac, 0x81, 0x73, 0xce,
+	0xe6, 0xc6, 0x4b, 0x83, 0x58, 0x87, 0xda, 0xbc, 0x97, 0x34, 0xaf, 0x98, 0xb1, 0xc7, 0x20, 0xae,
+	0x0f, 0xfe, 0xf7, 0x0e, 0x38, 0xe3, 0x44, 0x92, 0x53, 0xe8, 0x73, 0x86, 0x05, 0x2d, 0xcf, 0xad,
+	0xff, 0xf6, 0x1a, 0x4c, 0x3c, 0x38, 0xa9, 0xa5, 0x51, 0x2b, 0x5e, 0x50, 0xc8, 0x31, 0xb8, 0x52,
+	0x28, 0x2c, 0xad, 0x99, 0x9e, 0x37, 0xc1, 0x9d, 0x09, 0x85, 0x31, 0xe5, 0x33, 0x16, 0xb5, 0xe2,
+	0x9a, 0xe2, 0x47, 0xd0, 0xb7, 0x5f, 0x42, 0x1e, 0x41, 0x27, 0x93, 0xb6, 0xcb, 0xfb, 0x4b, 0xac,
+	0xdd, 0xdd, 0x37, 0x67, 0x07, 0xd3, 0xa9, 0x62, 0x65, 0x19, 0x77, 0x32, 0x49, 0x08, 0x74, 0xcd,
+	0x23, 0x75, 0xcc, 0xbe, 0x9a, 0xd8, 0x0f, 0x61, 0xb0, 0xe4, 0xeb, 0x31, 0x15, 0x19, 0xb7, 0xfb,
+	0xac, 0x43, 0x73, 0x43, 0xaf, 0xac, 0x42, 0x87, 0x87, 0x7d, 0xbb, 0xdf, 0xfe, 0x8f, 0x0e, 0x74,
+	0xb5, 0x2b, 0xc8, 0x0e, 0xf4, 0xca, 0x24, 0x65, 0x05, 0xb3, 0x5d, 0x6c, 0x5c, 0xef, 0x62, 0x64,
+	0xb2, 0xc6, 0xd4, 0x26, 0x22, 0xcf, 0xa0, 0x57, 0x30, 0x4c, 0xc5, 0xd4, 0x8e, 0xc3, 0xbf, 0xae,
+	0xd0, 0xdc, 0x63, 0x53, 0xa1, 0x55, 0x75, 0x2d, 0xf9, 0x00, 0x03, 0x5a, 0x61, 0x2a, 0x54, 0x86,
+	0x8b, 0xad, 0xde, 0x6f, 0x62, 0xdf, 0x60, 0x84, 0x2a, 0xe3, 0xb3, 0xc5, 0x96, 0xfe, 0x82, 0x91,
+	0x13, 0xe8, 0x4a, 0x8a, 0xa9, 0xdd, 0xd4, 0x7f, 0x81, 0x1a, 0x8e, 0x1f, 0xc1, 0x70, 0xe5, 0x9a,
+	0x6c, 0x80, 0xcb, 0xae, 0x68, 0x52, 0xff, 0x51, 0x0e, 0xf4, 0xaf, 0x68, 0x8e, 0xc4, 0x83, 0x9e,
+	0x54, 0xec, 0x4b, 0x56, 0xcf, 0x57, 0x27, 0xec, 0x79, 0x39, 0xe4, 0x9b, 0xc1, 0xee, 0x7b, 0x70,
+	0xc6, 0x54, 0x92, 0xb7, 0xd0, 0xb7, 0x3d, 0x91, 0x07, 0x7f, 0xec, 0xd7, 0xf7, 0xae, 0x0f, 0x78,
+	0x4c, 0xe5, 0xd1, 0x25, 0xe3, 0xb8, 0xd5, 0xda, 0x69, 0x1f, 0xee, 0x7f, 0x7c, 0x31, 0xcb, 0x30,
+	0xad, 0x26, 0x3a, 0x1b, 0xaa, 0x8a, 0xdb, 0xe2, 0x70, 0xe5, 0x13, 0x95, 0xc8, 0x73, 0xa6, 0xc2,
+	0x19, 0xe3, 0xe1, 0xf2, 0xe5, 0x31, 0xe9, 0x99, 0x97, 0xc3, 0xde, 0xcf, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x25, 0x39, 0x61, 0x18, 0x50, 0x06, 0x00, 0x00,
 }
diff --git a/controller/gen/public/api.pb.go b/controller/gen/public/public.pb.go
similarity index 86%
rename from controller/gen/public/api.pb.go
rename to controller/gen/public/public.pb.go
index 2d83b194b..814f4a192 100644
--- a/controller/gen/public/api.pb.go
+++ b/controller/gen/public/public.pb.go
@@ -1,11 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: public/api.proto
+// source: public.proto
 
 /*
-Package conduit_public is a generated protocol buffer package.
+Package public is a generated protocol buffer package.
 
 It is generated from these files:
-	public/api.proto
+	public.proto
 
 It has these top-level messages:
 	Empty
@@ -23,7 +23,7 @@ It has these top-level messages:
 	BasicStats
 	StatTable
 */
-package conduit_public
+package public
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -1740,99 +1740,100 @@ var _Api_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "public/api.proto",
+	Metadata: "public.proto",
 }
 
-func init() { proto.RegisterFile("public/api.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("public.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1397 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdf, 0x72, 0x1b, 0xb5,
-	0x17, 0xb6, 0x77, 0xed, 0xc4, 0x39, 0x4e, 0xd2, 0x54, 0xe9, 0xef, 0x37, 0x5b, 0x03, 0xc5, 0x6c,
-	0x4b, 0xc9, 0x14, 0x70, 0x32, 0x86, 0xcc, 0x90, 0x76, 0xa0, 0x6d, 0xda, 0x4c, 0x9d, 0xa1, 0xa5,
-	0x9e, 0x75, 0x06, 0x98, 0xe1, 0xc2, 0x23, 0xef, 0x2a, 0xf1, 0x92, 0x5d, 0x49, 0x59, 0x69, 0x09,
-	0x7e, 0x03, 0xae, 0xb8, 0xe6, 0x19, 0xe0, 0x06, 0xde, 0x85, 0x19, 0xee, 0x78, 0x02, 0x2e, 0x79,
-	0x00, 0x46, 0x7f, 0x76, 0x63, 0xbb, 0x49, 0x9b, 0xf6, 0xca, 0xd2, 0xa7, 0xef, 0x48, 0x47, 0xe7,
-	0x3b, 0xe7, 0xc8, 0x0b, 0x6b, 0x3c, 0x1f, 0x25, 0x71, 0xb8, 0x89, 0x79, 0xdc, 0xe1, 0x19, 0x93,
-	0x0c, 0xad, 0x86, 0x8c, 0x46, 0x79, 0x2c, 0x3b, 0x66, 0xa5, 0x75, 0xe3, 0x88, 0xb1, 0xa3, 0x84,
-	0x6c, 0xea, 0xd5, 0x51, 0x7e, 0xb8, 0x19, 0xe5, 0x19, 0x96, 0x31, 0xa3, 0x86, 0xdf, 0x5a, 0x0f,
-	0x59, 0x9a, 0x32, 0xba, 0x69, 0x7e, 0x2c, 0x78, 0xcb, 0x82, 0x63, 0x82, 0x13, 0x39, 0x0e, 0xc7,
-	0x24, 0x3c, 0x9e, 0x1e, 0x1b, 0x96, 0xbf, 0x08, 0xf5, 0xbd, 0x94, 0xcb, 0x89, 0x7f, 0x02, 0xcd,
-	0xaf, 0x49, 0x26, 0x62, 0x46, 0xf7, 0xe9, 0x21, 0x43, 0x6f, 0xc3, 0xd2, 0x11, 0xb3, 0x80, 0x57,
-	0x6d, 0x57, 0x37, 0x96, 0x82, 0x33, 0x40, 0xad, 0x8e, 0xf2, 0x38, 0x89, 0x1e, 0x63, 0x49, 0x3c,
-	0xc7, 0xac, 0x96, 0x00, 0xba, 0x0d, 0xab, 0x19, 0x49, 0x08, 0x16, 0xa4, 0xd8, 0xc0, 0xd5, 0x94,
-	0x39, 0xd4, 0xbf, 0x07, 0x6b, 0x4f, 0x63, 0x21, 0xfb, 0x2c, 0x12, 0x01, 0x11, 0x9c, 0x51, 0x41,
-	0xd0, 0x07, 0x50, 0xe3, 0x2c, 0x12, 0x5e, 0xb5, 0xed, 0x6e, 0x34, 0xbb, 0xeb, 0x9d, 0xd9, 0x48,
-	0x74, 0xfa, 0x2c, 0x0a, 0x34, 0xc1, 0xff, 0xc5, 0x01, 0xb7, 0xcf, 0x22, 0x84, 0xa0, 0x46, 0x71,
-	0x4a, 0xac, 0x8f, 0x7a, 0x8c, 0xae, 0x41, 0x9d, 0xb3, 0x68, 0xbf, 0x6f, 0x5d, 0x33, 0x13, 0x74,
-	0x03, 0x20, 0x22, 0x3c, 0x61, 0x93, 0x94, 0x50, 0x69, 0x5d, 0x9a, 0x42, 0xd0, 0xff, 0x61, 0x41,
-	0x48, 0x2c, 0x73, 0xe1, 0xd5, 0xf4, 0x9a, 0x9d, 0xa9, 0xdd, 0x70, 0x14, 0x91, 0xc8, 0xab, 0xb7,
-	0xab, 0x1b, 0x8d, 0xc0, 0x4c, 0xd0, 0x23, 0xb8, 0x22, 0x62, 0x1a, 0x92, 0xa7, 0x58, 0xc8, 0x80,
-	0x70, 0x96, 0x49, 0x6f, 0xa1, 0x5d, 0xdd, 0x68, 0x76, 0xaf, 0x77, 0x8c, 0x5a, 0x9d, 0x42, 0xad,
-	0xce, 0x63, 0xab, 0x56, 0x30, 0x6f, 0x81, 0xb6, 0x60, 0x3d, 0x64, 0x54, 0x66, 0x2c, 0x49, 0x48,
-	0xf6, 0x15, 0x4e, 0x89, 0xe0, 0x38, 0x24, 0xde, 0xa2, 0x3e, 0xff, 0xbc, 0x25, 0xe4, 0xc3, 0xb2,
-	0x85, 0xfb, 0x09, 0xa6, 0xc4, 0x6b, 0x68, 0x9f, 0x66, 0x30, 0xff, 0x57, 0x07, 0xe0, 0x00, 0xf3,
-	0x80, 0x9c, 0xe4, 0x44, 0x48, 0x84, 0xc0, 0xe5, 0x2c, 0x32, 0x01, 0xea, 0x55, 0x02, 0x35, 0x41,
-	0xed, 0x99, 0x58, 0x38, 0x76, 0x69, 0x2e, 0x1a, 0x29, 0xfe, 0x31, 0xe0, 0x42, 0x47, 0xca, 0x09,
-	0xec, 0x4c, 0xe1, 0x92, 0xf5, 0xd5, 0x75, 0x55, 0x94, 0x56, 0x02, 0x3b, 0x53, 0x3a, 0x48, 0xb6,
-	0xdf, 0xd7, 0x41, 0x5a, 0x0a, 0xf4, 0x18, 0xb5, 0xa0, 0x71, 0x98, 0xb1, 0xb4, 0x5f, 0x04, 0x67,
-	0x25, 0x28, 0xe7, 0x6a, 0x1f, 0x35, 0xde, 0xef, 0xdb, 0xdb, 0xda, 0x99, 0x56, 0x21, 0x1c, 0x93,
-	0xd4, 0x5c, 0x4d, 0xa9, 0xa0, 0x67, 0xda, 0x1f, 0x22, 0xc7, 0x2c, 0xf2, 0x96, 0x0c, 0x6e, 0x66,
-	0x2a, 0x15, 0x71, 0x2e, 0xc7, 0x2c, 0x8b, 0xe5, 0xc4, 0x03, 0x93, 0x8a, 0x25, 0xa0, 0xbc, 0xe2,
-	0x58, 0x8e, 0xbd, 0xa6, 0xf1, 0x4a, 0x8d, 0xef, 0x3a, 0x5e, 0x75, 0xb7, 0x01, 0x0b, 0x12, 0x67,
-	0x47, 0x44, 0xfa, 0x7f, 0xd7, 0xe1, 0xda, 0x01, 0xe6, 0xbb, 0x93, 0x80, 0x08, 0x96, 0x67, 0x21,
-	0x29, 0xc2, 0xb6, 0x53, 0x50, 0x74, 0xe4, 0x9a, 0xdd, 0xf7, 0xe6, 0x73, 0xb1, 0x30, 0x18, 0x90,
-	0x84, 0x84, 0x5a, 0x5f, 0x6b, 0x80, 0x1e, 0x40, 0x3d, 0xc5, 0x32, 0x1c, 0xeb, 0xc0, 0x36, 0xbb,
-	0x77, 0xe6, 0x2d, 0xcf, 0x3b, 0xaf, 0xf3, 0x4c, 0x59, 0x04, 0xc6, 0xf0, 0xa2, 0xe8, 0xb7, 0x7e,
-	0xaf, 0x41, 0x5d, 0x13, 0xd1, 0x2e, 0xb8, 0x38, 0x49, 0xac, 0x6f, 0x9d, 0xcb, 0x9f, 0xd0, 0x19,
-	0x90, 0x13, 0x95, 0x05, 0x38, 0x49, 0xf4, 0x1e, 0x74, 0x62, 0xbd, 0x7c, 0x93, 0x3d, 0xe8, 0x04,
-	0x7d, 0x01, 0x2e, 0x65, 0xa6, 0x9c, 0x5e, 0xeb, 0xa6, 0xca, 0x9e, 0x32, 0x89, 0x9e, 0xc0, 0x72,
-	0x44, 0x84, 0x8c, 0xa9, 0x2e, 0x11, 0x53, 0x7b, 0x97, 0x09, 0x76, 0xaf, 0x12, 0xcc, 0x18, 0xa2,
-	0x3d, 0xa8, 0x8d, 0xa5, 0xe4, 0x3a, 0x01, 0x9b, 0xdd, 0xcd, 0xd7, 0xb8, 0x4d, 0x4f, 0x4a, 0xde,
-	0xab, 0x04, 0xda, 0xbc, 0xf5, 0x25, 0xb8, 0x03, 0x72, 0x82, 0x1e, 0xc3, 0xa2, 0x56, 0x82, 0x14,
-	0xad, 0xe8, 0x75, 0x44, 0x2c, 0x4c, 0x5b, 0x13, 0xa8, 0xa9, 0xcd, 0x91, 0x57, 0x26, 0x75, 0x51,
-	0x85, 0x45, 0x5a, 0x7b, 0x65, 0x5a, 0x17, 0x45, 0x58, 0x24, 0xf6, 0x8d, 0xe9, 0xc4, 0x76, 0xed,
-	0xe2, 0x54, 0x6a, 0x5f, 0xb3, 0xa9, 0x5d, 0xb3, 0x4b, 0x7a, 0xb6, 0xbb, 0x68, 0x53, 0xaf, 0x1c,
-	0xf8, 0x6d, 0x68, 0x3c, 0xe4, 0xf1, 0x5e, 0x96, 0xb1, 0x4c, 0xb5, 0x32, 0xa2, 0x06, 0xb6, 0x5b,
-	0x9a, 0x89, 0xdf, 0x87, 0x46, 0x71, 0x0f, 0x55, 0x4e, 0xb4, 0xec, 0x43, 0xb6, 0xef, 0x97, 0x80,
-	0x2e, 0xf2, 0x09, 0x2f, 0x5a, 0xbe, 0x1e, 0x97, 0x0d, 0xd8, 0x3d, 0x6b, 0xc0, 0x3e, 0x87, 0xab,
-	0x2f, 0x08, 0x86, 0x3e, 0x85, 0x46, 0x66, 0x41, 0x9b, 0xb6, 0xde, 0x45, 0x2a, 0x07, 0x25, 0x13,
-	0xbd, 0x0f, 0xab, 0x09, 0x1e, 0x91, 0x64, 0x28, 0xf4, 0x46, 0x2c, 0xb3, 0x87, 0xaf, 0x68, 0x74,
-	0x60, 0x41, 0xff, 0x3b, 0x58, 0x29, 0x8c, 0xcd, 0x55, 0xdf, 0xec, 0xb4, 0x32, 0x40, 0xce, 0x74,
-	0x80, 0x7e, 0x73, 0x00, 0x0d, 0x24, 0x96, 0x83, 0x3c, 0x4d, 0x71, 0x36, 0x29, 0x3a, 0xc4, 0xe7,
-	0xd0, 0x28, 0x9d, 0xba, 0x74, 0x8f, 0x28, 0x4d, 0xd0, 0xbb, 0xd0, 0x94, 0x71, 0x4a, 0x86, 0xa7,
-	0x31, 0x8d, 0xd8, 0xa9, 0x3d, 0x11, 0x14, 0xf4, 0x8d, 0x46, 0xd0, 0x87, 0x50, 0xa3, 0x8c, 0x12,
-	0x5b, 0x5b, 0xff, 0x9b, 0xdf, 0x5b, 0xbf, 0xdb, 0x4a, 0x78, 0x45, 0x42, 0xf7, 0xa0, 0x29, 0xd9,
-	0xb0, 0xbc, 0x72, 0xed, 0xe5, 0x57, 0x56, 0xcd, 0x5e, 0xb2, 0x52, 0xf5, 0xfb, 0xb0, 0xa2, 0xda,
-	0xef, 0x99, 0x79, 0xfd, 0x95, 0xe6, 0xcb, 0xca, 0xa0, 0x98, 0xef, 0x02, 0x34, 0x58, 0x2e, 0x47,
-	0x2c, 0xa7, 0x91, 0xff, 0x67, 0x15, 0xd6, 0x67, 0xa2, 0x65, 0x9f, 0xf6, 0xcf, 0xc0, 0x61, 0xc7,
-	0x36, 0x50, 0xb7, 0xe7, 0x77, 0x3e, 0xc7, 0xa0, 0xf3, 0xfc, 0xb8, 0x57, 0x09, 0x1c, 0x76, 0x8c,
-	0xb6, 0xa7, 0x55, 0x69, 0x76, 0xdf, 0xb9, 0xc8, 0x2d, 0xad, 0x7c, 0xaf, 0x62, 0x65, 0x6b, 0x3d,
-	0x00, 0xe7, 0xf9, 0x31, 0xba, 0x0b, 0x4d, 0xf5, 0x90, 0x0f, 0x25, 0x1e, 0x25, 0x65, 0x35, 0x5f,
-	0x3f, 0xef, 0xfc, 0x03, 0xc5, 0x08, 0x40, 0x14, 0x43, 0xa1, 0xae, 0x95, 0x59, 0x6f, 0xfc, 0x7f,
-	0xab, 0x00, 0xbb, 0x58, 0xc4, 0xa1, 0xa2, 0x0a, 0x74, 0x13, 0x56, 0x44, 0x1e, 0x86, 0x44, 0x88,
-	0x61, 0xc8, 0x72, 0x6a, 0x5e, 0x89, 0x5a, 0xb0, 0x6c, 0xc1, 0x47, 0x0a, 0x53, 0xa4, 0x43, 0x1c,
-	0x27, 0x79, 0x46, 0x2c, 0xc9, 0x31, 0x24, 0x0b, 0x1a, 0xd2, 0x2d, 0x95, 0xe1, 0x92, 0xd0, 0x70,
-	0x32, 0x4c, 0xc5, 0x90, 0x6f, 0x6f, 0x69, 0xc1, 0x6b, 0xc1, 0xb2, 0x45, 0x9f, 0x89, 0xfe, 0xf6,
-	0xd6, 0x3c, 0x6b, 0x67, 0x5b, 0x4b, 0x3c, 0xc3, 0xda, 0xd9, 0x7e, 0x81, 0xb5, 0xa3, 0x95, 0x9c,
-	0x65, 0xed, 0xa0, 0x3b, 0x70, 0x55, 0x26, 0x62, 0x98, 0x99, 0x3c, 0xb6, 0xae, 0x2d, 0x68, 0xe2,
-	0x15, 0x99, 0x08, 0x9b, 0xdf, 0xda, 0x3b, 0xff, 0x0f, 0x17, 0x96, 0xca, 0xe0, 0xa0, 0x87, 0xb0,
-	0xc4, 0x59, 0x34, 0x3c, 0xca, 0x58, 0xce, 0xad, 0x94, 0xfe, 0x85, 0xa1, 0x54, 0xff, 0xd6, 0x9e,
-	0x28, 0x66, 0xaf, 0x12, 0x34, 0xb8, 0x1d, 0xb7, 0xfe, 0x72, 0xa0, 0x51, 0x2c, 0xa0, 0xbb, 0x50,
-	0xcb, 0xd8, 0x69, 0xa1, 0xca, 0xed, 0x57, 0x6f, 0xd5, 0x09, 0xd8, 0x69, 0xa0, 0x6d, 0x5a, 0x3f,
-	0x3b, 0xe0, 0x06, 0xec, 0xf4, 0x0d, 0x2b, 0xfd, 0x95, 0xd5, 0xb7, 0x01, 0x6b, 0x29, 0x11, 0x63,
-	0x12, 0x0d, 0xd5, 0x8d, 0x4d, 0x8c, 0x8c, 0x30, 0xab, 0x06, 0xef, 0xb3, 0xc8, 0x08, 0x78, 0x07,
-	0xae, 0x66, 0x39, 0xa5, 0x31, 0x3d, 0x9a, 0xa2, 0x1a, 0x75, 0xae, 0xd8, 0x85, 0x92, 0xbb, 0x01,
-	0x6b, 0x4a, 0xfc, 0x99, 0x5d, 0x4d, 0xe4, 0x57, 0x0d, 0x5e, 0x32, 0xb7, 0xa0, 0xae, 0x32, 0x51,
-	0xd8, 0x5a, 0x6c, 0xcd, 0xdf, 0xe9, 0x2c, 0x17, 0x03, 0x43, 0x54, 0x2d, 0x5f, 0x27, 0x79, 0xf7,
-	0x1f, 0x17, 0xdc, 0x87, 0x3c, 0x46, 0xdf, 0x42, 0x73, 0xaa, 0xae, 0x90, 0xff, 0xd2, 0xa2, 0xd3,
-	0x9a, 0xb7, 0x6e, 0x5e, 0xa2, 0x30, 0xfd, 0x0a, 0xda, 0x83, 0x46, 0xf1, 0xd7, 0x1d, 0x9d, 0xdf,
-	0x98, 0x5a, 0xed, 0x79, 0x78, 0xfe, 0xbf, 0xbe, 0x5f, 0x51, 0x7f, 0x40, 0x0e, 0x30, 0x47, 0xad,
-	0x73, 0xde, 0xd6, 0xc2, 0xa1, 0x33, 0x2d, 0xed, 0xd7, 0xcd, 0x01, 0xe6, 0x7b, 0x3f, 0x10, 0x2a,
-	0x7d, 0xf7, 0x27, 0xa7, 0xba, 0x55, 0x45, 0x03, 0x58, 0x99, 0x79, 0x8a, 0xd1, 0xad, 0xcb, 0xbc,
-	0xd4, 0x2f, 0xd9, 0xb7, 0xb2, 0x55, 0x45, 0xf7, 0x61, 0xb1, 0xf8, 0xd6, 0xb9, 0xe0, 0x7a, 0x6f,
-	0xcd, 0xc3, 0x53, 0x5f, 0x4f, 0x7e, 0x05, 0x7d, 0x0f, 0x4b, 0x03, 0x92, 0x1c, 0x3e, 0x52, 0x9f,
-	0x5a, 0xe8, 0xa3, 0xf9, 0xb3, 0xa6, 0xbf, 0xc3, 0x4a, 0x5a, 0xe1, 0xd9, 0xc7, 0x97, 0x64, 0x17,
-	0x51, 0x1c, 0x2d, 0xe8, 0x2f, 0x8d, 0x4f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x3d, 0xa6,
-	0x25, 0x49, 0x0e, 0x00, 0x00,
+	// 1418 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x72, 0x1b, 0xc5,
+	0x12, 0x96, 0x76, 0x25, 0x5b, 0x6e, 0x49, 0x4e, 0x32, 0xc9, 0x39, 0xb5, 0xd1, 0x39, 0x27, 0x47,
+	0x6c, 0x42, 0x70, 0x05, 0x90, 0x5c, 0x0a, 0xae, 0xc2, 0x49, 0x41, 0x12, 0x25, 0xae, 0xc8, 0x45,
+	0x42, 0x54, 0x2b, 0x17, 0x50, 0x70, 0xa1, 0x1a, 0xed, 0x8e, 0xa5, 0xc5, 0xbb, 0x33, 0xeb, 0x9d,
+	0x59, 0x8c, 0xde, 0x80, 0x2b, 0xae, 0x79, 0x06, 0xb8, 0x81, 0x77, 0xa1, 0x8a, 0x3b, 0x9e, 0x80,
+	0x4b, 0x1e, 0x80, 0x9a, 0x9f, 0x5d, 0x4b, 0x8a, 0x9d, 0x38, 0xb9, 0xd2, 0x74, 0xcf, 0xd7, 0x33,
+	0xdd, 0xfd, 0x75, 0xf7, 0x6a, 0xa0, 0x91, 0x64, 0x93, 0x28, 0xf4, 0x3b, 0x49, 0xca, 0x04, 0x43,
+	0x9b, 0x3e, 0xa3, 0x41, 0x16, 0x8a, 0x8e, 0xd6, 0xb6, 0x6e, 0x4c, 0x19, 0x9b, 0x46, 0xa4, 0xab,
+	0x76, 0x27, 0xd9, 0x61, 0x37, 0xc8, 0x52, 0x2c, 0x42, 0x46, 0x35, 0xbe, 0xd5, 0xf0, 0x59, 0x1c,
+	0x17, 0x92, 0xa3, 0xa5, 0xee, 0x8c, 0xe0, 0x48, 0xcc, 0xfc, 0x19, 0xf1, 0x8f, 0xf4, 0x8e, 0xbb,
+	0x0e, 0xd5, 0xbd, 0x38, 0x11, 0x73, 0xf7, 0x18, 0xea, 0x5f, 0x90, 0x94, 0x87, 0x8c, 0xee, 0xd3,
+	0x43, 0x86, 0xfe, 0x0b, 0x1b, 0x53, 0x66, 0x14, 0x4e, 0xb9, 0x5d, 0xde, 0xda, 0xf0, 0x4e, 0x15,
+	0x72, 0x77, 0x92, 0x85, 0x51, 0xf0, 0x04, 0x0b, 0xe2, 0x58, 0x7a, 0xb7, 0x50, 0xa0, 0xdb, 0xb0,
+	0x99, 0x92, 0x88, 0x60, 0x4e, 0xf2, 0x03, 0x6c, 0x05, 0x59, 0xd1, 0xba, 0xf7, 0xe1, 0xf2, 0xb3,
+	0x90, 0x8b, 0x21, 0x0b, 0xb8, 0x47, 0x78, 0xc2, 0x28, 0x27, 0xe8, 0x3d, 0xa8, 0x24, 0x2c, 0xe0,
+	0x4e, 0xb9, 0x6d, 0x6f, 0xd5, 0x7b, 0x57, 0x3b, 0xcb, 0x61, 0x77, 0x86, 0x2c, 0xf0, 0x14, 0xc0,
+	0xfd, 0xc9, 0x02, 0x7b, 0xc8, 0x02, 0x84, 0xa0, 0x42, 0x71, 0x4c, 0x8c, 0x8f, 0x6a, 0x8d, 0xae,
+	0x41, 0x35, 0x61, 0xc1, 0xfe, 0xd0, 0xb8, 0xa6, 0x05, 0x74, 0x03, 0x20, 0x20, 0x49, 0xc4, 0xe6,
+	0x31, 0xa1, 0xc2, 0xb8, 0xb4, 0xa0, 0x41, 0xff, 0x86, 0x35, 0x2e, 0xb0, 0xc8, 0xb8, 0x53, 0x51,
+	0x7b, 0x46, 0x92, 0xa7, 0xe1, 0x20, 0x20, 0x81, 0x53, 0x6d, 0x97, 0xb7, 0x6a, 0x9e, 0x16, 0xd0,
+	0x63, 0xb8, 0xc4, 0x43, 0xea, 0x93, 0x67, 0x98, 0x0b, 0x8f, 0x24, 0x2c, 0x15, 0xce, 0x5a, 0xbb,
+	0xbc, 0x55, 0xef, 0x5d, 0xef, 0x68, 0x6a, 0x3a, 0x39, 0x35, 0x9d, 0x27, 0x86, 0x1a, 0x6f, 0xd5,
+	0x02, 0x6d, 0xc3, 0x55, 0x9f, 0x51, 0x91, 0xb2, 0x28, 0x22, 0xe9, 0xe7, 0x38, 0x26, 0x3c, 0xc1,
+	0x3e, 0x71, 0xd6, 0xd5, 0xfd, 0x67, 0x6d, 0x21, 0x17, 0x1a, 0x46, 0x3d, 0x8c, 0x30, 0x25, 0x4e,
+	0x4d, 0xf9, 0xb4, 0xa4, 0x73, 0x7f, 0xb6, 0x00, 0x0e, 0x70, 0xe2, 0x91, 0xe3, 0x8c, 0x70, 0x81,
+	0x10, 0xd8, 0x09, 0x0b, 0x74, 0x82, 0x06, 0x25, 0x4f, 0x0a, 0xa8, 0xbd, 0x94, 0x0b, 0xcb, 0x6c,
+	0xad, 0x64, 0x23, 0xc6, 0xdf, 0x7b, 0x09, 0x57, 0x99, 0xb2, 0x3c, 0x23, 0x49, 0xbd, 0x60, 0x43,
+	0x19, 0xae, 0xcc, 0x52, 0xd3, 0x33, 0x92, 0xe4, 0x41, 0xb0, 0xfd, 0xa1, 0x4a, 0xd2, 0x86, 0xa7,
+	0xd6, 0xa8, 0x05, 0xb5, 0xc3, 0x94, 0xc5, 0xc3, 0x3c, 0x39, 0x4d, 0xaf, 0x90, 0xe5, 0x39, 0x72,
+	0xbd, 0x3f, 0x34, 0xd1, 0x1a, 0x49, 0xb1, 0xe0, 0xcf, 0x48, 0xac, 0x43, 0x93, 0x2c, 0x28, 0x49,
+	0xf9, 0x43, 0xc4, 0x8c, 0x05, 0xce, 0x86, 0xd6, 0x6b, 0x49, 0x96, 0x22, 0xce, 0xc4, 0x8c, 0xa5,
+	0xa1, 0x98, 0x3b, 0xa0, 0x4b, 0xb1, 0x50, 0x48, 0xaf, 0x12, 0x2c, 0x66, 0x4e, 0x5d, 0x7b, 0x25,
+	0xd7, 0xf7, 0x2c, 0xa7, 0xdc, 0xaf, 0xc1, 0x9a, 0xc0, 0xe9, 0x94, 0x08, 0xf7, 0xcf, 0x2a, 0x5c,
+	0x3b, 0xc0, 0x49, 0x7f, 0xee, 0x11, 0xce, 0xb2, 0xd4, 0x27, 0x79, 0xda, 0x76, 0x73, 0x88, 0xca,
+	0x5c, 0xbd, 0xf7, 0xce, 0x6a, 0x2d, 0xe6, 0x06, 0x23, 0x12, 0x11, 0x5f, 0xf1, 0x6b, 0x0c, 0xd0,
+	0x43, 0xa8, 0xc6, 0x58, 0xf8, 0x33, 0x95, 0xd8, 0x7a, 0xef, 0xce, 0xaa, 0xe5, 0x59, 0xf7, 0x75,
+	0x9e, 0x4b, 0x0b, 0x4f, 0x1b, 0x9e, 0x97, 0xfd, 0xd6, 0xaf, 0x15, 0xa8, 0x2a, 0x20, 0xea, 0x83,
+	0x8d, 0xa3, 0xc8, 0xf8, 0xd6, 0xb9, 0xf8, 0x0d, 0x9d, 0x11, 0x39, 0x96, 0x55, 0x80, 0xa3, 0x48,
+	0x9d, 0x41, 0xe7, 0xc6, 0xcb, 0xb7, 0x39, 0x83, 0xce, 0xd1, 0xa7, 0x60, 0x53, 0xa6, 0xdb, 0xe9,
+	0x8d, 0x22, 0x95, 0xf6, 0x94, 0x09, 0xf4, 0x14, 0x1a, 0x01, 0xe1, 0x22, 0xa4, 0xaa, 0x45, 0x74,
+	0xef, 0x5d, 0x24, 0xd9, 0x83, 0x92, 0xb7, 0x64, 0x88, 0xf6, 0xa0, 0x32, 0x13, 0x22, 0x51, 0x05,
+	0x58, 0xef, 0x75, 0xdf, 0x20, 0x9a, 0x81, 0x10, 0xc9, 0xa0, 0xe4, 0x29, 0xf3, 0xd6, 0x67, 0x60,
+	0x8f, 0xc8, 0x31, 0x7a, 0x02, 0xeb, 0x8a, 0x09, 0x92, 0x8f, 0xa2, 0x37, 0x21, 0x31, 0x37, 0x6d,
+	0xcd, 0xa1, 0x22, 0x0f, 0x47, 0x4e, 0x51, 0xd4, 0x79, 0x17, 0xe6, 0x65, 0xed, 0x14, 0x65, 0x9d,
+	0x37, 0x61, 0x5e, 0xd8, 0x37, 0x16, 0x0b, 0xdb, 0x36, 0x9b, 0x0b, 0xa5, 0x7d, 0xcd, 0x94, 0x76,
+	0xc5, 0x6c, 0x29, 0xa9, 0xbf, 0x6e, 0x4a, 0xaf, 0x58, 0xb8, 0x6d, 0xa8, 0x3d, 0x4a, 0xc2, 0xbd,
+	0x34, 0x65, 0xa9, 0x1c, 0x65, 0x44, 0x2e, 0xcc, 0xb4, 0xd4, 0x82, 0x3b, 0x84, 0x5a, 0x1e, 0x87,
+	0x6c, 0x27, 0x5a, 0xcc, 0x21, 0x33, 0xf7, 0x0b, 0x85, 0x6a, 0xf2, 0x79, 0x92, 0x8f, 0x7c, 0xb5,
+	0x2e, 0x06, 0xb0, 0x7d, 0x3a, 0x80, 0xdd, 0x04, 0xae, 0xbc, 0x44, 0x18, 0xfa, 0x08, 0x6a, 0xa9,
+	0x51, 0x9a, 0xb2, 0x75, 0xce, 0x63, 0xd9, 0x2b, 0x90, 0xe8, 0x5d, 0xd8, 0x8c, 0xf0, 0x84, 0x44,
+	0x63, 0xae, 0x0e, 0x62, 0xa9, 0xb9, 0xbc, 0xa9, 0xb4, 0x23, 0xa3, 0x74, 0xbf, 0x81, 0x66, 0x6e,
+	0xac, 0x43, 0x7d, 0xbb, 0xdb, 0x8a, 0x04, 0x59, 0x8b, 0x09, 0xfa, 0xc5, 0x02, 0x34, 0x12, 0x58,
+	0x8c, 0xb2, 0x38, 0xc6, 0xe9, 0x3c, 0x9f, 0x10, 0x9f, 0x40, 0xad, 0x70, 0xea, 0xc2, 0x33, 0xa2,
+	0x30, 0x41, 0xff, 0x87, 0xba, 0x08, 0x63, 0x32, 0x3e, 0x09, 0x69, 0xc0, 0x4e, 0xcc, 0x8d, 0x20,
+	0x55, 0x5f, 0x2a, 0x0d, 0x7a, 0x1f, 0x2a, 0x94, 0x51, 0x62, 0x7a, 0xeb, 0x5f, 0xab, 0x67, 0xab,
+	0xef, 0xb6, 0x24, 0x5e, 0x82, 0xd0, 0x7d, 0xa8, 0x0b, 0x36, 0x2e, 0x42, 0xae, 0xbc, 0x3a, 0x64,
+	0x39, 0xec, 0x05, 0x2b, 0x58, 0x7f, 0x00, 0x4d, 0x39, 0x7e, 0x4f, 0xcd, 0xab, 0xaf, 0x35, 0x6f,
+	0x48, 0x83, 0x5c, 0xee, 0x03, 0xd4, 0x58, 0x26, 0x26, 0x2c, 0xa3, 0x81, 0xfb, 0x7b, 0x19, 0xae,
+	0x2e, 0x65, 0xcb, 0x7c, 0xda, 0x3f, 0x06, 0x8b, 0x1d, 0x99, 0x44, 0xdd, 0x5e, 0x3d, 0xf9, 0x0c,
+	0x83, 0xce, 0x8b, 0xa3, 0x41, 0xc9, 0xb3, 0xd8, 0x11, 0xda, 0x59, 0x64, 0xa5, 0xde, 0xfb, 0xdf,
+	0x79, 0x6e, 0x29, 0xe6, 0x07, 0x25, 0x43, 0x5b, 0xeb, 0x21, 0x58, 0x2f, 0x8e, 0xd0, 0x3d, 0xa8,
+	0xcb, 0x0f, 0xf9, 0x58, 0xe0, 0x49, 0x54, 0x74, 0xf3, 0xf5, 0xb3, 0xee, 0x3f, 0x90, 0x08, 0x0f,
+	0x78, 0xbe, 0xe4, 0x32, 0xac, 0xd4, 0x78, 0xe3, 0xfe, 0x5d, 0x06, 0xe8, 0x63, 0x1e, 0xfa, 0x12,
+	0xca, 0xd1, 0x4d, 0x68, 0xf2, 0xcc, 0xf7, 0x09, 0xe7, 0x63, 0x9f, 0x65, 0x54, 0x7f, 0x25, 0x2a,
+	0x5e, 0xc3, 0x28, 0x1f, 0x4b, 0x9d, 0x04, 0x1d, 0xe2, 0x30, 0xca, 0x52, 0x62, 0x40, 0x96, 0x06,
+	0x19, 0xa5, 0x06, 0xdd, 0x92, 0x15, 0x2e, 0x08, 0xf5, 0xe7, 0xe3, 0x98, 0x8f, 0x93, 0x9d, 0x6d,
+	0x45, 0x78, 0xc5, 0x6b, 0x18, 0xed, 0x73, 0x3e, 0xdc, 0xd9, 0x5e, 0x45, 0xed, 0xee, 0x28, 0x8a,
+	0x97, 0x50, 0xbb, 0x3b, 0x2f, 0xa1, 0x76, 0x15, 0x93, 0xcb, 0xa8, 0x5d, 0x74, 0x07, 0xae, 0x88,
+	0x88, 0x8f, 0x53, 0x5d, 0xc7, 0xc6, 0xb5, 0x35, 0x05, 0xbc, 0x24, 0x22, 0x6e, 0xea, 0x5b, 0x79,
+	0xe7, 0xfe, 0x66, 0xc3, 0x46, 0x91, 0x1c, 0xf4, 0x08, 0x36, 0x12, 0x16, 0x8c, 0xa7, 0x29, 0xcb,
+	0x12, 0x43, 0xa5, 0x7b, 0x6e, 0x2a, 0xe5, 0xbf, 0xb5, 0xa7, 0x12, 0x39, 0x28, 0x79, 0xb5, 0xc4,
+	0xac, 0x5b, 0x7f, 0x58, 0x50, 0xcb, 0x37, 0xd0, 0x3d, 0xa8, 0xa4, 0xec, 0x24, 0x67, 0xe5, 0xf6,
+	0xeb, 0x8f, 0xea, 0x78, 0xec, 0xc4, 0x53, 0x36, 0xad, 0x1f, 0x2d, 0xb0, 0x3d, 0x76, 0xf2, 0x96,
+	0x9d, 0xfe, 0xda, 0xee, 0xdb, 0x82, 0xcb, 0x31, 0xe1, 0x33, 0x12, 0x8c, 0x65, 0xc4, 0x3a, 0x47,
+	0x9a, 0x98, 0x4d, 0xad, 0x1f, 0xb2, 0x40, 0x13, 0x78, 0x07, 0xae, 0xa4, 0x19, 0xa5, 0x21, 0x9d,
+	0x2e, 0x40, 0x35, 0x3b, 0x97, 0xcc, 0x46, 0x81, 0xdd, 0x82, 0xcb, 0x92, 0xfc, 0xa5, 0x53, 0x75,
+	0xe6, 0x37, 0xb5, 0xbe, 0x40, 0x6e, 0x43, 0x55, 0x56, 0x22, 0x37, 0xbd, 0xd8, 0x5a, 0x8d, 0xe9,
+	0xb4, 0x16, 0x3d, 0x0d, 0x94, 0x23, 0x5f, 0x15, 0x79, 0xef, 0x2f, 0x1b, 0xec, 0x47, 0x49, 0x88,
+	0xbe, 0x82, 0xfa, 0x42, 0x5f, 0x21, 0xf7, 0x95, 0x4d, 0xa7, 0x38, 0x6f, 0xdd, 0xbc, 0x40, 0x63,
+	0xba, 0x25, 0xb4, 0x07, 0xb5, 0xfc, 0xaf, 0x3b, 0x3a, 0x7b, 0x30, 0xb5, 0xda, 0xab, 0xea, 0xd5,
+	0xff, 0xfa, 0x6e, 0x49, 0xfe, 0x01, 0x39, 0xc0, 0x09, 0x6a, 0x9d, 0xf1, 0x6d, 0xcd, 0x1d, 0x3a,
+	0xe5, 0xd2, 0xbc, 0x68, 0x0e, 0x70, 0xb2, 0xf7, 0x1d, 0xa1, 0xc2, 0xb5, 0x7f, 0xb0, 0xca, 0xdb,
+	0x65, 0x34, 0x82, 0xe6, 0xd2, 0xa7, 0x18, 0xdd, 0xba, 0xc8, 0x97, 0xfa, 0x15, 0xe7, 0x96, 0xb6,
+	0xcb, 0xe8, 0x01, 0xac, 0xe7, 0x6f, 0x9d, 0x73, 0xc2, 0xfb, 0xcf, 0xaa, 0x7a, 0xe1, 0xf5, 0xe4,
+	0x96, 0xd0, 0xb7, 0xb0, 0x31, 0x22, 0xd1, 0xe1, 0x63, 0xf9, 0xd4, 0x42, 0x1f, 0xac, 0xde, 0xb5,
+	0xf8, 0x0e, 0x2b, 0x60, 0xb9, 0x67, 0x1f, 0x5e, 0x10, 0x9d, 0x67, 0xb1, 0xbf, 0xf3, 0xf5, 0xdd,
+	0x69, 0x28, 0x66, 0xd9, 0x44, 0x1a, 0x74, 0xd3, 0x8c, 0x1a, 0xfb, 0xee, 0xc2, 0xaf, 0x79, 0x48,
+	0x74, 0xa7, 0x84, 0x76, 0xb5, 0xc3, 0x93, 0x35, 0xf5, 0x40, 0xb9, 0xfb, 0x4f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x0f, 0x54, 0x37, 0xe8, 0x69, 0x0e, 0x00, 0x00,
 }
diff --git a/proto/common/common.proto b/proto/common.proto
similarity index 96%
rename from proto/common/common.proto
rename to proto/common.proto
index f286df6f7..4c7c1d61b 100644
--- a/proto/common/common.proto
+++ b/proto/common.proto
@@ -4,6 +4,8 @@ package conduit.common;
 
 import "google/protobuf/duration.proto";
 
+option go_package = "github.com/runconduit/conduit/controller/gen/common";
+
 message HttpMethod {
   enum Registered {
     GET = 0;
diff --git a/proto/common/healthcheck/healthcheck.proto b/proto/common/healthcheck.proto
similarity index 80%
rename from proto/common/healthcheck/healthcheck.proto
rename to proto/common/healthcheck.proto
index 31f494334..8a1450c12 100644
--- a/proto/common/healthcheck/healthcheck.proto
+++ b/proto/common/healthcheck.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package conduit.common.healthcheck;
 
+option go_package = "github.com/runconduit/conduit/controller/gen/common/healthcheck";
+
 enum CheckStatus {
     OK = 0;
     FAIL = 1;
diff --git a/proto/controller/tap/tap.proto b/proto/controller/tap.proto
similarity index 65%
rename from proto/controller/tap/tap.proto
rename to proto/controller/tap.proto
index 8cd5d871c..b7a8adba9 100644
--- a/proto/controller/tap/tap.proto
+++ b/proto/controller/tap.proto
@@ -2,8 +2,10 @@ syntax = "proto3";
 
 package conduit.controller.tap;
 
-import "common/common.proto";
-import "public/api.proto";
+import "common.proto";
+import "public.proto";
+
+option go_package = "github.com/runconduit/conduit/controller/gen/controller/tap";
 
 service Tap {
   rpc Tap(public.TapRequest) returns (stream common.TapEvent) { option deprecated = true; }
diff --git a/proto/proxy/destination/destination.proto b/proto/proxy/destination.proto
similarity index 97%
rename from proto/proxy/destination/destination.proto
rename to proto/proxy/destination.proto
index 0d6c83107..3eb52693f 100644
--- a/proto/proxy/destination/destination.proto
+++ b/proto/proxy/destination.proto
@@ -2,7 +2,9 @@ syntax = "proto3";
 
 package conduit.proxy.destination;
 
-import "common/common.proto";
+import "common.proto";
+
+option go_package = "github.com/runconduit/conduit/controller/gen/proxy/destination";
 
 /// Destination Service ///
 //
diff --git a/proto/proxy/tap/tap.proto b/proto/proxy/tap.proto
similarity index 94%
rename from proto/proxy/tap/tap.proto
rename to proto/proxy/tap.proto
index 57aaa54be..64f4d421d 100644
--- a/proto/proxy/tap/tap.proto
+++ b/proto/proxy/tap.proto
@@ -2,7 +2,9 @@ syntax = "proto3";
 
 package conduit.proxy.tap;
 
-import "common/common.proto";
+import "common.proto";
+
+option go_package = "github.com/runconduit/conduit/controller/gen/proxy/tap";
 
 // A service exposed by proxy instances to setup
 service Tap {
diff --git a/proto/public/api.proto b/proto/public.proto
similarity index 97%
rename from proto/public/api.proto
rename to proto/public.proto
index 7a92bde6a..ed3d4c9ba 100644
--- a/proto/public/api.proto
+++ b/proto/public.proto
@@ -4,8 +4,10 @@ package conduit.public;
 
 import "google/protobuf/duration.proto";
 
-import "common/common.proto";
-import "common/healthcheck/healthcheck.proto";
+import "common.proto";
+import "common/healthcheck.proto";
+
+option go_package = "github.com/runconduit/conduit/controller/gen/public";
 
 message Empty {}
 
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index 8b635f2d6..70bdb72f3 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -37,7 +37,7 @@ RUN if [ -n "$PROXY_UNOPTIMIZED" ]; \
 
 # Build gRPC bindings, leaving the proxy mocked out.
 COPY proto/proxy proto/proxy
-COPY proto/common proto/common
+COPY proto/common.proto proto/common.proto
 COPY proxy/controller-grpc proxy/controller-grpc
 RUN if [ -n "$PROXY_UNOPTIMIZED" ]; \
     then cargo build -p conduit-proxy-controller-grpc --frozen ; \
diff --git a/proxy/controller-grpc/build.rs b/proxy/controller-grpc/build.rs
index eac393797..ba94fe444 100644
--- a/proxy/controller-grpc/build.rs
+++ b/proxy/controller-grpc/build.rs
@@ -6,9 +6,9 @@ fn main() {
 
 fn build_control() {
     let iface_files = &[
-        "../../proto/common/common.proto",
-        "../../proto/proxy/destination/destination.proto",
-        "../../proto/proxy/tap/tap.proto"
+        "../../proto/common.proto",
+        "../../proto/proxy/destination.proto",
+        "../../proto/proxy/tap.proto"
     ];
     let dirs = &["../../proto"];