diff --git a/proto/audit/v1/dns_details.proto b/proto/audit/v1/dns_details.proto
index 974e530..e85b978 100644
--- a/proto/audit/v1/dns_details.proto
+++ b/proto/audit/v1/dns_details.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package inetmock.audit.v1;
 
 option csharp_namespace = "INetMock.Client.Audit";
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/v1";
 option java_multiple_files = true;
 option java_outer_classname = "HandlerEventProto";
 option java_package = "com.github.baez90.inetmock.audit";
diff --git a/proto/audit/v1/event_entity.proto b/proto/audit/v1/event_entity.proto
index 3b1047a..0e2046f 100644
--- a/proto/audit/v1/event_entity.proto
+++ b/proto/audit/v1/event_entity.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package inetmock.audit.v1;
 
 option csharp_namespace = "INetMock.Client.Audit";
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/v1";
 option java_multiple_files = true;
 option java_outer_classname = "HandlerEventProto";
 option java_package = "com.github.baez90.inetmock.audit";
diff --git a/proto/audit/v1/http_details.proto b/proto/audit/v1/http_details.proto
index 9db4396..6d55bfa 100644
--- a/proto/audit/v1/http_details.proto
+++ b/proto/audit/v1/http_details.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package inetmock.audit.v1;
 
 option csharp_namespace = "INetMock.Client.Audit";
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/v1";
 option java_multiple_files = true;
 option java_outer_classname = "HandlerEventProto";
 option java_package = "com.github.baez90.inetmock.audit";
diff --git a/proto/rpc/pcap.proto b/proto/rpc/pcap.proto
deleted file mode 100644
index 07ac7d2..0000000
--- a/proto/rpc/pcap.proto
+++ /dev/null
@@ -1,59 +0,0 @@
-syntax = "proto3";
-
-option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.rpc";
-option java_outer_classname = "AuditProto";
-option csharp_namespace = "INetMock.Client.Rpc";
-
-package inetmock.rpc;
-
-import "google/protobuf/duration.proto";
-
-message ListAvailableDevicesRequest {
-
-}
-
-message ListAvailableDevicesResponse {
-
-    message PCAPDevice {
-        string name = 1;
-        repeated bytes addresses = 2;
-    }
-
-    repeated PCAPDevice availableDevices = 1;
-}
-
-message ListRecordingsRequest {
-
-}
-
-message ListRecordingsResponse {
-    repeated string subscriptions = 1;
-}
-
-message StartPCAPFileRecordRequest {
-    string device = 1;
-    string targetPath = 2;
-    bool promiscuous = 3;
-    google.protobuf.Duration readTimeout = 4;
-}
-
-message StartPCAPFileRecordResponse {
-    string resolvedPath = 1;
-}
-
-message StopPCAPFileRecordRequest {
-    string consumerKey = 1;
-}
-
-message StopPCAPFileRecordResponse {
-    bool removed = 1;
-}
-
-service PCAP {
-    rpc ListAvailableDevices(ListAvailableDevicesRequest) returns (ListAvailableDevicesResponse);
-    rpc ListActiveRecordings(ListRecordingsRequest) returns (ListRecordingsResponse);
-    rpc StartPCAPFileRecording(StartPCAPFileRecordRequest) returns (StartPCAPFileRecordResponse);
-    rpc StopPCAPFileRecord(StopPCAPFileRecordRequest) returns (StopPCAPFileRecordResponse);
-}
diff --git a/proto/rpc/v1/audit.proto b/proto/rpc/v1/audit.proto
index f296e77..03a6459 100644
--- a/proto/rpc/v1/audit.proto
+++ b/proto/rpc/v1/audit.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package inetmock.rpc.v1;
 
 option csharp_namespace = "INetMock.Client.Rpc";
-option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc/v1";
 option java_multiple_files = true;
 option java_outer_classname = "AuditProto";
 option java_package = "com.github.baez90.inetmock.rpc";
diff --git a/proto/rpc/v1/health.proto b/proto/rpc/v1/health.proto
index 16813a8..8a543e4 100644
--- a/proto/rpc/v1/health.proto
+++ b/proto/rpc/v1/health.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package inetmock.rpc.v1;
 
 option csharp_namespace = "INetMock.Client.Rpc";
-option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc/v1";
 option java_multiple_files = true;
 option java_outer_classname = "HealthProto";
 option java_package = "com.github.baez90.inetmock.rpc";
diff --git a/proto/rpc/v1/pcap.proto b/proto/rpc/v1/pcap.proto
index 214d09a..ef701aa 100644
--- a/proto/rpc/v1/pcap.proto
+++ b/proto/rpc/v1/pcap.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package inetmock.rpc.v1;
 
 option csharp_namespace = "INetMock.Client.Rpc";
-option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc/v1";
 option java_multiple_files = true;
 option java_outer_classname = "AuditProto";
 option java_package = "com.github.baez90.inetmock.rpc";