diff --git a/src/dorkbox/network/connection/ConnectionImpl.java b/src/dorkbox/network/connection/ConnectionImpl.java
index d3f73d0d..ef5e910c 100644
--- a/src/dorkbox/network/connection/ConnectionImpl.java
+++ b/src/dorkbox/network/connection/ConnectionImpl.java
@@ -44,8 +44,8 @@ import dorkbox.network.rmi.Rmi;
 import dorkbox.network.rmi.RmiBridge;
 import dorkbox.network.rmi.RmiRegistration;
 import dorkbox.network.serialization.CryptoSerializationManager;
-import dorkbox.util.ClassHelper;
 import dorkbox.util.collections.IntMap;
+import dorkbox.util.generics.ClassHelper;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/dorkbox/network/connection/ConnectionManager.java b/src/dorkbox/network/connection/ConnectionManager.java
index 00c24192..2db10103 100644
--- a/src/dorkbox/network/connection/ConnectionManager.java
+++ b/src/dorkbox/network/connection/ConnectionManager.java
@@ -30,10 +30,10 @@ import dorkbox.network.connection.listenerManagement.OnConnectedManager;
 import dorkbox.network.connection.listenerManagement.OnDisconnectedManager;
 import dorkbox.network.connection.listenerManagement.OnIdleManager;
 import dorkbox.network.connection.listenerManagement.OnMessageReceivedManager;
-import dorkbox.util.ClassHelper;
 import dorkbox.util.Property;
-import dorkbox.util.TypeResolver;
 import dorkbox.util.collections.ConcurrentEntry;
+import dorkbox.util.generics.ClassHelper;
+import dorkbox.util.generics.TypeResolver;
 
 // .equals() compares the identity on purpose,this because we cannot create two separate objects that are somehow equal to each other.
 @SuppressWarnings("unchecked")
diff --git a/src/dorkbox/network/connection/listenerManagement/OnMessageReceivedManager.java b/src/dorkbox/network/connection/listenerManagement/OnMessageReceivedManager.java
index 22f2f71e..9b7b8110 100644
--- a/src/dorkbox/network/connection/listenerManagement/OnMessageReceivedManager.java
+++ b/src/dorkbox/network/connection/listenerManagement/OnMessageReceivedManager.java
@@ -32,9 +32,9 @@ import dorkbox.network.connection.Listener.OnError;
 import dorkbox.network.connection.Listener.OnMessageReceived;
 import dorkbox.network.connection.Listener.SelfDefinedType;
 import dorkbox.network.rmi.RmiMessages;
-import dorkbox.util.ClassHelper;
 import dorkbox.util.collections.ConcurrentEntry;
 import dorkbox.util.collections.ConcurrentIterator;
+import dorkbox.util.generics.ClassHelper;
 
 /**
  * Called when the remote end has been connected. This will be invoked before any objects are received by the network.