diff --git a/src/main/java/com/teragrep/rlp_03/Server.java b/src/main/java/com/teragrep/rlp_03/Server.java
index 1409566e..bfc82aa0 100644
--- a/src/main/java/com/teragrep/rlp_03/Server.java
+++ b/src/main/java/com/teragrep/rlp_03/Server.java
@@ -47,6 +47,7 @@
 package com.teragrep.rlp_03;
 
 import com.teragrep.rlp_03.context.channel.SocketFactory;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/teragrep/rlp_03/ServerFactory.java b/src/main/java/com/teragrep/rlp_03/ServerFactory.java
index 63419d66..9e1fc0d9 100644
--- a/src/main/java/com/teragrep/rlp_03/ServerFactory.java
+++ b/src/main/java/com/teragrep/rlp_03/ServerFactory.java
@@ -52,6 +52,7 @@
 import com.teragrep.rlp_03.context.channel.PlainFactory;
 import com.teragrep.rlp_03.context.channel.SocketFactory;
 import com.teragrep.rlp_03.context.channel.TLSFactory;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/src/main/java/com/teragrep/rlp_03/SocketPoll.java b/src/main/java/com/teragrep/rlp_03/SocketPoll.java
index 6d7d1adb..429d9bfc 100644
--- a/src/main/java/com/teragrep/rlp_03/SocketPoll.java
+++ b/src/main/java/com/teragrep/rlp_03/SocketPoll.java
@@ -49,6 +49,7 @@
 import com.teragrep.rlp_03.context.*;
 import com.teragrep.rlp_03.context.channel.Socket;
 import com.teragrep.rlp_03.context.channel.SocketFactory;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/teragrep/rlp_03/context/ConnectionContextImpl.java b/src/main/java/com/teragrep/rlp_03/context/ConnectionContextImpl.java
index 0f8d0469..572d6f38 100644
--- a/src/main/java/com/teragrep/rlp_03/context/ConnectionContextImpl.java
+++ b/src/main/java/com/teragrep/rlp_03/context/ConnectionContextImpl.java
@@ -46,7 +46,7 @@
 
 package com.teragrep.rlp_03.context;
 
-import com.teragrep.rlp_03.FrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import com.teragrep.rlp_03.context.buffer.BufferLeasePool;
 import com.teragrep.rlp_03.context.channel.Socket;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java b/src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java
index 62ece016..52f40ae6 100644
--- a/src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java
+++ b/src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java
@@ -46,9 +46,8 @@
 
 package com.teragrep.rlp_03.context;
 
-import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import com.teragrep.rlp_03.context.buffer.BufferLease;
 import com.teragrep.rlp_03.context.buffer.BufferLeasePool;
 import com.teragrep.rlp_03.context.frame.RelpFrameAccess;
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/relp/DefaultFrameDelegate.java b/src/main/java/com/teragrep/rlp_03/delegate/DefaultFrameDelegate.java
similarity index 98%
rename from src/main/java/com/teragrep/rlp_03/delegate/relp/DefaultFrameDelegate.java
rename to src/main/java/com/teragrep/rlp_03/delegate/DefaultFrameDelegate.java
index 954c131a..6958ae3d 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/relp/DefaultFrameDelegate.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/DefaultFrameDelegate.java
@@ -44,12 +44,11 @@
  * a licensee so wish it.
  */
 
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/teragrep/rlp_03/FrameDelegate.java b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegate.java
similarity index 96%
rename from src/main/java/com/teragrep/rlp_03/FrameDelegate.java
rename to src/main/java/com/teragrep/rlp_03/delegate/FrameDelegate.java
index 8faa44b9..6dbad7b6 100644
--- a/src/main/java/com/teragrep/rlp_03/FrameDelegate.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegate.java
@@ -44,7 +44,9 @@
  * a licensee so wish it.
  */
 
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.delegate;
+
+import com.teragrep.rlp_03.FrameContext;
 
 /*
  * FrameDelegate is responsible for delegating processing of. RelpFrames
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegatePool.java b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegatePool.java
index 78988dda..17e8327c 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegatePool.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegatePool.java
@@ -46,7 +46,6 @@
 
 package com.teragrep.rlp_03.delegate;
 
-import com.teragrep.rlp_03.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegateStub.java b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegateStub.java
index 83e42c5b..05628134 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegateStub.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegateStub.java
@@ -48,7 +48,6 @@
 
 
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
 
 public class FrameDelegateStub implements FrameDelegate {
 
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/PoolingDelegate.java b/src/main/java/com/teragrep/rlp_03/delegate/PoolingDelegate.java
index 6cdf7c70..c7bd9d35 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/PoolingDelegate.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/PoolingDelegate.java
@@ -47,7 +47,6 @@
 package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEvent.java b/src/main/java/com/teragrep/rlp_03/delegate/RelpEvent.java
similarity index 98%
rename from src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEvent.java
rename to src/main/java/com/teragrep/rlp_03/delegate/RelpEvent.java
index 83362e86..e3fb9a0d 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEvent.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/RelpEvent.java
@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpFrameTX;
 import com.teragrep.rlp_03.FrameContext;
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventClose.java b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventClose.java
similarity index 98%
rename from src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventClose.java
rename to src/main/java/com/teragrep/rlp_03/delegate/RelpEventClose.java
index f44712fd..253e3f0e 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventClose.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventClose.java
@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventOpen.java b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventOpen.java
similarity index 98%
rename from src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventOpen.java
rename to src/main/java/com/teragrep/rlp_03/delegate/RelpEventOpen.java
index 9c425112..0c613746 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventOpen.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventOpen.java
@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventServerClose.java b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventServerClose.java
similarity index 98%
rename from src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventServerClose.java
rename to src/main/java/com/teragrep/rlp_03/delegate/RelpEventServerClose.java
index d4b34243..783c1cc9 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventServerClose.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventServerClose.java
@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;
diff --git a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventSyslog.java b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventSyslog.java
similarity index 98%
rename from src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventSyslog.java
rename to src/main/java/com/teragrep/rlp_03/delegate/RelpEventSyslog.java
index 91034d73..2ae83594 100644
--- a/src/main/java/com/teragrep/rlp_03/delegate/relp/RelpEventSyslog.java
+++ b/src/main/java/com/teragrep/rlp_03/delegate/RelpEventSyslog.java
@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;
diff --git a/src/test/java/com/teragrep/rlp_03/CloseByteConsumerTest.java b/src/test/java/com/teragrep/rlp_03/CloseByteConsumerTest.java
index 0cdfd2f5..521aba5f 100644
--- a/src/test/java/com/teragrep/rlp_03/CloseByteConsumerTest.java
+++ b/src/test/java/com/teragrep/rlp_03/CloseByteConsumerTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/src/test/java/com/teragrep/rlp_03/CloseRelpFrameServerRXConsumerTest.java b/src/test/java/com/teragrep/rlp_03/CloseRelpFrameServerRXConsumerTest.java
index 0286b131..4e26c4a8 100644
--- a/src/test/java/com/teragrep/rlp_03/CloseRelpFrameServerRXConsumerTest.java
+++ b/src/test/java/com/teragrep/rlp_03/CloseRelpFrameServerRXConsumerTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/src/test/java/com/teragrep/rlp_03/ConnectionStormTest.java b/src/test/java/com/teragrep/rlp_03/ConnectionStormTest.java
index 3de6b229..e93dfd0d 100644
--- a/src/test/java/com/teragrep/rlp_03/ConnectionStormTest.java
+++ b/src/test/java/com/teragrep/rlp_03/ConnectionStormTest.java
@@ -48,7 +48,7 @@
 
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 
 import java.util.LinkedList;
diff --git a/src/test/java/com/teragrep/rlp_03/ManualPerformanceTest.java b/src/test/java/com/teragrep/rlp_03/ManualPerformanceTest.java
index 94d79311..dc0620a8 100644
--- a/src/test/java/com/teragrep/rlp_03/ManualPerformanceTest.java
+++ b/src/test/java/com/teragrep/rlp_03/ManualPerformanceTest.java
@@ -47,7 +47,8 @@
 package com.teragrep.rlp_03;
 
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.slf4j.Logger;
diff --git a/src/test/java/com/teragrep/rlp_03/ManualTest.java b/src/test/java/com/teragrep/rlp_03/ManualTest.java
index 84992153..84c8373f 100644
--- a/src/test/java/com/teragrep/rlp_03/ManualTest.java
+++ b/src/test/java/com/teragrep/rlp_03/ManualTest.java
@@ -48,7 +48,7 @@
 
 import com.teragrep.rlp_03.config.Config;
 import com.teragrep.rlp_03.config.TLSConfig;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import com.teragrep.rlp_03.tls.SSLContextWithCustomTrustAndKeyManagerHelper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/src/test/java/com/teragrep/rlp_03/MultiClientTest.java b/src/test/java/com/teragrep/rlp_03/MultiClientTest.java
index 7e289c0a..a60ea98c 100644
--- a/src/test/java/com/teragrep/rlp_03/MultiClientTest.java
+++ b/src/test/java/com/teragrep/rlp_03/MultiClientTest.java
@@ -49,7 +49,8 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
diff --git a/src/test/java/com/teragrep/rlp_03/SendMessageTest.java b/src/test/java/com/teragrep/rlp_03/SendMessageTest.java
index 519fd760..3e816602 100644
--- a/src/test/java/com/teragrep/rlp_03/SendMessageTest.java
+++ b/src/test/java/com/teragrep/rlp_03/SendMessageTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/com/teragrep/rlp_03/ServerShutdownTest.java b/src/test/java/com/teragrep/rlp_03/ServerShutdownTest.java
index 638c4f8d..130c3c5e 100644
--- a/src/test/java/com/teragrep/rlp_03/ServerShutdownTest.java
+++ b/src/test/java/com/teragrep/rlp_03/ServerShutdownTest.java
@@ -47,7 +47,7 @@
 package com.teragrep.rlp_03;
 
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/teragrep/rlp_03/TearDownTest.java b/src/test/java/com/teragrep/rlp_03/TearDownTest.java
index 56edc9af..84b4fa22 100644
--- a/src/test/java/com/teragrep/rlp_03/TearDownTest.java
+++ b/src/test/java/com/teragrep/rlp_03/TearDownTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 
 import java.nio.charset.StandardCharsets;
diff --git a/src/test/java/com/teragrep/rlp_03/TlsClientTest.java b/src/test/java/com/teragrep/rlp_03/TlsClientTest.java
index 34228cf0..ede0cd3a 100644
--- a/src/test/java/com/teragrep/rlp_03/TlsClientTest.java
+++ b/src/test/java/com/teragrep/rlp_03/TlsClientTest.java
@@ -51,7 +51,7 @@
 import com.teragrep.rlp_01.SSLContextFactory;
 import com.teragrep.rlp_03.config.Config;
 import com.teragrep.rlp_03.config.TLSConfig;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 
 import javax.net.ssl.KeyManagerFactory;