diff --git a/src/main/java/envoy/client/Client.java b/src/main/java/envoy/client/Client.java
index 935669f..8ed3bb4 100644
--- a/src/main/java/envoy/client/Client.java
+++ b/src/main/java/envoy/client/Client.java
@@ -9,6 +9,8 @@ import java.util.logging.Logger;
 
 import javax.naming.TimeLimitExceededException;
 
+import envoy.client.net.ReceivedMessageProcessor;
+import envoy.client.net.Receiver;
 import envoy.client.util.EnvoyLog;
 import envoy.data.*;
 import envoy.event.IdGeneratorRequest;
diff --git a/src/main/java/envoy/client/event/MessageCreationEvent.java b/src/main/java/envoy/client/event/MessageCreationEvent.java
index 36397d9..301603e 100644
--- a/src/main/java/envoy/client/event/MessageCreationEvent.java
+++ b/src/main/java/envoy/client/event/MessageCreationEvent.java
@@ -11,6 +11,8 @@ import envoy.data.Message;
  */
 public class MessageCreationEvent extends MessageEvent {
 
+	private static final long serialVersionUID = -6451021678064566774L;
+
 	/**
 	 * @param message the {@link Message} that has been created
 	 */
diff --git a/src/main/java/envoy/client/event/MessageEvent.java b/src/main/java/envoy/client/event/MessageEvent.java
index a1b5c68..8bd05d1 100644
--- a/src/main/java/envoy/client/event/MessageEvent.java
+++ b/src/main/java/envoy/client/event/MessageEvent.java
@@ -12,6 +12,8 @@ import envoy.event.Event;
  */
 public class MessageEvent implements Event<Message> {
 
+	private static final long serialVersionUID = 7658989461923112804L;
+
 	/**
 	 * the {@link Message} attached to this {@link MessageEvent}.
 	 */
diff --git a/src/main/java/envoy/client/event/MessageModificationEvent.java b/src/main/java/envoy/client/event/MessageModificationEvent.java
index 248c6f1..3a5549a 100644
--- a/src/main/java/envoy/client/event/MessageModificationEvent.java
+++ b/src/main/java/envoy/client/event/MessageModificationEvent.java
@@ -11,6 +11,8 @@ import envoy.data.Message;
  */
 public class MessageModificationEvent extends MessageEvent {
 
+	private static final long serialVersionUID = 4650039506439563116L;
+
 	/**
 	 * @param message the {@link Message} that has been modified
 	 */
diff --git a/src/main/java/envoy/client/event/ThemeChangeEvent.java b/src/main/java/envoy/client/event/ThemeChangeEvent.java
index adb9707..02a15df 100644
--- a/src/main/java/envoy/client/event/ThemeChangeEvent.java
+++ b/src/main/java/envoy/client/event/ThemeChangeEvent.java
@@ -13,7 +13,8 @@ import envoy.event.Event;
  */
 public class ThemeChangeEvent implements Event<Theme> {
 
-	private final Theme theme;
+	private static final long	serialVersionUID	= 6756772448803774547L;
+	private final Theme			theme;
 
 	/**
 	 * Initializes a {@link ThemeChangeEvent} conveying information about the change
diff --git a/src/main/java/envoy/client/ReceivedMessageProcessor.java b/src/main/java/envoy/client/net/ReceivedMessageProcessor.java
similarity index 97%
rename from src/main/java/envoy/client/ReceivedMessageProcessor.java
rename to src/main/java/envoy/client/net/ReceivedMessageProcessor.java
index d408993..27b505e 100644
--- a/src/main/java/envoy/client/ReceivedMessageProcessor.java
+++ b/src/main/java/envoy/client/net/ReceivedMessageProcessor.java
@@ -1,4 +1,4 @@
-package envoy.client;
+package envoy.client.net;
 
 import java.util.function.Consumer;
 import java.util.logging.Logger;
diff --git a/src/main/java/envoy/client/Receiver.java b/src/main/java/envoy/client/net/Receiver.java
similarity index 99%
rename from src/main/java/envoy/client/Receiver.java
rename to src/main/java/envoy/client/net/Receiver.java
index e6cd3c5..5030241 100644
--- a/src/main/java/envoy/client/Receiver.java
+++ b/src/main/java/envoy/client/net/Receiver.java
@@ -1,4 +1,4 @@
-package envoy.client;
+package envoy.client.net;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;