diff --git a/api.bak/.editorconfig b/api.bak/.editorconfig
deleted file mode 100644
index 698c63d..0000000
--- a/api.bak/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.proto]
-indent_style = space
-indent_size = 4
diff --git a/api.bak/.gitignore b/api.bak/.gitignore
deleted file mode 100644
index 1c0b8d4..0000000
--- a/api.bak/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vscode/
-.idea/
\ No newline at end of file
diff --git a/api.bak/README.md b/api.bak/README.md
deleted file mode 100644
index 19fee22..0000000
--- a/api.bak/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# INetMock protobuf API
\ No newline at end of file
diff --git a/api.bak/proto/audit/details/dns_details.proto b/api.bak/proto/audit/details/dns_details.proto
deleted file mode 100644
index f820840..0000000
--- a/api.bak/proto/audit/details/dns_details.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-syntax = "proto3";
-
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.audit.details";
-option java_outer_classname = "HandlerEventProto";
-option csharp_namespace = "INetMock.Client.Audit.Details";
-
-package inetmock.audit.details;
-
-enum DNSOpCode {
-    Query = 0;
-    Status = 2;
-    Notify = 4;
-    Update = 5;
-}
-
-enum ResourceRecordType {
-    UnknownRR = 0;
-    A = 1;
-    NS = 2;
-    CNAME = 5;
-    SOA = 6;
-    PTR = 12;
-    HINFO = 13;
-    MINFO = 14;
-    MX = 15;
-    TXT = 16;
-    RP = 17;
-    AAAA = 28;
-    SRV = 33;
-    NAPTR = 35;
-}
-
-message DNSQuestionEntity {
-    ResourceRecordType type = 1;
-    string name = 2;
-}
-
-message DNSDetailsEntity {
-    DNSOpCode opcode = 1;
-    repeated DNSQuestionEntity questions = 2;
-}
diff --git a/api.bak/proto/audit/details/http_details.proto b/api.bak/proto/audit/details/http_details.proto
deleted file mode 100644
index e5e5d7a..0000000
--- a/api.bak/proto/audit/details/http_details.proto
+++ /dev/null
@@ -1,33 +0,0 @@
-syntax = "proto3";
-
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.audit.details";
-option java_outer_classname = "HandlerEventProto";
-option csharp_namespace = "INetMock.Client.Audit.Details";
-
-package inetmock.audit.details;
-
-enum HTTPMethod {
-    GET = 0;
-    HEAD = 1;
-    POST = 2;
-    PUT = 3;
-    DELETE = 4;
-    CONNECT = 5;
-    OPTIONS = 6;
-    TRACE = 7;
-    PATCH = 8;
-}
-
-message HTTPHeaderValue {
-    repeated string values = 1;
-}
-
-message HTTPDetailsEntity {
-    HTTPMethod method = 1;
-    string host = 2;
-    string uri = 3;
-    string proto = 4;
-    map<string, HTTPHeaderValue> headers = 5;
-}
diff --git a/api.bak/proto/audit/event_entity.proto b/api.bak/proto/audit/event_entity.proto
deleted file mode 100644
index 3b213ee..0000000
--- a/api.bak/proto/audit/event_entity.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-syntax = "proto3";
-
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.audit";
-option java_outer_classname = "HandlerEventProto";
-option csharp_namespace = "INetMock.Client.Audit";
-
-package inetmock.audit;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/timestamp.proto";
-
-enum TransportProtocol {
-    UNKNOWN_TRANSPORT = 0;
-    TCP = 1;
-    UDP = 2;
-}
-
-enum AppProtocol {
-    UNKNOWN_APPLICATION = 0;
-    DNS = 1;
-    HTTP = 2;
-    HTTP_PROXY = 3;
-}
-
-enum TLSVersion {
-    SSLv30 = 0;
-    TLS10 = 1;
-    TLS11 = 2;
-    TLS12 = 3;
-    TLS13 = 4;
-}
-
-message TLSDetailsEntity {
-    TLSVersion version = 1;
-    string cipherSuite = 2;
-    string serverName = 3;
-}
-
-message EventEntity {
-    int64 id = 1;
-    google.protobuf.Timestamp timestamp = 2;
-    TransportProtocol transport = 3;
-    AppProtocol application = 4;
-    bytes sourceIP = 5;
-    bytes destinationIP = 6;
-    uint32 sourcePort = 7;
-    uint32 destinationPort = 8;
-    TLSDetailsEntity tls = 9;
-    google.protobuf.Any protocolDetails = 10;
-}
diff --git a/api.bak/proto/rpc/audit.proto b/api.bak/proto/rpc/audit.proto
deleted file mode 100644
index ca369c1..0000000
--- a/api.bak/proto/rpc/audit.proto
+++ /dev/null
@@ -1,53 +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";
-
-import 'proto/audit/event_entity.proto';
-
-package inetmock.rpc;
-
-enum FileOpenMode {
-    TRUNCATE = 0;
-    APPEND = 1;
-}
-
-message WatchEventsRequest {
-    string watcherName = 1;
-}
-
-message RegisterFileSinkRequest {
-    string targetPath = 1;
-    FileOpenMode openMode = 2;
-    uint32 permissions = 3;
-}
-
-message RegisterFileSinkResponse {
-
-}
-
-message RemoveFileSinkRequest {
-    string targetPath = 1;
-}
-
-message RemoveFileSinkResponse {
-    bool SinkGotRemoved = 1;
-}
-
-message ListSinksRequest {
-
-}
-
-message ListSinksResponse {
-    repeated string sinks = 1;
-}
-
-service Audit {
-    rpc WatchEvents (WatchEventsRequest) returns (stream inetmock.audit.EventEntity);
-    rpc RegisterFileSink (RegisterFileSinkRequest) returns (RegisterFileSinkResponse);
-    rpc RemoveFileSink (RemoveFileSinkRequest) returns (RemoveFileSinkResponse);
-    rpc ListSinks(ListSinksRequest) returns (ListSinksResponse);
-}
diff --git a/api.bak/proto/rpc/health.proto b/api.bak/proto/rpc/health.proto
deleted file mode 100644
index 193bc8c..0000000
--- a/api.bak/proto/rpc/health.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-syntax = "proto3";
-
-option go_package = "gitlab.com/inetmock/inetmock/internal/rpc";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.rpc";
-option java_outer_classname = "HealthProto";
-option csharp_namespace = "INetMock.Client.Rpc";
-
-package inetmock.rpc;
-
-service Health {
-    rpc GetHealth (HealthRequest) returns (HealthResponse) {
-    }
-}
-
-enum HealthState {
-    HEALTHY = 0;
-    INITIALIZING = 1;
-    UNHEALTHY = 2;
-    UNKNOWN = 3;
-}
-
-message HealthRequest {
-    repeated string components = 1;
-}
-
-message ComponentHealth {
-    HealthState State = 1;
-    string message = 2;
-}
-
-message HealthResponse {
-    HealthState overallHealthState = 1;
-    map<string, ComponentHealth> componentsHealth = 2;
-}
diff --git a/api/proto/audit/details/dns_details.proto b/api/proto/audit/details/dns_details.proto
index 3dc2fb8..f820840 100644
--- a/api/proto/audit/details/dns_details.proto
+++ b/api/proto/audit/details/dns_details.proto
@@ -4,6 +4,7 @@ option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
 option java_multiple_files = true;
 option java_package = "com.github.baez90.inetmock.audit.details";
 option java_outer_classname = "HandlerEventProto";
+option csharp_namespace = "INetMock.Client.Audit.Details";
 
 package inetmock.audit.details;
 
diff --git a/api/proto/audit/details/http_details.proto b/api/proto/audit/details/http_details.proto
index e9a3955..e5e5d7a 100644
--- a/api/proto/audit/details/http_details.proto
+++ b/api/proto/audit/details/http_details.proto
@@ -4,6 +4,7 @@ option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
 option java_multiple_files = true;
 option java_package = "com.github.baez90.inetmock.audit.details";
 option java_outer_classname = "HandlerEventProto";
+option csharp_namespace = "INetMock.Client.Audit.Details";
 
 package inetmock.audit.details;
 
@@ -29,4 +30,4 @@ message HTTPDetailsEntity {
     string uri = 3;
     string proto = 4;
     map<string, HTTPHeaderValue> headers = 5;
-}
\ No newline at end of file
+}
diff --git a/api/proto/audit/event_entity.proto b/api/proto/audit/event_entity.proto
index 00492af..3b213ee 100644
--- a/api/proto/audit/event_entity.proto
+++ b/api/proto/audit/event_entity.proto
@@ -4,6 +4,7 @@ option go_package = "gitlab.com/inetmock/inetmock/pkg/audit";
 option java_multiple_files = true;
 option java_package = "com.github.baez90.inetmock.audit";
 option java_outer_classname = "HandlerEventProto";
+option csharp_namespace = "INetMock.Client.Audit";
 
 package inetmock.audit;
 
@@ -48,4 +49,4 @@ message EventEntity {
     uint32 destinationPort = 8;
     TLSDetailsEntity tls = 9;
     google.protobuf.Any protocolDetails = 10;
-}
\ No newline at end of file
+}
diff --git a/api/proto/rpc/audit.proto b/api/proto/rpc/audit.proto
index 1d43bd3..ca369c1 100644
--- a/api/proto/rpc/audit.proto
+++ b/api/proto/rpc/audit.proto
@@ -4,8 +4,9 @@ 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";
 
-import 'pkg/audit/event_entity.proto';
+import 'proto/audit/event_entity.proto';
 
 package inetmock.rpc;
 
@@ -49,4 +50,4 @@ service Audit {
     rpc RegisterFileSink (RegisterFileSinkRequest) returns (RegisterFileSinkResponse);
     rpc RemoveFileSink (RemoveFileSinkRequest) returns (RemoveFileSinkResponse);
     rpc ListSinks(ListSinksRequest) returns (ListSinksResponse);
-}
\ No newline at end of file
+}
diff --git a/api/proto/rpc/health.proto b/api/proto/rpc/health.proto
index 3ff1aee..193bc8c 100644
--- a/api/proto/rpc/health.proto
+++ b/api/proto/rpc/health.proto
@@ -4,6 +4,7 @@ option go_package = "gitlab.com/inetmock/inetmock/internal/rpc";
 option java_multiple_files = true;
 option java_package = "com.github.baez90.inetmock.rpc";
 option java_outer_classname = "HealthProto";
+option csharp_namespace = "INetMock.Client.Rpc";
 
 package inetmock.rpc;
 
@@ -31,4 +32,4 @@ message ComponentHealth {
 message HealthResponse {
     HealthState overallHealthState = 1;
     map<string, ComponentHealth> componentsHealth = 2;
-}
\ No newline at end of file
+}