diff --git a/Dorkbox-Network/test/dorkbox/network/ClientSendTest.java b/Dorkbox-Network/test/dorkbox/network/ClientSendTest.java
index 37f3da29..67909991 100644
--- a/Dorkbox-Network/test/dorkbox/network/ClientSendTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/ClientSendTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.SerializationManager;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
diff --git a/Dorkbox-Network/test/dorkbox/network/ConnectionTest.java b/Dorkbox-Network/test/dorkbox/network/ConnectionTest.java
index 88b8140c..8d5eb0f3 100644
--- a/Dorkbox-Network/test/dorkbox/network/ConnectionTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/ConnectionTest.java
@@ -2,7 +2,6 @@
 package dorkbox.network;
 
 
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.Timer;
@@ -11,6 +10,7 @@ import java.util.TimerTask;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
diff --git a/Dorkbox-Network/test/dorkbox/network/DiscoverHostTest.java b/Dorkbox-Network/test/dorkbox/network/DiscoverHostTest.java
index 3c13db0a..5bc4b469 100644
--- a/Dorkbox-Network/test/dorkbox/network/DiscoverHostTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/DiscoverHostTest.java
@@ -3,13 +3,13 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
diff --git a/Dorkbox-Network/test/dorkbox/network/IdleTest.java b/Dorkbox-Network/test/dorkbox/network/IdleTest.java
index aea183d1..7da9d47c 100644
--- a/Dorkbox-Network/test/dorkbox/network/IdleTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/IdleTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -14,6 +13,7 @@ import org.junit.Test;
 
 import dorkbox.network.PingPongTest.TYPE;
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.connection.idle.IdleBridge;
 import dorkbox.network.connection.idle.InputStreamSender;
 import dorkbox.network.util.SerializationManager;
diff --git a/Dorkbox-Network/test/dorkbox/network/LargeBufferTest.java b/Dorkbox-Network/test/dorkbox/network/LargeBufferTest.java
index 48b55ff3..b978b9be 100644
--- a/Dorkbox-Network/test/dorkbox/network/LargeBufferTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/LargeBufferTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -12,6 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.SerializationManager;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
diff --git a/Dorkbox-Network/test/dorkbox/network/MultipleServerTest.java b/Dorkbox-Network/test/dorkbox/network/MultipleServerTest.java
index f9444440..0eeab203 100644
--- a/Dorkbox-Network/test/dorkbox/network/MultipleServerTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/MultipleServerTest.java
@@ -2,7 +2,6 @@
 package dorkbox.network;
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -10,6 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
diff --git a/Dorkbox-Network/test/dorkbox/network/MultipleThreadTest.java b/Dorkbox-Network/test/dorkbox/network/MultipleThreadTest.java
index d9b452d2..cba0b38b 100644
--- a/Dorkbox-Network/test/dorkbox/network/MultipleThreadTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/MultipleThreadTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.assertEquals;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -15,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
-import dorkbox.network.connection.ListenerRaw;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
@@ -95,7 +94,7 @@ public class MultipleThreadTest extends BaseTest {
             client.getSerialization().register(String[].class);
             client.getSerialization().register(DataClass.class);
             addEndPoint(client);
-            client.listeners().add(new ListenerRaw<Connection, DataClass>() {
+            client.listeners().add(new Listener<DataClass>() {
                 AtomicInteger received = new AtomicInteger(1);
 
                 @Override
diff --git a/Dorkbox-Network/test/dorkbox/network/PingPongLocalTest.java b/Dorkbox-Network/test/dorkbox/network/PingPongLocalTest.java
index f0202c6e..2845cbdf 100644
--- a/Dorkbox-Network/test/dorkbox/network/PingPongLocalTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/PingPongLocalTest.java
@@ -2,7 +2,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.SerializationManager;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
diff --git a/Dorkbox-Network/test/dorkbox/network/PingPongTest.java b/Dorkbox-Network/test/dorkbox/network/PingPongTest.java
index cd28e138..2be59fa0 100644
--- a/Dorkbox-Network/test/dorkbox/network/PingPongTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/PingPongTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -14,6 +13,7 @@ import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
 import dorkbox.network.connection.EndPoint;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.SerializationManager;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
diff --git a/Dorkbox-Network/test/dorkbox/network/ReconnectTest.java b/Dorkbox-Network/test/dorkbox/network/ReconnectTest.java
index b6779267..229605fb 100644
--- a/Dorkbox-Network/test/dorkbox/network/ReconnectTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/ReconnectTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.assertEquals;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.Timer;
@@ -13,6 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
diff --git a/Dorkbox-Network/test/dorkbox/network/ReuseTest.java b/Dorkbox-Network/test/dorkbox/network/ReuseTest.java
index 03ba9ca0..919dd6ce 100644
--- a/Dorkbox-Network/test/dorkbox/network/ReuseTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/ReuseTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.assertEquals;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
diff --git a/Dorkbox-Network/test/dorkbox/network/UnregisteredClassTest.java b/Dorkbox-Network/test/dorkbox/network/UnregisteredClassTest.java
index 35305883..69967586 100644
--- a/Dorkbox-Network/test/dorkbox/network/UnregisteredClassTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/UnregisteredClassTest.java
@@ -3,7 +3,6 @@ package dorkbox.network;
 
 
 import static org.junit.Assert.fail;
-import hive.common.Listener;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -14,6 +13,7 @@ import org.junit.Test;
 
 import dorkbox.network.connection.Connection;
 import dorkbox.network.connection.EndPoint;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
 
diff --git a/Dorkbox-Network/test/dorkbox/network/rmi/RmiSendObjectTest.java b/Dorkbox-Network/test/dorkbox/network/rmi/RmiSendObjectTest.java
index 4344bd15..f31b4c7d 100644
--- a/Dorkbox-Network/test/dorkbox/network/rmi/RmiSendObjectTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/rmi/RmiSendObjectTest.java
@@ -7,12 +7,12 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import dorkbox.network.BaseTest;
 import dorkbox.network.Client;
 import dorkbox.network.ConnectionOptions;
-import dorkbox.network.BaseTest;
 import dorkbox.network.Server;
 import dorkbox.network.connection.Connection;
-import dorkbox.network.connection.ListenerRaw;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.SerializationManager;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;
@@ -48,15 +48,15 @@ public class RmiSendObjectTest extends BaseTest {
         serverTestObject.otherObject = new OtherObjectImpl();
 
         // Both objects must be registered with the ObjectSpace.
-        serverRMI = server.getRmiBridge();
-        serverRMI.register(42, serverTestObject);
-        serverRMI.register(777, serverTestObject.getOtherObject());
+        this.serverRMI = server.getRmiBridge();
+        this.serverRMI.register(42, serverTestObject);
+        this.serverRMI.register(777, serverTestObject.getOtherObject());
 
-        server.listeners().add(new ListenerRaw<Connection, OtherObjectImpl>() {
+        server.listeners().add(new Listener<OtherObjectImpl>() {
             @Override
             public void connected(final Connection connection) {
                 // Allow the connection to access objects in the ObjectSpace.
-                serverRMI.addConnection(connection);
+                RmiSendObjectTest.this.serverRMI.addConnection(connection);
             }
 
             @Override
@@ -74,7 +74,7 @@ public class RmiSendObjectTest extends BaseTest {
         register(client.getSerialization());
 
         addEndPoint(client);
-        client.listeners().add(new ListenerRaw<Connection, Object>() {
+        client.listeners().add(new Listener<Object>() {
             @Override
             public void connected(final Connection connection) {
                 new Thread(new Runnable() {
@@ -126,7 +126,7 @@ public class RmiSendObjectTest extends BaseTest {
 
         @Override
         public OtherObject getOtherObject() {
-            return otherObject;
+            return this.otherObject;
         }
     }
 
diff --git a/Dorkbox-Network/test/dorkbox/network/rmi/RmiTest.java b/Dorkbox-Network/test/dorkbox/network/rmi/RmiTest.java
index aea21d0f..bc66deef 100644
--- a/Dorkbox-Network/test/dorkbox/network/rmi/RmiTest.java
+++ b/Dorkbox-Network/test/dorkbox/network/rmi/RmiTest.java
@@ -4,7 +4,6 @@ package dorkbox.network.rmi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import hive.common.Listener;
 
 import java.io.IOException;
 
@@ -15,6 +14,7 @@ import dorkbox.network.Client;
 import dorkbox.network.ConnectionOptions;
 import dorkbox.network.Server;
 import dorkbox.network.connection.Connection;
+import dorkbox.network.connection.Listener;
 import dorkbox.network.util.SerializationManager;
 import dorkbox.network.util.exceptions.InitializationException;
 import dorkbox.network.util.exceptions.SecurityException;