diff --git a/Makefile b/Makefile
index f8be8048..e7bbdb6a 100644
--- a/Makefile
+++ b/Makefile
@@ -105,15 +105,15 @@ docker-agentk-debug: --image-debug ## build docker agentk debug image with embed
 ##@ Codegen
 
 .PHONY: codegen
-codegen: --ensure-tools codegen-delete --mocks --protoc ## regenerate protobuf and mocks
+codegen: --ensure-tools codegen-delete --protoc --mocks ## regenerate protobuf and mocks
 
 .PHONY: codegen-delete
 codegen-delete: ## delete generated files
-	find . -name '*.pb.go' -type f -delete
-	find . -name '*.pb.validate.go' -type f -delete
-	find . \( -name '*_pb.rb' -and -not -name 'validate_pb.rb' \) -type f -delete
-	find . -name '*_proto_docs.md' -type f -delete
-	find . -empty -type d -delete
+	@find . -name '*.pb.go' -type f -delete
+	@find . -name '*.pb.validate.go' -type f -delete
+	@find . \( -name '*_pb.rb' -and -not -name 'validate_pb.rb' \) -type f -delete
+	@find . -name '*_proto_docs.md' -type f -delete
+	@find . -empty -type d -delete
 
 .PHONY: --protoc
 --protoc:
@@ -124,24 +124,24 @@ codegen-delete: ## delete generated files
 	@PATH="${PATH}:$(shell pwd)/build" go generate -x -v \
 		"github.com/pluralsh/kuberentes-agent/cmd/agentk/agentkapp" \
 		"github.com/pluralsh/kuberentes-agent/cmd/kas/kasapp" \
-		"github.com/pluralsh/kuberentes-agent/internal/module/modagent" \
-		"github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/redistool" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_agent_registrar" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_agent_tracker" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_cache" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_k8s" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_kubernetes_api" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_modagent" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_modserver" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_modshared" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_redis" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_reverse_tunnel_rpc" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_reverse_tunnel_tunnel" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_rpc" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_stdlib" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_tool" \
-		"github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_usage_metrics"
+		"github.com/pluralsh/kuberentes-agent/pkg/module/modagent" \
+		"github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/redistool" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_agent_registrar" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_agent_tracker" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_cache" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_k8s" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_kubernetes_api" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modagent" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modserver" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modshared" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_redis" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_reverse_tunnel_rpc" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_reverse_tunnel_tunnel" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_rpc" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_stdlib" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_tool" \
+		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_usage_metrics"
 
 ##@ Tests
 
diff --git a/build/include/tools.mk b/build/include/tools.mk
index 3b5fbbfe..d5df6661 100644
--- a/build/include/tools.mk
+++ b/build/include/tools.mk
@@ -4,4 +4,4 @@
 .PHONY: --ensure-go-tools
 --ensure-go-tools:
 	@echo "ensuring required tools availability..."
-	@cat internal/tool/tools.go | grep _ | awk -F'"' '{print $$2}' | xargs -tI % go install %
\ No newline at end of file
+	@cat pkg/tool/tools.go | grep _ | awk -F'"' '{print $$2}' | xargs -tI % go install %
\ No newline at end of file
diff --git a/build/protoc.sh b/build/protoc.sh
index 81322dbe..05f6c180 100755
--- a/build/protoc.sh
+++ b/build/protoc.sh
@@ -60,5 +60,4 @@ function plrl::protoc::generate() {
 
 plrl::protoc::ensure
 plrl::protoc::generate "${ROOT_DIR}/cmd"
-plrl::protoc::generate "${ROOT_DIR}/pkg"
-plrl::protoc::generate "${ROOT_DIR}/internal"
\ No newline at end of file
+plrl::protoc::generate "${ROOT_DIR}/pkg"
\ No newline at end of file
diff --git a/cmd/agentk/agentkapp/app_internal_server.go b/cmd/agentk/agentkapp/app_internal_server.go
index d3100065..67039bb0 100644
--- a/cmd/agentk/agentkapp/app_internal_server.go
+++ b/cmd/agentk/agentkapp/app_internal_server.go
@@ -60,12 +60,12 @@ func newInternalServer(log *zap.Logger, tp trace.TracerProvider, mp otelmetric.M
 			grpc.StatsHandler(grpctool2.ServerNoopMaxConnAgeStatsHandler{}),
 			grpc.SharedWriteBuffer(true),
 			grpc.ChainStreamInterceptor(
-				streamProm,                                 // 1. measure all invocations
+				streamProm, // 1. measure all invocations
 				modagent2.StreamRpcApiInterceptor(factory), // 2. inject RPC API
 				grpc_validator.StreamServerInterceptor(),   // x. wrap with validator
 			),
 			grpc.ChainUnaryInterceptor(
-				unaryProm,                                 // 1. measure all invocations
+				unaryProm, // 1. measure all invocations
 				modagent2.UnaryRpcApiInterceptor(factory), // 2. inject RPC API
 				grpc_validator.UnaryServerInterceptor(),   // x. wrap with validator
 			),
diff --git a/pkg/tool/testing/mock_modagent/gomock_reflect_565558532/prog.go b/cmd/agentk/agentkapp/gomock_reflect_561387360/prog.go
similarity index 78%
rename from pkg/tool/testing/mock_modagent/gomock_reflect_565558532/prog.go
rename to cmd/agentk/agentkapp/gomock_reflect_561387360/prog.go
index 43ea3b31..c27d1673 100644
--- a/pkg/tool/testing/mock_modagent/gomock_reflect_565558532/prog.go
+++ b/cmd/agentk/agentkapp/gomock_reflect_561387360/prog.go
@@ -1,3 +1,4 @@
+
 package main
 
 import (
@@ -10,7 +11,7 @@ import (
 
 	"go.uber.org/mock/mockgen/model"
 
-	pkg_ "github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
+	pkg_ "github.com/pluralsh/kuberentes-agent/cmd/agentk/agentkapp"
 )
 
 var output = flag.String("output", "", "The output file name, or empty to use stdout.")
@@ -18,22 +19,21 @@ var output = flag.String("output", "", "The output file name, or empty to use st
 func main() {
 	flag.Parse()
 
-	its := []struct {
+	its := []struct{
 		sym string
 		typ reflect.Type
 	}{
-
-		{"Api", reflect.TypeOf((*pkg_.Api)(nil)).Elem()},
-
-		{"Factory", reflect.TypeOf((*pkg_.Factory)(nil)).Elem()},
-
-		{"Module", reflect.TypeOf((*pkg_.Module)(nil)).Elem()},
+		
+		{ "Runner", reflect.TypeOf((*pkg_.Runner)(nil)).Elem()},
+		
+		{ "LeaderElector", reflect.TypeOf((*pkg_.LeaderElector)(nil)).Elem()},
+		
 	}
 	pkg := &model.Package{
 		// NOTE: This behaves contrary to documented behaviour if the
 		// package name is not the final component of the import path.
 		// The reflect package doesn't expose the package name, though.
-		Name: path.Base("github.com/pluralsh/kuberentes-agent/internal/module/modagent"),
+		Name: path.Base("github.com/pluralsh/kuberentes-agent/cmd/agentk/agentkapp"),
 	}
 
 	for _, it := range its {
diff --git a/cmd/kas/kasapp/configured_app.go b/cmd/kas/kasapp/configured_app.go
index 65976615..7db8c570 100644
--- a/cmd/kas/kasapp/configured_app.go
+++ b/cmd/kas/kasapp/configured_app.go
@@ -332,7 +332,6 @@ func (a *ConfiguredApp) constructPluralRpcApiFactory(errRep errz.ErrReporter, se
 			dt,
 			gapi.IsCacheableError,
 		),
-		PluralClient: pluralclient.New(a.Configuration.PluralUrl, a.Configuration.PluralToken),
 	}
 	return f.New, fAgent.New
 }
diff --git a/cmd/kas/kasapp/kasapp.pb.go b/cmd/kas/kasapp/kasapp.pb.go
index d3302d67..a15836a5 100644
--- a/cmd/kas/kasapp/kasapp.pb.go
+++ b/cmd/kas/kasapp/kasapp.pb.go
@@ -9,16 +9,14 @@
 package kasapp
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	_ "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool/automata"
-	"google.golang.org/genproto/googleapis/rpc/status"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	_ "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/automata"
+	prototool "github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -481,89 +479,89 @@ var file_cmd_kas_kasapp_kasapp_proto_rawDesc = []byte{
 	0x0a, 0x1b, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x61, 0x73, 0x2f, 0x6b, 0x61, 0x73, 0x61, 0x70, 0x70,
 	0x2f, 0x6b, 0x61, 0x73, 0x61, 0x70, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x10, 0x67,
 	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x1a,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67,
-	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61,
-	0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x27, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f,
-	0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x17, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x74,
-	0x61, 0x72, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x22, 0xd1, 0x08, 0x0a,
-	0x12, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x63, 0x0a, 0x0c, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x5f, 0x72, 0x65,
-	0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x67, 0x69, 0x74, 0x6c,
-	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74,
-	0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x64, 0x79, 0x42, 0x0c, 0xfa, 0x42, 0x05,
-	0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x75, 0x6e,
-	0x6e, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x64, 0x79, 0x12, 0x57, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65,
-	0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80,
-	0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x12, 0x5a, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6,
-	0x2c, 0x04, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x63, 0x0a,
-	0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c,
+	0x29, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f,
+	0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x75, 0x74, 0x6f,
+	0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x70, 0x6b, 0x67, 0x2f,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
+	0x72, 0x70, 0x63, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x22, 0x10, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69,
+	0x6e, 0x67, 0x22, 0xd1, 0x08, 0x0a, 0x12, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x63, 0x0a, 0x0c, 0x74, 0x75, 0x6e,
+	0x6e, 0x65, 0x6c, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x30, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b,
+	0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x64,
+	0x79, 0x42, 0x0c, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x48,
+	0x00, 0x52, 0x0b, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x64, 0x79, 0x12, 0x57,
+	0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b,
 	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61,
 	0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x42, 0x19, 0xfa, 0x42,
-	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x05, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c,
-	0x65, 0x72, 0x12, 0x59, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x15, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x67, 0x0a,
-	0x09, 0x6e, 0x6f, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52,
+	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x5a, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65,
+	0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x12, 0x63, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b,
+	0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c,
+	0x65, 0x72, 0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x05,
+	0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52,
+	0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x12, 0x59, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77,
+	0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x45, 0x72,
+	0x72, 0x6f, 0x72, 0x42, 0x15, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x12, 0x67, 0x0a, 0x09, 0x6e, 0x6f, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
+	0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4e, 0x6f, 0x54,
+	0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80,
+	0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x80, 0xf6, 0x2c, 0x01,
+	0x48, 0x00, 0x52, 0x08, 0x6e, 0x6f, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x1a, 0x0d, 0x0a, 0x0b,
+	0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x64, 0x79, 0x1a, 0x0a, 0x0a, 0x08, 0x4e,
+	0x6f, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x1a, 0xac, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x12, 0x49, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x35, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
 	0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4e, 0x6f, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x42,
-	0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x80, 0xf6, 0x2c, 0x01, 0x48, 0x00, 0x52, 0x08, 0x6e, 0x6f,
-	0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x1a, 0x0d, 0x0a, 0x0b, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c,
-	0x52, 0x65, 0x61, 0x64, 0x79, 0x1a, 0x0a, 0x0a, 0x08, 0x4e, 0x6f, 0x54, 0x75, 0x6e, 0x6e, 0x65,
-	0x6c, 0x1a, 0xac, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x04,
-	0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61,
-	0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x1d, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a,
-	0xae, 0x01, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x04, 0x6d,
-	0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x69, 0x74, 0x6c,
-	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x61, 0x73, 0x2e, 0x47, 0x61, 0x74,
-	0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x3d, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x34, 0x0a, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42,
-	0x1f, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x18, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x88, 0xf6, 0x2c, 0x06,
-	0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70,
-	0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74,
-	0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x61, 0x73,
-	0x2f, 0x6b, 0x61, 0x73, 0x61, 0x70, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a,
+	0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69,
+	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x1d, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0xae, 0x01, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65,
+	0x72, 0x12, 0x4a, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x36, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b,
+	0x61, 0x73, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4b, 0x61, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x2e, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a,
+	0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69,
+	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3d, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12,
+	0x34, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x12, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x1f, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x18, 0xf8, 0x42,
+	0x01, 0x88, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x88, 0xf6,
+	0x2c, 0x01, 0x88, 0xf6, 0x2c, 0x06, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75,
+	0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x63,
+	0x6d, 0x64, 0x2f, 0x6b, 0x61, 0x73, 0x2f, 0x6b, 0x61, 0x73, 0x61, 0x70, 0x70, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/cmd/kas/kasapp/kasapp.proto b/cmd/kas/kasapp/kasapp.proto
index c5e046e0..5672f5db 100644
--- a/cmd/kas/kasapp/kasapp.proto
+++ b/cmd/kas/kasapp/kasapp.proto
@@ -6,8 +6,8 @@ package gitlab.agent.kas;
 
 option go_package = "github.com/pluralsh/kuberentes-agent/cmd/kas/kasapp";
 
-import "internal/tool/grpctool/automata/automata.proto";
-import "internal/tool/prototool/prototool.proto";
+import "pkg/tool/grpctool/automata/automata.proto";
+import "pkg/tool/prototool/prototool.proto";
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
 // https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto
diff --git a/cmd/kas/kasapp/plural/agent_rpc_api.go b/cmd/kas/kasapp/plural/agent_rpc_api.go
index 26f57d77..f365ab07 100644
--- a/cmd/kas/kasapp/plural/agent_rpc_api.go
+++ b/cmd/kas/kasapp/plural/agent_rpc_api.go
@@ -29,7 +29,7 @@ func (a *ServerAgentRpcApi) AgentInfo(ctx context.Context, log *zap.Logger) (*ap
 
 func (a *ServerAgentRpcApi) getAgentInfoCached(ctx context.Context) (*api.AgentInfo, error) {
 	return a.AgentInfoCache.GetItem(ctx, a.Token, func() (*api.AgentInfo, error) {
-		return plural.GetAgentInfo(ctx, a.Token)
+		return plural.GetAgentInfo(ctx, a.Token, "")
 	})
 }
 
diff --git a/pkg/gitlab/api/api.pb.go b/pkg/gitlab/api/api.pb.go
index 3f98ac83..38a9f644 100644
--- a/pkg/gitlab/api/api.pb.go
+++ b/pkg/gitlab/api/api.pb.go
@@ -2,22 +2,20 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/gitlab/api/api.proto
+// source: pkg/gitlab/api/api.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package api
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/entity"
+	agentcfg "github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
+	entity "github.com/pluralsh/kuberentes-agent/pkg/entity"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -42,7 +40,7 @@ type Configuration struct {
 func (x *Configuration) Reset() {
 	*x = Configuration{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[0]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -55,7 +53,7 @@ func (x *Configuration) String() string {
 func (*Configuration) ProtoMessage() {}
 
 func (x *Configuration) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[0]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -68,7 +66,7 @@ func (x *Configuration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Configuration.ProtoReflect.Descriptor instead.
 func (*Configuration) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{0}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Configuration) GetDefaultNamespace() string {
@@ -98,7 +96,7 @@ type AllowedAgent struct {
 func (x *AllowedAgent) Reset() {
 	*x = AllowedAgent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[1]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -111,7 +109,7 @@ func (x *AllowedAgent) String() string {
 func (*AllowedAgent) ProtoMessage() {}
 
 func (x *AllowedAgent) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[1]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -124,7 +122,7 @@ func (x *AllowedAgent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AllowedAgent.ProtoReflect.Descriptor instead.
 func (*AllowedAgent) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{1}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *AllowedAgent) GetId() int64 {
@@ -159,7 +157,7 @@ type ConfigProject struct {
 func (x *ConfigProject) Reset() {
 	*x = ConfigProject{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[2]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -172,7 +170,7 @@ func (x *ConfigProject) String() string {
 func (*ConfigProject) ProtoMessage() {}
 
 func (x *ConfigProject) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[2]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -185,7 +183,7 @@ func (x *ConfigProject) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConfigProject.ProtoReflect.Descriptor instead.
 func (*ConfigProject) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{2}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ConfigProject) GetId() int64 {
@@ -206,7 +204,7 @@ type Pipeline struct {
 func (x *Pipeline) Reset() {
 	*x = Pipeline{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[3]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -219,7 +217,7 @@ func (x *Pipeline) String() string {
 func (*Pipeline) ProtoMessage() {}
 
 func (x *Pipeline) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[3]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -232,7 +230,7 @@ func (x *Pipeline) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Pipeline.ProtoReflect.Descriptor instead.
 func (*Pipeline) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{3}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *Pipeline) GetId() int64 {
@@ -254,7 +252,7 @@ type Project struct {
 func (x *Project) Reset() {
 	*x = Project{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[4]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -267,7 +265,7 @@ func (x *Project) String() string {
 func (*Project) ProtoMessage() {}
 
 func (x *Project) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[4]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -280,7 +278,7 @@ func (x *Project) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Project.ProtoReflect.Descriptor instead.
 func (*Project) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{4}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *Project) GetId() int64 {
@@ -308,7 +306,7 @@ type Group struct {
 func (x *Group) Reset() {
 	*x = Group{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[5]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -321,7 +319,7 @@ func (x *Group) String() string {
 func (*Group) ProtoMessage() {}
 
 func (x *Group) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[5]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -334,7 +332,7 @@ func (x *Group) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Group.ProtoReflect.Descriptor instead.
 func (*Group) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{5}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *Group) GetId() int64 {
@@ -355,7 +353,7 @@ type Job struct {
 func (x *Job) Reset() {
 	*x = Job{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[6]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -368,7 +366,7 @@ func (x *Job) String() string {
 func (*Job) ProtoMessage() {}
 
 func (x *Job) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[6]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -381,7 +379,7 @@ func (x *Job) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Job.ProtoReflect.Descriptor instead.
 func (*Job) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{6}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *Job) GetId() int64 {
@@ -403,7 +401,7 @@ type User struct {
 func (x *User) Reset() {
 	*x = User{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[7]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -416,7 +414,7 @@ func (x *User) String() string {
 func (*User) ProtoMessage() {}
 
 func (x *User) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[7]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -429,7 +427,7 @@ func (x *User) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use User.ProtoReflect.Descriptor instead.
 func (*User) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{7}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *User) GetId() int64 {
@@ -458,7 +456,7 @@ type Environment struct {
 func (x *Environment) Reset() {
 	*x = Environment{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[8]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -471,7 +469,7 @@ func (x *Environment) String() string {
 func (*Environment) ProtoMessage() {}
 
 func (x *Environment) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[8]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -484,7 +482,7 @@ func (x *Environment) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Environment.ProtoReflect.Descriptor instead.
 func (*Environment) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{8}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *Environment) GetSlug() string {
@@ -517,7 +515,7 @@ type GetAgentInfoResponse struct {
 func (x *GetAgentInfoResponse) Reset() {
 	*x = GetAgentInfoResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[9]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -530,7 +528,7 @@ func (x *GetAgentInfoResponse) String() string {
 func (*GetAgentInfoResponse) ProtoMessage() {}
 
 func (x *GetAgentInfoResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[9]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -543,7 +541,7 @@ func (x *GetAgentInfoResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAgentInfoResponse.ProtoReflect.Descriptor instead.
 func (*GetAgentInfoResponse) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{9}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *GetAgentInfoResponse) GetProjectId() int64 {
@@ -602,7 +600,7 @@ type GetProjectInfoResponse struct {
 func (x *GetProjectInfoResponse) Reset() {
 	*x = GetProjectInfoResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[10]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -615,7 +613,7 @@ func (x *GetProjectInfoResponse) String() string {
 func (*GetProjectInfoResponse) ProtoMessage() {}
 
 func (x *GetProjectInfoResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[10]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -628,7 +626,7 @@ func (x *GetProjectInfoResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetProjectInfoResponse.ProtoReflect.Descriptor instead.
 func (*GetProjectInfoResponse) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{10}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *GetProjectInfoResponse) GetProjectId() int64 {
@@ -675,7 +673,7 @@ type AllowedAgentsForJob struct {
 func (x *AllowedAgentsForJob) Reset() {
 	*x = AllowedAgentsForJob{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[11]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -688,7 +686,7 @@ func (x *AllowedAgentsForJob) String() string {
 func (*AllowedAgentsForJob) ProtoMessage() {}
 
 func (x *AllowedAgentsForJob) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[11]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -701,7 +699,7 @@ func (x *AllowedAgentsForJob) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AllowedAgentsForJob.ProtoReflect.Descriptor instead.
 func (*AllowedAgentsForJob) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{11}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *AllowedAgentsForJob) GetAllowedAgents() []*AllowedAgent {
@@ -760,7 +758,7 @@ type AuthorizeProxyUserRequest struct {
 func (x *AuthorizeProxyUserRequest) Reset() {
 	*x = AuthorizeProxyUserRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[12]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -773,7 +771,7 @@ func (x *AuthorizeProxyUserRequest) String() string {
 func (*AuthorizeProxyUserRequest) ProtoMessage() {}
 
 func (x *AuthorizeProxyUserRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[12]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -786,7 +784,7 @@ func (x *AuthorizeProxyUserRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AuthorizeProxyUserRequest.ProtoReflect.Descriptor instead.
 func (*AuthorizeProxyUserRequest) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{12}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *AuthorizeProxyUserRequest) GetAgentId() int64 {
@@ -830,7 +828,7 @@ type AuthorizeProxyUserResponse struct {
 func (x *AuthorizeProxyUserResponse) Reset() {
 	*x = AuthorizeProxyUserResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[13]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -843,7 +841,7 @@ func (x *AuthorizeProxyUserResponse) String() string {
 func (*AuthorizeProxyUserResponse) ProtoMessage() {}
 
 func (x *AuthorizeProxyUserResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[13]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -856,7 +854,7 @@ func (x *AuthorizeProxyUserResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AuthorizeProxyUserResponse.ProtoReflect.Descriptor instead.
 func (*AuthorizeProxyUserResponse) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{13}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *AuthorizeProxyUserResponse) GetAgent() *AuthorizedAgentForUser {
@@ -892,7 +890,7 @@ type AuthorizedAgentForUser struct {
 func (x *AuthorizedAgentForUser) Reset() {
 	*x = AuthorizedAgentForUser{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[14]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -905,7 +903,7 @@ func (x *AuthorizedAgentForUser) String() string {
 func (*AuthorizedAgentForUser) ProtoMessage() {}
 
 func (x *AuthorizedAgentForUser) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[14]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -918,7 +916,7 @@ func (x *AuthorizedAgentForUser) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AuthorizedAgentForUser.ProtoReflect.Descriptor instead.
 func (*AuthorizedAgentForUser) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{14}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *AuthorizedAgentForUser) GetId() int64 {
@@ -950,7 +948,7 @@ type AccessAsProxyAuthorization struct {
 func (x *AccessAsProxyAuthorization) Reset() {
 	*x = AccessAsProxyAuthorization{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[15]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -963,7 +961,7 @@ func (x *AccessAsProxyAuthorization) String() string {
 func (*AccessAsProxyAuthorization) ProtoMessage() {}
 
 func (x *AccessAsProxyAuthorization) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[15]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -976,7 +974,7 @@ func (x *AccessAsProxyAuthorization) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AccessAsProxyAuthorization.ProtoReflect.Descriptor instead.
 func (*AccessAsProxyAuthorization) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{15}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{15}
 }
 
 func (m *AccessAsProxyAuthorization) GetAccessAs() isAccessAsProxyAuthorization_AccessAs {
@@ -1025,7 +1023,7 @@ type AccessAsAgentAuthorization struct {
 func (x *AccessAsAgentAuthorization) Reset() {
 	*x = AccessAsAgentAuthorization{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[16]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1038,7 +1036,7 @@ func (x *AccessAsAgentAuthorization) String() string {
 func (*AccessAsAgentAuthorization) ProtoMessage() {}
 
 func (x *AccessAsAgentAuthorization) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[16]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1051,7 +1049,7 @@ func (x *AccessAsAgentAuthorization) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AccessAsAgentAuthorization.ProtoReflect.Descriptor instead.
 func (*AccessAsAgentAuthorization) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{16}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{16}
 }
 
 type AccessAsUserAuthorization struct {
@@ -1066,7 +1064,7 @@ type AccessAsUserAuthorization struct {
 func (x *AccessAsUserAuthorization) Reset() {
 	*x = AccessAsUserAuthorization{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[17]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1079,7 +1077,7 @@ func (x *AccessAsUserAuthorization) String() string {
 func (*AccessAsUserAuthorization) ProtoMessage() {}
 
 func (x *AccessAsUserAuthorization) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[17]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1092,7 +1090,7 @@ func (x *AccessAsUserAuthorization) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AccessAsUserAuthorization.ProtoReflect.Descriptor instead.
 func (*AccessAsUserAuthorization) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{17}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *AccessAsUserAuthorization) GetProjects() []*ProjectAccessCF {
@@ -1121,7 +1119,7 @@ type ProjectAccessCF struct {
 func (x *ProjectAccessCF) Reset() {
 	*x = ProjectAccessCF{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[18]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1134,7 +1132,7 @@ func (x *ProjectAccessCF) String() string {
 func (*ProjectAccessCF) ProtoMessage() {}
 
 func (x *ProjectAccessCF) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[18]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1147,7 +1145,7 @@ func (x *ProjectAccessCF) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectAccessCF.ProtoReflect.Descriptor instead.
 func (*ProjectAccessCF) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{18}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *ProjectAccessCF) GetId() int64 {
@@ -1176,7 +1174,7 @@ type GroupAccessCF struct {
 func (x *GroupAccessCF) Reset() {
 	*x = GroupAccessCF{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[19]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1189,7 +1187,7 @@ func (x *GroupAccessCF) String() string {
 func (*GroupAccessCF) ProtoMessage() {}
 
 func (x *GroupAccessCF) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[19]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1202,7 +1200,7 @@ func (x *GroupAccessCF) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GroupAccessCF.ProtoReflect.Descriptor instead.
 func (*GroupAccessCF) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{19}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *GroupAccessCF) GetId() int64 {
@@ -1231,7 +1229,7 @@ type AgentConfigurationRequest struct {
 func (x *AgentConfigurationRequest) Reset() {
 	*x = AgentConfigurationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_api_api_proto_msgTypes[20]
+		mi := &file_pkg_gitlab_api_api_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1244,7 +1242,7 @@ func (x *AgentConfigurationRequest) String() string {
 func (*AgentConfigurationRequest) ProtoMessage() {}
 
 func (x *AgentConfigurationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_api_api_proto_msgTypes[20]
+	mi := &file_pkg_gitlab_api_api_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1257,7 +1255,7 @@ func (x *AgentConfigurationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AgentConfigurationRequest.ProtoReflect.Descriptor instead.
 func (*AgentConfigurationRequest) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_api_api_proto_rawDescGZIP(), []int{20}
+	return file_pkg_gitlab_api_api_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *AgentConfigurationRequest) GetAgentId() int64 {
@@ -1274,229 +1272,228 @@ func (x *AgentConfigurationRequest) GetAgentConfig() *agentcfg.ConfigurationFile
 	return nil
 }
 
-var File_internal_gitlab_api_api_proto protoreflect.FileDescriptor
-
-var file_internal_gitlab_api_api_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x17, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x1a, 0x1b, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f,
-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17,
-	0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x6e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x5f, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63,
-	0x66, 0x67, 0x2e, 0x43, 0x69, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x43, 0x46, 0x52,
-	0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x0c, 0x41,
-	0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x58, 0x0a, 0x0e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05,
-	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72,
-	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x4c, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67,
-	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c,
-	0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0x1f, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f,
-	0x6a, 0x65, 0x63, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x08, 0x50, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64,
-	0x22, 0x51, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x06, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x73, 0x22, 0x17, 0x0a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x15, 0x0a, 0x03,
-	0x4a, 0x6f, 0x62, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x02, 0x69, 0x64, 0x22, 0x3b, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x08, 0x75,
-	0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65,
-	0x22, 0x47, 0x0a, 0x0b, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12,
-	0x1b, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x12, 0x1b, 0x0a, 0x04,
-	0x74, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x20, 0x01, 0x52, 0x04, 0x74, 0x69, 0x65, 0x72, 0x22, 0xea, 0x02, 0x0a, 0x14, 0x47, 0x65,
-	0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x27, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52,
-	0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x08, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64,
-	0x12, 0x27, 0x0a, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0a, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4b, 0x0a, 0x0b, 0x67, 0x69, 0x74,
-	0x61, 0x6c, 0x79, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
-	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x67, 0x69, 0x74, 0x61, 0x6c,
-	0x79, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x5d, 0x0a, 0x11, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79,
-	0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x52, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x11, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73,
-	0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x5f, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x22, 0x9e, 0x02, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x50, 0x72,
-	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x27, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x0a,
-	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x4b, 0x0a, 0x0b, 0x67, 0x69,
-	0x74, 0x61, 0x6c, 0x79, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1f, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x49, 0x6e, 0x66, 0x6f,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x67, 0x69, 0x74, 0x61,
-	0x6c, 0x79, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x5d, 0x0a, 0x11, 0x67, 0x69, 0x74, 0x61, 0x6c,
-	0x79, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x52,
-	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x11, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x70, 0x6f,
-	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
-	0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x5f, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x22, 0xb2, 0x03, 0x0a, 0x13, 0x41, 0x6c, 0x6c, 0x6f,
-	0x77, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x46, 0x6f, 0x72, 0x4a, 0x6f, 0x62, 0x12,
-	0x4d, 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x0e,
-	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x38,
-	0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x4a, 0x6f, 0x62, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x47, 0x0a, 0x08, 0x70, 0x69, 0x70, 0x65,
-	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e,
-	0x65, 0x12, 0x44, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x72, 0x6f,
-	0x6a, 0x65, 0x63, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07,
-	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x3b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x04,
-	0x75, 0x73, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x0b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+var File_pkg_gitlab_api_api_proto protoreflect.FileDescriptor
+
+var file_pkg_gitlab_api_api_proto_rawDesc = []byte{
+	0x0a, 0x18, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x17, 0x67, 0x69, 0x74, 0x6c,
 	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x52,
-	0x0b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0xd9, 0x01, 0x0a,
-	0x19, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x55,
-	0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x08, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa, 0x42,
-	0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x12,
-	0x4e, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x2c, 0xfa, 0x42, 0x29, 0x72, 0x27, 0x52, 0x0e, 0x73, 0x65, 0x73,
-	0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x52, 0x15, 0x70, 0x65, 0x72,
-	0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x6f, 0x6b,
-	0x65, 0x6e, 0x52, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12,
-	0x27, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0a, 0x61, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x73, 0x72, 0x66,
-	0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x73,
-	0x72, 0x66, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x87, 0x02, 0x0a, 0x1a, 0x41, 0x75, 0x74,
-	0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4f, 0x0a, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x70, 0x69, 0x1a, 0x1b, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66,
+	0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x11, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x73, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e, 0x43, 0x69,
+	0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x43, 0x46, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x5f, 0x61, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65,
+	0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x58, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26,
+	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69,
+	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
+	0x12, 0x4c, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x1f,
+	0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12,
+	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22,
+	0x1a, 0x0a, 0x08, 0x50, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x07, 0x50,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
 	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x46, 0x6f, 0x72, 0x55, 0x73, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
-	0x01, 0x52, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x22, 0x17,
+	0x0a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x15, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3b,
+	0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20,
+	0x01, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x47, 0x0a, 0x0b, 0x45,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x73, 0x6c,
+	0x75, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20,
+	0x01, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x12, 0x1b, 0x0a, 0x04, 0x74, 0x69, 0x65, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x04,
+	0x74, 0x69, 0x65, 0x72, 0x22, 0xea, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x67, 0x65, 0x6e,
+	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a,
+	0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x03, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6a,
+	0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20,
+	0x00, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x0a, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4b, 0x0a, 0x0b, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x69,
+	0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a,
+	0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x69, 0x6e, 0x66,
+	0x6f, 0x12, 0x5d, 0x0a, 0x11, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x6f, 0x72, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x11, 0x67,
+	0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79,
+	0x12, 0x2f, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x72, 0x61, 0x6e,
+	0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20,
+	0x01, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x72, 0x61, 0x6e, 0x63,
+	0x68, 0x22, 0x9e, 0x02, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0a,
+	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65,
+	0x63, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x4b, 0x0a, 0x0b, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f,
+	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x69, 0x6e,
+	0x66, 0x6f, 0x12, 0x5d, 0x0a, 0x11, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x70,
+	0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x2e, 0x47, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69,
+	0x74, 0x6f, 0x72, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x11,
+	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72,
+	0x79, 0x12, 0x2f, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x72, 0x61,
+	0x6e, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x20, 0x01, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x72, 0x61, 0x6e,
+	0x63, 0x68, 0x22, 0xb2, 0x03, 0x0a, 0x13, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x41, 0x67,
+	0x65, 0x6e, 0x74, 0x73, 0x46, 0x6f, 0x72, 0x4a, 0x6f, 0x62, 0x12, 0x4d, 0x0a, 0x0e, 0x61, 0x6c,
+	0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x6c, 0x6c,
+	0x6f, 0x77, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
+	0x65, 0x64, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x38, 0x0a, 0x03, 0x6a, 0x6f, 0x62,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
 	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x5b, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f,
-	0x61, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79,
-	0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f,
-	0x61, 0x73, 0x22, 0x82, 0x01, 0x0a, 0x16, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65,
-	0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x46, 0x6f, 0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x58, 0x0a,
-	0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f,
-	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x22, 0xd9, 0x01, 0x0a, 0x1a, 0x41, 0x63, 0x63, 0x65,
-	0x73, 0x73, 0x41, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
+	0x2e, 0x4a, 0x6f, 0x62, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x03,
+	0x6a, 0x6f, 0x62, 0x12, 0x47, 0x0a, 0x08, 0x70, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
 	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x41, 0x75, 0x74,
+	0x50, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x08, 0x70, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x44, 0x0a, 0x07,
+	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x42,
+	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65,
+	0x63, 0x74, 0x12, 0x3b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x42,
+	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12,
+	0x46, 0x0a, 0x0b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x45,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0b, 0x65, 0x6e, 0x76, 0x69,
+	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0xd9, 0x01, 0x0a, 0x19, 0x41, 0x75, 0x74, 0x68,
+	0x6f, 0x72, 0x69, 0x7a, 0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00,
+	0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x4e, 0x0a, 0x0b, 0x61, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x2c, 0xfa, 0x42, 0x29, 0x72, 0x27, 0x52, 0x0e, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f,
+	0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x52, 0x15, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c,
+	0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x0b, 0x61,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x27, 0x0a, 0x0a, 0x61, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f,
+	0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x73, 0x72, 0x66, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x73, 0x72, 0x66, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x22, 0x87, 0x02, 0x0a, 0x1a, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a,
+	0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x4f, 0x0a, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x75, 0x74, 0x68,
+	0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x46, 0x6f, 0x72, 0x55, 0x73,
+	0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x55, 0x73, 0x65, 0x72,
+	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72,
+	0x12, 0x5b, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x73, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x75, 0x74, 0x68, 0x6f,
+	0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x73, 0x22, 0x82, 0x01,
+	0x0a, 0x16, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e,
+	0x74, 0x46, 0x6f, 0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x58, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65,
+	0x63, 0x74, 0x22, 0xd9, 0x01, 0x0a, 0x1a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x50,
+	0x72, 0x6f, 0x78, 0x79, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x55, 0x0a, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x33, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x41, 0x73, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48,
+	0x00, 0x52, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x52, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x55, 0x73, 0x65, 0x72, 0x41, 0x75, 0x74,
 	0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x52, 0x0a,
-	0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x55, 0x73,
-	0x65, 0x72, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x04, 0x75, 0x73, 0x65,
-	0x72, 0x42, 0x10, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x73, 0x12, 0x03,
-	0xf8, 0x42, 0x01, 0x22, 0x1c, 0x0a, 0x1a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x41,
-	0x67, 0x65, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0xa1, 0x01, 0x0a, 0x19, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x55, 0x73,
-	0x65, 0x72, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x44, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x72, 0x6f, 0x6a,
-	0x65, 0x63, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x52, 0x08, 0x70, 0x72, 0x6f,
-	0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x3e, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x52, 0x06, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x73, 0x22, 0x37, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
-	0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x35,
-	0x0a, 0x0d, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x98, 0x01, 0x0a, 0x19, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x08,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x56, 0x0a, 0x0c, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
-	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x6c, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70,
-	0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74,
-	0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2f, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42, 0x10, 0x0a, 0x09,
+	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x73, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x1c,
+	0x0a, 0x1a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x41,
+	0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa1, 0x01, 0x0a,
+	0x19, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x73, 0x55, 0x73, 0x65, 0x72, 0x41, 0x75, 0x74,
+	0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x08, 0x70, 0x72,
+	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73,
+	0x12, 0x3e, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70,
+	0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73,
+	0x22, 0x37, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x43, 0x46, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x35, 0x0a, 0x0d, 0x47, 0x72, 0x6f,
+	0x75, 0x70, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x43, 0x46, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f,
+	0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73,
+	0x22, 0x98, 0x01, 0x0a, 0x19, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23,
+	0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x22, 0x02, 0x20, 0x00, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x5f, 0x69, 0x64, 0x12, 0x56, 0x0a, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66,
+	0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46,
+	0x69, 0x6c, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x35, 0x5a, 0x33, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c,
+	0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2f, 0x61,
+	0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_gitlab_api_api_proto_rawDescOnce sync.Once
-	file_internal_gitlab_api_api_proto_rawDescData = file_internal_gitlab_api_api_proto_rawDesc
+	file_pkg_gitlab_api_api_proto_rawDescOnce sync.Once
+	file_pkg_gitlab_api_api_proto_rawDescData = file_pkg_gitlab_api_api_proto_rawDesc
 )
 
-func file_internal_gitlab_api_api_proto_rawDescGZIP() []byte {
-	file_internal_gitlab_api_api_proto_rawDescOnce.Do(func() {
-		file_internal_gitlab_api_api_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_gitlab_api_api_proto_rawDescData)
+func file_pkg_gitlab_api_api_proto_rawDescGZIP() []byte {
+	file_pkg_gitlab_api_api_proto_rawDescOnce.Do(func() {
+		file_pkg_gitlab_api_api_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_gitlab_api_api_proto_rawDescData)
 	})
-	return file_internal_gitlab_api_api_proto_rawDescData
+	return file_pkg_gitlab_api_api_proto_rawDescData
 }
 
-var file_internal_gitlab_api_api_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
-var file_internal_gitlab_api_api_proto_goTypes = []interface{}{
+var file_pkg_gitlab_api_api_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
+var file_pkg_gitlab_api_api_proto_goTypes = []interface{}{
 	(*Configuration)(nil),              // 0: gitlab.agent.gitlab.api.Configuration
 	(*AllowedAgent)(nil),               // 1: gitlab.agent.gitlab.api.AllowedAgent
 	(*ConfigProject)(nil),              // 2: gitlab.agent.gitlab.api.ConfigProject
@@ -1523,7 +1520,7 @@ var file_internal_gitlab_api_api_proto_goTypes = []interface{}{
 	(*entity.GitalyRepository)(nil),    // 23: gitlab.agent.entity.GitalyRepository
 	(*agentcfg.ConfigurationFile)(nil), // 24: gitlab.agent.agentcfg.ConfigurationFile
 }
-var file_internal_gitlab_api_api_proto_depIdxs = []int32{
+var file_pkg_gitlab_api_api_proto_depIdxs = []int32{
 	21, // 0: gitlab.agent.gitlab.api.Configuration.access_as:type_name -> gitlab.agent.agentcfg.CiAccessAsCF
 	2,  // 1: gitlab.agent.gitlab.api.AllowedAgent.config_project:type_name -> gitlab.agent.gitlab.api.ConfigProject
 	0,  // 2: gitlab.agent.gitlab.api.AllowedAgent.configuration:type_name -> gitlab.agent.gitlab.api.Configuration
@@ -1554,13 +1551,13 @@ var file_internal_gitlab_api_api_proto_depIdxs = []int32{
 	0,  // [0:23] is the sub-list for field type_name
 }
 
-func init() { file_internal_gitlab_api_api_proto_init() }
-func file_internal_gitlab_api_api_proto_init() {
-	if File_internal_gitlab_api_api_proto != nil {
+func init() { file_pkg_gitlab_api_api_proto_init() }
+func file_pkg_gitlab_api_api_proto_init() {
+	if File_pkg_gitlab_api_api_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_gitlab_api_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Configuration); i {
 			case 0:
 				return &v.state
@@ -1572,7 +1569,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AllowedAgent); i {
 			case 0:
 				return &v.state
@@ -1584,7 +1581,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConfigProject); i {
 			case 0:
 				return &v.state
@@ -1596,7 +1593,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Pipeline); i {
 			case 0:
 				return &v.state
@@ -1608,7 +1605,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Project); i {
 			case 0:
 				return &v.state
@@ -1620,7 +1617,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Group); i {
 			case 0:
 				return &v.state
@@ -1632,7 +1629,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Job); i {
 			case 0:
 				return &v.state
@@ -1644,7 +1641,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*User); i {
 			case 0:
 				return &v.state
@@ -1656,7 +1653,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Environment); i {
 			case 0:
 				return &v.state
@@ -1668,7 +1665,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetAgentInfoResponse); i {
 			case 0:
 				return &v.state
@@ -1680,7 +1677,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetProjectInfoResponse); i {
 			case 0:
 				return &v.state
@@ -1692,7 +1689,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AllowedAgentsForJob); i {
 			case 0:
 				return &v.state
@@ -1704,7 +1701,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AuthorizeProxyUserRequest); i {
 			case 0:
 				return &v.state
@@ -1716,7 +1713,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AuthorizeProxyUserResponse); i {
 			case 0:
 				return &v.state
@@ -1728,7 +1725,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AuthorizedAgentForUser); i {
 			case 0:
 				return &v.state
@@ -1740,7 +1737,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AccessAsProxyAuthorization); i {
 			case 0:
 				return &v.state
@@ -1752,7 +1749,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AccessAsAgentAuthorization); i {
 			case 0:
 				return &v.state
@@ -1764,7 +1761,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AccessAsUserAuthorization); i {
 			case 0:
 				return &v.state
@@ -1776,7 +1773,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ProjectAccessCF); i {
 			case 0:
 				return &v.state
@@ -1788,7 +1785,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GroupAccessCF); i {
 			case 0:
 				return &v.state
@@ -1800,7 +1797,7 @@ func file_internal_gitlab_api_api_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_api_api_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_api_api_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AgentConfigurationRequest); i {
 			case 0:
 				return &v.state
@@ -1813,7 +1810,7 @@ func file_internal_gitlab_api_api_proto_init() {
 			}
 		}
 	}
-	file_internal_gitlab_api_api_proto_msgTypes[15].OneofWrappers = []interface{}{
+	file_pkg_gitlab_api_api_proto_msgTypes[15].OneofWrappers = []interface{}{
 		(*AccessAsProxyAuthorization_Agent)(nil),
 		(*AccessAsProxyAuthorization_User)(nil),
 	}
@@ -1821,18 +1818,18 @@ func file_internal_gitlab_api_api_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_gitlab_api_api_proto_rawDesc,
+			RawDescriptor: file_pkg_gitlab_api_api_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   21,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_gitlab_api_api_proto_goTypes,
-		DependencyIndexes: file_internal_gitlab_api_api_proto_depIdxs,
-		MessageInfos:      file_internal_gitlab_api_api_proto_msgTypes,
+		GoTypes:           file_pkg_gitlab_api_api_proto_goTypes,
+		DependencyIndexes: file_pkg_gitlab_api_api_proto_depIdxs,
+		MessageInfos:      file_pkg_gitlab_api_api_proto_msgTypes,
 	}.Build()
-	File_internal_gitlab_api_api_proto = out.File
-	file_internal_gitlab_api_api_proto_rawDesc = nil
-	file_internal_gitlab_api_api_proto_goTypes = nil
-	file_internal_gitlab_api_api_proto_depIdxs = nil
+	File_pkg_gitlab_api_api_proto = out.File
+	file_pkg_gitlab_api_api_proto_rawDesc = nil
+	file_pkg_gitlab_api_api_proto_goTypes = nil
+	file_pkg_gitlab_api_api_proto_depIdxs = nil
 }
diff --git a/pkg/gitlab/api/api.pb.validate.go b/pkg/gitlab/api/api.pb.validate.go
index 20290b7e..18e4049c 100644
--- a/pkg/gitlab/api/api.pb.validate.go
+++ b/pkg/gitlab/api/api.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/gitlab/api/api.proto
+// source: pkg/gitlab/api/api.proto
 
 package api
 
diff --git a/pkg/gitlab/api/api.proto b/pkg/gitlab/api/api.proto
index 534dee1a..8659c001 100644
--- a/pkg/gitlab/api/api.proto
+++ b/pkg/gitlab/api/api.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.gitlab.api;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/gitlab/api";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/gitlab/api";
 
 import "pkg/agentcfg/agentcfg.proto";
 import "validate/validate.proto";
diff --git a/pkg/gitlab/api/api_proto_docs.md b/pkg/gitlab/api/api_proto_docs.md
index 1bfc0bda..1fbb849e 100644
--- a/pkg/gitlab/api/api_proto_docs.md
+++ b/pkg/gitlab/api/api_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/gitlab/api/api.proto](#internal_gitlab_api_api-proto)
+- [pkg/gitlab/api/api.proto](#pkg_gitlab_api_api-proto)
     - [AccessAsAgentAuthorization](#gitlab-agent-gitlab-api-AccessAsAgentAuthorization)
     - [AccessAsProxyAuthorization](#gitlab-agent-gitlab-api-AccessAsProxyAuthorization)
     - [AccessAsUserAuthorization](#gitlab-agent-gitlab-api-AccessAsUserAuthorization)
@@ -30,10 +30,10 @@
 
 
 
-<a name="internal_gitlab_api_api-proto"></a>
+<a name="pkg_gitlab_api_api-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/gitlab/api/api.proto
+## pkg/gitlab/api/api.proto
 
 
 
diff --git a/pkg/gitlab/gitlab.pb.go b/pkg/gitlab/gitlab.pb.go
index a55873a2..97e732f3 100644
--- a/pkg/gitlab/gitlab.pb.go
+++ b/pkg/gitlab/gitlab.pb.go
@@ -2,18 +2,17 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/gitlab/gitlab.proto
+// source: pkg/gitlab/gitlab.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package gitlab
 
 import (
-	"reflect"
-	"sync"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -36,7 +35,7 @@ type ClientError struct {
 func (x *ClientError) Reset() {
 	*x = ClientError{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_gitlab_proto_msgTypes[0]
+		mi := &file_pkg_gitlab_gitlab_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -49,7 +48,7 @@ func (x *ClientError) String() string {
 func (*ClientError) ProtoMessage() {}
 
 func (x *ClientError) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_gitlab_proto_msgTypes[0]
+	mi := &file_pkg_gitlab_gitlab_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -62,7 +61,7 @@ func (x *ClientError) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientError.ProtoReflect.Descriptor instead.
 func (*ClientError) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_gitlab_proto_rawDescGZIP(), []int{0}
+	return file_pkg_gitlab_gitlab_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ClientError) GetStatusCode() int32 {
@@ -98,7 +97,7 @@ type DefaultApiError struct {
 func (x *DefaultApiError) Reset() {
 	*x = DefaultApiError{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_gitlab_gitlab_proto_msgTypes[1]
+		mi := &file_pkg_gitlab_gitlab_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -111,7 +110,7 @@ func (x *DefaultApiError) String() string {
 func (*DefaultApiError) ProtoMessage() {}
 
 func (x *DefaultApiError) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_gitlab_gitlab_proto_msgTypes[1]
+	mi := &file_pkg_gitlab_gitlab_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -124,7 +123,7 @@ func (x *DefaultApiError) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DefaultApiError.ProtoReflect.Descriptor instead.
 func (*DefaultApiError) Descriptor() ([]byte, []int) {
-	return file_internal_gitlab_gitlab_proto_rawDescGZIP(), []int{1}
+	return file_pkg_gitlab_gitlab_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *DefaultApiError) GetMessage() string {
@@ -134,45 +133,45 @@ func (x *DefaultApiError) GetMessage() string {
 	return ""
 }
 
-var File_internal_gitlab_gitlab_proto protoreflect.FileDescriptor
+var File_pkg_gitlab_gitlab_proto protoreflect.FileDescriptor
 
-var file_internal_gitlab_gitlab_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13,
-	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x22, 0x5a, 0x0a, 0x0b, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43,
-	0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f,
-	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22,
-	0x2b, 0x0a, 0x0f, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x41, 0x70, 0x69, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x36, 0x5a, 0x34,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61,
-	0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var file_pkg_gitlab_gitlab_proto_rawDesc = []byte{
+	0x0a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2f, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x22, 0x5a,
+	0x0a, 0x0b, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1f, 0x0a,
+	0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61,
+	0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x2b, 0x0a, 0x0f, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x41, 0x70, 0x69, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b,
+	0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f,
+	0x70, 0x6b, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
-	file_internal_gitlab_gitlab_proto_rawDescOnce sync.Once
-	file_internal_gitlab_gitlab_proto_rawDescData = file_internal_gitlab_gitlab_proto_rawDesc
+	file_pkg_gitlab_gitlab_proto_rawDescOnce sync.Once
+	file_pkg_gitlab_gitlab_proto_rawDescData = file_pkg_gitlab_gitlab_proto_rawDesc
 )
 
-func file_internal_gitlab_gitlab_proto_rawDescGZIP() []byte {
-	file_internal_gitlab_gitlab_proto_rawDescOnce.Do(func() {
-		file_internal_gitlab_gitlab_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_gitlab_gitlab_proto_rawDescData)
+func file_pkg_gitlab_gitlab_proto_rawDescGZIP() []byte {
+	file_pkg_gitlab_gitlab_proto_rawDescOnce.Do(func() {
+		file_pkg_gitlab_gitlab_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_gitlab_gitlab_proto_rawDescData)
 	})
-	return file_internal_gitlab_gitlab_proto_rawDescData
+	return file_pkg_gitlab_gitlab_proto_rawDescData
 }
 
-var file_internal_gitlab_gitlab_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_internal_gitlab_gitlab_proto_goTypes = []interface{}{
+var file_pkg_gitlab_gitlab_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_pkg_gitlab_gitlab_proto_goTypes = []interface{}{
 	(*ClientError)(nil),     // 0: gitlab.agent.gitlab.ClientError
 	(*DefaultApiError)(nil), // 1: gitlab.agent.gitlab.DefaultApiError
 }
-var file_internal_gitlab_gitlab_proto_depIdxs = []int32{
+var file_pkg_gitlab_gitlab_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -180,13 +179,13 @@ var file_internal_gitlab_gitlab_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_internal_gitlab_gitlab_proto_init() }
-func file_internal_gitlab_gitlab_proto_init() {
-	if File_internal_gitlab_gitlab_proto != nil {
+func init() { file_pkg_gitlab_gitlab_proto_init() }
+func file_pkg_gitlab_gitlab_proto_init() {
+	if File_pkg_gitlab_gitlab_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_gitlab_gitlab_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_gitlab_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ClientError); i {
 			case 0:
 				return &v.state
@@ -198,7 +197,7 @@ func file_internal_gitlab_gitlab_proto_init() {
 				return nil
 			}
 		}
-		file_internal_gitlab_gitlab_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_gitlab_gitlab_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DefaultApiError); i {
 			case 0:
 				return &v.state
@@ -215,18 +214,18 @@ func file_internal_gitlab_gitlab_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_gitlab_gitlab_proto_rawDesc,
+			RawDescriptor: file_pkg_gitlab_gitlab_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_gitlab_gitlab_proto_goTypes,
-		DependencyIndexes: file_internal_gitlab_gitlab_proto_depIdxs,
-		MessageInfos:      file_internal_gitlab_gitlab_proto_msgTypes,
+		GoTypes:           file_pkg_gitlab_gitlab_proto_goTypes,
+		DependencyIndexes: file_pkg_gitlab_gitlab_proto_depIdxs,
+		MessageInfos:      file_pkg_gitlab_gitlab_proto_msgTypes,
 	}.Build()
-	File_internal_gitlab_gitlab_proto = out.File
-	file_internal_gitlab_gitlab_proto_rawDesc = nil
-	file_internal_gitlab_gitlab_proto_goTypes = nil
-	file_internal_gitlab_gitlab_proto_depIdxs = nil
+	File_pkg_gitlab_gitlab_proto = out.File
+	file_pkg_gitlab_gitlab_proto_rawDesc = nil
+	file_pkg_gitlab_gitlab_proto_goTypes = nil
+	file_pkg_gitlab_gitlab_proto_depIdxs = nil
 }
diff --git a/pkg/gitlab/gitlab.pb.validate.go b/pkg/gitlab/gitlab.pb.validate.go
index e0647147..8dbf073c 100644
--- a/pkg/gitlab/gitlab.pb.validate.go
+++ b/pkg/gitlab/gitlab.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/gitlab/gitlab.proto
+// source: pkg/gitlab/gitlab.proto
 
 package gitlab
 
diff --git a/pkg/gitlab/gitlab.proto b/pkg/gitlab/gitlab.proto
index 91168aee..61927ab1 100644
--- a/pkg/gitlab/gitlab.proto
+++ b/pkg/gitlab/gitlab.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.gitlab;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/gitlab";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/gitlab";
 
 message ClientError {
   int32 status_code = 1;
diff --git a/pkg/gitlab/gitlab_proto_docs.md b/pkg/gitlab/gitlab_proto_docs.md
index 0033b521..fb6c2b04 100644
--- a/pkg/gitlab/gitlab_proto_docs.md
+++ b/pkg/gitlab/gitlab_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/gitlab/gitlab.proto](#internal_gitlab_gitlab-proto)
+- [pkg/gitlab/gitlab.proto](#pkg_gitlab_gitlab-proto)
     - [ClientError](#gitlab-agent-gitlab-ClientError)
     - [DefaultApiError](#gitlab-agent-gitlab-DefaultApiError)
   
@@ -11,10 +11,10 @@
 
 
 
-<a name="internal_gitlab_gitlab-proto"></a>
+<a name="pkg_gitlab_gitlab-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/gitlab/gitlab.proto
+## pkg/gitlab/gitlab.proto
 
 
 
diff --git a/pkg/module/agent_configuration/rpc/rpc.pb.go b/pkg/module/agent_configuration/rpc/rpc.pb.go
index ed89433f..06141b1d 100644
--- a/pkg/module/agent_configuration/rpc/rpc.pb.go
+++ b/pkg/module/agent_configuration/rpc/rpc.pb.go
@@ -2,22 +2,20 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/agent_configuration/rpc/rpc.proto
+// source: pkg/module/agent_configuration/rpc/rpc.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/entity"
+	agentcfg "github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
+	entity "github.com/pluralsh/kuberentes-agent/pkg/entity"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -46,7 +44,7 @@ type ConfigurationRequest struct {
 func (x *ConfigurationRequest) Reset() {
 	*x = ConfigurationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes[0]
+		mi := &file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -59,7 +57,7 @@ func (x *ConfigurationRequest) String() string {
 func (*ConfigurationRequest) ProtoMessage() {}
 
 func (x *ConfigurationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes[0]
+	mi := &file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -72,7 +70,7 @@ func (x *ConfigurationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConfigurationRequest.ProtoReflect.Descriptor instead.
 func (*ConfigurationRequest) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_configuration_rpc_rpc_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ConfigurationRequest) GetCommitId() string {
@@ -110,7 +108,7 @@ type ConfigurationResponse struct {
 func (x *ConfigurationResponse) Reset() {
 	*x = ConfigurationResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes[1]
+		mi := &file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -123,7 +121,7 @@ func (x *ConfigurationResponse) String() string {
 func (*ConfigurationResponse) ProtoMessage() {}
 
 func (x *ConfigurationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes[1]
+	mi := &file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -136,7 +134,7 @@ func (x *ConfigurationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConfigurationResponse.ProtoReflect.Descriptor instead.
 func (*ConfigurationResponse) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_configuration_rpc_rpc_proto_rawDescGZIP(), []int{1}
+	return file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ConfigurationResponse) GetConfiguration() *agentcfg.AgentConfiguration {
@@ -153,77 +151,76 @@ func (x *ConfigurationResponse) GetCommitId() string {
 	return ""
 }
 
-var File_internal_module_agent_configuration_rpc_rpc_proto protoreflect.FileDescriptor
+var File_pkg_module_agent_configuration_rpc_rpc_proto protoreflect.FileDescriptor
 
-var file_internal_module_agent_configuration_rpc_rpc_proto_rawDesc = []byte{
-	0x0a, 0x31, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x24, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x72, 0x70, 0x63, 0x1a, 0x1b, 0x70, 0x6b, 0x67, 0x2f, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x64, 0x12, 0x3d,
-	0x0a, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65,
-	0x74, 0x61, 0x52, 0x09, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x23, 0x0a,
-	0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
-	0x65, 0x72, 0x22, 0x8e, 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4f, 0x0a, 0x0d,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e, 0x41, 0x67, 0x65, 0x6e,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a,
-	0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x69,
-	0x74, 0x49, 0x64, 0x32, 0xa6, 0x01, 0x0a, 0x12, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x8f, 0x01, 0x0a, 0x10, 0x47,
-	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x3a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3b, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x4e, 0x5a, 0x4c,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61,
-	0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f,
-	0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+var file_pkg_module_agent_configuration_rpc_rpc_proto_rawDesc = []byte{
+	0x0a, 0x2c, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2f, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x24,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x72, 0x70, 0x63, 0x1a, 0x1b, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63,
+	0x66, 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09,
+	0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x64, 0x12, 0x3d, 0x0a, 0x0a, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x09, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70,
+	0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0c, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x22, 0x8e, 0x01,
+	0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4f, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x63, 0x66, 0x67, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x6d,
+	0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x72, 0x02, 0x20, 0x01, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x64, 0x32, 0xa6,
+	0x01, 0x0a, 0x12, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x8f, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x2e, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3b, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b,
+	0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f,
+	0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x72,
+	0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_module_agent_configuration_rpc_rpc_proto_rawDescOnce sync.Once
-	file_internal_module_agent_configuration_rpc_rpc_proto_rawDescData = file_internal_module_agent_configuration_rpc_rpc_proto_rawDesc
+	file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescOnce sync.Once
+	file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescData = file_pkg_module_agent_configuration_rpc_rpc_proto_rawDesc
 )
 
-func file_internal_module_agent_configuration_rpc_rpc_proto_rawDescGZIP() []byte {
-	file_internal_module_agent_configuration_rpc_rpc_proto_rawDescOnce.Do(func() {
-		file_internal_module_agent_configuration_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_agent_configuration_rpc_rpc_proto_rawDescData)
+func file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescGZIP() []byte {
+	file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescOnce.Do(func() {
+		file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescData)
 	})
-	return file_internal_module_agent_configuration_rpc_rpc_proto_rawDescData
+	return file_pkg_module_agent_configuration_rpc_rpc_proto_rawDescData
 }
 
-var file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_internal_module_agent_configuration_rpc_rpc_proto_goTypes = []interface{}{
+var file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_pkg_module_agent_configuration_rpc_rpc_proto_goTypes = []interface{}{
 	(*ConfigurationRequest)(nil),        // 0: gitlab.agent.agent_configuration.rpc.ConfigurationRequest
 	(*ConfigurationResponse)(nil),       // 1: gitlab.agent.agent_configuration.rpc.ConfigurationResponse
 	(*entity.AgentMeta)(nil),            // 2: gitlab.agent.entity.AgentMeta
 	(*agentcfg.AgentConfiguration)(nil), // 3: gitlab.agent.agentcfg.AgentConfiguration
 }
-var file_internal_module_agent_configuration_rpc_rpc_proto_depIdxs = []int32{
+var file_pkg_module_agent_configuration_rpc_rpc_proto_depIdxs = []int32{
 	2, // 0: gitlab.agent.agent_configuration.rpc.ConfigurationRequest.agent_meta:type_name -> gitlab.agent.entity.AgentMeta
 	3, // 1: gitlab.agent.agent_configuration.rpc.ConfigurationResponse.configuration:type_name -> gitlab.agent.agentcfg.AgentConfiguration
 	0, // 2: gitlab.agent.agent_configuration.rpc.AgentConfiguration.GetConfiguration:input_type -> gitlab.agent.agent_configuration.rpc.ConfigurationRequest
@@ -235,13 +232,13 @@ var file_internal_module_agent_configuration_rpc_rpc_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_agent_configuration_rpc_rpc_proto_init() }
-func file_internal_module_agent_configuration_rpc_rpc_proto_init() {
-	if File_internal_module_agent_configuration_rpc_rpc_proto != nil {
+func init() { file_pkg_module_agent_configuration_rpc_rpc_proto_init() }
+func file_pkg_module_agent_configuration_rpc_rpc_proto_init() {
+	if File_pkg_module_agent_configuration_rpc_rpc_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConfigurationRequest); i {
 			case 0:
 				return &v.state
@@ -253,7 +250,7 @@ func file_internal_module_agent_configuration_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConfigurationResponse); i {
 			case 0:
 				return &v.state
@@ -270,18 +267,18 @@ func file_internal_module_agent_configuration_rpc_rpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_agent_configuration_rpc_rpc_proto_rawDesc,
+			RawDescriptor: file_pkg_module_agent_configuration_rpc_rpc_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_internal_module_agent_configuration_rpc_rpc_proto_goTypes,
-		DependencyIndexes: file_internal_module_agent_configuration_rpc_rpc_proto_depIdxs,
-		MessageInfos:      file_internal_module_agent_configuration_rpc_rpc_proto_msgTypes,
+		GoTypes:           file_pkg_module_agent_configuration_rpc_rpc_proto_goTypes,
+		DependencyIndexes: file_pkg_module_agent_configuration_rpc_rpc_proto_depIdxs,
+		MessageInfos:      file_pkg_module_agent_configuration_rpc_rpc_proto_msgTypes,
 	}.Build()
-	File_internal_module_agent_configuration_rpc_rpc_proto = out.File
-	file_internal_module_agent_configuration_rpc_rpc_proto_rawDesc = nil
-	file_internal_module_agent_configuration_rpc_rpc_proto_goTypes = nil
-	file_internal_module_agent_configuration_rpc_rpc_proto_depIdxs = nil
+	File_pkg_module_agent_configuration_rpc_rpc_proto = out.File
+	file_pkg_module_agent_configuration_rpc_rpc_proto_rawDesc = nil
+	file_pkg_module_agent_configuration_rpc_rpc_proto_goTypes = nil
+	file_pkg_module_agent_configuration_rpc_rpc_proto_depIdxs = nil
 }
diff --git a/pkg/module/agent_configuration/rpc/rpc.pb.validate.go b/pkg/module/agent_configuration/rpc/rpc.pb.validate.go
index cfd6cff4..ac40f8e8 100644
--- a/pkg/module/agent_configuration/rpc/rpc.pb.validate.go
+++ b/pkg/module/agent_configuration/rpc/rpc.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/agent_configuration/rpc/rpc.proto
+// source: pkg/module/agent_configuration/rpc/rpc.proto
 
 package rpc
 
diff --git a/pkg/module/agent_configuration/rpc/rpc.proto b/pkg/module/agent_configuration/rpc/rpc.proto
index f6b86b2e..bd920b89 100644
--- a/pkg/module/agent_configuration/rpc/rpc.proto
+++ b/pkg/module/agent_configuration/rpc/rpc.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.agent_configuration.rpc;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/agent_configuration/rpc";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc";
 
 import "pkg/agentcfg/agentcfg.proto";
 import "pkg/entity/entity.proto";
diff --git a/pkg/module/agent_configuration/rpc/rpc_grpc.pb.go b/pkg/module/agent_configuration/rpc/rpc_grpc.pb.go
index caba3e1f..e1def18c 100644
--- a/pkg/module/agent_configuration/rpc/rpc_grpc.pb.go
+++ b/pkg/module/agent_configuration/rpc/rpc_grpc.pb.go
@@ -1,17 +1,18 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v4.24.4
-// source: internal/module/agent_configuration/rpc/rpc.proto
+// source: pkg/module/agent_configuration/rpc/rpc.proto
+
+// If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -19,6 +20,10 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	AgentConfiguration_GetConfiguration_FullMethodName = "/gitlab.agent.agent_configuration.rpc.AgentConfiguration/GetConfiguration"
+)
+
 // AgentConfigurationClient is the client API for AgentConfiguration service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
@@ -36,7 +41,7 @@ func NewAgentConfigurationClient(cc grpc.ClientConnInterface) AgentConfiguration
 }
 
 func (c *agentConfigurationClient) GetConfiguration(ctx context.Context, in *ConfigurationRequest, opts ...grpc.CallOption) (AgentConfiguration_GetConfigurationClient, error) {
-	stream, err := c.cc.NewStream(ctx, &AgentConfiguration_ServiceDesc.Streams[0], "/gitlab.agent.agent_configuration.rpc.AgentConfiguration/GetConfiguration", opts...)
+	stream, err := c.cc.NewStream(ctx, &AgentConfiguration_ServiceDesc.Streams[0], AgentConfiguration_GetConfiguration_FullMethodName, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -131,5 +136,5 @@ var AgentConfiguration_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "internal/module/agent_configuration/rpc/rpc.proto",
+	Metadata: "pkg/module/agent_configuration/rpc/rpc.proto",
 }
diff --git a/pkg/module/agent_configuration/rpc/rpc_proto_docs.md b/pkg/module/agent_configuration/rpc/rpc_proto_docs.md
index d8122484..47ff96b1 100644
--- a/pkg/module/agent_configuration/rpc/rpc_proto_docs.md
+++ b/pkg/module/agent_configuration/rpc/rpc_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/module/agent_configuration/rpc/rpc.proto](#internal_module_agent_configuration_rpc_rpc-proto)
+- [pkg/module/agent_configuration/rpc/rpc.proto](#pkg_module_agent_configuration_rpc_rpc-proto)
     - [ConfigurationRequest](#gitlab-agent-agent_configuration-rpc-ConfigurationRequest)
     - [ConfigurationResponse](#gitlab-agent-agent_configuration-rpc-ConfigurationResponse)
   
@@ -13,10 +13,10 @@
 
 
 
-<a name="internal_module_agent_configuration_rpc_rpc-proto"></a>
+<a name="pkg_module_agent_configuration_rpc_rpc-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/agent_configuration/rpc/rpc.proto
+## pkg/module/agent_configuration/rpc/rpc.proto
 
 
 
diff --git a/pkg/module/agent_registrar/rpc/rpc.pb.go b/pkg/module/agent_registrar/rpc/rpc.pb.go
index 822ff5a2..ad8dbd63 100644
--- a/pkg/module/agent_registrar/rpc/rpc.pb.go
+++ b/pkg/module/agent_registrar/rpc/rpc.pb.go
@@ -2,20 +2,18 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/agent_registrar/rpc/rpc.proto
+// source: pkg/module/agent_registrar/rpc/rpc.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"reflect"
-	"sync"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/entity"
+	entity "github.com/pluralsh/kuberentes-agent/pkg/entity"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -39,7 +37,7 @@ type RegisterRequest struct {
 func (x *RegisterRequest) Reset() {
 	*x = RegisterRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes[0]
+		mi := &file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -52,7 +50,7 @@ func (x *RegisterRequest) String() string {
 func (*RegisterRequest) ProtoMessage() {}
 
 func (x *RegisterRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes[0]
+	mi := &file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -65,7 +63,7 @@ func (x *RegisterRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RegisterRequest.ProtoReflect.Descriptor instead.
 func (*RegisterRequest) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_registrar_rpc_rpc_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *RegisterRequest) GetAgentMeta() *entity.AgentMeta {
@@ -91,7 +89,7 @@ type RegisterResponse struct {
 func (x *RegisterResponse) Reset() {
 	*x = RegisterResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes[1]
+		mi := &file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -104,7 +102,7 @@ func (x *RegisterResponse) String() string {
 func (*RegisterResponse) ProtoMessage() {}
 
 func (x *RegisterResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes[1]
+	mi := &file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -117,62 +115,61 @@ func (x *RegisterResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RegisterResponse.ProtoReflect.Descriptor instead.
 func (*RegisterResponse) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_registrar_rpc_rpc_proto_rawDescGZIP(), []int{1}
-}
-
-var File_internal_module_agent_registrar_rpc_rpc_proto protoreflect.FileDescriptor
-
-var file_internal_module_agent_registrar_rpc_rpc_proto_rawDesc = []byte{
-	0x0a, 0x2d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61,
-	0x72, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x20, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x2e, 0x72, 0x70,
-	0x63, 0x1a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0f, 0x52, 0x65,
-	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a,
-	0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74,
-	0x61, 0x52, 0x09, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x15, 0x0a, 0x06,
-	0x70, 0x6f, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x6f,
-	0x64, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x85, 0x01, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x12, 0x73, 0x0a, 0x08, 0x52, 0x65,
-	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x31, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69,
-	0x73, 0x74, 0x72, 0x61, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
-	0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	return file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescGZIP(), []int{1}
+}
+
+var File_pkg_module_agent_registrar_rpc_rpc_proto protoreflect.FileDescriptor
+
+var file_pkg_module_agent_registrar_rpc_rpc_proto_rawDesc = []byte{
+	0x0a, 0x28, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x2f, 0x72, 0x70, 0x63,
+	0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x67, 0x69, 0x74, 0x6c,
 	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x72,
-	0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x67,
-	0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42,
-	0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c,
-	0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65,
-	0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65,
-	0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x1a, 0x17, 0x70, 0x6b,
+	0x67, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0f, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x0a, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x09, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x15, 0x0a, 0x06, 0x70, 0x6f, 0x64, 0x5f, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x6f, 0x64, 0x49, 0x64, 0x22, 0x12,
+	0x0a, 0x10, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x32, 0x85, 0x01, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69,
+	0x73, 0x74, 0x72, 0x61, 0x72, 0x12, 0x73, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x72, 0x12, 0x31, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72,
+	0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74,
+	0x72, 0x61, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73,
+	0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x72, 0x2f, 0x72, 0x70,
+	0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_module_agent_registrar_rpc_rpc_proto_rawDescOnce sync.Once
-	file_internal_module_agent_registrar_rpc_rpc_proto_rawDescData = file_internal_module_agent_registrar_rpc_rpc_proto_rawDesc
+	file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescOnce sync.Once
+	file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescData = file_pkg_module_agent_registrar_rpc_rpc_proto_rawDesc
 )
 
-func file_internal_module_agent_registrar_rpc_rpc_proto_rawDescGZIP() []byte {
-	file_internal_module_agent_registrar_rpc_rpc_proto_rawDescOnce.Do(func() {
-		file_internal_module_agent_registrar_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_agent_registrar_rpc_rpc_proto_rawDescData)
+func file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescGZIP() []byte {
+	file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescOnce.Do(func() {
+		file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescData)
 	})
-	return file_internal_module_agent_registrar_rpc_rpc_proto_rawDescData
+	return file_pkg_module_agent_registrar_rpc_rpc_proto_rawDescData
 }
 
-var file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_internal_module_agent_registrar_rpc_rpc_proto_goTypes = []interface{}{
+var file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_pkg_module_agent_registrar_rpc_rpc_proto_goTypes = []interface{}{
 	(*RegisterRequest)(nil),  // 0: gitlab.agent.agent_registrar.rpc.RegisterRequest
 	(*RegisterResponse)(nil), // 1: gitlab.agent.agent_registrar.rpc.RegisterResponse
 	(*entity.AgentMeta)(nil), // 2: gitlab.agent.entity.AgentMeta
 }
-var file_internal_module_agent_registrar_rpc_rpc_proto_depIdxs = []int32{
+var file_pkg_module_agent_registrar_rpc_rpc_proto_depIdxs = []int32{
 	2, // 0: gitlab.agent.agent_registrar.rpc.RegisterRequest.agent_meta:type_name -> gitlab.agent.entity.AgentMeta
 	0, // 1: gitlab.agent.agent_registrar.rpc.AgentRegistrar.Register:input_type -> gitlab.agent.agent_registrar.rpc.RegisterRequest
 	1, // 2: gitlab.agent.agent_registrar.rpc.AgentRegistrar.Register:output_type -> gitlab.agent.agent_registrar.rpc.RegisterResponse
@@ -183,13 +180,13 @@ var file_internal_module_agent_registrar_rpc_rpc_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_agent_registrar_rpc_rpc_proto_init() }
-func file_internal_module_agent_registrar_rpc_rpc_proto_init() {
-	if File_internal_module_agent_registrar_rpc_rpc_proto != nil {
+func init() { file_pkg_module_agent_registrar_rpc_rpc_proto_init() }
+func file_pkg_module_agent_registrar_rpc_rpc_proto_init() {
+	if File_pkg_module_agent_registrar_rpc_rpc_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RegisterRequest); i {
 			case 0:
 				return &v.state
@@ -201,7 +198,7 @@ func file_internal_module_agent_registrar_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RegisterResponse); i {
 			case 0:
 				return &v.state
@@ -218,18 +215,18 @@ func file_internal_module_agent_registrar_rpc_rpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_agent_registrar_rpc_rpc_proto_rawDesc,
+			RawDescriptor: file_pkg_module_agent_registrar_rpc_rpc_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_internal_module_agent_registrar_rpc_rpc_proto_goTypes,
-		DependencyIndexes: file_internal_module_agent_registrar_rpc_rpc_proto_depIdxs,
-		MessageInfos:      file_internal_module_agent_registrar_rpc_rpc_proto_msgTypes,
+		GoTypes:           file_pkg_module_agent_registrar_rpc_rpc_proto_goTypes,
+		DependencyIndexes: file_pkg_module_agent_registrar_rpc_rpc_proto_depIdxs,
+		MessageInfos:      file_pkg_module_agent_registrar_rpc_rpc_proto_msgTypes,
 	}.Build()
-	File_internal_module_agent_registrar_rpc_rpc_proto = out.File
-	file_internal_module_agent_registrar_rpc_rpc_proto_rawDesc = nil
-	file_internal_module_agent_registrar_rpc_rpc_proto_goTypes = nil
-	file_internal_module_agent_registrar_rpc_rpc_proto_depIdxs = nil
+	File_pkg_module_agent_registrar_rpc_rpc_proto = out.File
+	file_pkg_module_agent_registrar_rpc_rpc_proto_rawDesc = nil
+	file_pkg_module_agent_registrar_rpc_rpc_proto_goTypes = nil
+	file_pkg_module_agent_registrar_rpc_rpc_proto_depIdxs = nil
 }
diff --git a/pkg/module/agent_registrar/rpc/rpc.pb.validate.go b/pkg/module/agent_registrar/rpc/rpc.pb.validate.go
index 8e5ef889..f2e62762 100644
--- a/pkg/module/agent_registrar/rpc/rpc.pb.validate.go
+++ b/pkg/module/agent_registrar/rpc/rpc.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/agent_registrar/rpc/rpc.proto
+// source: pkg/module/agent_registrar/rpc/rpc.proto
 
 package rpc
 
diff --git a/pkg/module/agent_registrar/rpc/rpc.proto b/pkg/module/agent_registrar/rpc/rpc.proto
index 7b3153b9..9704c6d4 100644
--- a/pkg/module/agent_registrar/rpc/rpc.proto
+++ b/pkg/module/agent_registrar/rpc/rpc.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.agent_registrar.rpc;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/agent_registrar/rpc";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/rpc";
 
 import "pkg/entity/entity.proto";
 
diff --git a/pkg/module/agent_registrar/rpc/rpc_grpc.pb.go b/pkg/module/agent_registrar/rpc/rpc_grpc.pb.go
index 8b942b31..d86cac1f 100644
--- a/pkg/module/agent_registrar/rpc/rpc_grpc.pb.go
+++ b/pkg/module/agent_registrar/rpc/rpc_grpc.pb.go
@@ -1,17 +1,18 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v4.24.4
-// source: internal/module/agent_registrar/rpc/rpc.proto
+// source: pkg/module/agent_registrar/rpc/rpc.proto
+
+// If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -19,6 +20,10 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	AgentRegistrar_Register_FullMethodName = "/gitlab.agent.agent_registrar.rpc.AgentRegistrar/Register"
+)
+
 // AgentRegistrarClient is the client API for AgentRegistrar service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
@@ -37,7 +42,7 @@ func NewAgentRegistrarClient(cc grpc.ClientConnInterface) AgentRegistrarClient {
 
 func (c *agentRegistrarClient) Register(ctx context.Context, in *RegisterRequest, opts ...grpc.CallOption) (*RegisterResponse, error) {
 	out := new(RegisterResponse)
-	err := c.cc.Invoke(ctx, "/gitlab.agent.agent_registrar.rpc.AgentRegistrar/Register", in, out, opts...)
+	err := c.cc.Invoke(ctx, AgentRegistrar_Register_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +88,7 @@ func _AgentRegistrar_Register_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gitlab.agent.agent_registrar.rpc.AgentRegistrar/Register",
+		FullMethod: AgentRegistrar_Register_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(AgentRegistrarServer).Register(ctx, req.(*RegisterRequest))
@@ -104,5 +109,5 @@ var AgentRegistrar_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "internal/module/agent_registrar/rpc/rpc.proto",
+	Metadata: "pkg/module/agent_registrar/rpc/rpc.proto",
 }
diff --git a/pkg/module/agent_registrar/rpc/rpc_proto_docs.md b/pkg/module/agent_registrar/rpc/rpc_proto_docs.md
index 7698474f..093204fb 100644
--- a/pkg/module/agent_registrar/rpc/rpc_proto_docs.md
+++ b/pkg/module/agent_registrar/rpc/rpc_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/module/agent_registrar/rpc/rpc.proto](#internal_module_agent_registrar_rpc_rpc-proto)
+- [pkg/module/agent_registrar/rpc/rpc.proto](#pkg_module_agent_registrar_rpc_rpc-proto)
     - [RegisterRequest](#gitlab-agent-agent_registrar-rpc-RegisterRequest)
     - [RegisterResponse](#gitlab-agent-agent_registrar-rpc-RegisterResponse)
   
@@ -13,10 +13,10 @@
 
 
 
-<a name="internal_module_agent_registrar_rpc_rpc-proto"></a>
+<a name="pkg_module_agent_registrar_rpc_rpc-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/agent_registrar/rpc/rpc.proto
+## pkg/module/agent_registrar/rpc/rpc.proto
 
 
 
diff --git a/pkg/module/agent_tracker/agent_tracker.pb.go b/pkg/module/agent_tracker/agent_tracker.pb.go
index 683eda95..2de920e3 100644
--- a/pkg/module/agent_tracker/agent_tracker.pb.go
+++ b/pkg/module/agent_tracker/agent_tracker.pb.go
@@ -2,21 +2,19 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/agent_tracker/agent_tracker.proto
+// source: pkg/module/agent_tracker/agent_tracker.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package agent_tracker
 
 import (
-	"reflect"
-	"sync"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/entity"
+	entity "github.com/pluralsh/kuberentes-agent/pkg/entity"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -48,7 +46,7 @@ type ConnectedAgentInfo struct {
 func (x *ConnectedAgentInfo) Reset() {
 	*x = ConnectedAgentInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_tracker_agent_tracker_proto_msgTypes[0]
+		mi := &file_pkg_module_agent_tracker_agent_tracker_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -61,7 +59,7 @@ func (x *ConnectedAgentInfo) String() string {
 func (*ConnectedAgentInfo) ProtoMessage() {}
 
 func (x *ConnectedAgentInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_tracker_agent_tracker_proto_msgTypes[0]
+	mi := &file_pkg_module_agent_tracker_agent_tracker_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -74,7 +72,7 @@ func (x *ConnectedAgentInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConnectedAgentInfo.ProtoReflect.Descriptor instead.
 func (*ConnectedAgentInfo) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_tracker_agent_tracker_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_agent_tracker_agent_tracker_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ConnectedAgentInfo) GetAgentMeta() *entity.AgentMeta {
@@ -112,59 +110,59 @@ func (x *ConnectedAgentInfo) GetProjectId() int64 {
 	return 0
 }
 
-var File_internal_module_agent_tracker_agent_tracker_proto protoreflect.FileDescriptor
-
-var file_internal_module_agent_tracker_agent_tracker_proto_rawDesc = []byte{
-	0x0a, 0x31, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2f,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x1a,
-	0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf6, 0x01, 0x0a, 0x12, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f,
-	0x12, 0x3e, 0x0a, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x4d, 0x65, 0x74, 0x61, 0x52, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61,
-	0x12, 0x3e, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74,
-	0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
-	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
-	0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
-	0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f,
-	0x69, 0x64, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65,
-	0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_pkg_module_agent_tracker_agent_tracker_proto protoreflect.FileDescriptor
+
+var file_pkg_module_agent_tracker_agent_tracker_proto_rawDesc = []byte{
+	0x0a, 0x2c, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x70, 0x6b, 0x67,
+	0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf6, 0x01, 0x0a, 0x12, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3e, 0x0a, 0x0a, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x52,
+	0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x12, 0x3e, 0x0a, 0x0c, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
+	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x12, 0x1e, 0x0a,
+	0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x42, 0x3f, 0x5a,
+	0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72,
+	0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
+	0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_module_agent_tracker_agent_tracker_proto_rawDescOnce sync.Once
-	file_internal_module_agent_tracker_agent_tracker_proto_rawDescData = file_internal_module_agent_tracker_agent_tracker_proto_rawDesc
+	file_pkg_module_agent_tracker_agent_tracker_proto_rawDescOnce sync.Once
+	file_pkg_module_agent_tracker_agent_tracker_proto_rawDescData = file_pkg_module_agent_tracker_agent_tracker_proto_rawDesc
 )
 
-func file_internal_module_agent_tracker_agent_tracker_proto_rawDescGZIP() []byte {
-	file_internal_module_agent_tracker_agent_tracker_proto_rawDescOnce.Do(func() {
-		file_internal_module_agent_tracker_agent_tracker_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_agent_tracker_agent_tracker_proto_rawDescData)
+func file_pkg_module_agent_tracker_agent_tracker_proto_rawDescGZIP() []byte {
+	file_pkg_module_agent_tracker_agent_tracker_proto_rawDescOnce.Do(func() {
+		file_pkg_module_agent_tracker_agent_tracker_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_agent_tracker_agent_tracker_proto_rawDescData)
 	})
-	return file_internal_module_agent_tracker_agent_tracker_proto_rawDescData
+	return file_pkg_module_agent_tracker_agent_tracker_proto_rawDescData
 }
 
-var file_internal_module_agent_tracker_agent_tracker_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_module_agent_tracker_agent_tracker_proto_goTypes = []interface{}{
+var file_pkg_module_agent_tracker_agent_tracker_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_module_agent_tracker_agent_tracker_proto_goTypes = []interface{}{
 	(*ConnectedAgentInfo)(nil),    // 0: gitlab.agent.agent_tracker.ConnectedAgentInfo
 	(*entity.AgentMeta)(nil),      // 1: gitlab.agent.entity.AgentMeta
 	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
 }
-var file_internal_module_agent_tracker_agent_tracker_proto_depIdxs = []int32{
+var file_pkg_module_agent_tracker_agent_tracker_proto_depIdxs = []int32{
 	1, // 0: gitlab.agent.agent_tracker.ConnectedAgentInfo.agent_meta:type_name -> gitlab.agent.entity.AgentMeta
 	2, // 1: gitlab.agent.agent_tracker.ConnectedAgentInfo.connected_at:type_name -> google.protobuf.Timestamp
 	2, // [2:2] is the sub-list for method output_type
@@ -174,13 +172,13 @@ var file_internal_module_agent_tracker_agent_tracker_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_agent_tracker_agent_tracker_proto_init() }
-func file_internal_module_agent_tracker_agent_tracker_proto_init() {
-	if File_internal_module_agent_tracker_agent_tracker_proto != nil {
+func init() { file_pkg_module_agent_tracker_agent_tracker_proto_init() }
+func file_pkg_module_agent_tracker_agent_tracker_proto_init() {
+	if File_pkg_module_agent_tracker_agent_tracker_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_agent_tracker_agent_tracker_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_tracker_agent_tracker_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConnectedAgentInfo); i {
 			case 0:
 				return &v.state
@@ -197,18 +195,18 @@ func file_internal_module_agent_tracker_agent_tracker_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_agent_tracker_agent_tracker_proto_rawDesc,
+			RawDescriptor: file_pkg_module_agent_tracker_agent_tracker_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_module_agent_tracker_agent_tracker_proto_goTypes,
-		DependencyIndexes: file_internal_module_agent_tracker_agent_tracker_proto_depIdxs,
-		MessageInfos:      file_internal_module_agent_tracker_agent_tracker_proto_msgTypes,
+		GoTypes:           file_pkg_module_agent_tracker_agent_tracker_proto_goTypes,
+		DependencyIndexes: file_pkg_module_agent_tracker_agent_tracker_proto_depIdxs,
+		MessageInfos:      file_pkg_module_agent_tracker_agent_tracker_proto_msgTypes,
 	}.Build()
-	File_internal_module_agent_tracker_agent_tracker_proto = out.File
-	file_internal_module_agent_tracker_agent_tracker_proto_rawDesc = nil
-	file_internal_module_agent_tracker_agent_tracker_proto_goTypes = nil
-	file_internal_module_agent_tracker_agent_tracker_proto_depIdxs = nil
+	File_pkg_module_agent_tracker_agent_tracker_proto = out.File
+	file_pkg_module_agent_tracker_agent_tracker_proto_rawDesc = nil
+	file_pkg_module_agent_tracker_agent_tracker_proto_goTypes = nil
+	file_pkg_module_agent_tracker_agent_tracker_proto_depIdxs = nil
 }
diff --git a/pkg/module/agent_tracker/agent_tracker.pb.validate.go b/pkg/module/agent_tracker/agent_tracker.pb.validate.go
index 130d8ddc..aca96317 100644
--- a/pkg/module/agent_tracker/agent_tracker.pb.validate.go
+++ b/pkg/module/agent_tracker/agent_tracker.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/agent_tracker/agent_tracker.proto
+// source: pkg/module/agent_tracker/agent_tracker.proto
 
 package agent_tracker
 
diff --git a/pkg/module/agent_tracker/agent_tracker.proto b/pkg/module/agent_tracker/agent_tracker.proto
index a18ac463..10673a39 100644
--- a/pkg/module/agent_tracker/agent_tracker.proto
+++ b/pkg/module/agent_tracker/agent_tracker.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.agent_tracker;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/agent_tracker";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker";
 
 import "google/protobuf/timestamp.proto";
 import "pkg/entity/entity.proto";
diff --git a/pkg/module/agent_tracker/agent_tracker_proto_docs.md b/pkg/module/agent_tracker/agent_tracker_proto_docs.md
index 21ff9081..c65045f3 100644
--- a/pkg/module/agent_tracker/agent_tracker_proto_docs.md
+++ b/pkg/module/agent_tracker/agent_tracker_proto_docs.md
@@ -3,17 +3,17 @@
 
 ## Table of Contents
 
-- [internal/module/agent_tracker/agent_tracker.proto](#internal_module_agent_tracker_agent_tracker-proto)
+- [pkg/module/agent_tracker/agent_tracker.proto](#pkg_module_agent_tracker_agent_tracker-proto)
     - [ConnectedAgentInfo](#gitlab-agent-agent_tracker-ConnectedAgentInfo)
   
 - [Scalar Value Types](#scalar-value-types)
 
 
 
-<a name="internal_module_agent_tracker_agent_tracker-proto"></a>
+<a name="pkg_module_agent_tracker_agent_tracker-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/agent_tracker/agent_tracker.proto
+## pkg/module/agent_tracker/agent_tracker.proto
 
 
 
diff --git a/pkg/module/agent_tracker/rpc/rpc.pb.go b/pkg/module/agent_tracker/rpc/rpc.pb.go
index 4d186695..43386c2c 100644
--- a/pkg/module/agent_tracker/rpc/rpc.pb.go
+++ b/pkg/module/agent_tracker/rpc/rpc.pb.go
@@ -2,21 +2,19 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/agent_tracker/rpc/rpc.proto
+// source: pkg/module/agent_tracker/rpc/rpc.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker"
+	agent_tracker "github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -41,7 +39,7 @@ type GetConnectedAgentsRequest struct {
 func (x *GetConnectedAgentsRequest) Reset() {
 	*x = GetConnectedAgentsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[0]
+		mi := &file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -54,7 +52,7 @@ func (x *GetConnectedAgentsRequest) String() string {
 func (*GetConnectedAgentsRequest) ProtoMessage() {}
 
 func (x *GetConnectedAgentsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[0]
+	mi := &file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -67,7 +65,7 @@ func (x *GetConnectedAgentsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetConnectedAgentsRequest.ProtoReflect.Descriptor instead.
 func (*GetConnectedAgentsRequest) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_tracker_rpc_rpc_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescGZIP(), []int{0}
 }
 
 func (m *GetConnectedAgentsRequest) GetRequest() isGetConnectedAgentsRequest_Request {
@@ -119,7 +117,7 @@ type GetConnectedAgentsResponse struct {
 func (x *GetConnectedAgentsResponse) Reset() {
 	*x = GetConnectedAgentsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[1]
+		mi := &file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -132,7 +130,7 @@ func (x *GetConnectedAgentsResponse) String() string {
 func (*GetConnectedAgentsResponse) ProtoMessage() {}
 
 func (x *GetConnectedAgentsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[1]
+	mi := &file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -145,7 +143,7 @@ func (x *GetConnectedAgentsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetConnectedAgentsResponse.ProtoReflect.Descriptor instead.
 func (*GetConnectedAgentsResponse) Descriptor() ([]byte, []int) {
-	return file_internal_module_agent_tracker_rpc_rpc_proto_rawDescGZIP(), []int{1}
+	return file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *GetConnectedAgentsResponse) GetAgents() []*agent_tracker.ConnectedAgentInfo {
@@ -155,68 +153,67 @@ func (x *GetConnectedAgentsResponse) GetAgents() []*agent_tracker.ConnectedAgent
 	return nil
 }
 
-var File_internal_module_agent_tracker_rpc_rpc_proto protoreflect.FileDescriptor
-
-var file_internal_module_agent_tracker_rpc_rpc_proto_rawDesc = []byte{
-	0x0a, 0x2b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2f,
-	0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1e, 0x67,
-	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x1a, 0x31, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x69, 0x0a, 0x19, 0x47, 0x65, 0x74,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63,
-	0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x09, 0x70, 0x72,
-	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x07, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x49, 0x64, 0x42, 0x0e, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x03, 0xf8, 0x42, 0x01, 0x22, 0x64, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x46, 0x0a, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x32, 0x9e, 0x01, 0x0a, 0x0c, 0x41,
-	0x67, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x12, 0x8d, 0x01, 0x0a, 0x12,
-	0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e,
-	0x74, 0x73, 0x12, 0x39, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e,
-	0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
-	0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e,
-	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47,
-	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x48, 0x5a, 0x46, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c,
-	0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64,
-	0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65,
-	0x72, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_pkg_module_agent_tracker_rpc_rpc_proto protoreflect.FileDescriptor
+
+var file_pkg_module_agent_tracker_rpc_rpc_proto_rawDesc = []byte{
+	0x0a, 0x26, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x72,
+	0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61,
+	0x63, 0x6b, 0x65, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x1a, 0x2c, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f,
+	0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b,
+	0x65, 0x72, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
+	0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
+	0x69, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0a,
+	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x48, 0x00, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x1b, 0x0a,
+	0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48,
+	0x00, 0x52, 0x07, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x42, 0x0e, 0x0a, 0x07, 0x72, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x64, 0x0a, 0x1a, 0x47, 0x65,
+	0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x46, 0x0a, 0x06, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72,
+	0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73,
+	0x32, 0x9e, 0x01, 0x0a, 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x65,
+	0x72, 0x12, 0x8d, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x39, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72,
+	0x61, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72,
+	0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65,
+	0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e,
+	0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f,
+	0x64, 0x75, 0x6c, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b,
+	0x65, 0x72, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_module_agent_tracker_rpc_rpc_proto_rawDescOnce sync.Once
-	file_internal_module_agent_tracker_rpc_rpc_proto_rawDescData = file_internal_module_agent_tracker_rpc_rpc_proto_rawDesc
+	file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescOnce sync.Once
+	file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescData = file_pkg_module_agent_tracker_rpc_rpc_proto_rawDesc
 )
 
-func file_internal_module_agent_tracker_rpc_rpc_proto_rawDescGZIP() []byte {
-	file_internal_module_agent_tracker_rpc_rpc_proto_rawDescOnce.Do(func() {
-		file_internal_module_agent_tracker_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_agent_tracker_rpc_rpc_proto_rawDescData)
+func file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescGZIP() []byte {
+	file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescOnce.Do(func() {
+		file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescData)
 	})
-	return file_internal_module_agent_tracker_rpc_rpc_proto_rawDescData
+	return file_pkg_module_agent_tracker_rpc_rpc_proto_rawDescData
 }
 
-var file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_internal_module_agent_tracker_rpc_rpc_proto_goTypes = []interface{}{
+var file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_pkg_module_agent_tracker_rpc_rpc_proto_goTypes = []interface{}{
 	(*GetConnectedAgentsRequest)(nil),        // 0: gitlab.agent.agent_tracker.rpc.GetConnectedAgentsRequest
 	(*GetConnectedAgentsResponse)(nil),       // 1: gitlab.agent.agent_tracker.rpc.GetConnectedAgentsResponse
 	(*agent_tracker.ConnectedAgentInfo)(nil), // 2: gitlab.agent.agent_tracker.ConnectedAgentInfo
 }
-var file_internal_module_agent_tracker_rpc_rpc_proto_depIdxs = []int32{
+var file_pkg_module_agent_tracker_rpc_rpc_proto_depIdxs = []int32{
 	2, // 0: gitlab.agent.agent_tracker.rpc.GetConnectedAgentsResponse.agents:type_name -> gitlab.agent.agent_tracker.ConnectedAgentInfo
 	0, // 1: gitlab.agent.agent_tracker.rpc.AgentTracker.GetConnectedAgents:input_type -> gitlab.agent.agent_tracker.rpc.GetConnectedAgentsRequest
 	1, // 2: gitlab.agent.agent_tracker.rpc.AgentTracker.GetConnectedAgents:output_type -> gitlab.agent.agent_tracker.rpc.GetConnectedAgentsResponse
@@ -227,13 +224,13 @@ var file_internal_module_agent_tracker_rpc_rpc_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_agent_tracker_rpc_rpc_proto_init() }
-func file_internal_module_agent_tracker_rpc_rpc_proto_init() {
-	if File_internal_module_agent_tracker_rpc_rpc_proto != nil {
+func init() { file_pkg_module_agent_tracker_rpc_rpc_proto_init() }
+func file_pkg_module_agent_tracker_rpc_rpc_proto_init() {
+	if File_pkg_module_agent_tracker_rpc_rpc_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetConnectedAgentsRequest); i {
 			case 0:
 				return &v.state
@@ -245,7 +242,7 @@ func file_internal_module_agent_tracker_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetConnectedAgentsResponse); i {
 			case 0:
 				return &v.state
@@ -258,7 +255,7 @@ func file_internal_module_agent_tracker_rpc_rpc_proto_init() {
 			}
 		}
 	}
-	file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*GetConnectedAgentsRequest_ProjectId)(nil),
 		(*GetConnectedAgentsRequest_AgentId)(nil),
 	}
@@ -266,18 +263,18 @@ func file_internal_module_agent_tracker_rpc_rpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_agent_tracker_rpc_rpc_proto_rawDesc,
+			RawDescriptor: file_pkg_module_agent_tracker_rpc_rpc_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_internal_module_agent_tracker_rpc_rpc_proto_goTypes,
-		DependencyIndexes: file_internal_module_agent_tracker_rpc_rpc_proto_depIdxs,
-		MessageInfos:      file_internal_module_agent_tracker_rpc_rpc_proto_msgTypes,
+		GoTypes:           file_pkg_module_agent_tracker_rpc_rpc_proto_goTypes,
+		DependencyIndexes: file_pkg_module_agent_tracker_rpc_rpc_proto_depIdxs,
+		MessageInfos:      file_pkg_module_agent_tracker_rpc_rpc_proto_msgTypes,
 	}.Build()
-	File_internal_module_agent_tracker_rpc_rpc_proto = out.File
-	file_internal_module_agent_tracker_rpc_rpc_proto_rawDesc = nil
-	file_internal_module_agent_tracker_rpc_rpc_proto_goTypes = nil
-	file_internal_module_agent_tracker_rpc_rpc_proto_depIdxs = nil
+	File_pkg_module_agent_tracker_rpc_rpc_proto = out.File
+	file_pkg_module_agent_tracker_rpc_rpc_proto_rawDesc = nil
+	file_pkg_module_agent_tracker_rpc_rpc_proto_goTypes = nil
+	file_pkg_module_agent_tracker_rpc_rpc_proto_depIdxs = nil
 }
diff --git a/pkg/module/agent_tracker/rpc/rpc.pb.validate.go b/pkg/module/agent_tracker/rpc/rpc.pb.validate.go
index 91597118..7557865d 100644
--- a/pkg/module/agent_tracker/rpc/rpc.pb.validate.go
+++ b/pkg/module/agent_tracker/rpc/rpc.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/agent_tracker/rpc/rpc.proto
+// source: pkg/module/agent_tracker/rpc/rpc.proto
 
 package rpc
 
diff --git a/pkg/module/agent_tracker/rpc/rpc.proto b/pkg/module/agent_tracker/rpc/rpc.proto
index 50fb0ae0..621528dc 100644
--- a/pkg/module/agent_tracker/rpc/rpc.proto
+++ b/pkg/module/agent_tracker/rpc/rpc.proto
@@ -4,9 +4,9 @@ syntax = "proto3";
 
 package gitlab.agent.agent_tracker.rpc;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/agent_tracker/rpc";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker/rpc";
 
-import "internal/module/agent_tracker/agent_tracker.proto";
+import "pkg/module/agent_tracker/agent_tracker.proto";
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
 
diff --git a/pkg/module/agent_tracker/rpc/rpc_grpc.pb.go b/pkg/module/agent_tracker/rpc/rpc_grpc.pb.go
index 2ad09f1a..41f87f51 100644
--- a/pkg/module/agent_tracker/rpc/rpc_grpc.pb.go
+++ b/pkg/module/agent_tracker/rpc/rpc_grpc.pb.go
@@ -1,17 +1,18 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v4.24.4
-// source: internal/module/agent_tracker/rpc/rpc.proto
+// source: pkg/module/agent_tracker/rpc/rpc.proto
+
+// If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -19,6 +20,10 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	AgentTracker_GetConnectedAgents_FullMethodName = "/gitlab.agent.agent_tracker.rpc.AgentTracker/GetConnectedAgents"
+)
+
 // AgentTrackerClient is the client API for AgentTracker service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
@@ -37,7 +42,7 @@ func NewAgentTrackerClient(cc grpc.ClientConnInterface) AgentTrackerClient {
 
 func (c *agentTrackerClient) GetConnectedAgents(ctx context.Context, in *GetConnectedAgentsRequest, opts ...grpc.CallOption) (*GetConnectedAgentsResponse, error) {
 	out := new(GetConnectedAgentsResponse)
-	err := c.cc.Invoke(ctx, "/gitlab.agent.agent_tracker.rpc.AgentTracker/GetConnectedAgents", in, out, opts...)
+	err := c.cc.Invoke(ctx, AgentTracker_GetConnectedAgents_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +88,7 @@ func _AgentTracker_GetConnectedAgents_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gitlab.agent.agent_tracker.rpc.AgentTracker/GetConnectedAgents",
+		FullMethod: AgentTracker_GetConnectedAgents_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(AgentTrackerServer).GetConnectedAgents(ctx, req.(*GetConnectedAgentsRequest))
@@ -104,5 +109,5 @@ var AgentTracker_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "internal/module/agent_tracker/rpc/rpc.proto",
+	Metadata: "pkg/module/agent_tracker/rpc/rpc.proto",
 }
diff --git a/pkg/module/agent_tracker/rpc/rpc_proto_docs.md b/pkg/module/agent_tracker/rpc/rpc_proto_docs.md
index 75d03dce..3f21859c 100644
--- a/pkg/module/agent_tracker/rpc/rpc_proto_docs.md
+++ b/pkg/module/agent_tracker/rpc/rpc_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/module/agent_tracker/rpc/rpc.proto](#internal_module_agent_tracker_rpc_rpc-proto)
+- [pkg/module/agent_tracker/rpc/rpc.proto](#pkg_module_agent_tracker_rpc_rpc-proto)
     - [GetConnectedAgentsRequest](#gitlab-agent-agent_tracker-rpc-GetConnectedAgentsRequest)
     - [GetConnectedAgentsResponse](#gitlab-agent-agent_tracker-rpc-GetConnectedAgentsResponse)
   
@@ -13,10 +13,10 @@
 
 
 
-<a name="internal_module_agent_tracker_rpc_rpc-proto"></a>
+<a name="pkg_module_agent_tracker_rpc_rpc-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/agent_tracker/rpc/rpc.proto
+## pkg/module/agent_tracker/rpc/rpc.proto
 
 
 
diff --git a/pkg/module/kubernetes_api/rpc/rpc.pb.go b/pkg/module/kubernetes_api/rpc/rpc.pb.go
index bd1d350a..90d6b452 100644
--- a/pkg/module/kubernetes_api/rpc/rpc.pb.go
+++ b/pkg/module/kubernetes_api/rpc/rpc.pb.go
@@ -2,20 +2,18 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/kubernetes_api/rpc/rpc.proto
+// source: pkg/module/kubernetes_api/rpc/rpc.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"reflect"
-	"sync"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	grpctool "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -37,7 +35,7 @@ type HeaderExtra struct {
 func (x *HeaderExtra) Reset() {
 	*x = HeaderExtra{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[0]
+		mi := &file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -50,7 +48,7 @@ func (x *HeaderExtra) String() string {
 func (*HeaderExtra) ProtoMessage() {}
 
 func (x *HeaderExtra) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[0]
+	mi := &file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -63,7 +61,7 @@ func (x *HeaderExtra) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeaderExtra.ProtoReflect.Descriptor instead.
 func (*HeaderExtra) Descriptor() ([]byte, []int) {
-	return file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *HeaderExtra) GetImpConfig() *ImpersonationConfig {
@@ -89,7 +87,7 @@ type ImpersonationConfig struct {
 func (x *ImpersonationConfig) Reset() {
 	*x = ImpersonationConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[1]
+		mi := &file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -102,7 +100,7 @@ func (x *ImpersonationConfig) String() string {
 func (*ImpersonationConfig) ProtoMessage() {}
 
 func (x *ImpersonationConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[1]
+	mi := &file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -115,7 +113,7 @@ func (x *ImpersonationConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ImpersonationConfig.ProtoReflect.Descriptor instead.
 func (*ImpersonationConfig) Descriptor() ([]byte, []int) {
-	return file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP(), []int{1}
+	return file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ImpersonationConfig) GetUsername() string {
@@ -158,7 +156,7 @@ type ExtraKeyVal struct {
 func (x *ExtraKeyVal) Reset() {
 	*x = ExtraKeyVal{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[2]
+		mi := &file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -171,7 +169,7 @@ func (x *ExtraKeyVal) String() string {
 func (*ExtraKeyVal) ProtoMessage() {}
 
 func (x *ExtraKeyVal) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[2]
+	mi := &file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -184,7 +182,7 @@ func (x *ExtraKeyVal) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExtraKeyVal.ProtoReflect.Descriptor instead.
 func (*ExtraKeyVal) Descriptor() ([]byte, []int) {
-	return file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP(), []int{2}
+	return file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ExtraKeyVal) GetKey() string {
@@ -201,72 +199,71 @@ func (x *ExtraKeyVal) GetVal() []string {
 	return nil
 }
 
-var File_internal_module_kubernetes_api_rpc_rpc_proto protoreflect.FileDescriptor
-
-var file_internal_module_kubernetes_api_rpc_rpc_proto_rawDesc = []byte{
-	0x0a, 0x2c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69,
-	0x2f, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f,
+var File_pkg_module_kubernetes_api_rpc_rpc_proto protoreflect.FileDescriptor
+
+var file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDesc = []byte{
+	0x0a, 0x27, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x6b, 0x75, 0x62,
+	0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x2f,
+	0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
+	0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x70, 0x63, 0x1a, 0x20, 0x70, 0x6b, 0x67, 0x2f,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72,
+	0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x62, 0x0a, 0x0b,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x78, 0x74, 0x72, 0x61, 0x12, 0x53, 0x0a, 0x0a, 0x69,
+	0x6d, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x34, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b,
+	0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x49, 0x6d, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x09, 0x69, 0x6d, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x22, 0x9f, 0x01, 0x0a, 0x13, 0x49, 0x6d, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x42,
+	0x0a, 0x05, 0x65, 0x78, 0x74, 0x72, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e,
 	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x75, 0x62,
-	0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x70, 0x63, 0x1a,
-	0x25, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67,
-	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x62, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x45, 0x78, 0x74, 0x72, 0x61, 0x12, 0x53, 0x0a, 0x0a, 0x69, 0x6d, 0x70, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x69, 0x74, 0x6c,
-	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65,
-	0x74, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6d, 0x70, 0x65,
-	0x72, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x09, 0x69, 0x6d, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x9f, 0x01, 0x0a, 0x13, 0x49,
-	0x6d, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x42, 0x0a, 0x05, 0x65, 0x78, 0x74, 0x72,
-	0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65,
-	0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x4b,
-	0x65, 0x79, 0x56, 0x61, 0x6c, 0x52, 0x05, 0x65, 0x78, 0x74, 0x72, 0x61, 0x22, 0x31, 0x0a, 0x0b,
-	0x45, 0x78, 0x74, 0x72, 0x61, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x32,
-	0x6d, 0x0a, 0x0d, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x41, 0x70, 0x69,
-	0x12, 0x5c, 0x0a, 0x0b, 0x4d, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x22, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x49,
-	0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75,
-	0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73,
-	0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
-	0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65,
-	0x73, 0x5f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x70, 0x63, 0x2e,
+	0x45, 0x78, 0x74, 0x72, 0x61, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x52, 0x05, 0x65, 0x78, 0x74,
+	0x72, 0x61, 0x22, 0x31, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x72, 0x61, 0x4b, 0x65, 0x79, 0x56, 0x61,
+	0x6c, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x03, 0x76, 0x61, 0x6c, 0x32, 0x6d, 0x0a, 0x0d, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65,
+	0x74, 0x65, 0x73, 0x41, 0x70, 0x69, 0x12, 0x5c, 0x0a, 0x0b, 0x4d, 0x61, 0x6b, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74,
+	0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f,
+	0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x28, 0x01, 0x30, 0x01, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65,
+	0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67,
+	0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
+	0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
-	file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescOnce sync.Once
-	file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescData = file_internal_module_kubernetes_api_rpc_rpc_proto_rawDesc
+	file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescOnce sync.Once
+	file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescData = file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDesc
 )
 
-func file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP() []byte {
-	file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescOnce.Do(func() {
-		file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescData)
+func file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescGZIP() []byte {
+	file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescOnce.Do(func() {
+		file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescData)
 	})
-	return file_internal_module_kubernetes_api_rpc_rpc_proto_rawDescData
+	return file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDescData
 }
 
-var file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_internal_module_kubernetes_api_rpc_rpc_proto_goTypes = []interface{}{
+var file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_pkg_module_kubernetes_api_rpc_rpc_proto_goTypes = []interface{}{
 	(*HeaderExtra)(nil),           // 0: gitlab.agent.kubernetes_api.rpc.HeaderExtra
 	(*ImpersonationConfig)(nil),   // 1: gitlab.agent.kubernetes_api.rpc.ImpersonationConfig
 	(*ExtraKeyVal)(nil),           // 2: gitlab.agent.kubernetes_api.rpc.ExtraKeyVal
 	(*grpctool.HttpRequest)(nil),  // 3: gitlab.agent.grpctool.HttpRequest
 	(*grpctool.HttpResponse)(nil), // 4: gitlab.agent.grpctool.HttpResponse
 }
-var file_internal_module_kubernetes_api_rpc_rpc_proto_depIdxs = []int32{
+var file_pkg_module_kubernetes_api_rpc_rpc_proto_depIdxs = []int32{
 	1, // 0: gitlab.agent.kubernetes_api.rpc.HeaderExtra.imp_config:type_name -> gitlab.agent.kubernetes_api.rpc.ImpersonationConfig
 	2, // 1: gitlab.agent.kubernetes_api.rpc.ImpersonationConfig.extra:type_name -> gitlab.agent.kubernetes_api.rpc.ExtraKeyVal
 	3, // 2: gitlab.agent.kubernetes_api.rpc.KubernetesApi.MakeRequest:input_type -> gitlab.agent.grpctool.HttpRequest
@@ -278,13 +275,13 @@ var file_internal_module_kubernetes_api_rpc_rpc_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_kubernetes_api_rpc_rpc_proto_init() }
-func file_internal_module_kubernetes_api_rpc_rpc_proto_init() {
-	if File_internal_module_kubernetes_api_rpc_rpc_proto != nil {
+func init() { file_pkg_module_kubernetes_api_rpc_rpc_proto_init() }
+func file_pkg_module_kubernetes_api_rpc_rpc_proto_init() {
+	if File_pkg_module_kubernetes_api_rpc_rpc_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeaderExtra); i {
 			case 0:
 				return &v.state
@@ -296,7 +293,7 @@ func file_internal_module_kubernetes_api_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ImpersonationConfig); i {
 			case 0:
 				return &v.state
@@ -308,7 +305,7 @@ func file_internal_module_kubernetes_api_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExtraKeyVal); i {
 			case 0:
 				return &v.state
@@ -325,18 +322,18 @@ func file_internal_module_kubernetes_api_rpc_rpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_kubernetes_api_rpc_rpc_proto_rawDesc,
+			RawDescriptor: file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_internal_module_kubernetes_api_rpc_rpc_proto_goTypes,
-		DependencyIndexes: file_internal_module_kubernetes_api_rpc_rpc_proto_depIdxs,
-		MessageInfos:      file_internal_module_kubernetes_api_rpc_rpc_proto_msgTypes,
+		GoTypes:           file_pkg_module_kubernetes_api_rpc_rpc_proto_goTypes,
+		DependencyIndexes: file_pkg_module_kubernetes_api_rpc_rpc_proto_depIdxs,
+		MessageInfos:      file_pkg_module_kubernetes_api_rpc_rpc_proto_msgTypes,
 	}.Build()
-	File_internal_module_kubernetes_api_rpc_rpc_proto = out.File
-	file_internal_module_kubernetes_api_rpc_rpc_proto_rawDesc = nil
-	file_internal_module_kubernetes_api_rpc_rpc_proto_goTypes = nil
-	file_internal_module_kubernetes_api_rpc_rpc_proto_depIdxs = nil
+	File_pkg_module_kubernetes_api_rpc_rpc_proto = out.File
+	file_pkg_module_kubernetes_api_rpc_rpc_proto_rawDesc = nil
+	file_pkg_module_kubernetes_api_rpc_rpc_proto_goTypes = nil
+	file_pkg_module_kubernetes_api_rpc_rpc_proto_depIdxs = nil
 }
diff --git a/pkg/module/kubernetes_api/rpc/rpc.pb.validate.go b/pkg/module/kubernetes_api/rpc/rpc.pb.validate.go
index 1f386eaf..57c301e4 100644
--- a/pkg/module/kubernetes_api/rpc/rpc.pb.validate.go
+++ b/pkg/module/kubernetes_api/rpc/rpc.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/kubernetes_api/rpc/rpc.proto
+// source: pkg/module/kubernetes_api/rpc/rpc.proto
 
 package rpc
 
diff --git a/pkg/module/kubernetes_api/rpc/rpc.proto b/pkg/module/kubernetes_api/rpc/rpc.proto
index cf3230c0..be130088 100644
--- a/pkg/module/kubernetes_api/rpc/rpc.proto
+++ b/pkg/module/kubernetes_api/rpc/rpc.proto
@@ -4,9 +4,9 @@ syntax = "proto3";
 
 package gitlab.agent.kubernetes_api.rpc;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/kubernetes_api/rpc";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/rpc";
 
-import "internal/tool/grpctool/grpctool.proto";
+import "pkg/tool/grpctool/grpctool.proto";
 
 service KubernetesApi {
   // MakeRequest allows to make a HTTP request to Kubernetes API.
diff --git a/pkg/module/kubernetes_api/rpc/rpc_grpc.pb.go b/pkg/module/kubernetes_api/rpc/rpc_grpc.pb.go
index 6ce1b5b3..da62e63e 100644
--- a/pkg/module/kubernetes_api/rpc/rpc_grpc.pb.go
+++ b/pkg/module/kubernetes_api/rpc/rpc_grpc.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v4.24.4
-// source: internal/module/kubernetes_api/rpc/rpc.proto
+// source: pkg/module/kubernetes_api/rpc/rpc.proto
+
+// If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	context "context"
+	grpctool "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -21,6 +21,10 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	KubernetesApi_MakeRequest_FullMethodName = "/gitlab.agent.kubernetes_api.rpc.KubernetesApi/MakeRequest"
+)
+
 // KubernetesApiClient is the client API for KubernetesApi service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
@@ -38,7 +42,7 @@ func NewKubernetesApiClient(cc grpc.ClientConnInterface) KubernetesApiClient {
 }
 
 func (c *kubernetesApiClient) MakeRequest(ctx context.Context, opts ...grpc.CallOption) (KubernetesApi_MakeRequestClient, error) {
-	stream, err := c.cc.NewStream(ctx, &KubernetesApi_ServiceDesc.Streams[0], "/gitlab.agent.kubernetes_api.rpc.KubernetesApi/MakeRequest", opts...)
+	stream, err := c.cc.NewStream(ctx, &KubernetesApi_ServiceDesc.Streams[0], KubernetesApi_MakeRequest_FullMethodName, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -138,5 +142,5 @@ var KubernetesApi_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "internal/module/kubernetes_api/rpc/rpc.proto",
+	Metadata: "pkg/module/kubernetes_api/rpc/rpc.proto",
 }
diff --git a/pkg/module/kubernetes_api/rpc/rpc_proto_docs.md b/pkg/module/kubernetes_api/rpc/rpc_proto_docs.md
index b931880e..59ffcfd9 100644
--- a/pkg/module/kubernetes_api/rpc/rpc_proto_docs.md
+++ b/pkg/module/kubernetes_api/rpc/rpc_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/module/kubernetes_api/rpc/rpc.proto](#internal_module_kubernetes_api_rpc_rpc-proto)
+- [pkg/module/kubernetes_api/rpc/rpc.proto](#pkg_module_kubernetes_api_rpc_rpc-proto)
     - [ExtraKeyVal](#gitlab-agent-kubernetes_api-rpc-ExtraKeyVal)
     - [HeaderExtra](#gitlab-agent-kubernetes_api-rpc-HeaderExtra)
     - [ImpersonationConfig](#gitlab-agent-kubernetes_api-rpc-ImpersonationConfig)
@@ -14,10 +14,10 @@
 
 
 
-<a name="internal_module_kubernetes_api_rpc_rpc-proto"></a>
+<a name="pkg_module_kubernetes_api_rpc_rpc-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/kubernetes_api/rpc/rpc.proto
+## pkg/module/kubernetes_api/rpc/rpc.proto
 
 
 
diff --git a/pkg/module/modagent/mock_for_test.go b/pkg/module/modagent/mock_for_test.go
index 13391cb9..5de25b0b 100644
--- a/pkg/module/modagent/mock_for_test.go
+++ b/pkg/module/modagent/mock_for_test.go
@@ -9,13 +9,12 @@
 package modagent
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
+	agentcfg "github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
+	gomock "go.uber.org/mock/gomock"
+	proto "google.golang.org/protobuf/proto"
 )
 
 // MockWorkSource is a mock of WorkSource interface.
diff --git a/pkg/module/reverse_tunnel/info/info.pb.go b/pkg/module/reverse_tunnel/info/info.pb.go
index 07041494..e584719e 100644
--- a/pkg/module/reverse_tunnel/info/info.pb.go
+++ b/pkg/module/reverse_tunnel/info/info.pb.go
@@ -2,19 +2,18 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/reverse_tunnel/info/info.proto
+// source: pkg/module/reverse_tunnel/info/info.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package info
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -35,7 +34,7 @@ type Method struct {
 func (x *Method) Reset() {
 	*x = Method{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_info_info_proto_msgTypes[0]
+		mi := &file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -48,7 +47,7 @@ func (x *Method) String() string {
 func (*Method) ProtoMessage() {}
 
 func (x *Method) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_info_info_proto_msgTypes[0]
+	mi := &file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -61,7 +60,7 @@ func (x *Method) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Method.ProtoReflect.Descriptor instead.
 func (*Method) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_info_info_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_reverse_tunnel_info_info_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Method) GetName() string {
@@ -83,7 +82,7 @@ type Service struct {
 func (x *Service) Reset() {
 	*x = Service{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_info_info_proto_msgTypes[1]
+		mi := &file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -96,7 +95,7 @@ func (x *Service) String() string {
 func (*Service) ProtoMessage() {}
 
 func (x *Service) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_info_info_proto_msgTypes[1]
+	mi := &file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -109,7 +108,7 @@ func (x *Service) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Service.ProtoReflect.Descriptor instead.
 func (*Service) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_info_info_proto_rawDescGZIP(), []int{1}
+	return file_pkg_module_reverse_tunnel_info_info_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *Service) GetName() string {
@@ -137,7 +136,7 @@ type AgentDescriptor struct {
 func (x *AgentDescriptor) Reset() {
 	*x = AgentDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_info_info_proto_msgTypes[2]
+		mi := &file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -150,7 +149,7 @@ func (x *AgentDescriptor) String() string {
 func (*AgentDescriptor) ProtoMessage() {}
 
 func (x *AgentDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_info_info_proto_msgTypes[2]
+	mi := &file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -163,7 +162,7 @@ func (x *AgentDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AgentDescriptor.ProtoReflect.Descriptor instead.
 func (*AgentDescriptor) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_info_info_proto_rawDescGZIP(), []int{2}
+	return file_pkg_module_reverse_tunnel_info_info_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *AgentDescriptor) GetServices() []*Service {
@@ -173,57 +172,57 @@ func (x *AgentDescriptor) GetServices() []*Service {
 	return nil
 }
 
-var File_internal_module_reverse_tunnel_info_info_proto protoreflect.FileDescriptor
-
-var file_internal_module_reverse_tunnel_info_info_proto_rawDesc = []byte{
-	0x0a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c,
-	0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x20, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72,
-	0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x69, 0x6e,
-	0x66, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x25, 0x0a, 0x06, 0x4d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x22, 0x6a, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1b, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
-	0x72, 0x02, 0x20, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x6d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72,
-	0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x4d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x07, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x22, 0x58,
-	0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x12, 0x45, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65,
-	0x6c, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x08,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x42, 0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f,
-	0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-	0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2f,
-	0x69, 0x6e, 0x66, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_pkg_module_reverse_tunnel_info_info_proto protoreflect.FileDescriptor
+
+var file_pkg_module_reverse_tunnel_info_info_proto_rawDesc = []byte{
+	0x0a, 0x29, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76,
+	0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2f, 0x69, 0x6e, 0x66, 0x6f,
+	0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73,
+	0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x1a, 0x17, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x25, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x6a, 0x0a,
+	0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75,
+	0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x52, 0x07, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x22, 0x58, 0x0a, 0x0f, 0x41, 0x67, 0x65,
+	0x6e, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x45, 0x0a, 0x08,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65,
+	0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x69, 0x6e, 0x66,
+	0x6f, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72,
+	0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
+	0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74,
+	0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
-	file_internal_module_reverse_tunnel_info_info_proto_rawDescOnce sync.Once
-	file_internal_module_reverse_tunnel_info_info_proto_rawDescData = file_internal_module_reverse_tunnel_info_info_proto_rawDesc
+	file_pkg_module_reverse_tunnel_info_info_proto_rawDescOnce sync.Once
+	file_pkg_module_reverse_tunnel_info_info_proto_rawDescData = file_pkg_module_reverse_tunnel_info_info_proto_rawDesc
 )
 
-func file_internal_module_reverse_tunnel_info_info_proto_rawDescGZIP() []byte {
-	file_internal_module_reverse_tunnel_info_info_proto_rawDescOnce.Do(func() {
-		file_internal_module_reverse_tunnel_info_info_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_reverse_tunnel_info_info_proto_rawDescData)
+func file_pkg_module_reverse_tunnel_info_info_proto_rawDescGZIP() []byte {
+	file_pkg_module_reverse_tunnel_info_info_proto_rawDescOnce.Do(func() {
+		file_pkg_module_reverse_tunnel_info_info_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_reverse_tunnel_info_info_proto_rawDescData)
 	})
-	return file_internal_module_reverse_tunnel_info_info_proto_rawDescData
+	return file_pkg_module_reverse_tunnel_info_info_proto_rawDescData
 }
 
-var file_internal_module_reverse_tunnel_info_info_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_internal_module_reverse_tunnel_info_info_proto_goTypes = []interface{}{
+var file_pkg_module_reverse_tunnel_info_info_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_pkg_module_reverse_tunnel_info_info_proto_goTypes = []interface{}{
 	(*Method)(nil),          // 0: gitlab.agent.reverse_tunnel.info.Method
 	(*Service)(nil),         // 1: gitlab.agent.reverse_tunnel.info.Service
 	(*AgentDescriptor)(nil), // 2: gitlab.agent.reverse_tunnel.info.AgentDescriptor
 }
-var file_internal_module_reverse_tunnel_info_info_proto_depIdxs = []int32{
+var file_pkg_module_reverse_tunnel_info_info_proto_depIdxs = []int32{
 	0, // 0: gitlab.agent.reverse_tunnel.info.Service.methods:type_name -> gitlab.agent.reverse_tunnel.info.Method
 	1, // 1: gitlab.agent.reverse_tunnel.info.AgentDescriptor.services:type_name -> gitlab.agent.reverse_tunnel.info.Service
 	2, // [2:2] is the sub-list for method output_type
@@ -233,13 +232,13 @@ var file_internal_module_reverse_tunnel_info_info_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_reverse_tunnel_info_info_proto_init() }
-func file_internal_module_reverse_tunnel_info_info_proto_init() {
-	if File_internal_module_reverse_tunnel_info_info_proto != nil {
+func init() { file_pkg_module_reverse_tunnel_info_info_proto_init() }
+func file_pkg_module_reverse_tunnel_info_info_proto_init() {
+	if File_pkg_module_reverse_tunnel_info_info_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_reverse_tunnel_info_info_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Method); i {
 			case 0:
 				return &v.state
@@ -251,7 +250,7 @@ func file_internal_module_reverse_tunnel_info_info_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_info_info_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Service); i {
 			case 0:
 				return &v.state
@@ -263,7 +262,7 @@ func file_internal_module_reverse_tunnel_info_info_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_info_info_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_info_info_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AgentDescriptor); i {
 			case 0:
 				return &v.state
@@ -280,18 +279,18 @@ func file_internal_module_reverse_tunnel_info_info_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_reverse_tunnel_info_info_proto_rawDesc,
+			RawDescriptor: file_pkg_module_reverse_tunnel_info_info_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_module_reverse_tunnel_info_info_proto_goTypes,
-		DependencyIndexes: file_internal_module_reverse_tunnel_info_info_proto_depIdxs,
-		MessageInfos:      file_internal_module_reverse_tunnel_info_info_proto_msgTypes,
+		GoTypes:           file_pkg_module_reverse_tunnel_info_info_proto_goTypes,
+		DependencyIndexes: file_pkg_module_reverse_tunnel_info_info_proto_depIdxs,
+		MessageInfos:      file_pkg_module_reverse_tunnel_info_info_proto_msgTypes,
 	}.Build()
-	File_internal_module_reverse_tunnel_info_info_proto = out.File
-	file_internal_module_reverse_tunnel_info_info_proto_rawDesc = nil
-	file_internal_module_reverse_tunnel_info_info_proto_goTypes = nil
-	file_internal_module_reverse_tunnel_info_info_proto_depIdxs = nil
+	File_pkg_module_reverse_tunnel_info_info_proto = out.File
+	file_pkg_module_reverse_tunnel_info_info_proto_rawDesc = nil
+	file_pkg_module_reverse_tunnel_info_info_proto_goTypes = nil
+	file_pkg_module_reverse_tunnel_info_info_proto_depIdxs = nil
 }
diff --git a/pkg/module/reverse_tunnel/info/info.pb.validate.go b/pkg/module/reverse_tunnel/info/info.pb.validate.go
index def84bc5..4b2ec714 100644
--- a/pkg/module/reverse_tunnel/info/info.pb.validate.go
+++ b/pkg/module/reverse_tunnel/info/info.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/reverse_tunnel/info/info.proto
+// source: pkg/module/reverse_tunnel/info/info.proto
 
 package info
 
diff --git a/pkg/module/reverse_tunnel/info/info.proto b/pkg/module/reverse_tunnel/info/info.proto
index d9614143..d8d11752 100644
--- a/pkg/module/reverse_tunnel/info/info.proto
+++ b/pkg/module/reverse_tunnel/info/info.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.reverse_tunnel.info;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/info";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/info";
 
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
diff --git a/pkg/module/reverse_tunnel/info/info_proto_docs.md b/pkg/module/reverse_tunnel/info/info_proto_docs.md
index 21408112..23d1d0d4 100644
--- a/pkg/module/reverse_tunnel/info/info_proto_docs.md
+++ b/pkg/module/reverse_tunnel/info/info_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/module/reverse_tunnel/info/info.proto](#internal_module_reverse_tunnel_info_info-proto)
+- [pkg/module/reverse_tunnel/info/info.proto](#pkg_module_reverse_tunnel_info_info-proto)
     - [AgentDescriptor](#gitlab-agent-reverse_tunnel-info-AgentDescriptor)
     - [Method](#gitlab-agent-reverse_tunnel-info-Method)
     - [Service](#gitlab-agent-reverse_tunnel-info-Service)
@@ -12,10 +12,10 @@
 
 
 
-<a name="internal_module_reverse_tunnel_info_info-proto"></a>
+<a name="pkg_module_reverse_tunnel_info_info-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/reverse_tunnel/info/info.proto
+## pkg/module/reverse_tunnel/info/info.proto
 
 
 
diff --git a/pkg/module/reverse_tunnel/rpc/rpc.pb.go b/pkg/module/reverse_tunnel/rpc/rpc.pb.go
index 52af660d..e15f5261 100644
--- a/pkg/module/reverse_tunnel/rpc/rpc.pb.go
+++ b/pkg/module/reverse_tunnel/rpc/rpc.pb.go
@@ -2,24 +2,22 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/module/reverse_tunnel/rpc/rpc.proto
+// source: pkg/module/reverse_tunnel/rpc/rpc.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	_ "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool/automata"
-	"google.golang.org/genproto/googleapis/rpc/status"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/info"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	info "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/info"
+	_ "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/automata"
+	prototool "github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -40,7 +38,7 @@ type Descriptor struct {
 func (x *Descriptor) Reset() {
 	*x = Descriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[0]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -53,7 +51,7 @@ func (x *Descriptor) String() string {
 func (*Descriptor) ProtoMessage() {}
 
 func (x *Descriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[0]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -66,7 +64,7 @@ func (x *Descriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Descriptor.ProtoReflect.Descriptor instead.
 func (*Descriptor) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{0}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Descriptor) GetAgentDescriptor() *info.AgentDescriptor {
@@ -88,7 +86,7 @@ type Header struct {
 func (x *Header) Reset() {
 	*x = Header{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[1]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -101,7 +99,7 @@ func (x *Header) String() string {
 func (*Header) ProtoMessage() {}
 
 func (x *Header) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[1]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -114,7 +112,7 @@ func (x *Header) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Header.ProtoReflect.Descriptor instead.
 func (*Header) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{1}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *Header) GetMeta() map[string]*prototool.Values {
@@ -136,7 +134,7 @@ type Message struct {
 func (x *Message) Reset() {
 	*x = Message{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[2]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -149,7 +147,7 @@ func (x *Message) String() string {
 func (*Message) ProtoMessage() {}
 
 func (x *Message) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[2]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -162,7 +160,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{2}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *Message) GetData() []byte {
@@ -184,7 +182,7 @@ type Trailer struct {
 func (x *Trailer) Reset() {
 	*x = Trailer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[3]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -197,7 +195,7 @@ func (x *Trailer) String() string {
 func (*Trailer) ProtoMessage() {}
 
 func (x *Trailer) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[3]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -210,7 +208,7 @@ func (x *Trailer) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Trailer.ProtoReflect.Descriptor instead.
 func (*Trailer) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{3}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *Trailer) GetMeta() map[string]*prototool.Values {
@@ -234,7 +232,7 @@ type Error struct {
 func (x *Error) Reset() {
 	*x = Error{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[4]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -247,7 +245,7 @@ func (x *Error) String() string {
 func (*Error) ProtoMessage() {}
 
 func (x *Error) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[4]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -260,7 +258,7 @@ func (x *Error) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Error.ProtoReflect.Descriptor instead.
 func (*Error) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{4}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *Error) GetStatus() *status.Status {
@@ -288,7 +286,7 @@ type ConnectRequest struct {
 func (x *ConnectRequest) Reset() {
 	*x = ConnectRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -301,7 +299,7 @@ func (x *ConnectRequest) String() string {
 func (*ConnectRequest) ProtoMessage() {}
 
 func (x *ConnectRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -314,7 +312,7 @@ func (x *ConnectRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConnectRequest.ProtoReflect.Descriptor instead.
 func (*ConnectRequest) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{5}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{5}
 }
 
 func (m *ConnectRequest) GetMsg() isConnectRequest_Msg {
@@ -405,7 +403,7 @@ type RequestInfo struct {
 func (x *RequestInfo) Reset() {
 	*x = RequestInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[6]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -418,7 +416,7 @@ func (x *RequestInfo) String() string {
 func (*RequestInfo) ProtoMessage() {}
 
 func (x *RequestInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[6]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -431,7 +429,7 @@ func (x *RequestInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RequestInfo.ProtoReflect.Descriptor instead.
 func (*RequestInfo) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{6}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *RequestInfo) GetMethodName() string {
@@ -457,7 +455,7 @@ type CloseSend struct {
 func (x *CloseSend) Reset() {
 	*x = CloseSend{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[7]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -470,7 +468,7 @@ func (x *CloseSend) String() string {
 func (*CloseSend) ProtoMessage() {}
 
 func (x *CloseSend) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[7]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -483,7 +481,7 @@ func (x *CloseSend) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CloseSend.ProtoReflect.Descriptor instead.
 func (*CloseSend) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{7}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{7}
 }
 
 type ConnectResponse struct {
@@ -502,7 +500,7 @@ type ConnectResponse struct {
 func (x *ConnectResponse) Reset() {
 	*x = ConnectResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8]
+		mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -515,7 +513,7 @@ func (x *ConnectResponse) String() string {
 func (*ConnectResponse) ProtoMessage() {}
 
 func (x *ConnectResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8]
+	mi := &file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -528,7 +526,7 @@ func (x *ConnectResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConnectResponse.ProtoReflect.Descriptor instead.
 func (*ConnectResponse) Descriptor() ([]byte, []int) {
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{8}
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP(), []int{8}
 }
 
 func (m *ConnectResponse) GetMsg() isConnectResponse_Msg {
@@ -581,158 +579,156 @@ func (*ConnectResponse_Message) isConnectResponse_Msg() {}
 
 func (*ConnectResponse_CloseSend) isConnectResponse_Msg() {}
 
-var File_internal_module_reverse_tunnel_rpc_rpc_proto protoreflect.FileDescriptor
+var File_pkg_module_reverse_tunnel_rpc_rpc_proto protoreflect.FileDescriptor
 
-var file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDesc = []byte{
-	0x0a, 0x2c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
-	0x65, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c,
-	0x2f, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f,
-	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76,
-	0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x1a,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67,
-	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61,
-	0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x27, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f,
-	0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73,
-	0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x69, 0x6e,
-	0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x17, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x74, 0x0a, 0x0a, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x66, 0x0a, 0x10, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c,
-	0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x0f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x22, 0xa8, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x04, 0x6d,
-	0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x67, 0x69, 0x74, 0x6c,
-	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65,
-	0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65,
-	0x74, 0x61, 0x1a, 0x57, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x1d, 0x0a, 0x07, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xaa, 0x01, 0x0a, 0x07, 0x54,
-	0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e,
-	0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x2e, 0x4d,
+var file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDesc = []byte{
+	0x0a, 0x27, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76,
+	0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2f, 0x72, 0x70, 0x63, 0x2f,
+	0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f,
+	0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x1a, 0x29, 0x70, 0x6b, 0x67, 0x2f,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75,
+	0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74,
+	0x6f, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x70, 0x6b, 0x67, 0x2f, 0x6d,
+	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75,
+	0x6e, 0x6e, 0x65, 0x6c, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x74, 0x0a, 0x0a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x12, 0x66, 0x0a, 0x10, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
+	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65,
+	0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x69, 0x6e, 0x66,
+	0x6f, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
+	0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x22, 0xa8, 0x01, 0x0a,
+	0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e,
+	0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x4d,
 	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57,
 	0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
 	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a,
 	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67,
 	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3d, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72,
-	0x12, 0x34, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x12, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xe6, 0x03, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5f, 0x0a, 0x0a, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
-	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76,
-	0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x05, 0x48, 0x00, 0x52, 0x0a,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x53, 0x0a, 0x06, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73,
-	0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c,
-	0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12,
-	0x56, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x1d, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xaa, 0x01, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c,
+	0x65, 0x72, 0x12, 0x46, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
 	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52, 0x07,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5f, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c,
-	0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f,
-	0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c,
-	0x65, 0x72, 0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x05,
-	0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52,
-	0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f,
-	0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74,
-	0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x42,
-	0x15, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x42,
-	0x0e, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x07, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x22,
-	0xd3, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x1f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x4a, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36,
-	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65,
-	0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63,
-	0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74,
-	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a, 0x09,
-	0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x0b, 0x0a, 0x09, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65,
-	0x6e, 0x64, 0x22, 0xe9, 0x02, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x70, 0x0a, 0x0c, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67,
-	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65,
-	0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x1d, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x63, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x70, 0x63, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a, 0x09, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f,
+	0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x3d, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x34, 0x0a, 0x06,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x22, 0xe6, 0x03, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5f, 0x0a, 0x0a, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x6c,
 	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65,
-	0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x42, 0x1d, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c,
-	0x02, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0x01, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x62, 0x0a,
-	0x0a, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e,
-	0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x42, 0x15, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x6e,
-	0x64, 0x42, 0x1b, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x14, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c,
-	0x01, 0x88, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x32, 0x83,
-	0x01, 0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c,
-	0x12, 0x72, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x2f, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72,
-	0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x67,
+	0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x05, 0x48, 0x00, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x53, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75,
+	0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42,
+	0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c,
+	0x04, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x56, 0x0a, 0x07, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67,
 	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65,
-	0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x28, 0x01, 0x30, 0x01, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65,
-	0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76,
-	0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2f, 0x72, 0x70, 0x63, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x12, 0x5f, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e,
+	0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x42, 0x19,
+	0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x05, 0x80, 0xf6, 0x2c, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x07, 0x74, 0x72, 0x61,
+	0x69, 0x6c, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65,
+	0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x15, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x01, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x0e, 0x0a, 0x03, 0x6d,
+	0x73, 0x67, 0x12, 0x07, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x22, 0xd3, 0x01, 0x0a, 0x0b,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x6d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x4a, 0x0a, 0x04,
+	0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73,
+	0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x1a, 0x57, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x22, 0x0b, 0x0a, 0x09, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x22, 0xe9,
+	0x02, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x70, 0x0a, 0x0c, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6e,
+	0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f,
+	0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x1d, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x63, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e,
+	0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42,
+	0x1d, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c,
+	0x03, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00,
+	0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x62, 0x0a, 0x0a, 0x63, 0x6c, 0x6f,
+	0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76,
+	0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e,
+	0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x42, 0x15, 0xfa, 0x42, 0x05, 0x8a, 0x01,
+	0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01,
+	0x48, 0x00, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x64, 0x42, 0x1b, 0x0a,
+	0x03, 0x6d, 0x73, 0x67, 0x12, 0x14, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x88, 0xf6, 0x2c,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x32, 0x83, 0x01, 0x0a, 0x0d, 0x52,
+	0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x72, 0x0a, 0x07,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x2f, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74,
+	0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f,
+	0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01,
+	0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70,
+	0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74,
+	0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x64,
+	0x75, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x74, 0x75, 0x6e, 0x6e,
+	0x65, 0x6c, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescOnce sync.Once
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescData = file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDesc
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescOnce sync.Once
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescData = file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDesc
 )
 
-func file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP() []byte {
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescOnce.Do(func() {
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescData)
+func file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescGZIP() []byte {
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescOnce.Do(func() {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescData)
 	})
-	return file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDescData
+	return file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDescData
 }
 
-var file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
-var file_internal_module_reverse_tunnel_rpc_rpc_proto_goTypes = []interface{}{
+var file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_pkg_module_reverse_tunnel_rpc_rpc_proto_goTypes = []interface{}{
 	(*Descriptor)(nil),           // 0: gitlab.agent.reverse_tunnel.rpc.Descriptor
 	(*Header)(nil),               // 1: gitlab.agent.reverse_tunnel.rpc.Header
 	(*Message)(nil),              // 2: gitlab.agent.reverse_tunnel.rpc.Message
@@ -749,7 +745,7 @@ var file_internal_module_reverse_tunnel_rpc_rpc_proto_goTypes = []interface{}{
 	(*status.Status)(nil),        // 13: google.rpc.Status
 	(*prototool.Values)(nil),     // 14: gitlab.agent.prototool.Values
 }
-var file_internal_module_reverse_tunnel_rpc_rpc_proto_depIdxs = []int32{
+var file_pkg_module_reverse_tunnel_rpc_rpc_proto_depIdxs = []int32{
 	12, // 0: gitlab.agent.reverse_tunnel.rpc.Descriptor.agent_descriptor:type_name -> gitlab.agent.reverse_tunnel.info.AgentDescriptor
 	9,  // 1: gitlab.agent.reverse_tunnel.rpc.Header.meta:type_name -> gitlab.agent.reverse_tunnel.rpc.Header.MetaEntry
 	10, // 2: gitlab.agent.reverse_tunnel.rpc.Trailer.meta:type_name -> gitlab.agent.reverse_tunnel.rpc.Trailer.MetaEntry
@@ -775,13 +771,13 @@ var file_internal_module_reverse_tunnel_rpc_rpc_proto_depIdxs = []int32{
 	0,  // [0:16] is the sub-list for field type_name
 }
 
-func init() { file_internal_module_reverse_tunnel_rpc_rpc_proto_init() }
-func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
-	if File_internal_module_reverse_tunnel_rpc_rpc_proto != nil {
+func init() { file_pkg_module_reverse_tunnel_rpc_rpc_proto_init() }
+func file_pkg_module_reverse_tunnel_rpc_rpc_proto_init() {
+	if File_pkg_module_reverse_tunnel_rpc_rpc_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Descriptor); i {
 			case 0:
 				return &v.state
@@ -793,7 +789,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Header); i {
 			case 0:
 				return &v.state
@@ -805,7 +801,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
@@ -817,7 +813,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Trailer); i {
 			case 0:
 				return &v.state
@@ -829,7 +825,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Error); i {
 			case 0:
 				return &v.state
@@ -841,7 +837,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConnectRequest); i {
 			case 0:
 				return &v.state
@@ -853,7 +849,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RequestInfo); i {
 			case 0:
 				return &v.state
@@ -865,7 +861,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CloseSend); i {
 			case 0:
 				return &v.state
@@ -877,7 +873,7 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 				return nil
 			}
 		}
-		file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConnectResponse); i {
 			case 0:
 				return &v.state
@@ -890,14 +886,14 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 			}
 		}
 	}
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5].OneofWrappers = []interface{}{
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[5].OneofWrappers = []interface{}{
 		(*ConnectRequest_Descriptor_)(nil),
 		(*ConnectRequest_Header)(nil),
 		(*ConnectRequest_Message)(nil),
 		(*ConnectRequest_Trailer)(nil),
 		(*ConnectRequest_Error)(nil),
 	}
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8].OneofWrappers = []interface{}{
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes[8].OneofWrappers = []interface{}{
 		(*ConnectResponse_RequestInfo)(nil),
 		(*ConnectResponse_Message)(nil),
 		(*ConnectResponse_CloseSend)(nil),
@@ -906,18 +902,18 @@ func file_internal_module_reverse_tunnel_rpc_rpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDesc,
+			RawDescriptor: file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_internal_module_reverse_tunnel_rpc_rpc_proto_goTypes,
-		DependencyIndexes: file_internal_module_reverse_tunnel_rpc_rpc_proto_depIdxs,
-		MessageInfos:      file_internal_module_reverse_tunnel_rpc_rpc_proto_msgTypes,
+		GoTypes:           file_pkg_module_reverse_tunnel_rpc_rpc_proto_goTypes,
+		DependencyIndexes: file_pkg_module_reverse_tunnel_rpc_rpc_proto_depIdxs,
+		MessageInfos:      file_pkg_module_reverse_tunnel_rpc_rpc_proto_msgTypes,
 	}.Build()
-	File_internal_module_reverse_tunnel_rpc_rpc_proto = out.File
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_rawDesc = nil
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_goTypes = nil
-	file_internal_module_reverse_tunnel_rpc_rpc_proto_depIdxs = nil
+	File_pkg_module_reverse_tunnel_rpc_rpc_proto = out.File
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_rawDesc = nil
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_goTypes = nil
+	file_pkg_module_reverse_tunnel_rpc_rpc_proto_depIdxs = nil
 }
diff --git a/pkg/module/reverse_tunnel/rpc/rpc.pb.validate.go b/pkg/module/reverse_tunnel/rpc/rpc.pb.validate.go
index 61cfa508..25d6e618 100644
--- a/pkg/module/reverse_tunnel/rpc/rpc.pb.validate.go
+++ b/pkg/module/reverse_tunnel/rpc/rpc.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/module/reverse_tunnel/rpc/rpc.proto
+// source: pkg/module/reverse_tunnel/rpc/rpc.proto
 
 package rpc
 
diff --git a/pkg/module/reverse_tunnel/rpc/rpc.proto b/pkg/module/reverse_tunnel/rpc/rpc.proto
index e4c17982..c0916c08 100644
--- a/pkg/module/reverse_tunnel/rpc/rpc.proto
+++ b/pkg/module/reverse_tunnel/rpc/rpc.proto
@@ -4,11 +4,11 @@ syntax = "proto3";
 
 package gitlab.agent.reverse_tunnel.rpc;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/rpc";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc";
 
-import "internal/tool/grpctool/automata/automata.proto";
-import "internal/tool/prototool/prototool.proto";
-import "internal/module/reverse_tunnel/info/info.proto";
+import "pkg/tool/grpctool/automata/automata.proto";
+import "pkg/tool/prototool/prototool.proto";
+import "pkg/module/reverse_tunnel/info/info.proto";
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
 // https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto
diff --git a/pkg/module/reverse_tunnel/rpc/rpc_grpc.pb.go b/pkg/module/reverse_tunnel/rpc/rpc_grpc.pb.go
index 244af93a..2d8ed4e3 100644
--- a/pkg/module/reverse_tunnel/rpc/rpc_grpc.pb.go
+++ b/pkg/module/reverse_tunnel/rpc/rpc_grpc.pb.go
@@ -1,17 +1,18 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v4.24.4
-// source: internal/module/reverse_tunnel/rpc/rpc.proto
+// source: pkg/module/reverse_tunnel/rpc/rpc.proto
+
+// If you make any changes make sure you run: make regenerate-proto
 
 package rpc
 
 import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -19,6 +20,10 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	ReverseTunnel_Connect_FullMethodName = "/gitlab.agent.reverse_tunnel.rpc.ReverseTunnel/Connect"
+)
+
 // ReverseTunnelClient is the client API for ReverseTunnel service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
@@ -36,7 +41,7 @@ func NewReverseTunnelClient(cc grpc.ClientConnInterface) ReverseTunnelClient {
 }
 
 func (c *reverseTunnelClient) Connect(ctx context.Context, opts ...grpc.CallOption) (ReverseTunnel_ConnectClient, error) {
-	stream, err := c.cc.NewStream(ctx, &ReverseTunnel_ServiceDesc.Streams[0], "/gitlab.agent.reverse_tunnel.rpc.ReverseTunnel/Connect", opts...)
+	stream, err := c.cc.NewStream(ctx, &ReverseTunnel_ServiceDesc.Streams[0], ReverseTunnel_Connect_FullMethodName, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -136,5 +141,5 @@ var ReverseTunnel_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "internal/module/reverse_tunnel/rpc/rpc.proto",
+	Metadata: "pkg/module/reverse_tunnel/rpc/rpc.proto",
 }
diff --git a/pkg/module/reverse_tunnel/rpc/rpc_proto_docs.md b/pkg/module/reverse_tunnel/rpc/rpc_proto_docs.md
index 86f25ff8..ade7c806 100644
--- a/pkg/module/reverse_tunnel/rpc/rpc_proto_docs.md
+++ b/pkg/module/reverse_tunnel/rpc/rpc_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/module/reverse_tunnel/rpc/rpc.proto](#internal_module_reverse_tunnel_rpc_rpc-proto)
+- [pkg/module/reverse_tunnel/rpc/rpc.proto](#pkg_module_reverse_tunnel_rpc_rpc-proto)
     - [CloseSend](#gitlab-agent-reverse_tunnel-rpc-CloseSend)
     - [ConnectRequest](#gitlab-agent-reverse_tunnel-rpc-ConnectRequest)
     - [ConnectResponse](#gitlab-agent-reverse_tunnel-rpc-ConnectResponse)
@@ -23,10 +23,10 @@
 
 
 
-<a name="internal_module_reverse_tunnel_rpc_rpc-proto"></a>
+<a name="pkg_module_reverse_tunnel_rpc_rpc-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/module/reverse_tunnel/rpc/rpc.proto
+## pkg/module/reverse_tunnel/rpc/rpc.proto
 
 
 
diff --git a/pkg/module/reverse_tunnel/tunnel/doc.go b/pkg/module/reverse_tunnel/tunnel/doc.go
index f9e2a9c0..095baeb9 100644
--- a/pkg/module/reverse_tunnel/tunnel/doc.go
+++ b/pkg/module/reverse_tunnel/tunnel/doc.go
@@ -1,3 +1,3 @@
 package tunnel
 
-//go:generate mockgen.sh -self_package "github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel" -destination "mock_for_test.go" -package "tunnel" "github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel" "DataCallback,Querier,Tracker"
+//go:generate mockgen.sh -self_package "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel" -destination "mock_for_test.go" -package "tunnel" "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel" "DataCallback,Querier,Tracker"
diff --git a/pkg/module/reverse_tunnel/tunnel/mock_for_test.go b/pkg/module/reverse_tunnel/tunnel/mock_for_test.go
index 4c066c13..dc6fbd27 100644
--- a/pkg/module/reverse_tunnel/tunnel/mock_for_test.go
+++ b/pkg/module/reverse_tunnel/tunnel/mock_for_test.go
@@ -1,22 +1,21 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel (interfaces: DataCallback,Querier,Tracker)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel (interfaces: DataCallback,Querier,Tracker)
 //
 // Generated by this command:
 //
-//	mockgen -typed -self_package github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel -destination mock_for_test.go -package tunnel github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel DataCallback,Querier,Tracker
+//	mockgen -typed -self_package github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel -destination mock_for_test.go -package tunnel github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel DataCallback,Querier,Tracker
 //
 // Package tunnel is a generated GoMock package.
 package tunnel
 
 import (
-	"context"
-	"reflect"
-	"time"
+	context "context"
+	reflect "reflect"
+	time "time"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/genproto/googleapis/rpc/status"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	prototool "github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	gomock "go.uber.org/mock/gomock"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 )
 
 // MockDataCallback is a mock of DataCallback interface.
diff --git a/pkg/plural/get_agent_info.go b/pkg/plural/get_agent_info.go
index 5f728503..2ab6ba48 100644
--- a/pkg/plural/get_agent_info.go
+++ b/pkg/plural/get_agent_info.go
@@ -6,10 +6,8 @@ import (
 	"github.com/pluralsh/kuberentes-agent/pkg/api"
 )
 
-func GetAgentInfo(ctx context.Context, agentToken string, pluralURL string) (*api.AgentInfo, error) {
-
-	client := New(pluralURL, agentToken)
-	client.
+func GetAgentInfo(ctx context.Context, agentToken api.AgentToken, pluralURL string) (*api.AgentInfo, error) {
+	_ = New(pluralURL, string(agentToken))
 	return &api.AgentInfo{
 		Id:            123456,
 		ProjectId:     0,
diff --git a/pkg/tool/grpctool/automata/automata.pb.go b/pkg/tool/grpctool/automata/automata.pb.go
index 0b297c2b..cf4efe7a 100644
--- a/pkg/tool/grpctool/automata/automata.pb.go
+++ b/pkg/tool/grpctool/automata/automata.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/tool/grpctool/automata/automata.proto
+// source: pkg/tool/grpctool/automata/automata.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
@@ -11,11 +11,10 @@
 package automata
 
 import (
-	"reflect"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	"google.golang.org/protobuf/types/descriptorpb"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
+	reflect "reflect"
 )
 
 const (
@@ -25,14 +24,14 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-var file_internal_tool_grpctool_automata_automata_proto_extTypes = []protoimpl.ExtensionInfo{
+var file_pkg_tool_grpctool_automata_automata_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*descriptorpb.FieldOptions)(nil),
 		ExtensionType: ([]int32)(nil),
 		Field:         92000,
 		Name:          "gitlab.agent.grpctool.automata.next_allowed_field",
 		Tag:           "varint,92000,rep,name=next_allowed_field",
-		Filename:      "internal/tool/grpctool/automata/automata.proto",
+		Filename:      "pkg/tool/grpctool/automata/automata.proto",
 	},
 	{
 		ExtendedType:  (*descriptorpb.OneofOptions)(nil),
@@ -40,7 +39,7 @@ var file_internal_tool_grpctool_automata_automata_proto_extTypes = []protoimpl.E
 		Field:         92001,
 		Name:          "gitlab.agent.grpctool.automata.first_allowed_field",
 		Tag:           "varint,92001,rep,name=first_allowed_field",
-		Filename:      "internal/tool/grpctool/automata/automata.proto",
+		Filename:      "pkg/tool/grpctool/automata/automata.proto",
 	},
 }
 
@@ -50,7 +49,7 @@ var (
 	// -1 can be used for EOF
 	//
 	// repeated int32 next_allowed_field = 92000;
-	E_NextAllowedField = &file_internal_tool_grpctool_automata_automata_proto_extTypes[0] // Random high number between 50000 and 99999.
+	E_NextAllowedField = &file_pkg_tool_grpctool_automata_automata_proto_extTypes[0] // Random high number between 50000 and 99999.
 )
 
 // Extension fields to descriptorpb.OneofOptions.
@@ -59,42 +58,41 @@ var (
 	// -1 can be used for EOF
 	//
 	// repeated int32 first_allowed_field = 92001;
-	E_FirstAllowedField = &file_internal_tool_grpctool_automata_automata_proto_extTypes[1] // Random high number between 50000 and 99999.
+	E_FirstAllowedField = &file_pkg_tool_grpctool_automata_automata_proto_extTypes[1] // Random high number between 50000 and 99999.
 )
 
-var File_internal_tool_grpctool_automata_automata_proto protoreflect.FileDescriptor
+var File_pkg_tool_grpctool_automata_automata_proto protoreflect.FileDescriptor
 
-var file_internal_tool_grpctool_automata_automata_proto_rawDesc = []byte{
-	0x0a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f,
-	0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74,
-	0x61, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x1e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61,
-	0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x3a, 0x4d, 0x0a, 0x12, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe0, 0xce, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x10, 0x6e, 0x65, 0x78, 0x74, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x3a, 0x4f, 0x0a, 0x13, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe1, 0xce, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x11, 0x66, 0x69, 0x72, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x46, 0x69, 0x65,
-	0x6c, 0x64, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65,
-	0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f,
-	0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+var file_pkg_tool_grpctool_automata_automata_proto_rawDesc = []byte{
+	0x0a, 0x29, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74,
+	0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x75, 0x74,
+	0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1e, 0x67, 0x69, 0x74,
+	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f,
+	0x6f, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x1a, 0x20, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x4d, 0x0a,
+	0x12, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x66, 0x69,
+	0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0xe0, 0xce, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x10, 0x6e, 0x65, 0x78, 0x74,
+	0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x4f, 0x0a, 0x13,
+	0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x66, 0x69,
+	0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0xe1, 0xce, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x11, 0x66, 0x69, 0x72, 0x73,
+	0x74, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x41, 0x5a,
+	0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72,
+	0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67,
+	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-var file_internal_tool_grpctool_automata_automata_proto_goTypes = []interface{}{
+var file_pkg_tool_grpctool_automata_automata_proto_goTypes = []interface{}{
 	(*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions
 	(*descriptorpb.OneofOptions)(nil), // 1: google.protobuf.OneofOptions
 }
-var file_internal_tool_grpctool_automata_automata_proto_depIdxs = []int32{
+var file_pkg_tool_grpctool_automata_automata_proto_depIdxs = []int32{
 	0, // 0: gitlab.agent.grpctool.automata.next_allowed_field:extendee -> google.protobuf.FieldOptions
 	1, // 1: gitlab.agent.grpctool.automata.first_allowed_field:extendee -> google.protobuf.OneofOptions
 	2, // [2:2] is the sub-list for method output_type
@@ -104,27 +102,27 @@ var file_internal_tool_grpctool_automata_automata_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_internal_tool_grpctool_automata_automata_proto_init() }
-func file_internal_tool_grpctool_automata_automata_proto_init() {
-	if File_internal_tool_grpctool_automata_automata_proto != nil {
+func init() { file_pkg_tool_grpctool_automata_automata_proto_init() }
+func file_pkg_tool_grpctool_automata_automata_proto_init() {
+	if File_pkg_tool_grpctool_automata_automata_proto != nil {
 		return
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_tool_grpctool_automata_automata_proto_rawDesc,
+			RawDescriptor: file_pkg_tool_grpctool_automata_automata_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 2,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_tool_grpctool_automata_automata_proto_goTypes,
-		DependencyIndexes: file_internal_tool_grpctool_automata_automata_proto_depIdxs,
-		ExtensionInfos:    file_internal_tool_grpctool_automata_automata_proto_extTypes,
+		GoTypes:           file_pkg_tool_grpctool_automata_automata_proto_goTypes,
+		DependencyIndexes: file_pkg_tool_grpctool_automata_automata_proto_depIdxs,
+		ExtensionInfos:    file_pkg_tool_grpctool_automata_automata_proto_extTypes,
 	}.Build()
-	File_internal_tool_grpctool_automata_automata_proto = out.File
-	file_internal_tool_grpctool_automata_automata_proto_rawDesc = nil
-	file_internal_tool_grpctool_automata_automata_proto_goTypes = nil
-	file_internal_tool_grpctool_automata_automata_proto_depIdxs = nil
+	File_pkg_tool_grpctool_automata_automata_proto = out.File
+	file_pkg_tool_grpctool_automata_automata_proto_rawDesc = nil
+	file_pkg_tool_grpctool_automata_automata_proto_goTypes = nil
+	file_pkg_tool_grpctool_automata_automata_proto_depIdxs = nil
 }
diff --git a/pkg/tool/grpctool/automata/automata.pb.validate.go b/pkg/tool/grpctool/automata/automata.pb.validate.go
index fccb77b0..70561d36 100644
--- a/pkg/tool/grpctool/automata/automata.pb.validate.go
+++ b/pkg/tool/grpctool/automata/automata.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/tool/grpctool/automata/automata.proto
+// source: pkg/tool/grpctool/automata/automata.proto
 
 package automata
 
diff --git a/pkg/tool/grpctool/automata/automata.proto b/pkg/tool/grpctool/automata/automata.proto
index b5dd1871..ca1bca7a 100644
--- a/pkg/tool/grpctool/automata/automata.proto
+++ b/pkg/tool/grpctool/automata/automata.proto
@@ -5,7 +5,7 @@ syntax = "proto3";
 // Package allows to define the allowed order in which fields of a oneof group can appear in a client gRPC stream.
 package gitlab.agent.grpctool.automata;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool/automata";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/automata";
 
 import "google/protobuf/descriptor.proto";
 
diff --git a/pkg/tool/grpctool/automata/automata_proto_docs.md b/pkg/tool/grpctool/automata/automata_proto_docs.md
index e75eb1c9..6277994a 100644
--- a/pkg/tool/grpctool/automata/automata_proto_docs.md
+++ b/pkg/tool/grpctool/automata/automata_proto_docs.md
@@ -3,18 +3,18 @@
 
 ## Table of Contents
 
-- [internal/tool/grpctool/automata/automata.proto](#internal_tool_grpctool_automata_automata-proto)
-    - [File-level Extensions](#internal_tool_grpctool_automata_automata-proto-extensions)
-    - [File-level Extensions](#internal_tool_grpctool_automata_automata-proto-extensions)
+- [pkg/tool/grpctool/automata/automata.proto](#pkg_tool_grpctool_automata_automata-proto)
+    - [File-level Extensions](#pkg_tool_grpctool_automata_automata-proto-extensions)
+    - [File-level Extensions](#pkg_tool_grpctool_automata_automata-proto-extensions)
   
 - [Scalar Value Types](#scalar-value-types)
 
 
 
-<a name="internal_tool_grpctool_automata_automata-proto"></a>
+<a name="pkg_tool_grpctool_automata_automata-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/tool/grpctool/automata/automata.proto
+## pkg/tool/grpctool/automata/automata.proto
 
 
  
@@ -22,7 +22,7 @@
  
 
 
-<a name="internal_tool_grpctool_automata_automata-proto-extensions"></a>
+<a name="pkg_tool_grpctool_automata_automata-proto-extensions"></a>
 
 ### File-level Extensions
 | Extension | Type | Base | Number | Description |
diff --git a/pkg/tool/grpctool/grpctool.pb.go b/pkg/tool/grpctool/grpctool.pb.go
index da29939c..c0359057 100644
--- a/pkg/tool/grpctool/grpctool.pb.go
+++ b/pkg/tool/grpctool/grpctool.pb.go
@@ -2,23 +2,21 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/tool/grpctool/grpctool.proto
+// source: pkg/tool/grpctool/grpctool.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package grpctool
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	_ "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool/automata"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	_ "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/automata"
+	prototool "github.com/pluralsh/kuberentes-agent/pkg/tool/prototool"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -45,7 +43,7 @@ type HttpRequest struct {
 func (x *HttpRequest) Reset() {
 	*x = HttpRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[0]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -58,7 +56,7 @@ func (x *HttpRequest) String() string {
 func (*HttpRequest) ProtoMessage() {}
 
 func (x *HttpRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[0]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -71,7 +69,7 @@ func (x *HttpRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpRequest.ProtoReflect.Descriptor instead.
 func (*HttpRequest) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0}
 }
 
 func (m *HttpRequest) GetMessage() isHttpRequest_Message {
@@ -154,7 +152,7 @@ type HttpResponse struct {
 func (x *HttpResponse) Reset() {
 	*x = HttpResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[1]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -167,7 +165,7 @@ func (x *HttpResponse) String() string {
 func (*HttpResponse) ProtoMessage() {}
 
 func (x *HttpResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[1]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -180,7 +178,7 @@ func (x *HttpResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpResponse.ProtoReflect.Descriptor instead.
 func (*HttpResponse) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1}
 }
 
 func (m *HttpResponse) GetMessage() isHttpResponse_Message {
@@ -266,7 +264,7 @@ type HttpRequest_Header struct {
 func (x *HttpRequest_Header) Reset() {
 	*x = HttpRequest_Header{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[2]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -279,7 +277,7 @@ func (x *HttpRequest_Header) String() string {
 func (*HttpRequest_Header) ProtoMessage() {}
 
 func (x *HttpRequest_Header) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[2]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -292,7 +290,7 @@ func (x *HttpRequest_Header) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpRequest_Header.ProtoReflect.Descriptor instead.
 func (*HttpRequest_Header) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 0}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 0}
 }
 
 func (x *HttpRequest_Header) GetRequest() *prototool.HttpRequest {
@@ -329,7 +327,7 @@ type HttpRequest_Data struct {
 func (x *HttpRequest_Data) Reset() {
 	*x = HttpRequest_Data{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[3]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -342,7 +340,7 @@ func (x *HttpRequest_Data) String() string {
 func (*HttpRequest_Data) ProtoMessage() {}
 
 func (x *HttpRequest_Data) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[3]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -355,7 +353,7 @@ func (x *HttpRequest_Data) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpRequest_Data.ProtoReflect.Descriptor instead.
 func (*HttpRequest_Data) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 1}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 1}
 }
 
 func (x *HttpRequest_Data) GetData() []byte {
@@ -375,7 +373,7 @@ type HttpRequest_Trailer struct {
 func (x *HttpRequest_Trailer) Reset() {
 	*x = HttpRequest_Trailer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[4]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -388,7 +386,7 @@ func (x *HttpRequest_Trailer) String() string {
 func (*HttpRequest_Trailer) ProtoMessage() {}
 
 func (x *HttpRequest_Trailer) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[4]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -401,7 +399,7 @@ func (x *HttpRequest_Trailer) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpRequest_Trailer.ProtoReflect.Descriptor instead.
 func (*HttpRequest_Trailer) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 2}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 2}
 }
 
 // Last message of the stream.
@@ -419,7 +417,7 @@ type HttpRequest_UpgradeData struct {
 func (x *HttpRequest_UpgradeData) Reset() {
 	*x = HttpRequest_UpgradeData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[5]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -432,7 +430,7 @@ func (x *HttpRequest_UpgradeData) String() string {
 func (*HttpRequest_UpgradeData) ProtoMessage() {}
 
 func (x *HttpRequest_UpgradeData) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[5]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -445,7 +443,7 @@ func (x *HttpRequest_UpgradeData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpRequest_UpgradeData.ProtoReflect.Descriptor instead.
 func (*HttpRequest_UpgradeData) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 3}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{0, 3}
 }
 
 func (x *HttpRequest_UpgradeData) GetData() []byte {
@@ -467,7 +465,7 @@ type HttpResponse_Header struct {
 func (x *HttpResponse_Header) Reset() {
 	*x = HttpResponse_Header{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[6]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -480,7 +478,7 @@ func (x *HttpResponse_Header) String() string {
 func (*HttpResponse_Header) ProtoMessage() {}
 
 func (x *HttpResponse_Header) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[6]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -493,7 +491,7 @@ func (x *HttpResponse_Header) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpResponse_Header.ProtoReflect.Descriptor instead.
 func (*HttpResponse_Header) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 0}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 0}
 }
 
 func (x *HttpResponse_Header) GetResponse() *prototool.HttpResponse {
@@ -516,7 +514,7 @@ type HttpResponse_Data struct {
 func (x *HttpResponse_Data) Reset() {
 	*x = HttpResponse_Data{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[7]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -529,7 +527,7 @@ func (x *HttpResponse_Data) String() string {
 func (*HttpResponse_Data) ProtoMessage() {}
 
 func (x *HttpResponse_Data) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[7]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -542,7 +540,7 @@ func (x *HttpResponse_Data) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpResponse_Data.ProtoReflect.Descriptor instead.
 func (*HttpResponse_Data) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 1}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 1}
 }
 
 func (x *HttpResponse_Data) GetData() []byte {
@@ -562,7 +560,7 @@ type HttpResponse_Trailer struct {
 func (x *HttpResponse_Trailer) Reset() {
 	*x = HttpResponse_Trailer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[8]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -575,7 +573,7 @@ func (x *HttpResponse_Trailer) String() string {
 func (*HttpResponse_Trailer) ProtoMessage() {}
 
 func (x *HttpResponse_Trailer) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[8]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -588,7 +586,7 @@ func (x *HttpResponse_Trailer) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpResponse_Trailer.ProtoReflect.Descriptor instead.
 func (*HttpResponse_Trailer) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 2}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 2}
 }
 
 // Last message of the stream.
@@ -606,7 +604,7 @@ type HttpResponse_UpgradeData struct {
 func (x *HttpResponse_UpgradeData) Reset() {
 	*x = HttpResponse_UpgradeData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[9]
+		mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -619,7 +617,7 @@ func (x *HttpResponse_UpgradeData) String() string {
 func (*HttpResponse_UpgradeData) ProtoMessage() {}
 
 func (x *HttpResponse_UpgradeData) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_grpctool_proto_msgTypes[9]
+	mi := &file_pkg_tool_grpctool_grpctool_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -632,7 +630,7 @@ func (x *HttpResponse_UpgradeData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpResponse_UpgradeData.ProtoReflect.Descriptor instead.
 func (*HttpResponse_UpgradeData) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 3}
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP(), []int{1, 3}
 }
 
 func (x *HttpResponse_UpgradeData) GetData() []byte {
@@ -642,122 +640,121 @@ func (x *HttpResponse_UpgradeData) GetData() []byte {
 	return nil
 }
 
-var File_internal_tool_grpctool_grpctool_proto protoreflect.FileDescriptor
-
-var file_internal_tool_grpctool_grpctool_proto_rawDesc = []byte{
-	0x0a, 0x25, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f,
-	0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f,
-	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x15, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x1a, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72,
-	0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f,
-	0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f,
-	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb6, 0x05, 0x0a, 0x0b,
-	0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x55, 0x0a, 0x06, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
-	0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x12, 0x4f, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x27, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x12, 0x61, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74,
-	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72,
-	0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6,
-	0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x07, 0x74,
-	0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x12, 0x6d, 0x0a, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64,
-	0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x42, 0x19, 0xfa, 0x42, 0x05,
-	0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64,
-	0x65, 0x44, 0x61, 0x74, 0x61, 0x1a, 0xce, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x12, 0x47, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
-	0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x05, 0x65, 0x78, 0x74,
-	0x72, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05,
-	0x65, 0x78, 0x74, 0x72, 0x61, 0x12, 0x3c, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x42, 0x10, 0xfa,
-	0x42, 0x0d, 0x22, 0x0b, 0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48,
-	0x00, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68,
-	0x88, 0x01, 0x01, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f,
-	0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x1a, 0x1a, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x1a, 0x09, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x1a, 0x21, 0x0a,
-	0x0b, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x42, 0x12, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x07, 0xf8, 0x42, 0x01,
-	0x88, 0xf6, 0x2c, 0x01, 0x22, 0xc0, 0x04, 0x0a, 0x0c, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
+var File_pkg_tool_grpctool_grpctool_proto protoreflect.FileDescriptor
+
+var file_pkg_tool_grpctool_grpctool_proto_rawDesc = []byte{
+	0x0a, 0x20, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74,
+	0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x12, 0x15, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x1a, 0x29, 0x70, 0x6b, 0x67, 0x2f, 0x74,
+	0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74,
+	0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f,
+	0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
+	0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb6, 0x05, 0x0a,
+	0x0b, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x55, 0x0a, 0x06,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x12, 0x4f, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x27, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a,
+	0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x12, 0x61, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61,
 	0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02, 0x80,
-	0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x50, 0x0a,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80,
-	0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
-	0x62, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x42, 0x19, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6, 0x2c, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x07, 0x74, 0x72, 0x61, 0x69,
-	0x6c, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61,
-	0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c,
-	0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x55, 0x70,
-	0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44,
-	0x61, 0x74, 0x61, 0x1a, 0x54, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x4a, 0x0a,
-	0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x1a, 0x0a, 0x04, 0x44, 0x61, 0x74,
-	0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x09, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72,
-	0x1a, 0x21, 0x0a, 0x0b, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12,
+	0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65,
+	0x72, 0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80,
+	0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x07,
+	0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x12, 0x6d, 0x0a, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61,
+	0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x42, 0x19, 0xfa, 0x42,
+	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61,
+	0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x1a, 0xce, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x12, 0x47, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x05, 0x65, 0x78,
+	0x74, 0x72, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52,
+	0x05, 0x65, 0x78, 0x74, 0x72, 0x61, 0x12, 0x3c, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x42, 0x10,
+	0xfa, 0x42, 0x0d, 0x22, 0x0b, 0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01,
+	0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x6e, 0x67, 0x74,
+	0x68, 0x88, 0x01, 0x01, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
+	0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x1a, 0x1a, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12,
 	0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x42, 0x12, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x07,
-	0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b,
-	0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72,
-	0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x74, 0x61, 0x1a, 0x09, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x1a, 0x21,
+	0x0a, 0x0b, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x42, 0x12, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x07, 0xf8, 0x42,
+	0x01, 0x88, 0xf6, 0x2c, 0x01, 0x22, 0xc0, 0x04, 0x0a, 0x0c, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48,
+	0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x02,
+	0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x50,
+	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x80, 0xf6, 0x2c, 0x02, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x12, 0x62, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x42, 0x19,
+	0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6, 0x2c, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x07, 0x74, 0x72, 0x61,
+	0x69, 0x6c, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44,
+	0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f,
+	0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x55,
+	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x42, 0x19, 0xfa, 0x42, 0x05, 0x8a,
+	0x01, 0x02, 0x10, 0x01, 0x80, 0xf6, 0x2c, 0x04, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65,
+	0x44, 0x61, 0x74, 0x61, 0x1a, 0x54, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x4a,
+	0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x1a, 0x0a, 0x04, 0x44, 0x61,
+	0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x09, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65,
+	0x72, 0x1a, 0x21, 0x0a, 0x0b, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x42, 0x12, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
+	0x07, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f,
+	0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f,
+	0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_tool_grpctool_grpctool_proto_rawDescOnce sync.Once
-	file_internal_tool_grpctool_grpctool_proto_rawDescData = file_internal_tool_grpctool_grpctool_proto_rawDesc
+	file_pkg_tool_grpctool_grpctool_proto_rawDescOnce sync.Once
+	file_pkg_tool_grpctool_grpctool_proto_rawDescData = file_pkg_tool_grpctool_grpctool_proto_rawDesc
 )
 
-func file_internal_tool_grpctool_grpctool_proto_rawDescGZIP() []byte {
-	file_internal_tool_grpctool_grpctool_proto_rawDescOnce.Do(func() {
-		file_internal_tool_grpctool_grpctool_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_tool_grpctool_grpctool_proto_rawDescData)
+func file_pkg_tool_grpctool_grpctool_proto_rawDescGZIP() []byte {
+	file_pkg_tool_grpctool_grpctool_proto_rawDescOnce.Do(func() {
+		file_pkg_tool_grpctool_grpctool_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_tool_grpctool_grpctool_proto_rawDescData)
 	})
-	return file_internal_tool_grpctool_grpctool_proto_rawDescData
+	return file_pkg_tool_grpctool_grpctool_proto_rawDescData
 }
 
-var file_internal_tool_grpctool_grpctool_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_internal_tool_grpctool_grpctool_proto_goTypes = []interface{}{
+var file_pkg_tool_grpctool_grpctool_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_pkg_tool_grpctool_grpctool_proto_goTypes = []interface{}{
 	(*HttpRequest)(nil),              // 0: gitlab.agent.grpctool.HttpRequest
 	(*HttpResponse)(nil),             // 1: gitlab.agent.grpctool.HttpResponse
 	(*HttpRequest_Header)(nil),       // 2: gitlab.agent.grpctool.HttpRequest.Header
@@ -772,7 +769,7 @@ var file_internal_tool_grpctool_grpctool_proto_goTypes = []interface{}{
 	(*anypb.Any)(nil),                // 11: google.protobuf.Any
 	(*prototool.HttpResponse)(nil),   // 12: gitlab.agent.prototool.HttpResponse
 }
-var file_internal_tool_grpctool_grpctool_proto_depIdxs = []int32{
+var file_pkg_tool_grpctool_grpctool_proto_depIdxs = []int32{
 	2,  // 0: gitlab.agent.grpctool.HttpRequest.header:type_name -> gitlab.agent.grpctool.HttpRequest.Header
 	3,  // 1: gitlab.agent.grpctool.HttpRequest.data:type_name -> gitlab.agent.grpctool.HttpRequest.Data
 	4,  // 2: gitlab.agent.grpctool.HttpRequest.trailer:type_name -> gitlab.agent.grpctool.HttpRequest.Trailer
@@ -791,13 +788,13 @@ var file_internal_tool_grpctool_grpctool_proto_depIdxs = []int32{
 	0,  // [0:11] is the sub-list for field type_name
 }
 
-func init() { file_internal_tool_grpctool_grpctool_proto_init() }
-func file_internal_tool_grpctool_grpctool_proto_init() {
-	if File_internal_tool_grpctool_grpctool_proto != nil {
+func init() { file_pkg_tool_grpctool_grpctool_proto_init() }
+func file_pkg_tool_grpctool_grpctool_proto_init() {
+	if File_pkg_tool_grpctool_grpctool_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpRequest); i {
 			case 0:
 				return &v.state
@@ -809,7 +806,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpResponse); i {
 			case 0:
 				return &v.state
@@ -821,7 +818,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpRequest_Header); i {
 			case 0:
 				return &v.state
@@ -833,7 +830,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpRequest_Data); i {
 			case 0:
 				return &v.state
@@ -845,7 +842,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpRequest_Trailer); i {
 			case 0:
 				return &v.state
@@ -857,7 +854,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpRequest_UpgradeData); i {
 			case 0:
 				return &v.state
@@ -869,7 +866,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpResponse_Header); i {
 			case 0:
 				return &v.state
@@ -881,7 +878,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpResponse_Data); i {
 			case 0:
 				return &v.state
@@ -893,7 +890,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpResponse_Trailer); i {
 			case 0:
 				return &v.state
@@ -905,7 +902,7 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_grpctool_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_grpctool_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpResponse_UpgradeData); i {
 			case 0:
 				return &v.state
@@ -918,35 +915,35 @@ func file_internal_tool_grpctool_grpctool_proto_init() {
 			}
 		}
 	}
-	file_internal_tool_grpctool_grpctool_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_grpctool_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*HttpRequest_Header_)(nil),
 		(*HttpRequest_Data_)(nil),
 		(*HttpRequest_Trailer_)(nil),
 		(*HttpRequest_UpgradeData_)(nil),
 	}
-	file_internal_tool_grpctool_grpctool_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_grpctool_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*HttpResponse_Header_)(nil),
 		(*HttpResponse_Data_)(nil),
 		(*HttpResponse_Trailer_)(nil),
 		(*HttpResponse_UpgradeData_)(nil),
 	}
-	file_internal_tool_grpctool_grpctool_proto_msgTypes[2].OneofWrappers = []interface{}{}
+	file_pkg_tool_grpctool_grpctool_proto_msgTypes[2].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_tool_grpctool_grpctool_proto_rawDesc,
+			RawDescriptor: file_pkg_tool_grpctool_grpctool_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_tool_grpctool_grpctool_proto_goTypes,
-		DependencyIndexes: file_internal_tool_grpctool_grpctool_proto_depIdxs,
-		MessageInfos:      file_internal_tool_grpctool_grpctool_proto_msgTypes,
+		GoTypes:           file_pkg_tool_grpctool_grpctool_proto_goTypes,
+		DependencyIndexes: file_pkg_tool_grpctool_grpctool_proto_depIdxs,
+		MessageInfos:      file_pkg_tool_grpctool_grpctool_proto_msgTypes,
 	}.Build()
-	File_internal_tool_grpctool_grpctool_proto = out.File
-	file_internal_tool_grpctool_grpctool_proto_rawDesc = nil
-	file_internal_tool_grpctool_grpctool_proto_goTypes = nil
-	file_internal_tool_grpctool_grpctool_proto_depIdxs = nil
+	File_pkg_tool_grpctool_grpctool_proto = out.File
+	file_pkg_tool_grpctool_grpctool_proto_rawDesc = nil
+	file_pkg_tool_grpctool_grpctool_proto_goTypes = nil
+	file_pkg_tool_grpctool_grpctool_proto_depIdxs = nil
 }
diff --git a/pkg/tool/grpctool/grpctool.pb.validate.go b/pkg/tool/grpctool/grpctool.pb.validate.go
index 70161e99..ad5dcfd0 100644
--- a/pkg/tool/grpctool/grpctool.pb.validate.go
+++ b/pkg/tool/grpctool/grpctool.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/tool/grpctool/grpctool.proto
+// source: pkg/tool/grpctool/grpctool.proto
 
 package grpctool
 
diff --git a/pkg/tool/grpctool/grpctool.proto b/pkg/tool/grpctool/grpctool.proto
index 60a95b73..9890b04b 100644
--- a/pkg/tool/grpctool/grpctool.proto
+++ b/pkg/tool/grpctool/grpctool.proto
@@ -4,10 +4,10 @@ syntax = "proto3";
 
 package gitlab.agent.grpctool;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool";
 
-import "internal/tool/grpctool/automata/automata.proto";
-import "internal/tool/prototool/prototool.proto";
+import "pkg/tool/grpctool/automata/automata.proto";
+import "pkg/tool/prototool/prototool.proto";
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
 import "google/protobuf/any.proto";
diff --git a/pkg/tool/grpctool/grpctool_proto_docs.md b/pkg/tool/grpctool/grpctool_proto_docs.md
index 8699f554..82cfb31c 100644
--- a/pkg/tool/grpctool/grpctool_proto_docs.md
+++ b/pkg/tool/grpctool/grpctool_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/tool/grpctool/grpctool.proto](#internal_tool_grpctool_grpctool-proto)
+- [pkg/tool/grpctool/grpctool.proto](#pkg_tool_grpctool_grpctool-proto)
     - [HttpRequest](#gitlab-agent-grpctool-HttpRequest)
     - [HttpRequest.Data](#gitlab-agent-grpctool-HttpRequest-Data)
     - [HttpRequest.Header](#gitlab-agent-grpctool-HttpRequest-Header)
@@ -19,10 +19,10 @@
 
 
 
-<a name="internal_tool_grpctool_grpctool-proto"></a>
+<a name="pkg_tool_grpctool_grpctool-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/tool/grpctool/grpctool.proto
+## pkg/tool/grpctool/grpctool.proto
 
 
 
diff --git a/pkg/tool/grpctool/test/test.pb.go b/pkg/tool/grpctool/test/test.pb.go
index 15585ed5..6298ad8c 100644
--- a/pkg/tool/grpctool/test/test.pb.go
+++ b/pkg/tool/grpctool/test/test.pb.go
@@ -2,20 +2,19 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/tool/grpctool/test/test.proto
+// source: pkg/tool/grpctool/test/test.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package test
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	_ "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool/automata"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
+	_ "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/automata"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -55,11 +54,11 @@ func (x Enum1) String() string {
 }
 
 func (Enum1) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_tool_grpctool_test_test_proto_enumTypes[0].Descriptor()
+	return file_pkg_tool_grpctool_test_test_proto_enumTypes[0].Descriptor()
 }
 
 func (Enum1) Type() protoreflect.EnumType {
-	return &file_internal_tool_grpctool_test_test_proto_enumTypes[0]
+	return &file_pkg_tool_grpctool_test_test_proto_enumTypes[0]
 }
 
 func (x Enum1) Number() protoreflect.EnumNumber {
@@ -68,7 +67,7 @@ func (x Enum1) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Enum1.Descriptor instead.
 func (Enum1) EnumDescriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{0}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{0}
 }
 
 type Request struct {
@@ -82,7 +81,7 @@ type Request struct {
 func (x *Request) Reset() {
 	*x = Request{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[0]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -95,7 +94,7 @@ func (x *Request) String() string {
 func (*Request) ProtoMessage() {}
 
 func (x *Request) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[0]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -108,7 +107,7 @@ func (x *Request) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Request.ProtoReflect.Descriptor instead.
 func (*Request) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{0}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Request) GetS1() string {
@@ -135,7 +134,7 @@ type Response struct {
 func (x *Response) Reset() {
 	*x = Response{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[1]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -148,7 +147,7 @@ func (x *Response) String() string {
 func (*Response) ProtoMessage() {}
 
 func (x *Response) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[1]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -161,7 +160,7 @@ func (x *Response) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Response.ProtoReflect.Descriptor instead.
 func (*Response) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{1}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{1}
 }
 
 func (m *Response) GetMessage() isResponse_Message {
@@ -236,7 +235,7 @@ type NoOneofs struct {
 func (x *NoOneofs) Reset() {
 	*x = NoOneofs{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[2]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -249,7 +248,7 @@ func (x *NoOneofs) String() string {
 func (*NoOneofs) ProtoMessage() {}
 
 func (x *NoOneofs) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[2]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -262,7 +261,7 @@ func (x *NoOneofs) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NoOneofs.ProtoReflect.Descriptor instead.
 func (*NoOneofs) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{2}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{2}
 }
 
 type TwoOneofs struct {
@@ -285,7 +284,7 @@ type TwoOneofs struct {
 func (x *TwoOneofs) Reset() {
 	*x = TwoOneofs{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[3]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -298,7 +297,7 @@ func (x *TwoOneofs) String() string {
 func (*TwoOneofs) ProtoMessage() {}
 
 func (x *TwoOneofs) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[3]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -311,7 +310,7 @@ func (x *TwoOneofs) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TwoOneofs.ProtoReflect.Descriptor instead.
 func (*TwoOneofs) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{3}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{3}
 }
 
 func (m *TwoOneofs) GetMessage1() isTwoOneofs_Message1 {
@@ -408,7 +407,7 @@ type TwoValidOneofs struct {
 func (x *TwoValidOneofs) Reset() {
 	*x = TwoValidOneofs{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[4]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -421,7 +420,7 @@ func (x *TwoValidOneofs) String() string {
 func (*TwoValidOneofs) ProtoMessage() {}
 
 func (x *TwoValidOneofs) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[4]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -434,7 +433,7 @@ func (x *TwoValidOneofs) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TwoValidOneofs.ProtoReflect.Descriptor instead.
 func (*TwoValidOneofs) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{4}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{4}
 }
 
 func (m *TwoValidOneofs) GetMessage1() isTwoValidOneofs_Message1 {
@@ -527,7 +526,7 @@ type OutOfOneof struct {
 func (x *OutOfOneof) Reset() {
 	*x = OutOfOneof{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[5]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -540,7 +539,7 @@ func (x *OutOfOneof) String() string {
 func (*OutOfOneof) ProtoMessage() {}
 
 func (x *OutOfOneof) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[5]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -553,7 +552,7 @@ func (x *OutOfOneof) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OutOfOneof.ProtoReflect.Descriptor instead.
 func (*OutOfOneof) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{5}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *OutOfOneof) GetX() int32 {
@@ -616,7 +615,7 @@ type NotAllReachable struct {
 func (x *NotAllReachable) Reset() {
 	*x = NotAllReachable{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[6]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -629,7 +628,7 @@ func (x *NotAllReachable) String() string {
 func (*NotAllReachable) ProtoMessage() {}
 
 func (x *NotAllReachable) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[6]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -642,7 +641,7 @@ func (x *NotAllReachable) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NotAllReachable.ProtoReflect.Descriptor instead.
 func (*NotAllReachable) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{6}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{6}
 }
 
 func (m *NotAllReachable) GetMessage() isNotAllReachable_Message {
@@ -707,7 +706,7 @@ type Response_Data struct {
 func (x *Response_Data) Reset() {
 	*x = Response_Data{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[7]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -720,7 +719,7 @@ func (x *Response_Data) String() string {
 func (*Response_Data) ProtoMessage() {}
 
 func (x *Response_Data) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[7]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -733,7 +732,7 @@ func (x *Response_Data) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Response_Data.ProtoReflect.Descriptor instead.
 func (*Response_Data) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{1, 0}
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{1, 0}
 }
 
 func (x *Response_Data) GetData() []byte {
@@ -753,7 +752,7 @@ type Response_Last struct {
 func (x *Response_Last) Reset() {
 	*x = Response_Last{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[8]
+		mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -766,7 +765,7 @@ func (x *Response_Last) String() string {
 func (*Response_Last) ProtoMessage() {}
 
 func (x *Response_Last) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_grpctool_test_test_proto_msgTypes[8]
+	mi := &file_pkg_tool_grpctool_test_test_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -779,114 +778,113 @@ func (x *Response_Last) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Response_Last.ProtoReflect.Descriptor instead.
 func (*Response_Last) Descriptor() ([]byte, []int) {
-	return file_internal_tool_grpctool_test_test_proto_rawDescGZIP(), []int{1, 1}
-}
-
-var File_internal_tool_grpctool_test_test_proto protoreflect.FileDescriptor
-
-var file_internal_tool_grpctool_test_test_proto_rawDesc = []byte{
-	0x0a, 0x26, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f,
-	0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74,
-	0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x22, 0x0a,
-	0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x02, 0x73, 0x31, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x02, 0x73,
-	0x31, 0x22, 0xb8, 0x02, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e,
-	0x0a, 0x06, 0x73, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x04,
-	0x80, 0xf6, 0x2c, 0x02, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x12, 0x39,
-	0x0a, 0x02, 0x78, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x67, 0x69, 0x74,
-	0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f,
-	0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x31, 0x42, 0x04, 0x80,
-	0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x02, 0x78, 0x31, 0x12, 0x49, 0x0a, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x61,
-	0x74, 0x61, 0x42, 0x08, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x00, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x42, 0x0d, 0x80,
-	0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x04,
-	0x6c, 0x61, 0x73, 0x74, 0x1a, 0x1a, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x1a, 0x06, 0x0a, 0x04, 0x4c, 0x61, 0x73, 0x74, 0x42, 0x12, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x12, 0x07, 0xf8, 0x42, 0x01, 0x88, 0xf6, 0x2c, 0x01, 0x22, 0x0a, 0x0a, 0x08,
-	0x4e, 0x6f, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x22, 0x7f, 0x0a, 0x09, 0x54, 0x77, 0x6f, 0x4f,
-	0x6e, 0x65, 0x6f, 0x66, 0x73, 0x12, 0x12, 0x0a, 0x03, 0x6d, 0x31, 0x31, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x31, 0x31, 0x12, 0x12, 0x0a, 0x03, 0x6d, 0x31, 0x32,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x31, 0x32, 0x12, 0x12, 0x0a,
-	0x03, 0x6d, 0x32, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x03, 0x6d, 0x32,
-	0x31, 0x12, 0x12, 0x0a, 0x03, 0x6d, 0x32, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01,
-	0x52, 0x03, 0x6d, 0x32, 0x32, 0x42, 0x10, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x31, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x01, 0x42, 0x10, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x32, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x03, 0x22, 0xae, 0x01, 0x0a, 0x0e, 0x54, 0x77,
-	0x6f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x12, 0x18, 0x0a, 0x03,
-	0x6d, 0x31, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x02, 0x48,
-	0x00, 0x52, 0x03, 0x6d, 0x31, 0x31, 0x12, 0x21, 0x0a, 0x03, 0x6d, 0x31, 0x32, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0x01, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x31, 0x32, 0x12, 0x18, 0x0a, 0x03, 0x6d, 0x32, 0x31,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x04, 0x48, 0x01, 0x52, 0x03,
-	0x6d, 0x32, 0x31, 0x12, 0x21, 0x0a, 0x03, 0x6d, 0x32, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
-	0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48,
-	0x01, 0x52, 0x03, 0x6d, 0x32, 0x32, 0x42, 0x10, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x31, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x01, 0x42, 0x10, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x32, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x03, 0x22, 0x64, 0x0a, 0x0a, 0x4f, 0x75,
-	0x74, 0x4f, 0x66, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x16, 0x0a, 0x02, 0x6d, 0x31, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x01, 0x48, 0x00, 0x52, 0x02, 0x6d, 0x31, 0x12, 0x1f,
-	0x0a, 0x02, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x02, 0x6d, 0x32, 0x42,
-	0x0f, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x02,
-	0x22, 0x73, 0x0a, 0x0f, 0x4e, 0x6f, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x61, 0x63, 0x68, 0x61,
-	0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x02, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42,
-	0x04, 0x80, 0xf6, 0x2c, 0x02, 0x48, 0x00, 0x52, 0x02, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x02, 0x6d,
-	0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x01, 0x48, 0x00, 0x52,
-	0x02, 0x6d, 0x32, 0x12, 0x1f, 0x0a, 0x02, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x42,
-	0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00,
-	0x52, 0x02, 0x6d, 0x33, 0x42, 0x0f, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x04, 0x88, 0xf6, 0x2c, 0x03, 0x2a, 0x17, 0x0a, 0x05, 0x65, 0x6e, 0x75, 0x6d, 0x31, 0x12, 0x06,
-	0x0a, 0x02, 0x76, 0x31, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x76, 0x32, 0x10, 0x01, 0x32, 0xd6,
-	0x01, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x5e, 0x0a, 0x0f, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x2e,
+	return file_pkg_tool_grpctool_test_test_proto_rawDescGZIP(), []int{1, 1}
+}
+
+var File_pkg_tool_grpctool_test_test_proto protoreflect.FileDescriptor
+
+var file_pkg_tool_grpctool_test_test_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74,
+	0x6f, 0x6f, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x1a,
+	0x29, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f,
+	0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x75, 0x74, 0x6f,
+	0x6d, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x22, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17,
+	0x0a, 0x02, 0x73, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
+	0x02, 0x20, 0x01, 0x52, 0x02, 0x73, 0x31, 0x22, 0xb8, 0x02, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x06, 0x73, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x02, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63,
+	0x61, 0x6c, 0x61, 0x72, 0x12, 0x39, 0x0a, 0x02, 0x78, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x65, 0x6e,
+	0x75, 0x6d, 0x31, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x03, 0x48, 0x00, 0x52, 0x02, 0x78, 0x31, 0x12,
+	0x49, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
 	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6b, 0x0a, 0x18, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b,
-	0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67, 0x72,
-	0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61, 0x2f,
-	0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x08, 0x80, 0xf6, 0x2c, 0x03, 0x80, 0xf6,
+	0x2c, 0x04, 0x48, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x04, 0x6c, 0x61,
+	0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c,
+	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4c,
+	0x61, 0x73, 0x74, 0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x01, 0x48, 0x00, 0x52, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x1a, 0x1a, 0x0a, 0x04, 0x44, 0x61,
+	0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x06, 0x0a, 0x04, 0x4c, 0x61, 0x73, 0x74, 0x42, 0x12,
+	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x07, 0xf8, 0x42, 0x01, 0x88, 0xf6,
+	0x2c, 0x01, 0x22, 0x0a, 0x0a, 0x08, 0x4e, 0x6f, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x22, 0x7f,
+	0x0a, 0x09, 0x54, 0x77, 0x6f, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x12, 0x12, 0x0a, 0x03, 0x6d,
+	0x31, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x31, 0x31, 0x12,
+	0x12, 0x0a, 0x03, 0x6d, 0x31, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x03,
+	0x6d, 0x31, 0x32, 0x12, 0x12, 0x0a, 0x03, 0x6d, 0x32, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x48, 0x01, 0x52, 0x03, 0x6d, 0x32, 0x31, 0x12, 0x12, 0x0a, 0x03, 0x6d, 0x32, 0x32, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x03, 0x6d, 0x32, 0x32, 0x42, 0x10, 0x0a, 0x08, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x01, 0x42, 0x10, 0x0a,
+	0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x03, 0x22,
+	0xae, 0x01, 0x0a, 0x0e, 0x54, 0x77, 0x6f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x4f, 0x6e, 0x65, 0x6f,
+	0x66, 0x73, 0x12, 0x18, 0x0a, 0x03, 0x6d, 0x31, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42,
+	0x04, 0x80, 0xf6, 0x2c, 0x02, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x31, 0x31, 0x12, 0x21, 0x0a, 0x03,
+	0x6d, 0x31, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x31, 0x32, 0x12,
+	0x18, 0x0a, 0x03, 0x6d, 0x32, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80, 0xf6,
+	0x2c, 0x04, 0x48, 0x01, 0x52, 0x03, 0x6d, 0x32, 0x31, 0x12, 0x21, 0x0a, 0x03, 0x6d, 0x32, 0x32,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x48, 0x01, 0x52, 0x03, 0x6d, 0x32, 0x32, 0x42, 0x10, 0x0a, 0x08,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x01, 0x42, 0x10,
+	0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x03,
+	0x22, 0x64, 0x0a, 0x0a, 0x4f, 0x75, 0x74, 0x4f, 0x66, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x12, 0x0c,
+	0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x16, 0x0a, 0x02,
+	0x6d, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x01, 0x48, 0x00,
+	0x52, 0x02, 0x6d, 0x31, 0x12, 0x1f, 0x0a, 0x02, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x48,
+	0x00, 0x52, 0x02, 0x6d, 0x32, 0x42, 0x0f, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x12, 0x04, 0x88, 0xf6, 0x2c, 0x02, 0x22, 0x73, 0x0a, 0x0f, 0x4e, 0x6f, 0x74, 0x41, 0x6c, 0x6c,
+	0x52, 0x65, 0x61, 0x63, 0x68, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x02, 0x6d, 0x31, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80, 0xf6, 0x2c, 0x02, 0x48, 0x00, 0x52, 0x02, 0x6d,
+	0x31, 0x12, 0x16, 0x0a, 0x02, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x04, 0x80,
+	0xf6, 0x2c, 0x01, 0x48, 0x00, 0x52, 0x02, 0x6d, 0x32, 0x12, 0x1f, 0x0a, 0x02, 0x6d, 0x33, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0d, 0x80, 0xf6, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x01, 0x48, 0x00, 0x52, 0x02, 0x6d, 0x33, 0x42, 0x0f, 0x0a, 0x07, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x04, 0x88, 0xf6, 0x2c, 0x03, 0x2a, 0x17, 0x0a, 0x05, 0x65,
+	0x6e, 0x75, 0x6d, 0x31, 0x12, 0x06, 0x0a, 0x02, 0x76, 0x31, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02,
+	0x76, 0x32, 0x10, 0x01, 0x32, 0xd6, 0x01, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67,
+	0x12, 0x5e, 0x0a, 0x0f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74,
+	0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c,
+	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x6b, 0x0a, 0x18, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x2e, 0x67,
+	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x46, 0x5a,
+	0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72,
+	0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x67,
+	0x72, 0x70, 0x63, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x61,
+	0x2f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_tool_grpctool_test_test_proto_rawDescOnce sync.Once
-	file_internal_tool_grpctool_test_test_proto_rawDescData = file_internal_tool_grpctool_test_test_proto_rawDesc
+	file_pkg_tool_grpctool_test_test_proto_rawDescOnce sync.Once
+	file_pkg_tool_grpctool_test_test_proto_rawDescData = file_pkg_tool_grpctool_test_test_proto_rawDesc
 )
 
-func file_internal_tool_grpctool_test_test_proto_rawDescGZIP() []byte {
-	file_internal_tool_grpctool_test_test_proto_rawDescOnce.Do(func() {
-		file_internal_tool_grpctool_test_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_tool_grpctool_test_test_proto_rawDescData)
+func file_pkg_tool_grpctool_test_test_proto_rawDescGZIP() []byte {
+	file_pkg_tool_grpctool_test_test_proto_rawDescOnce.Do(func() {
+		file_pkg_tool_grpctool_test_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_tool_grpctool_test_test_proto_rawDescData)
 	})
-	return file_internal_tool_grpctool_test_test_proto_rawDescData
+	return file_pkg_tool_grpctool_test_test_proto_rawDescData
 }
 
-var file_internal_tool_grpctool_test_test_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_internal_tool_grpctool_test_test_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_internal_tool_grpctool_test_test_proto_goTypes = []interface{}{
+var file_pkg_tool_grpctool_test_test_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_pkg_tool_grpctool_test_test_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
+var file_pkg_tool_grpctool_test_test_proto_goTypes = []interface{}{
 	(Enum1)(0),              // 0: gitlab.agent.grpctool.test.enum1
 	(*Request)(nil),         // 1: gitlab.agent.grpctool.test.Request
 	(*Response)(nil),        // 2: gitlab.agent.grpctool.test.Response
@@ -898,7 +896,7 @@ var file_internal_tool_grpctool_test_test_proto_goTypes = []interface{}{
 	(*Response_Data)(nil),   // 8: gitlab.agent.grpctool.test.Response.Data
 	(*Response_Last)(nil),   // 9: gitlab.agent.grpctool.test.Response.Last
 }
-var file_internal_tool_grpctool_test_test_proto_depIdxs = []int32{
+var file_pkg_tool_grpctool_test_test_proto_depIdxs = []int32{
 	0, // 0: gitlab.agent.grpctool.test.Response.x1:type_name -> gitlab.agent.grpctool.test.enum1
 	8, // 1: gitlab.agent.grpctool.test.Response.data:type_name -> gitlab.agent.grpctool.test.Response.Data
 	9, // 2: gitlab.agent.grpctool.test.Response.last:type_name -> gitlab.agent.grpctool.test.Response.Last
@@ -913,13 +911,13 @@ var file_internal_tool_grpctool_test_test_proto_depIdxs = []int32{
 	0, // [0:3] is the sub-list for field type_name
 }
 
-func init() { file_internal_tool_grpctool_test_test_proto_init() }
-func file_internal_tool_grpctool_test_test_proto_init() {
-	if File_internal_tool_grpctool_test_test_proto != nil {
+func init() { file_pkg_tool_grpctool_test_test_proto_init() }
+func file_pkg_tool_grpctool_test_test_proto_init() {
+	if File_pkg_tool_grpctool_test_test_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_tool_grpctool_test_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Request); i {
 			case 0:
 				return &v.state
@@ -931,7 +929,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Response); i {
 			case 0:
 				return &v.state
@@ -943,7 +941,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NoOneofs); i {
 			case 0:
 				return &v.state
@@ -955,7 +953,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TwoOneofs); i {
 			case 0:
 				return &v.state
@@ -967,7 +965,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TwoValidOneofs); i {
 			case 0:
 				return &v.state
@@ -979,7 +977,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OutOfOneof); i {
 			case 0:
 				return &v.state
@@ -991,7 +989,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NotAllReachable); i {
 			case 0:
 				return &v.state
@@ -1003,7 +1001,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Response_Data); i {
 			case 0:
 				return &v.state
@@ -1015,7 +1013,7 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_grpctool_test_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_grpctool_test_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Response_Last); i {
 			case 0:
 				return &v.state
@@ -1028,29 +1026,29 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 			}
 		}
 	}
-	file_internal_tool_grpctool_test_test_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_test_test_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*Response_Scalar)(nil),
 		(*Response_X1)(nil),
 		(*Response_Data_)(nil),
 		(*Response_Last_)(nil),
 	}
-	file_internal_tool_grpctool_test_test_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_test_test_proto_msgTypes[3].OneofWrappers = []interface{}{
 		(*TwoOneofs_M11)(nil),
 		(*TwoOneofs_M12)(nil),
 		(*TwoOneofs_M21)(nil),
 		(*TwoOneofs_M22)(nil),
 	}
-	file_internal_tool_grpctool_test_test_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_test_test_proto_msgTypes[4].OneofWrappers = []interface{}{
 		(*TwoValidOneofs_M11)(nil),
 		(*TwoValidOneofs_M12)(nil),
 		(*TwoValidOneofs_M21)(nil),
 		(*TwoValidOneofs_M22)(nil),
 	}
-	file_internal_tool_grpctool_test_test_proto_msgTypes[5].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_test_test_proto_msgTypes[5].OneofWrappers = []interface{}{
 		(*OutOfOneof_M1)(nil),
 		(*OutOfOneof_M2)(nil),
 	}
-	file_internal_tool_grpctool_test_test_proto_msgTypes[6].OneofWrappers = []interface{}{
+	file_pkg_tool_grpctool_test_test_proto_msgTypes[6].OneofWrappers = []interface{}{
 		(*NotAllReachable_M1)(nil),
 		(*NotAllReachable_M2)(nil),
 		(*NotAllReachable_M3)(nil),
@@ -1059,19 +1057,19 @@ func file_internal_tool_grpctool_test_test_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_tool_grpctool_test_test_proto_rawDesc,
+			RawDescriptor: file_pkg_tool_grpctool_test_test_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_internal_tool_grpctool_test_test_proto_goTypes,
-		DependencyIndexes: file_internal_tool_grpctool_test_test_proto_depIdxs,
-		EnumInfos:         file_internal_tool_grpctool_test_test_proto_enumTypes,
-		MessageInfos:      file_internal_tool_grpctool_test_test_proto_msgTypes,
+		GoTypes:           file_pkg_tool_grpctool_test_test_proto_goTypes,
+		DependencyIndexes: file_pkg_tool_grpctool_test_test_proto_depIdxs,
+		EnumInfos:         file_pkg_tool_grpctool_test_test_proto_enumTypes,
+		MessageInfos:      file_pkg_tool_grpctool_test_test_proto_msgTypes,
 	}.Build()
-	File_internal_tool_grpctool_test_test_proto = out.File
-	file_internal_tool_grpctool_test_test_proto_rawDesc = nil
-	file_internal_tool_grpctool_test_test_proto_goTypes = nil
-	file_internal_tool_grpctool_test_test_proto_depIdxs = nil
+	File_pkg_tool_grpctool_test_test_proto = out.File
+	file_pkg_tool_grpctool_test_test_proto_rawDesc = nil
+	file_pkg_tool_grpctool_test_test_proto_goTypes = nil
+	file_pkg_tool_grpctool_test_test_proto_depIdxs = nil
 }
diff --git a/pkg/tool/grpctool/test/test.pb.validate.go b/pkg/tool/grpctool/test/test.pb.validate.go
index 93993ba0..2005a745 100644
--- a/pkg/tool/grpctool/test/test.pb.validate.go
+++ b/pkg/tool/grpctool/test/test.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/tool/grpctool/test/test.proto
+// source: pkg/tool/grpctool/test/test.proto
 
 package test
 
diff --git a/pkg/tool/grpctool/test/test.proto b/pkg/tool/grpctool/test/test.proto
index fd4cbb23..b24bcbe4 100644
--- a/pkg/tool/grpctool/test/test.proto
+++ b/pkg/tool/grpctool/test/test.proto
@@ -4,9 +4,9 @@ syntax = "proto3";
 
 package gitlab.agent.grpctool.test;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool/automata/test";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/automata/test";
 
-import "internal/tool/grpctool/automata/automata.proto";
+import "pkg/tool/grpctool/automata/automata.proto";
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
 
diff --git a/pkg/tool/grpctool/test/test_grpc.pb.go b/pkg/tool/grpctool/test/test_grpc.pb.go
index 798173c7..0bdc4fd6 100644
--- a/pkg/tool/grpctool/test/test_grpc.pb.go
+++ b/pkg/tool/grpctool/test/test_grpc.pb.go
@@ -1,17 +1,18 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v4.24.4
-// source: internal/tool/grpctool/test/test.proto
+// source: pkg/tool/grpctool/test/test.proto
+
+// If you make any changes make sure you run: make regenerate-proto
 
 package test
 
 import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -19,6 +20,11 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	Testing_RequestResponse_FullMethodName          = "/gitlab.agent.grpctool.test.Testing/RequestResponse"
+	Testing_StreamingRequestResponse_FullMethodName = "/gitlab.agent.grpctool.test.Testing/StreamingRequestResponse"
+)
+
 // TestingClient is the client API for Testing service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
@@ -37,7 +43,7 @@ func NewTestingClient(cc grpc.ClientConnInterface) TestingClient {
 
 func (c *testingClient) RequestResponse(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/gitlab.agent.grpctool.test.Testing/RequestResponse", in, out, opts...)
+	err := c.cc.Invoke(ctx, Testing_RequestResponse_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -45,7 +51,7 @@ func (c *testingClient) RequestResponse(ctx context.Context, in *Request, opts .
 }
 
 func (c *testingClient) StreamingRequestResponse(ctx context.Context, opts ...grpc.CallOption) (Testing_StreamingRequestResponseClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Testing_ServiceDesc.Streams[0], "/gitlab.agent.grpctool.test.Testing/StreamingRequestResponse", opts...)
+	stream, err := c.cc.NewStream(ctx, &Testing_ServiceDesc.Streams[0], Testing_StreamingRequestResponse_FullMethodName, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -117,7 +123,7 @@ func _Testing_RequestResponse_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gitlab.agent.grpctool.test.Testing/RequestResponse",
+		FullMethod: Testing_RequestResponse_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(TestingServer).RequestResponse(ctx, req.(*Request))
@@ -171,5 +177,5 @@ var Testing_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "internal/tool/grpctool/test/test.proto",
+	Metadata: "pkg/tool/grpctool/test/test.proto",
 }
diff --git a/pkg/tool/grpctool/test/test_proto_docs.md b/pkg/tool/grpctool/test/test_proto_docs.md
index 450a85d3..c7a32f12 100644
--- a/pkg/tool/grpctool/test/test_proto_docs.md
+++ b/pkg/tool/grpctool/test/test_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/tool/grpctool/test/test.proto](#internal_tool_grpctool_test_test-proto)
+- [pkg/tool/grpctool/test/test.proto](#pkg_tool_grpctool_test_test-proto)
     - [NoOneofs](#gitlab-agent-grpctool-test-NoOneofs)
     - [NotAllReachable](#gitlab-agent-grpctool-test-NotAllReachable)
     - [OutOfOneof](#gitlab-agent-grpctool-test-OutOfOneof)
@@ -22,10 +22,10 @@
 
 
 
-<a name="internal_tool_grpctool_test_test-proto"></a>
+<a name="pkg_tool_grpctool_test_test-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/tool/grpctool/test/test.proto
+## pkg/tool/grpctool/test/test.proto
 
 
 
diff --git a/pkg/tool/prototool/prototool.pb.go b/pkg/tool/prototool/prototool.pb.go
index 099c797a..e8b96416 100644
--- a/pkg/tool/prototool/prototool.pb.go
+++ b/pkg/tool/prototool/prototool.pb.go
@@ -2,19 +2,18 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/tool/prototool/prototool.proto
+// source: pkg/tool/prototool/prototool.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package prototool
 
 import (
-	"reflect"
-	"sync"
-
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -35,7 +34,7 @@ type Values struct {
 func (x *Values) Reset() {
 	*x = Values{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_prototool_prototool_proto_msgTypes[0]
+		mi := &file_pkg_tool_prototool_prototool_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -48,7 +47,7 @@ func (x *Values) String() string {
 func (*Values) ProtoMessage() {}
 
 func (x *Values) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_prototool_prototool_proto_msgTypes[0]
+	mi := &file_pkg_tool_prototool_prototool_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -61,7 +60,7 @@ func (x *Values) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Values.ProtoReflect.Descriptor instead.
 func (*Values) Descriptor() ([]byte, []int) {
-	return file_internal_tool_prototool_prototool_proto_rawDescGZIP(), []int{0}
+	return file_pkg_tool_prototool_prototool_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Values) GetValue() []string {
@@ -89,7 +88,7 @@ type HttpRequest struct {
 func (x *HttpRequest) Reset() {
 	*x = HttpRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_prototool_prototool_proto_msgTypes[1]
+		mi := &file_pkg_tool_prototool_prototool_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -102,7 +101,7 @@ func (x *HttpRequest) String() string {
 func (*HttpRequest) ProtoMessage() {}
 
 func (x *HttpRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_prototool_prototool_proto_msgTypes[1]
+	mi := &file_pkg_tool_prototool_prototool_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -115,7 +114,7 @@ func (x *HttpRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpRequest.ProtoReflect.Descriptor instead.
 func (*HttpRequest) Descriptor() ([]byte, []int) {
-	return file_internal_tool_prototool_prototool_proto_rawDescGZIP(), []int{1}
+	return file_pkg_tool_prototool_prototool_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *HttpRequest) GetMethod() string {
@@ -162,7 +161,7 @@ type HttpResponse struct {
 func (x *HttpResponse) Reset() {
 	*x = HttpResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_prototool_prototool_proto_msgTypes[2]
+		mi := &file_pkg_tool_prototool_prototool_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -175,7 +174,7 @@ func (x *HttpResponse) String() string {
 func (*HttpResponse) ProtoMessage() {}
 
 func (x *HttpResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_prototool_prototool_proto_msgTypes[2]
+	mi := &file_pkg_tool_prototool_prototool_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -188,7 +187,7 @@ func (x *HttpResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HttpResponse.ProtoReflect.Descriptor instead.
 func (*HttpResponse) Descriptor() ([]byte, []int) {
-	return file_internal_tool_prototool_prototool_proto_rawDescGZIP(), []int{2}
+	return file_pkg_tool_prototool_prototool_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *HttpResponse) GetStatusCode() int32 {
@@ -212,78 +211,77 @@ func (x *HttpResponse) GetHeader() map[string]*Values {
 	return nil
 }
 
-var File_internal_tool_prototool_prototool_proto protoreflect.FileDescriptor
-
-var file_internal_tool_prototool_prototool_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f,
-	0x6c, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1e, 0x0a, 0x06, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x96, 0x03, 0x0a, 0x0b, 0x48,
-	0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x06, 0x6d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x20, 0x01, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x47, 0x0a, 0x06, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x69,
-	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x08, 0x75, 0x72, 0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52,
-	0x07, 0x75, 0x72, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x12, 0x44, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72,
-	0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c,
-	0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x59,
-	0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e,
-	0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x58, 0x0a, 0x0a, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
+var File_pkg_tool_prototool_prototool_proto protoreflect.FileDescriptor
+
+var file_pkg_tool_prototool_prototool_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x1a, 0x17, 0x76, 0x61,
+	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1e, 0x0a, 0x06, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x96, 0x03, 0x0a, 0x0b, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x06,
+	0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x47, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e,
+	0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12,
+	0x22, 0x0a, 0x08, 0x75, 0x72, 0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x07, 0x75, 0x72, 0x6c, 0x50,
+	0x61, 0x74, 0x68, 0x12, 0x44, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x59, 0x0a, 0x0b, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c,
+	0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f,
+	0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x58, 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xec,
+	0x01, 0x0a, 0x0c, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65,
+	0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x48, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61,
 	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f,
-	0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0xec, 0x01, 0x0a, 0x0c, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63,
-	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x48, 0x0a,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e,
-	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x1a, 0x59, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62,
-	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c,
-	0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65,
-	0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f,
-	0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x1a, 0x59, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x39, 0x5a,
+	0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72,
+	0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_tool_prototool_prototool_proto_rawDescOnce sync.Once
-	file_internal_tool_prototool_prototool_proto_rawDescData = file_internal_tool_prototool_prototool_proto_rawDesc
+	file_pkg_tool_prototool_prototool_proto_rawDescOnce sync.Once
+	file_pkg_tool_prototool_prototool_proto_rawDescData = file_pkg_tool_prototool_prototool_proto_rawDesc
 )
 
-func file_internal_tool_prototool_prototool_proto_rawDescGZIP() []byte {
-	file_internal_tool_prototool_prototool_proto_rawDescOnce.Do(func() {
-		file_internal_tool_prototool_prototool_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_tool_prototool_prototool_proto_rawDescData)
+func file_pkg_tool_prototool_prototool_proto_rawDescGZIP() []byte {
+	file_pkg_tool_prototool_prototool_proto_rawDescOnce.Do(func() {
+		file_pkg_tool_prototool_prototool_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_tool_prototool_prototool_proto_rawDescData)
 	})
-	return file_internal_tool_prototool_prototool_proto_rawDescData
+	return file_pkg_tool_prototool_prototool_proto_rawDescData
 }
 
-var file_internal_tool_prototool_prototool_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_internal_tool_prototool_prototool_proto_goTypes = []interface{}{
+var file_pkg_tool_prototool_prototool_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_pkg_tool_prototool_prototool_proto_goTypes = []interface{}{
 	(*Values)(nil),       // 0: gitlab.agent.prototool.Values
 	(*HttpRequest)(nil),  // 1: gitlab.agent.prototool.HttpRequest
 	(*HttpResponse)(nil), // 2: gitlab.agent.prototool.HttpResponse
@@ -291,7 +289,7 @@ var file_internal_tool_prototool_prototool_proto_goTypes = []interface{}{
 	nil,                  // 4: gitlab.agent.prototool.HttpRequest.QueryEntry
 	nil,                  // 5: gitlab.agent.prototool.HttpResponse.HeaderEntry
 }
-var file_internal_tool_prototool_prototool_proto_depIdxs = []int32{
+var file_pkg_tool_prototool_prototool_proto_depIdxs = []int32{
 	3, // 0: gitlab.agent.prototool.HttpRequest.header:type_name -> gitlab.agent.prototool.HttpRequest.HeaderEntry
 	4, // 1: gitlab.agent.prototool.HttpRequest.query:type_name -> gitlab.agent.prototool.HttpRequest.QueryEntry
 	5, // 2: gitlab.agent.prototool.HttpResponse.header:type_name -> gitlab.agent.prototool.HttpResponse.HeaderEntry
@@ -305,13 +303,13 @@ var file_internal_tool_prototool_prototool_proto_depIdxs = []int32{
 	0, // [0:6] is the sub-list for field type_name
 }
 
-func init() { file_internal_tool_prototool_prototool_proto_init() }
-func file_internal_tool_prototool_prototool_proto_init() {
-	if File_internal_tool_prototool_prototool_proto != nil {
+func init() { file_pkg_tool_prototool_prototool_proto_init() }
+func file_pkg_tool_prototool_prototool_proto_init() {
+	if File_pkg_tool_prototool_prototool_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_tool_prototool_prototool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_prototool_prototool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Values); i {
 			case 0:
 				return &v.state
@@ -323,7 +321,7 @@ func file_internal_tool_prototool_prototool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_prototool_prototool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_prototool_prototool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpRequest); i {
 			case 0:
 				return &v.state
@@ -335,7 +333,7 @@ func file_internal_tool_prototool_prototool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_prototool_prototool_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_prototool_prototool_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HttpResponse); i {
 			case 0:
 				return &v.state
@@ -352,18 +350,18 @@ func file_internal_tool_prototool_prototool_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_tool_prototool_prototool_proto_rawDesc,
+			RawDescriptor: file_pkg_tool_prototool_prototool_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_tool_prototool_prototool_proto_goTypes,
-		DependencyIndexes: file_internal_tool_prototool_prototool_proto_depIdxs,
-		MessageInfos:      file_internal_tool_prototool_prototool_proto_msgTypes,
+		GoTypes:           file_pkg_tool_prototool_prototool_proto_goTypes,
+		DependencyIndexes: file_pkg_tool_prototool_prototool_proto_depIdxs,
+		MessageInfos:      file_pkg_tool_prototool_prototool_proto_msgTypes,
 	}.Build()
-	File_internal_tool_prototool_prototool_proto = out.File
-	file_internal_tool_prototool_prototool_proto_rawDesc = nil
-	file_internal_tool_prototool_prototool_proto_goTypes = nil
-	file_internal_tool_prototool_prototool_proto_depIdxs = nil
+	File_pkg_tool_prototool_prototool_proto = out.File
+	file_pkg_tool_prototool_prototool_proto_rawDesc = nil
+	file_pkg_tool_prototool_prototool_proto_goTypes = nil
+	file_pkg_tool_prototool_prototool_proto_depIdxs = nil
 }
diff --git a/pkg/tool/prototool/prototool.pb.validate.go b/pkg/tool/prototool/prototool.pb.validate.go
index 9225607b..f5003d3b 100644
--- a/pkg/tool/prototool/prototool.pb.validate.go
+++ b/pkg/tool/prototool/prototool.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/tool/prototool/prototool.proto
+// source: pkg/tool/prototool/prototool.proto
 
 package prototool
 
diff --git a/pkg/tool/prototool/prototool.proto b/pkg/tool/prototool/prototool.proto
index 15fdab58..3321593b 100644
--- a/pkg/tool/prototool/prototool.proto
+++ b/pkg/tool/prototool/prototool.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.prototool;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/tool/prototool";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/tool/prototool";
 
 //import "github.com/envoyproxy/protoc-gen-validate/blob/master/validate/validate.proto";
 import "validate/validate.proto";
diff --git a/pkg/tool/prototool/prototool_proto_docs.md b/pkg/tool/prototool/prototool_proto_docs.md
index 25845b6e..337cfabb 100644
--- a/pkg/tool/prototool/prototool_proto_docs.md
+++ b/pkg/tool/prototool/prototool_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/tool/prototool/prototool.proto](#internal_tool_prototool_prototool-proto)
+- [pkg/tool/prototool/prototool.proto](#pkg_tool_prototool_prototool-proto)
     - [HttpRequest](#gitlab-agent-prototool-HttpRequest)
     - [HttpRequest.HeaderEntry](#gitlab-agent-prototool-HttpRequest-HeaderEntry)
     - [HttpRequest.QueryEntry](#gitlab-agent-prototool-HttpRequest-QueryEntry)
@@ -15,10 +15,10 @@
 
 
 
-<a name="internal_tool_prototool_prototool-proto"></a>
+<a name="pkg_tool_prototool_prototool-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/tool/prototool/prototool.proto
+## pkg/tool/prototool/prototool.proto
 
 
 
diff --git a/pkg/tool/redistool/doc.go b/pkg/tool/redistool/doc.go
index 1e866857..88d3b361 100644
--- a/pkg/tool/redistool/doc.go
+++ b/pkg/tool/redistool/doc.go
@@ -1,3 +1,3 @@
 package redistool
 
-//go:generate mockgen.sh -self_package "github.com/pluralsh/kuberentes-agent/internal/tool/redistool" -destination "mock_for_test.go" -package "redistool" "github.com/pluralsh/kuberentes-agent/internal/tool/redistool" "RpcApi"
+//go:generate mockgen.sh -self_package "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool" -destination "mock_for_test.go" -package "redistool" "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool" "RpcApi"
diff --git a/pkg/tool/redistool/mock_for_test.go b/pkg/tool/redistool/mock_for_test.go
index e5b74731..4843d7a5 100644
--- a/pkg/tool/redistool/mock_for_test.go
+++ b/pkg/tool/redistool/mock_for_test.go
@@ -1,18 +1,18 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/tool/redistool (interfaces: RpcApi)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/tool/redistool (interfaces: RpcApi)
 //
 // Generated by this command:
 //
-//	mockgen -typed -self_package github.com/pluralsh/kuberentes-agent/internal/tool/redistool -destination mock_for_test.go -package redistool github.com/pluralsh/kuberentes-agent/internal/tool/redistool RpcApi
+//	mockgen -typed -self_package github.com/pluralsh/kuberentes-agent/pkg/tool/redistool -destination mock_for_test.go -package redistool github.com/pluralsh/kuberentes-agent/pkg/tool/redistool RpcApi
 //
 // Package redistool is a generated GoMock package.
 package redistool
 
 import (
-	"reflect"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
 )
 
 // MockRpcApi is a mock of RpcApi interface.
diff --git a/pkg/tool/redistool/redistool.pb.go b/pkg/tool/redistool/redistool.pb.go
index 3af6dd7c..ef34b0aa 100644
--- a/pkg/tool/redistool/redistool.pb.go
+++ b/pkg/tool/redistool/redistool.pb.go
@@ -2,18 +2,17 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.4
-// source: internal/tool/redistool/redistool.proto
+// source: pkg/tool/redistool/redistool.proto
 
 // If you make any changes make sure you run: make regenerate-proto
 
 package redistool
 
 import (
-	"reflect"
-	"sync"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -36,7 +35,7 @@ type ExpiringValue struct {
 func (x *ExpiringValue) Reset() {
 	*x = ExpiringValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_redistool_redistool_proto_msgTypes[0]
+		mi := &file_pkg_tool_redistool_redistool_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -49,7 +48,7 @@ func (x *ExpiringValue) String() string {
 func (*ExpiringValue) ProtoMessage() {}
 
 func (x *ExpiringValue) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_redistool_redistool_proto_msgTypes[0]
+	mi := &file_pkg_tool_redistool_redistool_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -62,7 +61,7 @@ func (x *ExpiringValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExpiringValue.ProtoReflect.Descriptor instead.
 func (*ExpiringValue) Descriptor() ([]byte, []int) {
-	return file_internal_tool_redistool_redistool_proto_rawDescGZIP(), []int{0}
+	return file_pkg_tool_redistool_redistool_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ExpiringValue) GetExpiresAt() int64 {
@@ -92,7 +91,7 @@ type ExpiringValueTimestamp struct {
 func (x *ExpiringValueTimestamp) Reset() {
 	*x = ExpiringValueTimestamp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_tool_redistool_redistool_proto_msgTypes[1]
+		mi := &file_pkg_tool_redistool_redistool_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -105,7 +104,7 @@ func (x *ExpiringValueTimestamp) String() string {
 func (*ExpiringValueTimestamp) ProtoMessage() {}
 
 func (x *ExpiringValueTimestamp) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_tool_redistool_redistool_proto_msgTypes[1]
+	mi := &file_pkg_tool_redistool_redistool_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -118,7 +117,7 @@ func (x *ExpiringValueTimestamp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExpiringValueTimestamp.ProtoReflect.Descriptor instead.
 func (*ExpiringValueTimestamp) Descriptor() ([]byte, []int) {
-	return file_internal_tool_redistool_redistool_proto_rawDescGZIP(), []int{1}
+	return file_pkg_tool_redistool_redistool_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ExpiringValueTimestamp) GetExpiresAt() int64 {
@@ -128,46 +127,45 @@ func (x *ExpiringValueTimestamp) GetExpiresAt() int64 {
 	return 0
 }
 
-var File_internal_tool_redistool_redistool_proto protoreflect.FileDescriptor
-
-var file_internal_tool_redistool_redistool_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f,
-	0x72, 0x65, 0x64, 0x69, 0x73, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74,
-	0x6f, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x67, 0x69, 0x74, 0x6c, 0x61,
-	0x62, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, 0x6f, 0x6f,
-	0x6c, 0x22, 0x44, 0x0a, 0x0d, 0x45, 0x78, 0x70, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x61, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x41,
-	0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x37, 0x0a, 0x16, 0x45, 0x78, 0x70, 0x69, 0x72,
-	0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x61, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x41, 0x74,
-	0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70,
-	0x6c, 0x75, 0x72, 0x61, 0x6c, 0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74,
-	0x65, 0x73, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, 0x6f, 0x6f, 0x6c,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_pkg_tool_redistool_redistool_proto protoreflect.FileDescriptor
+
+var file_pkg_tool_redistool_redistool_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x72, 0x65, 0x64, 0x69, 0x73,
+	0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, 0x6f, 0x6f, 0x6c, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, 0x6f, 0x6f, 0x6c, 0x22, 0x44, 0x0a, 0x0d,
+	0x45, 0x78, 0x70, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a,
+	0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x41, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x22, 0x37, 0x0a, 0x16, 0x45, 0x78, 0x70, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x1d, 0x0a, 0x0a,
+	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x41, 0x74, 0x42, 0x39, 0x5a, 0x37, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c,
+	0x73, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x73, 0x2d, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x2f, 0x72, 0x65, 0x64,
+	0x69, 0x73, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_internal_tool_redistool_redistool_proto_rawDescOnce sync.Once
-	file_internal_tool_redistool_redistool_proto_rawDescData = file_internal_tool_redistool_redistool_proto_rawDesc
+	file_pkg_tool_redistool_redistool_proto_rawDescOnce sync.Once
+	file_pkg_tool_redistool_redistool_proto_rawDescData = file_pkg_tool_redistool_redistool_proto_rawDesc
 )
 
-func file_internal_tool_redistool_redistool_proto_rawDescGZIP() []byte {
-	file_internal_tool_redistool_redistool_proto_rawDescOnce.Do(func() {
-		file_internal_tool_redistool_redistool_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_tool_redistool_redistool_proto_rawDescData)
+func file_pkg_tool_redistool_redistool_proto_rawDescGZIP() []byte {
+	file_pkg_tool_redistool_redistool_proto_rawDescOnce.Do(func() {
+		file_pkg_tool_redistool_redistool_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_tool_redistool_redistool_proto_rawDescData)
 	})
-	return file_internal_tool_redistool_redistool_proto_rawDescData
+	return file_pkg_tool_redistool_redistool_proto_rawDescData
 }
 
-var file_internal_tool_redistool_redistool_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_internal_tool_redistool_redistool_proto_goTypes = []interface{}{
+var file_pkg_tool_redistool_redistool_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_pkg_tool_redistool_redistool_proto_goTypes = []interface{}{
 	(*ExpiringValue)(nil),          // 0: gitlab.agent.redistool.ExpiringValue
 	(*ExpiringValueTimestamp)(nil), // 1: gitlab.agent.redistool.ExpiringValueTimestamp
 }
-var file_internal_tool_redistool_redistool_proto_depIdxs = []int32{
+var file_pkg_tool_redistool_redistool_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -175,13 +173,13 @@ var file_internal_tool_redistool_redistool_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_internal_tool_redistool_redistool_proto_init() }
-func file_internal_tool_redistool_redistool_proto_init() {
-	if File_internal_tool_redistool_redistool_proto != nil {
+func init() { file_pkg_tool_redistool_redistool_proto_init() }
+func file_pkg_tool_redistool_redistool_proto_init() {
+	if File_pkg_tool_redistool_redistool_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_internal_tool_redistool_redistool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_redistool_redistool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExpiringValue); i {
 			case 0:
 				return &v.state
@@ -193,7 +191,7 @@ func file_internal_tool_redistool_redistool_proto_init() {
 				return nil
 			}
 		}
-		file_internal_tool_redistool_redistool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_tool_redistool_redistool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExpiringValueTimestamp); i {
 			case 0:
 				return &v.state
@@ -210,18 +208,18 @@ func file_internal_tool_redistool_redistool_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_tool_redistool_redistool_proto_rawDesc,
+			RawDescriptor: file_pkg_tool_redistool_redistool_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_internal_tool_redistool_redistool_proto_goTypes,
-		DependencyIndexes: file_internal_tool_redistool_redistool_proto_depIdxs,
-		MessageInfos:      file_internal_tool_redistool_redistool_proto_msgTypes,
+		GoTypes:           file_pkg_tool_redistool_redistool_proto_goTypes,
+		DependencyIndexes: file_pkg_tool_redistool_redistool_proto_depIdxs,
+		MessageInfos:      file_pkg_tool_redistool_redistool_proto_msgTypes,
 	}.Build()
-	File_internal_tool_redistool_redistool_proto = out.File
-	file_internal_tool_redistool_redistool_proto_rawDesc = nil
-	file_internal_tool_redistool_redistool_proto_goTypes = nil
-	file_internal_tool_redistool_redistool_proto_depIdxs = nil
+	File_pkg_tool_redistool_redistool_proto = out.File
+	file_pkg_tool_redistool_redistool_proto_rawDesc = nil
+	file_pkg_tool_redistool_redistool_proto_goTypes = nil
+	file_pkg_tool_redistool_redistool_proto_depIdxs = nil
 }
diff --git a/pkg/tool/redistool/redistool.pb.validate.go b/pkg/tool/redistool/redistool.pb.validate.go
index 8e8bbe4e..98444537 100644
--- a/pkg/tool/redistool/redistool.pb.validate.go
+++ b/pkg/tool/redistool/redistool.pb.validate.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: internal/tool/redistool/redistool.proto
+// source: pkg/tool/redistool/redistool.proto
 
 package redistool
 
diff --git a/pkg/tool/redistool/redistool.proto b/pkg/tool/redistool/redistool.proto
index 08b1a473..12c9b9fe 100644
--- a/pkg/tool/redistool/redistool.proto
+++ b/pkg/tool/redistool/redistool.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package gitlab.agent.redistool;
 
-option go_package = "github.com/pluralsh/kuberentes-agent/internal/tool/redistool";
+option go_package = "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool";
 
 message ExpiringValue {
   // When the value should be considered expired. Number of seconds since UNIX epoch.
diff --git a/pkg/tool/redistool/redistool_proto_docs.md b/pkg/tool/redistool/redistool_proto_docs.md
index f9b553b5..96547bea 100644
--- a/pkg/tool/redistool/redistool_proto_docs.md
+++ b/pkg/tool/redistool/redistool_proto_docs.md
@@ -3,7 +3,7 @@
 
 ## Table of Contents
 
-- [internal/tool/redistool/redistool.proto](#internal_tool_redistool_redistool-proto)
+- [pkg/tool/redistool/redistool.proto](#pkg_tool_redistool_redistool-proto)
     - [ExpiringValue](#gitlab-agent-redistool-ExpiringValue)
     - [ExpiringValueTimestamp](#gitlab-agent-redistool-ExpiringValueTimestamp)
   
@@ -11,10 +11,10 @@
 
 
 
-<a name="internal_tool_redistool_redistool-proto"></a>
+<a name="pkg_tool_redistool_redistool-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## internal/tool/redistool/redistool.proto
+## pkg/tool/redistool/redistool.proto
 
 
 
diff --git a/pkg/tool/testing/mock_agent_registrar/agent_registrar.go b/pkg/tool/testing/mock_agent_registrar/agent_registrar.go
index 2a38694b..fe535789 100644
--- a/pkg/tool/testing/mock_agent_registrar/agent_registrar.go
+++ b/pkg/tool/testing/mock_agent_registrar/agent_registrar.go
@@ -1,21 +1,20 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/agent_registrar/rpc (interfaces: AgentRegistrarClient)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/rpc (interfaces: AgentRegistrarClient)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination agent_registrar.go -package mock_agent_registrar github.com/pluralsh/kuberentes-agent/internal/module/agent_registrar/rpc AgentRegistrarClient
+//	mockgen -typed -destination agent_registrar.go -package mock_agent_registrar github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/rpc AgentRegistrarClient
 //
 // Package mock_agent_registrar is a generated GoMock package.
 package mock_agent_registrar
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/grpc"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/rpc"
+	rpc "github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/rpc"
+	gomock "go.uber.org/mock/gomock"
+	grpc "google.golang.org/grpc"
 )
 
 // MockAgentRegistrarClient is a mock of AgentRegistrarClient interface.
diff --git a/pkg/tool/testing/mock_agent_registrar/doc.go b/pkg/tool/testing/mock_agent_registrar/doc.go
index 3efdb9e9..da8a4f59 100644
--- a/pkg/tool/testing/mock_agent_registrar/doc.go
+++ b/pkg/tool/testing/mock_agent_registrar/doc.go
@@ -1,3 +1,3 @@
 package mock_agent_registrar
 
-//go:generate mockgen.sh -destination "agent_registrar.go" -package "mock_agent_registrar" "github.com/pluralsh/kuberentes-agent/internal/module/agent_registrar/rpc" "AgentRegistrarClient"
+//go:generate mockgen.sh -destination "agent_registrar.go" -package "mock_agent_registrar" "github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/rpc" "AgentRegistrarClient"
diff --git a/pkg/tool/testing/mock_agent_tracker/doc.go b/pkg/tool/testing/mock_agent_tracker/doc.go
index 901e7d9c..a53084ff 100644
--- a/pkg/tool/testing/mock_agent_tracker/doc.go
+++ b/pkg/tool/testing/mock_agent_tracker/doc.go
@@ -1,3 +1,3 @@
 package mock_agent_tracker
 
-//go:generate mockgen.sh -destination "tracker.go" "github.com/pluralsh/kuberentes-agent/internal/module/agent_tracker" "Tracker"
+//go:generate mockgen.sh -destination "tracker.go" "github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker" "Tracker"
diff --git a/pkg/tool/testing/mock_agent_tracker/tracker.go b/pkg/tool/testing/mock_agent_tracker/tracker.go
index 9776dfae..66ba98ee 100644
--- a/pkg/tool/testing/mock_agent_tracker/tracker.go
+++ b/pkg/tool/testing/mock_agent_tracker/tracker.go
@@ -1,20 +1,19 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/agent_tracker (interfaces: Tracker)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker (interfaces: Tracker)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination tracker.go github.com/pluralsh/kuberentes-agent/internal/module/agent_tracker Tracker
+//	mockgen -typed -destination tracker.go github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker Tracker
 //
 // Package mock_agent_tracker is a generated GoMock package.
 package mock_agent_tracker
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-
-	agent_tracker2 "github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker"
+	agent_tracker "github.com/pluralsh/kuberentes-agent/pkg/module/agent_tracker"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockTracker is a mock of Tracker interface.
@@ -80,7 +79,7 @@ func (c *TrackerGetConnectedAgentsCountCall) DoAndReturn(f func(context.Context)
 }
 
 // GetConnectionsByAgentId mocks base method.
-func (m *MockTracker) GetConnectionsByAgentId(arg0 context.Context, arg1 int64, arg2 agent_tracker2.ConnectedAgentInfoCallback) error {
+func (m *MockTracker) GetConnectionsByAgentId(arg0 context.Context, arg1 int64, arg2 agent_tracker.ConnectedAgentInfoCallback) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetConnectionsByAgentId", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -106,19 +105,19 @@ func (c *TrackerGetConnectionsByAgentIdCall) Return(arg0 error) *TrackerGetConne
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *TrackerGetConnectionsByAgentIdCall) Do(f func(context.Context, int64, agent_tracker2.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByAgentIdCall {
+func (c *TrackerGetConnectionsByAgentIdCall) Do(f func(context.Context, int64, agent_tracker.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByAgentIdCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *TrackerGetConnectionsByAgentIdCall) DoAndReturn(f func(context.Context, int64, agent_tracker2.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByAgentIdCall {
+func (c *TrackerGetConnectionsByAgentIdCall) DoAndReturn(f func(context.Context, int64, agent_tracker.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByAgentIdCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
 
 // GetConnectionsByProjectId mocks base method.
-func (m *MockTracker) GetConnectionsByProjectId(arg0 context.Context, arg1 int64, arg2 agent_tracker2.ConnectedAgentInfoCallback) error {
+func (m *MockTracker) GetConnectionsByProjectId(arg0 context.Context, arg1 int64, arg2 agent_tracker.ConnectedAgentInfoCallback) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetConnectionsByProjectId", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -144,19 +143,19 @@ func (c *TrackerGetConnectionsByProjectIdCall) Return(arg0 error) *TrackerGetCon
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *TrackerGetConnectionsByProjectIdCall) Do(f func(context.Context, int64, agent_tracker2.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByProjectIdCall {
+func (c *TrackerGetConnectionsByProjectIdCall) Do(f func(context.Context, int64, agent_tracker.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByProjectIdCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *TrackerGetConnectionsByProjectIdCall) DoAndReturn(f func(context.Context, int64, agent_tracker2.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByProjectIdCall {
+func (c *TrackerGetConnectionsByProjectIdCall) DoAndReturn(f func(context.Context, int64, agent_tracker.ConnectedAgentInfoCallback) error) *TrackerGetConnectionsByProjectIdCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
 
 // RegisterConnection mocks base method.
-func (m *MockTracker) RegisterConnection(arg0 context.Context, arg1 *agent_tracker2.ConnectedAgentInfo) error {
+func (m *MockTracker) RegisterConnection(arg0 context.Context, arg1 *agent_tracker.ConnectedAgentInfo) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RegisterConnection", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -182,13 +181,13 @@ func (c *TrackerRegisterConnectionCall) Return(arg0 error) *TrackerRegisterConne
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *TrackerRegisterConnectionCall) Do(f func(context.Context, *agent_tracker2.ConnectedAgentInfo) error) *TrackerRegisterConnectionCall {
+func (c *TrackerRegisterConnectionCall) Do(f func(context.Context, *agent_tracker.ConnectedAgentInfo) error) *TrackerRegisterConnectionCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *TrackerRegisterConnectionCall) DoAndReturn(f func(context.Context, *agent_tracker2.ConnectedAgentInfo) error) *TrackerRegisterConnectionCall {
+func (c *TrackerRegisterConnectionCall) DoAndReturn(f func(context.Context, *agent_tracker.ConnectedAgentInfo) error) *TrackerRegisterConnectionCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -232,7 +231,7 @@ func (c *TrackerRunCall) DoAndReturn(f func(context.Context) error) *TrackerRunC
 }
 
 // UnregisterConnection mocks base method.
-func (m *MockTracker) UnregisterConnection(arg0 context.Context, arg1 *agent_tracker2.ConnectedAgentInfo) error {
+func (m *MockTracker) UnregisterConnection(arg0 context.Context, arg1 *agent_tracker.ConnectedAgentInfo) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UnregisterConnection", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -258,13 +257,13 @@ func (c *TrackerUnregisterConnectionCall) Return(arg0 error) *TrackerUnregisterC
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *TrackerUnregisterConnectionCall) Do(f func(context.Context, *agent_tracker2.ConnectedAgentInfo) error) *TrackerUnregisterConnectionCall {
+func (c *TrackerUnregisterConnectionCall) Do(f func(context.Context, *agent_tracker.ConnectedAgentInfo) error) *TrackerUnregisterConnectionCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *TrackerUnregisterConnectionCall) DoAndReturn(f func(context.Context, *agent_tracker2.ConnectedAgentInfo) error) *TrackerUnregisterConnectionCall {
+func (c *TrackerUnregisterConnectionCall) DoAndReturn(f func(context.Context, *agent_tracker.ConnectedAgentInfo) error) *TrackerUnregisterConnectionCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
diff --git a/pkg/tool/testing/mock_cache/cache.go b/pkg/tool/testing/mock_cache/cache.go
index 8b40333c..7238181b 100644
--- a/pkg/tool/testing/mock_cache/cache.go
+++ b/pkg/tool/testing/mock_cache/cache.go
@@ -9,11 +9,11 @@
 package mock_cache
 
 import (
-	"context"
-	"reflect"
-	"time"
+	context "context"
+	reflect "reflect"
+	time "time"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockErrCacher is a mock of ErrCacher interface.
diff --git a/pkg/tool/testing/mock_k8s/apiextensionclient_v1.go b/pkg/tool/testing/mock_k8s/apiextensionclient_v1.go
index 187eef76..b46ceae2 100644
--- a/pkg/tool/testing/mock_k8s/apiextensionclient_v1.go
+++ b/pkg/tool/testing/mock_k8s/apiextensionclient_v1.go
@@ -9,17 +9,17 @@
 package mock_k8s
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	v10 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1"
 	v11 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
 	v12 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/rest"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	rest "k8s.io/client-go/rest"
 )
 
 // MockApiextensionsV1Interface is a mock of ApiextensionsV1Interface interface.
diff --git a/pkg/tool/testing/mock_k8s/cache.go b/pkg/tool/testing/mock_k8s/cache.go
index 21a9316b..c0ad79c0 100644
--- a/pkg/tool/testing/mock_k8s/cache.go
+++ b/pkg/tool/testing/mock_k8s/cache.go
@@ -9,12 +9,12 @@
 package mock_k8s
 
 import (
-	"reflect"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/tools/cache"
+	gomock "go.uber.org/mock/gomock"
+	labels "k8s.io/apimachinery/pkg/labels"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // MockIndexer is a mock of Indexer interface.
diff --git a/pkg/tool/testing/mock_k8s/core_v1.go b/pkg/tool/testing/mock_k8s/core_v1.go
index c112593e..d228dfe5 100644
--- a/pkg/tool/testing/mock_k8s/core_v1.go
+++ b/pkg/tool/testing/mock_k8s/core_v1.go
@@ -9,17 +9,17 @@
 package mock_k8s
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 	v1 "k8s.io/api/core/v1"
 	v10 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/watch"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
 	v11 "k8s.io/client-go/applyconfigurations/core/v1"
 	v12 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/rest"
+	rest "k8s.io/client-go/rest"
 )
 
 // MockCoreV1Interface is a mock of CoreV1Interface interface.
diff --git a/pkg/tool/testing/mock_k8s/dynamic.go b/pkg/tool/testing/mock_k8s/dynamic.go
index bb35dcb2..dbcb816a 100644
--- a/pkg/tool/testing/mock_k8s/dynamic.go
+++ b/pkg/tool/testing/mock_k8s/dynamic.go
@@ -9,15 +9,15 @@
 package mock_k8s
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/dynamic"
+	unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	dynamic "k8s.io/client-go/dynamic"
 )
 
 // MockNamespaceableResourceInterface is a mock of NamespaceableResourceInterface interface.
diff --git a/pkg/tool/testing/mock_k8s/kubectl_cmd_util.go b/pkg/tool/testing/mock_k8s/kubectl_cmd_util.go
index 177b6c95..cd1b0703 100644
--- a/pkg/tool/testing/mock_k8s/kubectl_cmd_util.go
+++ b/pkg/tool/testing/mock_k8s/kubectl_cmd_util.go
@@ -9,19 +9,19 @@
 package mock_k8s
 
 import (
-	"reflect"
-
-	"go.uber.org/mock/gomock"
-	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/cli-runtime/pkg/resource"
-	"k8s.io/client-go/discovery"
-	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/openapi"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
+	reflect "reflect"
+
+	gomock "go.uber.org/mock/gomock"
+	meta "k8s.io/apimachinery/pkg/api/meta"
+	resource "k8s.io/cli-runtime/pkg/resource"
+	discovery "k8s.io/client-go/discovery"
+	dynamic "k8s.io/client-go/dynamic"
+	kubernetes "k8s.io/client-go/kubernetes"
+	openapi "k8s.io/client-go/openapi"
+	rest "k8s.io/client-go/rest"
+	clientcmd "k8s.io/client-go/tools/clientcmd"
 	openapi0 "k8s.io/kubectl/pkg/util/openapi"
-	"k8s.io/kubectl/pkg/validation"
+	validation "k8s.io/kubectl/pkg/validation"
 )
 
 // MockFactory is a mock of Factory interface.
diff --git a/pkg/tool/testing/mock_k8s/meta.go b/pkg/tool/testing/mock_k8s/meta.go
index b4898fd8..8def5905 100644
--- a/pkg/tool/testing/mock_k8s/meta.go
+++ b/pkg/tool/testing/mock_k8s/meta.go
@@ -9,11 +9,11 @@
 package mock_k8s
 
 import (
-	"reflect"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	gomock "go.uber.org/mock/gomock"
+	meta "k8s.io/apimachinery/pkg/api/meta"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // MockResettableRESTMapper is a mock of ResettableRESTMapper interface.
diff --git a/pkg/tool/testing/mock_k8s/resource.go b/pkg/tool/testing/mock_k8s/resource.go
index 9fdee132..263c2d32 100644
--- a/pkg/tool/testing/mock_k8s/resource.go
+++ b/pkg/tool/testing/mock_k8s/resource.go
@@ -9,12 +9,12 @@
 package mock_k8s
 
 import (
-	"reflect"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/client-go/discovery"
-	"k8s.io/client-go/rest"
+	gomock "go.uber.org/mock/gomock"
+	meta "k8s.io/apimachinery/pkg/api/meta"
+	discovery "k8s.io/client-go/discovery"
+	rest "k8s.io/client-go/rest"
 )
 
 // MockRESTClientGetter is a mock of RESTClientGetter interface.
diff --git a/pkg/tool/testing/mock_k8s/workqueue.go b/pkg/tool/testing/mock_k8s/workqueue.go
index e49046c2..02920237 100644
--- a/pkg/tool/testing/mock_k8s/workqueue.go
+++ b/pkg/tool/testing/mock_k8s/workqueue.go
@@ -9,10 +9,10 @@
 package mock_k8s
 
 import (
-	"reflect"
-	"time"
+	reflect "reflect"
+	time "time"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockRateLimitingWorkqueue is a mock of RateLimitingInterface interface.
diff --git a/pkg/tool/testing/mock_kubernetes_api/doc.go b/pkg/tool/testing/mock_kubernetes_api/doc.go
index c96d2c81..ba7e7570 100644
--- a/pkg/tool/testing/mock_kubernetes_api/doc.go
+++ b/pkg/tool/testing/mock_kubernetes_api/doc.go
@@ -1,3 +1,3 @@
 package mock_kubernetes_api
 
-//go:generate mockgen.sh -destination "rpc.go" -package "mock_kubernetes_api" "github.com/pluralsh/kuberentes-agent/internal/module/kubernetes_api/rpc" "KubernetesApiClient,KubernetesApi_MakeRequestClient"
+//go:generate mockgen.sh -destination "rpc.go" -package "mock_kubernetes_api" "github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/rpc" "KubernetesApiClient,KubernetesApi_MakeRequestClient"
diff --git a/pkg/tool/testing/mock_kubernetes_api/rpc.go b/pkg/tool/testing/mock_kubernetes_api/rpc.go
index 2f528d7c..df8092da 100644
--- a/pkg/tool/testing/mock_kubernetes_api/rpc.go
+++ b/pkg/tool/testing/mock_kubernetes_api/rpc.go
@@ -1,23 +1,22 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/kubernetes_api/rpc (interfaces: KubernetesApiClient,KubernetesApi_MakeRequestClient)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/rpc (interfaces: KubernetesApiClient,KubernetesApi_MakeRequestClient)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination rpc.go -package mock_kubernetes_api github.com/pluralsh/kuberentes-agent/internal/module/kubernetes_api/rpc KubernetesApiClient,KubernetesApi_MakeRequestClient
+//	mockgen -typed -destination rpc.go -package mock_kubernetes_api github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/rpc KubernetesApiClient,KubernetesApi_MakeRequestClient
 //
 // Package mock_kubernetes_api is a generated GoMock package.
 package mock_kubernetes_api
 
 import (
-	"context"
-	"reflect"
-
-	"go.uber.org/mock/gomock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/rpc"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	context "context"
+	reflect "reflect"
+
+	rpc "github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/rpc"
+	grpctool "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	gomock "go.uber.org/mock/gomock"
+	grpc "google.golang.org/grpc"
+	metadata "google.golang.org/grpc/metadata"
 )
 
 // MockKubernetesApiClient is a mock of KubernetesApiClient interface.
diff --git a/pkg/tool/testing/mock_modagent/api.go b/pkg/tool/testing/mock_modagent/api.go
index 84ad02fc..33a46257 100644
--- a/pkg/tool/testing/mock_modagent/api.go
+++ b/pkg/tool/testing/mock_modagent/api.go
@@ -1,24 +1,23 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/modagent (interfaces: Api,Factory,Module)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/modagent (interfaces: Api,Factory,Module)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination api.go -package mock_modagent github.com/pluralsh/kuberentes-agent/internal/module/modagent Api,Factory,Module
+//	mockgen -typed -destination api.go -package mock_modagent github.com/pluralsh/kuberentes-agent/pkg/module/modagent Api,Factory,Module
 //
 // Package mock_modagent is a generated GoMock package.
 package mock_modagent
 
 import (
-	"context"
-	"net/url"
-	"reflect"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modshared"
-
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
+	context "context"
+	url "net/url"
+	reflect "reflect"
+
+	agentcfg "github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
+	modagent "github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
+	modshared "github.com/pluralsh/kuberentes-agent/pkg/module/modshared"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
 )
 
 // MockApi is a mock of Api interface.
diff --git a/pkg/tool/testing/mock_modagent/doc.go b/pkg/tool/testing/mock_modagent/doc.go
index eac279b2..85bd5178 100644
--- a/pkg/tool/testing/mock_modagent/doc.go
+++ b/pkg/tool/testing/mock_modagent/doc.go
@@ -1,3 +1,3 @@
 package mock_modagent
 
-//go:generate mockgen.sh -destination "api.go" -package "mock_modagent" "github.com/pluralsh/kuberentes-agent/internal/module/modagent" "Api,Factory,Module"
+//go:generate mockgen.sh -destination "api.go" -package "mock_modagent" "github.com/pluralsh/kuberentes-agent/pkg/module/modagent" "Api,Factory,Module"
diff --git a/pkg/tool/testing/mock_modserver/api.go b/pkg/tool/testing/mock_modserver/api.go
index 19954ab7..5cd9c507 100644
--- a/pkg/tool/testing/mock_modserver/api.go
+++ b/pkg/tool/testing/mock_modserver/api.go
@@ -9,16 +9,15 @@
 package mock_modserver
 
 import (
-	"context"
-	"reflect"
-
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/event"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modserver"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modshared"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/syncz"
+	context "context"
+	reflect "reflect"
+
+	event "github.com/pluralsh/kuberentes-agent/pkg/event"
+	modserver "github.com/pluralsh/kuberentes-agent/pkg/module/modserver"
+	modshared "github.com/pluralsh/kuberentes-agent/pkg/module/modshared"
+	syncz "github.com/pluralsh/kuberentes-agent/pkg/tool/syncz"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
 )
 
 // MockApi is a mock of Api interface.
diff --git a/pkg/tool/testing/mock_modserver/doc.go b/pkg/tool/testing/mock_modserver/doc.go
index 9edcaf69..6f09ed92 100644
--- a/pkg/tool/testing/mock_modserver/doc.go
+++ b/pkg/tool/testing/mock_modserver/doc.go
@@ -2,4 +2,4 @@ package mock_modserver
 
 //go:generate mockgen.sh -source "../../../module/modserver/api.go" -destination "api.go" -package "mock_modserver"
 
-//go:generate mockgen.sh -destination "rpc_api.go" -package "mock_modserver" "github.com/pluralsh/kuberentes-agent/internal/module/modserver" "RpcApi,AgentRpcApi"
+//go:generate mockgen.sh -destination "rpc_api.go" -package "mock_modserver" "github.com/pluralsh/kuberentes-agent/pkg/module/modserver" "RpcApi,AgentRpcApi"
diff --git a/pkg/tool/testing/mock_modserver/rpc_api.go b/pkg/tool/testing/mock_modserver/rpc_api.go
index de952af3..6d7b01d7 100644
--- a/pkg/tool/testing/mock_modserver/rpc_api.go
+++ b/pkg/tool/testing/mock_modserver/rpc_api.go
@@ -1,22 +1,21 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/modserver (interfaces: RpcApi,AgentRpcApi)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/modserver (interfaces: RpcApi,AgentRpcApi)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination rpc_api.go -package mock_modserver github.com/pluralsh/kuberentes-agent/internal/module/modserver RpcApi,AgentRpcApi
+//	mockgen -typed -destination rpc_api.go -package mock_modserver github.com/pluralsh/kuberentes-agent/pkg/module/modserver RpcApi,AgentRpcApi
 //
 // Package mock_modserver is a generated GoMock package.
 package mock_modserver
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/api"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/retry"
+	api "github.com/pluralsh/kuberentes-agent/pkg/api"
+	retry "github.com/pluralsh/kuberentes-agent/pkg/tool/retry"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
 )
 
 // MockRpcApi is a mock of RpcApi interface.
diff --git a/pkg/tool/testing/mock_modshared/api.go b/pkg/tool/testing/mock_modshared/api.go
index da8f6448..09dc9b88 100644
--- a/pkg/tool/testing/mock_modshared/api.go
+++ b/pkg/tool/testing/mock_modshared/api.go
@@ -1,21 +1,20 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/modshared (interfaces: RpcApi,Api)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/modshared (interfaces: RpcApi,Api)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination api.go -package mock_modshared github.com/pluralsh/kuberentes-agent/internal/module/modshared RpcApi,Api
+//	mockgen -typed -destination api.go -package mock_modshared github.com/pluralsh/kuberentes-agent/pkg/module/modshared RpcApi,Api
 //
 // Package mock_modshared is a generated GoMock package.
 package mock_modshared
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/retry"
+	retry "github.com/pluralsh/kuberentes-agent/pkg/tool/retry"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
 )
 
 // MockRpcApi is a mock of RpcApi interface.
diff --git a/pkg/tool/testing/mock_modshared/doc.go b/pkg/tool/testing/mock_modshared/doc.go
index 47ed913c..e3ea3e87 100644
--- a/pkg/tool/testing/mock_modshared/doc.go
+++ b/pkg/tool/testing/mock_modshared/doc.go
@@ -1,3 +1,3 @@
 package mock_modshared
 
-//go:generate mockgen.sh -destination "api.go" -package "mock_modshared" "github.com/pluralsh/kuberentes-agent/internal/module/modshared" "RpcApi,Api"
+//go:generate mockgen.sh -destination "api.go" -package "mock_modshared" "github.com/pluralsh/kuberentes-agent/pkg/module/modshared" "RpcApi,Api"
diff --git a/pkg/tool/testing/mock_redis/expiring_hash.go b/pkg/tool/testing/mock_redis/expiring_hash.go
index d91bf182..bb7790c5 100644
--- a/pkg/tool/testing/mock_redis/expiring_hash.go
+++ b/pkg/tool/testing/mock_redis/expiring_hash.go
@@ -9,13 +9,12 @@
 package mock_redis
 
 import (
-	"context"
-	"reflect"
-	"time"
+	context "context"
+	reflect "reflect"
+	time "time"
 
-	"go.uber.org/mock/gomock"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/redistool"
+	redistool "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockExpiringHash is a mock of ExpiringHash interface.
diff --git a/pkg/tool/testing/mock_redis/expiring_hash_api.go b/pkg/tool/testing/mock_redis/expiring_hash_api.go
index 618af8b2..3f8d59a7 100644
--- a/pkg/tool/testing/mock_redis/expiring_hash_api.go
+++ b/pkg/tool/testing/mock_redis/expiring_hash_api.go
@@ -9,12 +9,11 @@
 package mock_redis
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-
-	redistool2 "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool"
+	redistool "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockExpiringHashApi is a mock of ExpiringHashApi interface.
@@ -41,7 +40,7 @@ func (m *MockExpiringHashApi[K1, K2]) EXPECT() *MockExpiringHashApiMockRecorder[
 }
 
 // Scan mocks base method.
-func (m *MockExpiringHashApi[K1, K2]) Scan(ctx context.Context, key K1, cb redistool2.ScanCallback) (int, error) {
+func (m *MockExpiringHashApi[K1, K2]) Scan(ctx context.Context, key K1, cb redistool.ScanCallback) (int, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Scan", ctx, key, cb)
 	ret0, _ := ret[0].(int)
@@ -68,22 +67,22 @@ func (c *ExpiringHashApiScanCall[K1, K2]) Return(arg0 int, arg1 error) *Expiring
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ExpiringHashApiScanCall[K1, K2]) Do(f func(context.Context, K1, redistool2.ScanCallback) (int, error)) *ExpiringHashApiScanCall[K1, K2] {
+func (c *ExpiringHashApiScanCall[K1, K2]) Do(f func(context.Context, K1, redistool.ScanCallback) (int, error)) *ExpiringHashApiScanCall[K1, K2] {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ExpiringHashApiScanCall[K1, K2]) DoAndReturn(f func(context.Context, K1, redistool2.ScanCallback) (int, error)) *ExpiringHashApiScanCall[K1, K2] {
+func (c *ExpiringHashApiScanCall[K1, K2]) DoAndReturn(f func(context.Context, K1, redistool.ScanCallback) (int, error)) *ExpiringHashApiScanCall[K1, K2] {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
 
 // SetBuilder mocks base method.
-func (m *MockExpiringHashApi[K1, K2]) SetBuilder() redistool2.SetBuilder[K1, K2] {
+func (m *MockExpiringHashApi[K1, K2]) SetBuilder() redistool.SetBuilder[K1, K2] {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetBuilder")
-	ret0, _ := ret[0].(redistool2.SetBuilder[K1, K2])
+	ret0, _ := ret[0].(redistool.SetBuilder[K1, K2])
 	return ret0
 }
 
@@ -100,19 +99,19 @@ type ExpiringHashApiSetBuilderCall[K1 any, K2 any] struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *ExpiringHashApiSetBuilderCall[K1, K2]) Return(arg0 redistool2.SetBuilder[K1, K2]) *ExpiringHashApiSetBuilderCall[K1, K2] {
+func (c *ExpiringHashApiSetBuilderCall[K1, K2]) Return(arg0 redistool.SetBuilder[K1, K2]) *ExpiringHashApiSetBuilderCall[K1, K2] {
 	c.Call = c.Call.Return(arg0)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ExpiringHashApiSetBuilderCall[K1, K2]) Do(f func() redistool2.SetBuilder[K1, K2]) *ExpiringHashApiSetBuilderCall[K1, K2] {
+func (c *ExpiringHashApiSetBuilderCall[K1, K2]) Do(f func() redistool.SetBuilder[K1, K2]) *ExpiringHashApiSetBuilderCall[K1, K2] {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ExpiringHashApiSetBuilderCall[K1, K2]) DoAndReturn(f func() redistool2.SetBuilder[K1, K2]) *ExpiringHashApiSetBuilderCall[K1, K2] {
+func (c *ExpiringHashApiSetBuilderCall[K1, K2]) DoAndReturn(f func() redistool.SetBuilder[K1, K2]) *ExpiringHashApiSetBuilderCall[K1, K2] {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
diff --git a/pkg/tool/testing/mock_redis/expiring_hash_api_set_builder.go b/pkg/tool/testing/mock_redis/expiring_hash_api_set_builder.go
index d813e2a0..a19e0ab6 100644
--- a/pkg/tool/testing/mock_redis/expiring_hash_api_set_builder.go
+++ b/pkg/tool/testing/mock_redis/expiring_hash_api_set_builder.go
@@ -9,13 +9,12 @@
 package mock_redis
 
 import (
-	"context"
-	"reflect"
-	"time"
+	context "context"
+	reflect "reflect"
+	time "time"
 
-	"go.uber.org/mock/gomock"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/redistool"
+	redistool "github.com/pluralsh/kuberentes-agent/pkg/tool/redistool"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockSetBuilder is a mock of SetBuilder interface.
diff --git a/pkg/tool/testing/mock_reverse_tunnel_rpc/doc.go b/pkg/tool/testing/mock_reverse_tunnel_rpc/doc.go
index 39013d40..2aad0f27 100644
--- a/pkg/tool/testing/mock_reverse_tunnel_rpc/doc.go
+++ b/pkg/tool/testing/mock_reverse_tunnel_rpc/doc.go
@@ -1,3 +1,3 @@
 package mock_reverse_tunnel_rpc
 
-//go:generate mockgen.sh -destination "rpc.go" -package "mock_reverse_tunnel_rpc" "github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/rpc" "ReverseTunnel_ConnectServer,ReverseTunnel_ConnectClient,ReverseTunnelClient"
+//go:generate mockgen.sh -destination "rpc.go" -package "mock_reverse_tunnel_rpc" "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc" "ReverseTunnel_ConnectServer,ReverseTunnel_ConnectClient,ReverseTunnelClient"
diff --git a/pkg/tool/testing/mock_reverse_tunnel_rpc/rpc.go b/pkg/tool/testing/mock_reverse_tunnel_rpc/rpc.go
index c26ea407..06a3f593 100644
--- a/pkg/tool/testing/mock_reverse_tunnel_rpc/rpc.go
+++ b/pkg/tool/testing/mock_reverse_tunnel_rpc/rpc.go
@@ -1,22 +1,21 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/rpc (interfaces: ReverseTunnel_ConnectServer,ReverseTunnel_ConnectClient,ReverseTunnelClient)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc (interfaces: ReverseTunnel_ConnectServer,ReverseTunnel_ConnectClient,ReverseTunnelClient)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination rpc.go -package mock_reverse_tunnel_rpc github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/rpc ReverseTunnel_ConnectServer,ReverseTunnel_ConnectClient,ReverseTunnelClient
+//	mockgen -typed -destination rpc.go -package mock_reverse_tunnel_rpc github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc ReverseTunnel_ConnectServer,ReverseTunnel_ConnectClient,ReverseTunnelClient
 //
 // Package mock_reverse_tunnel_rpc is a generated GoMock package.
 package mock_reverse_tunnel_rpc
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
-
-	rpc2 "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc"
+	rpc "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc"
+	gomock "go.uber.org/mock/gomock"
+	grpc "google.golang.org/grpc"
+	metadata "google.golang.org/grpc/metadata"
 )
 
 // MockReverseTunnel_ConnectServer is a mock of ReverseTunnel_ConnectServer interface.
@@ -81,10 +80,10 @@ func (c *ReverseTunnel_ConnectServerContextCall) DoAndReturn(f func() context.Co
 }
 
 // Recv mocks base method.
-func (m *MockReverseTunnel_ConnectServer) Recv() (*rpc2.ConnectRequest, error) {
+func (m *MockReverseTunnel_ConnectServer) Recv() (*rpc.ConnectRequest, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Recv")
-	ret0, _ := ret[0].(*rpc2.ConnectRequest)
+	ret0, _ := ret[0].(*rpc.ConnectRequest)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -102,19 +101,19 @@ type ReverseTunnel_ConnectServerRecvCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *ReverseTunnel_ConnectServerRecvCall) Return(arg0 *rpc2.ConnectRequest, arg1 error) *ReverseTunnel_ConnectServerRecvCall {
+func (c *ReverseTunnel_ConnectServerRecvCall) Return(arg0 *rpc.ConnectRequest, arg1 error) *ReverseTunnel_ConnectServerRecvCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ReverseTunnel_ConnectServerRecvCall) Do(f func() (*rpc2.ConnectRequest, error)) *ReverseTunnel_ConnectServerRecvCall {
+func (c *ReverseTunnel_ConnectServerRecvCall) Do(f func() (*rpc.ConnectRequest, error)) *ReverseTunnel_ConnectServerRecvCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ReverseTunnel_ConnectServerRecvCall) DoAndReturn(f func() (*rpc2.ConnectRequest, error)) *ReverseTunnel_ConnectServerRecvCall {
+func (c *ReverseTunnel_ConnectServerRecvCall) DoAndReturn(f func() (*rpc.ConnectRequest, error)) *ReverseTunnel_ConnectServerRecvCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -158,7 +157,7 @@ func (c *ReverseTunnel_ConnectServerRecvMsgCall) DoAndReturn(f func(any) error)
 }
 
 // Send mocks base method.
-func (m *MockReverseTunnel_ConnectServer) Send(arg0 *rpc2.ConnectResponse) error {
+func (m *MockReverseTunnel_ConnectServer) Send(arg0 *rpc.ConnectResponse) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Send", arg0)
 	ret0, _ := ret[0].(error)
@@ -184,13 +183,13 @@ func (c *ReverseTunnel_ConnectServerSendCall) Return(arg0 error) *ReverseTunnel_
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ReverseTunnel_ConnectServerSendCall) Do(f func(*rpc2.ConnectResponse) error) *ReverseTunnel_ConnectServerSendCall {
+func (c *ReverseTunnel_ConnectServerSendCall) Do(f func(*rpc.ConnectResponse) error) *ReverseTunnel_ConnectServerSendCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ReverseTunnel_ConnectServerSendCall) DoAndReturn(f func(*rpc2.ConnectResponse) error) *ReverseTunnel_ConnectServerSendCall {
+func (c *ReverseTunnel_ConnectServerSendCall) DoAndReturn(f func(*rpc.ConnectResponse) error) *ReverseTunnel_ConnectServerSendCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -484,10 +483,10 @@ func (c *ReverseTunnel_ConnectClientHeaderCall) DoAndReturn(f func() (metadata.M
 }
 
 // Recv mocks base method.
-func (m *MockReverseTunnel_ConnectClient) Recv() (*rpc2.ConnectResponse, error) {
+func (m *MockReverseTunnel_ConnectClient) Recv() (*rpc.ConnectResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Recv")
-	ret0, _ := ret[0].(*rpc2.ConnectResponse)
+	ret0, _ := ret[0].(*rpc.ConnectResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -505,19 +504,19 @@ type ReverseTunnel_ConnectClientRecvCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *ReverseTunnel_ConnectClientRecvCall) Return(arg0 *rpc2.ConnectResponse, arg1 error) *ReverseTunnel_ConnectClientRecvCall {
+func (c *ReverseTunnel_ConnectClientRecvCall) Return(arg0 *rpc.ConnectResponse, arg1 error) *ReverseTunnel_ConnectClientRecvCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ReverseTunnel_ConnectClientRecvCall) Do(f func() (*rpc2.ConnectResponse, error)) *ReverseTunnel_ConnectClientRecvCall {
+func (c *ReverseTunnel_ConnectClientRecvCall) Do(f func() (*rpc.ConnectResponse, error)) *ReverseTunnel_ConnectClientRecvCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ReverseTunnel_ConnectClientRecvCall) DoAndReturn(f func() (*rpc2.ConnectResponse, error)) *ReverseTunnel_ConnectClientRecvCall {
+func (c *ReverseTunnel_ConnectClientRecvCall) DoAndReturn(f func() (*rpc.ConnectResponse, error)) *ReverseTunnel_ConnectClientRecvCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -561,7 +560,7 @@ func (c *ReverseTunnel_ConnectClientRecvMsgCall) DoAndReturn(f func(any) error)
 }
 
 // Send mocks base method.
-func (m *MockReverseTunnel_ConnectClient) Send(arg0 *rpc2.ConnectRequest) error {
+func (m *MockReverseTunnel_ConnectClient) Send(arg0 *rpc.ConnectRequest) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Send", arg0)
 	ret0, _ := ret[0].(error)
@@ -587,13 +586,13 @@ func (c *ReverseTunnel_ConnectClientSendCall) Return(arg0 error) *ReverseTunnel_
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ReverseTunnel_ConnectClientSendCall) Do(f func(*rpc2.ConnectRequest) error) *ReverseTunnel_ConnectClientSendCall {
+func (c *ReverseTunnel_ConnectClientSendCall) Do(f func(*rpc.ConnectRequest) error) *ReverseTunnel_ConnectClientSendCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ReverseTunnel_ConnectClientSendCall) DoAndReturn(f func(*rpc2.ConnectRequest) error) *ReverseTunnel_ConnectClientSendCall {
+func (c *ReverseTunnel_ConnectClientSendCall) DoAndReturn(f func(*rpc.ConnectRequest) error) *ReverseTunnel_ConnectClientSendCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -698,14 +697,14 @@ func (m *MockReverseTunnelClient) EXPECT() *MockReverseTunnelClientMockRecorder
 }
 
 // Connect mocks base method.
-func (m *MockReverseTunnelClient) Connect(arg0 context.Context, arg1 ...grpc.CallOption) (rpc2.ReverseTunnel_ConnectClient, error) {
+func (m *MockReverseTunnelClient) Connect(arg0 context.Context, arg1 ...grpc.CallOption) (rpc.ReverseTunnel_ConnectClient, error) {
 	m.ctrl.T.Helper()
 	varargs := []any{arg0}
 	for _, a := range arg1 {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "Connect", varargs...)
-	ret0, _ := ret[0].(rpc2.ReverseTunnel_ConnectClient)
+	ret0, _ := ret[0].(rpc.ReverseTunnel_ConnectClient)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -724,19 +723,19 @@ type ReverseTunnelClientConnectCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *ReverseTunnelClientConnectCall) Return(arg0 rpc2.ReverseTunnel_ConnectClient, arg1 error) *ReverseTunnelClientConnectCall {
+func (c *ReverseTunnelClientConnectCall) Return(arg0 rpc.ReverseTunnel_ConnectClient, arg1 error) *ReverseTunnelClientConnectCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ReverseTunnelClientConnectCall) Do(f func(context.Context, ...grpc.CallOption) (rpc2.ReverseTunnel_ConnectClient, error)) *ReverseTunnelClientConnectCall {
+func (c *ReverseTunnelClientConnectCall) Do(f func(context.Context, ...grpc.CallOption) (rpc.ReverseTunnel_ConnectClient, error)) *ReverseTunnelClientConnectCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ReverseTunnelClientConnectCall) DoAndReturn(f func(context.Context, ...grpc.CallOption) (rpc2.ReverseTunnel_ConnectClient, error)) *ReverseTunnelClientConnectCall {
+func (c *ReverseTunnelClientConnectCall) DoAndReturn(f func(context.Context, ...grpc.CallOption) (rpc.ReverseTunnel_ConnectClient, error)) *ReverseTunnelClientConnectCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
diff --git a/pkg/tool/testing/mock_reverse_tunnel_tunnel/doc.go b/pkg/tool/testing/mock_reverse_tunnel_tunnel/doc.go
index 2d40ed80..5bc72635 100644
--- a/pkg/tool/testing/mock_reverse_tunnel_tunnel/doc.go
+++ b/pkg/tool/testing/mock_reverse_tunnel_tunnel/doc.go
@@ -3,4 +3,4 @@ package mock_reverse_tunnel_tunnel
 // This package imports internal/module/reverse_tunnel/tunnel, so it cannot be used in tests in that package
 // because of circular imports. Some of the same mocks are generated locally in that package.
 
-//go:generate mockgen.sh -destination "tunnel.go" -package "mock_reverse_tunnel_tunnel" "github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel" "Tracker,Handler,FindHandle,Tunnel,PollingQuerier,Finder"
+//go:generate mockgen.sh -destination "tunnel.go" -package "mock_reverse_tunnel_tunnel" "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel" "Tracker,Handler,FindHandle,Tunnel,PollingQuerier,Finder"
diff --git a/pkg/tool/testing/mock_reverse_tunnel_tunnel/tunnel.go b/pkg/tool/testing/mock_reverse_tunnel_tunnel/tunnel.go
index 43a083a0..404f3b3b 100644
--- a/pkg/tool/testing/mock_reverse_tunnel_tunnel/tunnel.go
+++ b/pkg/tool/testing/mock_reverse_tunnel_tunnel/tunnel.go
@@ -1,25 +1,24 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel (interfaces: Tracker,Handler,FindHandle,Tunnel,PollingQuerier,Finder)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel (interfaces: Tracker,Handler,FindHandle,Tunnel,PollingQuerier,Finder)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination tunnel.go -package mock_reverse_tunnel_tunnel github.com/pluralsh/kuberentes-agent/internal/module/reverse_tunnel/tunnel Tracker,Handler,FindHandle,Tunnel,PollingQuerier,Finder
+//	mockgen -typed -destination tunnel.go -package mock_reverse_tunnel_tunnel github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel Tracker,Handler,FindHandle,Tunnel,PollingQuerier,Finder
 //
 // Package mock_reverse_tunnel_tunnel is a generated GoMock package.
 package mock_reverse_tunnel_tunnel
 
 import (
-	"context"
-	"reflect"
-	"time"
-
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/api"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc"
-	tunnel2 "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel"
+	context "context"
+	reflect "reflect"
+	time "time"
+
+	api "github.com/pluralsh/kuberentes-agent/pkg/api"
+	rpc "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/rpc"
+	tunnel "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
+	grpc "google.golang.org/grpc"
 )
 
 // MockTracker is a mock of Tracker interface.
@@ -324,10 +323,10 @@ func (c *FindHandleDoneCall) DoAndReturn(f func(context.Context)) *FindHandleDon
 }
 
 // Get mocks base method.
-func (m *MockFindHandle) Get(arg0 context.Context) (tunnel2.Tunnel, error) {
+func (m *MockFindHandle) Get(arg0 context.Context) (tunnel.Tunnel, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Get", arg0)
-	ret0, _ := ret[0].(tunnel2.Tunnel)
+	ret0, _ := ret[0].(tunnel.Tunnel)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -345,19 +344,19 @@ type FindHandleGetCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *FindHandleGetCall) Return(arg0 tunnel2.Tunnel, arg1 error) *FindHandleGetCall {
+func (c *FindHandleGetCall) Return(arg0 tunnel.Tunnel, arg1 error) *FindHandleGetCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *FindHandleGetCall) Do(f func(context.Context) (tunnel2.Tunnel, error)) *FindHandleGetCall {
+func (c *FindHandleGetCall) Do(f func(context.Context) (tunnel.Tunnel, error)) *FindHandleGetCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *FindHandleGetCall) DoAndReturn(f func(context.Context) (tunnel2.Tunnel, error)) *FindHandleGetCall {
+func (c *FindHandleGetCall) DoAndReturn(f func(context.Context) (tunnel.Tunnel, error)) *FindHandleGetCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -422,7 +421,7 @@ func (c *TunnelDoneCall) DoAndReturn(f func(context.Context)) *TunnelDoneCall {
 }
 
 // ForwardStream mocks base method.
-func (m *MockTunnel) ForwardStream(arg0 *zap.Logger, arg1 tunnel2.RpcApi, arg2 grpc.ServerStream, arg3 tunnel2.DataCallback) error {
+func (m *MockTunnel) ForwardStream(arg0 *zap.Logger, arg1 tunnel.RpcApi, arg2 grpc.ServerStream, arg3 tunnel.DataCallback) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ForwardStream", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
@@ -448,13 +447,13 @@ func (c *TunnelForwardStreamCall) Return(arg0 error) *TunnelForwardStreamCall {
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *TunnelForwardStreamCall) Do(f func(*zap.Logger, tunnel2.RpcApi, grpc.ServerStream, tunnel2.DataCallback) error) *TunnelForwardStreamCall {
+func (c *TunnelForwardStreamCall) Do(f func(*zap.Logger, tunnel.RpcApi, grpc.ServerStream, tunnel.DataCallback) error) *TunnelForwardStreamCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *TunnelForwardStreamCall) DoAndReturn(f func(*zap.Logger, tunnel2.RpcApi, grpc.ServerStream, tunnel2.DataCallback) error) *TunnelForwardStreamCall {
+func (c *TunnelForwardStreamCall) DoAndReturn(f func(*zap.Logger, tunnel.RpcApi, grpc.ServerStream, tunnel.DataCallback) error) *TunnelForwardStreamCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -521,7 +520,7 @@ func (c *PollingQuerierCachedKasUrlsByAgentIdCall) DoAndReturn(f func(int64) []s
 }
 
 // PollKasUrlsByAgentId mocks base method.
-func (m *MockPollingQuerier) PollKasUrlsByAgentId(arg0 context.Context, arg1 int64, arg2 tunnel2.PollKasUrlsByAgentIdCallback) {
+func (m *MockPollingQuerier) PollKasUrlsByAgentId(arg0 context.Context, arg1 int64, arg2 tunnel.PollKasUrlsByAgentIdCallback) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "PollKasUrlsByAgentId", arg0, arg1, arg2)
 }
@@ -545,13 +544,13 @@ func (c *PollingQuerierPollKasUrlsByAgentIdCall) Return() *PollingQuerierPollKas
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *PollingQuerierPollKasUrlsByAgentIdCall) Do(f func(context.Context, int64, tunnel2.PollKasUrlsByAgentIdCallback)) *PollingQuerierPollKasUrlsByAgentIdCall {
+func (c *PollingQuerierPollKasUrlsByAgentIdCall) Do(f func(context.Context, int64, tunnel.PollKasUrlsByAgentIdCallback)) *PollingQuerierPollKasUrlsByAgentIdCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *PollingQuerierPollKasUrlsByAgentIdCall) DoAndReturn(f func(context.Context, int64, tunnel2.PollKasUrlsByAgentIdCallback)) *PollingQuerierPollKasUrlsByAgentIdCall {
+func (c *PollingQuerierPollKasUrlsByAgentIdCall) DoAndReturn(f func(context.Context, int64, tunnel.PollKasUrlsByAgentIdCallback)) *PollingQuerierPollKasUrlsByAgentIdCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -580,11 +579,11 @@ func (m *MockFinder) EXPECT() *MockFinderMockRecorder {
 }
 
 // FindTunnel mocks base method.
-func (m *MockFinder) FindTunnel(arg0 context.Context, arg1 int64, arg2, arg3 string) (bool, tunnel2.FindHandle) {
+func (m *MockFinder) FindTunnel(arg0 context.Context, arg1 int64, arg2, arg3 string) (bool, tunnel.FindHandle) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindTunnel", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(bool)
-	ret1, _ := ret[1].(tunnel2.FindHandle)
+	ret1, _ := ret[1].(tunnel.FindHandle)
 	return ret0, ret1
 }
 
@@ -601,19 +600,19 @@ type FinderFindTunnelCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *FinderFindTunnelCall) Return(arg0 bool, arg1 tunnel2.FindHandle) *FinderFindTunnelCall {
+func (c *FinderFindTunnelCall) Return(arg0 bool, arg1 tunnel.FindHandle) *FinderFindTunnelCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *FinderFindTunnelCall) Do(f func(context.Context, int64, string, string) (bool, tunnel2.FindHandle)) *FinderFindTunnelCall {
+func (c *FinderFindTunnelCall) Do(f func(context.Context, int64, string, string) (bool, tunnel.FindHandle)) *FinderFindTunnelCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *FinderFindTunnelCall) DoAndReturn(f func(context.Context, int64, string, string) (bool, tunnel2.FindHandle)) *FinderFindTunnelCall {
+func (c *FinderFindTunnelCall) DoAndReturn(f func(context.Context, int64, string, string) (bool, tunnel.FindHandle)) *FinderFindTunnelCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
diff --git a/pkg/tool/testing/mock_rpc/agent_configuration.go b/pkg/tool/testing/mock_rpc/agent_configuration.go
index 8e89fc1f..a054fe0a 100644
--- a/pkg/tool/testing/mock_rpc/agent_configuration.go
+++ b/pkg/tool/testing/mock_rpc/agent_configuration.go
@@ -1,22 +1,21 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/agent_configuration/rpc (interfaces: AgentConfigurationClient,AgentConfiguration_GetConfigurationClient,AgentConfiguration_GetConfigurationServer,ConfigurationWatcherInterface)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc (interfaces: AgentConfigurationClient,AgentConfiguration_GetConfigurationClient,AgentConfiguration_GetConfigurationServer,ConfigurationWatcherInterface)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination agent_configuration.go -package mock_rpc github.com/pluralsh/kuberentes-agent/internal/module/agent_configuration/rpc AgentConfigurationClient,AgentConfiguration_GetConfigurationClient,AgentConfiguration_GetConfigurationServer,ConfigurationWatcherInterface
+//	mockgen -typed -destination agent_configuration.go -package mock_rpc github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc AgentConfigurationClient,AgentConfiguration_GetConfigurationClient,AgentConfiguration_GetConfigurationServer,ConfigurationWatcherInterface
 //
 // Package mock_rpc is a generated GoMock package.
 package mock_rpc
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
-
-	rpc2 "github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc"
+	rpc "github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc"
+	gomock "go.uber.org/mock/gomock"
+	grpc "google.golang.org/grpc"
+	metadata "google.golang.org/grpc/metadata"
 )
 
 // MockAgentConfigurationClient is a mock of AgentConfigurationClient interface.
@@ -43,14 +42,14 @@ func (m *MockAgentConfigurationClient) EXPECT() *MockAgentConfigurationClientMoc
 }
 
 // GetConfiguration mocks base method.
-func (m *MockAgentConfigurationClient) GetConfiguration(arg0 context.Context, arg1 *rpc2.ConfigurationRequest, arg2 ...grpc.CallOption) (rpc2.AgentConfiguration_GetConfigurationClient, error) {
+func (m *MockAgentConfigurationClient) GetConfiguration(arg0 context.Context, arg1 *rpc.ConfigurationRequest, arg2 ...grpc.CallOption) (rpc.AgentConfiguration_GetConfigurationClient, error) {
 	m.ctrl.T.Helper()
 	varargs := []any{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "GetConfiguration", varargs...)
-	ret0, _ := ret[0].(rpc2.AgentConfiguration_GetConfigurationClient)
+	ret0, _ := ret[0].(rpc.AgentConfiguration_GetConfigurationClient)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -69,19 +68,19 @@ type AgentConfigurationClientGetConfigurationCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *AgentConfigurationClientGetConfigurationCall) Return(arg0 rpc2.AgentConfiguration_GetConfigurationClient, arg1 error) *AgentConfigurationClientGetConfigurationCall {
+func (c *AgentConfigurationClientGetConfigurationCall) Return(arg0 rpc.AgentConfiguration_GetConfigurationClient, arg1 error) *AgentConfigurationClientGetConfigurationCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *AgentConfigurationClientGetConfigurationCall) Do(f func(context.Context, *rpc2.ConfigurationRequest, ...grpc.CallOption) (rpc2.AgentConfiguration_GetConfigurationClient, error)) *AgentConfigurationClientGetConfigurationCall {
+func (c *AgentConfigurationClientGetConfigurationCall) Do(f func(context.Context, *rpc.ConfigurationRequest, ...grpc.CallOption) (rpc.AgentConfiguration_GetConfigurationClient, error)) *AgentConfigurationClientGetConfigurationCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *AgentConfigurationClientGetConfigurationCall) DoAndReturn(f func(context.Context, *rpc2.ConfigurationRequest, ...grpc.CallOption) (rpc2.AgentConfiguration_GetConfigurationClient, error)) *AgentConfigurationClientGetConfigurationCall {
+func (c *AgentConfigurationClientGetConfigurationCall) DoAndReturn(f func(context.Context, *rpc.ConfigurationRequest, ...grpc.CallOption) (rpc.AgentConfiguration_GetConfigurationClient, error)) *AgentConfigurationClientGetConfigurationCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -225,10 +224,10 @@ func (c *AgentConfiguration_GetConfigurationClientHeaderCall) DoAndReturn(f func
 }
 
 // Recv mocks base method.
-func (m *MockAgentConfiguration_GetConfigurationClient) Recv() (*rpc2.ConfigurationResponse, error) {
+func (m *MockAgentConfiguration_GetConfigurationClient) Recv() (*rpc.ConfigurationResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Recv")
-	ret0, _ := ret[0].(*rpc2.ConfigurationResponse)
+	ret0, _ := ret[0].(*rpc.ConfigurationResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -246,19 +245,19 @@ type AgentConfiguration_GetConfigurationClientRecvCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *AgentConfiguration_GetConfigurationClientRecvCall) Return(arg0 *rpc2.ConfigurationResponse, arg1 error) *AgentConfiguration_GetConfigurationClientRecvCall {
+func (c *AgentConfiguration_GetConfigurationClientRecvCall) Return(arg0 *rpc.ConfigurationResponse, arg1 error) *AgentConfiguration_GetConfigurationClientRecvCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *AgentConfiguration_GetConfigurationClientRecvCall) Do(f func() (*rpc2.ConfigurationResponse, error)) *AgentConfiguration_GetConfigurationClientRecvCall {
+func (c *AgentConfiguration_GetConfigurationClientRecvCall) Do(f func() (*rpc.ConfigurationResponse, error)) *AgentConfiguration_GetConfigurationClientRecvCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *AgentConfiguration_GetConfigurationClientRecvCall) DoAndReturn(f func() (*rpc2.ConfigurationResponse, error)) *AgentConfiguration_GetConfigurationClientRecvCall {
+func (c *AgentConfiguration_GetConfigurationClientRecvCall) DoAndReturn(f func() (*rpc.ConfigurationResponse, error)) *AgentConfiguration_GetConfigurationClientRecvCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -477,7 +476,7 @@ func (c *AgentConfiguration_GetConfigurationServerRecvMsgCall) DoAndReturn(f fun
 }
 
 // Send mocks base method.
-func (m *MockAgentConfiguration_GetConfigurationServer) Send(arg0 *rpc2.ConfigurationResponse) error {
+func (m *MockAgentConfiguration_GetConfigurationServer) Send(arg0 *rpc.ConfigurationResponse) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Send", arg0)
 	ret0, _ := ret[0].(error)
@@ -503,13 +502,13 @@ func (c *AgentConfiguration_GetConfigurationServerSendCall) Return(arg0 error) *
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *AgentConfiguration_GetConfigurationServerSendCall) Do(f func(*rpc2.ConfigurationResponse) error) *AgentConfiguration_GetConfigurationServerSendCall {
+func (c *AgentConfiguration_GetConfigurationServerSendCall) Do(f func(*rpc.ConfigurationResponse) error) *AgentConfiguration_GetConfigurationServerSendCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *AgentConfiguration_GetConfigurationServerSendCall) DoAndReturn(f func(*rpc2.ConfigurationResponse) error) *AgentConfiguration_GetConfigurationServerSendCall {
+func (c *AgentConfiguration_GetConfigurationServerSendCall) DoAndReturn(f func(*rpc.ConfigurationResponse) error) *AgentConfiguration_GetConfigurationServerSendCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -688,7 +687,7 @@ func (m *MockConfigurationWatcherInterface) EXPECT() *MockConfigurationWatcherIn
 }
 
 // Watch mocks base method.
-func (m *MockConfigurationWatcherInterface) Watch(arg0 context.Context, arg1 rpc2.ConfigurationCallback) {
+func (m *MockConfigurationWatcherInterface) Watch(arg0 context.Context, arg1 rpc.ConfigurationCallback) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "Watch", arg0, arg1)
 }
@@ -712,13 +711,13 @@ func (c *ConfigurationWatcherInterfaceWatchCall) Return() *ConfigurationWatcherI
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *ConfigurationWatcherInterfaceWatchCall) Do(f func(context.Context, rpc2.ConfigurationCallback)) *ConfigurationWatcherInterfaceWatchCall {
+func (c *ConfigurationWatcherInterfaceWatchCall) Do(f func(context.Context, rpc.ConfigurationCallback)) *ConfigurationWatcherInterfaceWatchCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *ConfigurationWatcherInterfaceWatchCall) DoAndReturn(f func(context.Context, rpc2.ConfigurationCallback)) *ConfigurationWatcherInterfaceWatchCall {
+func (c *ConfigurationWatcherInterfaceWatchCall) DoAndReturn(f func(context.Context, rpc.ConfigurationCallback)) *ConfigurationWatcherInterfaceWatchCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
diff --git a/pkg/tool/testing/mock_rpc/doc.go b/pkg/tool/testing/mock_rpc/doc.go
index 106017db..cb788e35 100644
--- a/pkg/tool/testing/mock_rpc/doc.go
+++ b/pkg/tool/testing/mock_rpc/doc.go
@@ -3,6 +3,6 @@ package mock_rpc
 
 //go:generate mockgen.sh -destination "grpc.go" -package "mock_rpc" "google.golang.org/grpc" "ServerStream,ClientStream,ClientConnInterface,ServerTransportStream"
 
-//go:generate mockgen.sh -destination "agent_configuration.go" -package "mock_rpc" "github.com/pluralsh/kuberentes-agent/internal/module/agent_configuration/rpc" "AgentConfigurationClient,AgentConfiguration_GetConfigurationClient,AgentConfiguration_GetConfigurationServer,ConfigurationWatcherInterface"
+//go:generate mockgen.sh -destination "agent_configuration.go" -package "mock_rpc" "github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc" "AgentConfigurationClient,AgentConfiguration_GetConfigurationClient,AgentConfiguration_GetConfigurationServer,ConfigurationWatcherInterface"
 
-//go:generate mockgen.sh -destination "grpctool.go" -package "mock_rpc" "github.com/pluralsh/kuberentes-agent/internal/tool/grpctool" "InboundGrpcToOutboundHttpStream,PoolConn,PoolInterface,ServerErrorReporter"
+//go:generate mockgen.sh -destination "grpctool.go" -package "mock_rpc" "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool" "InboundGrpcToOutboundHttpStream,PoolConn,PoolInterface,ServerErrorReporter"
diff --git a/pkg/tool/testing/mock_rpc/grpc.go b/pkg/tool/testing/mock_rpc/grpc.go
index 58ef1e09..ee03ca90 100644
--- a/pkg/tool/testing/mock_rpc/grpc.go
+++ b/pkg/tool/testing/mock_rpc/grpc.go
@@ -9,12 +9,12 @@
 package mock_rpc
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
+	gomock "go.uber.org/mock/gomock"
+	grpc "google.golang.org/grpc"
+	metadata "google.golang.org/grpc/metadata"
 )
 
 // MockServerStream is a mock of ServerStream interface.
diff --git a/pkg/tool/testing/mock_rpc/grpctool.go b/pkg/tool/testing/mock_rpc/grpctool.go
index b45dedc1..ec54c660 100644
--- a/pkg/tool/testing/mock_rpc/grpctool.go
+++ b/pkg/tool/testing/mock_rpc/grpctool.go
@@ -1,22 +1,21 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/tool/grpctool (interfaces: InboundGrpcToOutboundHttpStream,PoolConn,PoolInterface,ServerErrorReporter)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool (interfaces: InboundGrpcToOutboundHttpStream,PoolConn,PoolInterface,ServerErrorReporter)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination grpctool.go -package mock_rpc github.com/pluralsh/kuberentes-agent/internal/tool/grpctool InboundGrpcToOutboundHttpStream,PoolConn,PoolInterface,ServerErrorReporter
+//	mockgen -typed -destination grpctool.go -package mock_rpc github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool InboundGrpcToOutboundHttpStream,PoolConn,PoolInterface,ServerErrorReporter
 //
 // Package mock_rpc is a generated GoMock package.
 package mock_rpc
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
-
-	grpctool2 "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	grpctool "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
+	gomock "go.uber.org/mock/gomock"
+	grpc "google.golang.org/grpc"
+	metadata "google.golang.org/grpc/metadata"
 )
 
 // MockInboundGrpcToOutboundHttpStream is a mock of InboundGrpcToOutboundHttpStream interface.
@@ -119,7 +118,7 @@ func (c *InboundGrpcToOutboundHttpStreamRecvMsgCall) DoAndReturn(f func(any) err
 }
 
 // Send mocks base method.
-func (m *MockInboundGrpcToOutboundHttpStream) Send(arg0 *grpctool2.HttpResponse) error {
+func (m *MockInboundGrpcToOutboundHttpStream) Send(arg0 *grpctool.HttpResponse) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Send", arg0)
 	ret0, _ := ret[0].(error)
@@ -145,13 +144,13 @@ func (c *InboundGrpcToOutboundHttpStreamSendCall) Return(arg0 error) *InboundGrp
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *InboundGrpcToOutboundHttpStreamSendCall) Do(f func(*grpctool2.HttpResponse) error) *InboundGrpcToOutboundHttpStreamSendCall {
+func (c *InboundGrpcToOutboundHttpStreamSendCall) Do(f func(*grpctool.HttpResponse) error) *InboundGrpcToOutboundHttpStreamSendCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *InboundGrpcToOutboundHttpStreamSendCall) DoAndReturn(f func(*grpctool2.HttpResponse) error) *InboundGrpcToOutboundHttpStreamSendCall {
+func (c *InboundGrpcToOutboundHttpStreamSendCall) DoAndReturn(f func(*grpctool.HttpResponse) error) *InboundGrpcToOutboundHttpStreamSendCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -514,10 +513,10 @@ func (c *PoolInterfaceCloseCall) DoAndReturn(f func() error) *PoolInterfaceClose
 }
 
 // Dial mocks base method.
-func (m *MockPoolInterface) Dial(arg0 context.Context, arg1 string) (grpctool2.PoolConn, error) {
+func (m *MockPoolInterface) Dial(arg0 context.Context, arg1 string) (grpctool.PoolConn, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Dial", arg0, arg1)
-	ret0, _ := ret[0].(grpctool2.PoolConn)
+	ret0, _ := ret[0].(grpctool.PoolConn)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -535,19 +534,19 @@ type PoolInterfaceDialCall struct {
 }
 
 // Return rewrite *gomock.Call.Return
-func (c *PoolInterfaceDialCall) Return(arg0 grpctool2.PoolConn, arg1 error) *PoolInterfaceDialCall {
+func (c *PoolInterfaceDialCall) Return(arg0 grpctool.PoolConn, arg1 error) *PoolInterfaceDialCall {
 	c.Call = c.Call.Return(arg0, arg1)
 	return c
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *PoolInterfaceDialCall) Do(f func(context.Context, string) (grpctool2.PoolConn, error)) *PoolInterfaceDialCall {
+func (c *PoolInterfaceDialCall) Do(f func(context.Context, string) (grpctool.PoolConn, error)) *PoolInterfaceDialCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *PoolInterfaceDialCall) DoAndReturn(f func(context.Context, string) (grpctool2.PoolConn, error)) *PoolInterfaceDialCall {
+func (c *PoolInterfaceDialCall) DoAndReturn(f func(context.Context, string) (grpctool.PoolConn, error)) *PoolInterfaceDialCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
diff --git a/pkg/tool/testing/mock_stdlib/doc.go b/pkg/tool/testing/mock_stdlib/doc.go
index f0f43968..16d717e5 100644
--- a/pkg/tool/testing/mock_stdlib/doc.go
+++ b/pkg/tool/testing/mock_stdlib/doc.go
@@ -3,7 +3,7 @@ package mock_stdlib
 
 import "net/http"
 
-//go:generate mockgen.sh -destination "net_http_custom.go" -package "mock_stdlib" "github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_stdlib" "ResponseWriterFlusher"
+//go:generate mockgen.sh -destination "net_http_custom.go" -package "mock_stdlib" "github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_stdlib" "ResponseWriterFlusher"
 
 //go:generate mockgen.sh -destination "net.go" -package "mock_stdlib" "net" "Conn"
 
diff --git a/pkg/tool/testing/mock_stdlib/net.go b/pkg/tool/testing/mock_stdlib/net.go
index 62805898..c986513d 100644
--- a/pkg/tool/testing/mock_stdlib/net.go
+++ b/pkg/tool/testing/mock_stdlib/net.go
@@ -9,11 +9,11 @@
 package mock_stdlib
 
 import (
-	"net"
-	"reflect"
-	"time"
+	net "net"
+	reflect "reflect"
+	time "time"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockConn is a mock of Conn interface.
diff --git a/pkg/tool/testing/mock_stdlib/net_http.go b/pkg/tool/testing/mock_stdlib/net_http.go
index 39f4da6f..fee39100 100644
--- a/pkg/tool/testing/mock_stdlib/net_http.go
+++ b/pkg/tool/testing/mock_stdlib/net_http.go
@@ -9,10 +9,10 @@
 package mock_stdlib
 
 import (
-	"net/http"
-	"reflect"
+	http "net/http"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockRoundTripper is a mock of RoundTripper interface.
diff --git a/pkg/tool/testing/mock_stdlib/net_http_custom.go b/pkg/tool/testing/mock_stdlib/net_http_custom.go
index 63ca11f3..fdbbc842 100644
--- a/pkg/tool/testing/mock_stdlib/net_http_custom.go
+++ b/pkg/tool/testing/mock_stdlib/net_http_custom.go
@@ -1,20 +1,20 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_stdlib (interfaces: ResponseWriterFlusher)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_stdlib (interfaces: ResponseWriterFlusher)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination net_http_custom.go -package mock_stdlib github.com/pluralsh/kuberentes-agent/internal/tool/testing/mock_stdlib ResponseWriterFlusher
+//	mockgen -typed -destination net_http_custom.go -package mock_stdlib github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_stdlib ResponseWriterFlusher
 //
 // Package mock_stdlib is a generated GoMock package.
 package mock_stdlib
 
 import (
-	"bufio"
-	"net"
-	"net/http"
-	"reflect"
+	bufio "bufio"
+	net "net"
+	http "net/http"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockResponseWriterFlusher is a mock of ResponseWriterFlusher interface.
diff --git a/pkg/tool/testing/mock_tool/doc.go b/pkg/tool/testing/mock_tool/doc.go
index 13e6859b..3342679c 100644
--- a/pkg/tool/testing/mock_tool/doc.go
+++ b/pkg/tool/testing/mock_tool/doc.go
@@ -1,3 +1,3 @@
 package mock_tool
 
-//go:generate mockgen.sh -destination "tool.go" -package "mock_tool" "github.com/pluralsh/kuberentes-agent/internal/tool/errz" "ErrReporter"
+//go:generate mockgen.sh -destination "tool.go" -package "mock_tool" "github.com/pluralsh/kuberentes-agent/pkg/tool/errz" "ErrReporter"
diff --git a/pkg/tool/testing/mock_tool/tool.go b/pkg/tool/testing/mock_tool/tool.go
index 56295456..3aebb018 100644
--- a/pkg/tool/testing/mock_tool/tool.go
+++ b/pkg/tool/testing/mock_tool/tool.go
@@ -1,19 +1,19 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/tool/errz (interfaces: ErrReporter)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/tool/errz (interfaces: ErrReporter)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination tool.go -package mock_tool github.com/pluralsh/kuberentes-agent/internal/tool/errz ErrReporter
+//	mockgen -typed -destination tool.go -package mock_tool github.com/pluralsh/kuberentes-agent/pkg/tool/errz ErrReporter
 //
 // Package mock_tool is a generated GoMock package.
 package mock_tool
 
 import (
-	"context"
-	"reflect"
+	context "context"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-	"go.uber.org/zap"
+	gomock "go.uber.org/mock/gomock"
+	zap "go.uber.org/zap"
 )
 
 // MockErrReporter is a mock of ErrReporter interface.
diff --git a/pkg/tool/testing/mock_usage_metrics/doc.go b/pkg/tool/testing/mock_usage_metrics/doc.go
index 6f522586..a5a4fed9 100644
--- a/pkg/tool/testing/mock_usage_metrics/doc.go
+++ b/pkg/tool/testing/mock_usage_metrics/doc.go
@@ -1,3 +1,3 @@
 package mock_usage_metrics
 
-//go:generate mockgen.sh -destination "tool.go" "github.com/pluralsh/kuberentes-agent/internal/module/usage_metrics" "UsageTrackerInterface,Counter,UniqueCounter"
+//go:generate mockgen.sh -destination "tool.go" "github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics" "UsageTrackerInterface,Counter,UniqueCounter"
diff --git a/pkg/tool/testing/mock_usage_metrics/tool.go b/pkg/tool/testing/mock_usage_metrics/tool.go
index c2b79f94..f3faea4f 100644
--- a/pkg/tool/testing/mock_usage_metrics/tool.go
+++ b/pkg/tool/testing/mock_usage_metrics/tool.go
@@ -1,19 +1,18 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/pluralsh/kuberentes-agent/internal/module/usage_metrics (interfaces: UsageTrackerInterface,Counter,UniqueCounter)
+// Source: github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics (interfaces: UsageTrackerInterface,Counter,UniqueCounter)
 //
 // Generated by this command:
 //
-//	mockgen -typed -destination tool.go github.com/pluralsh/kuberentes-agent/internal/module/usage_metrics UsageTrackerInterface,Counter,UniqueCounter
+//	mockgen -typed -destination tool.go github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics UsageTrackerInterface,Counter,UniqueCounter
 //
 // Package mock_usage_metrics is a generated GoMock package.
 package mock_usage_metrics
 
 import (
-	"reflect"
+	reflect "reflect"
 
-	"go.uber.org/mock/gomock"
-
-	"github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics"
+	usage_metrics "github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockUsageTrackerInterface is a mock of UsageTrackerInterface interface.