diff --git a/src/main/java/seng302/Networking/BinaryMesageEncoder.java b/src/main/java/seng302/Networking/BinaryMesageEncoder.java
index ce688279..a4f94c91 100644
--- a/src/main/java/seng302/Networking/BinaryMesageEncoder.java
+++ b/src/main/java/seng302/Networking/BinaryMesageEncoder.java
@@ -1,8 +1,9 @@
 package seng302.Networking;
 
 
+import seng302.Networking.Utils.MessageType;
+
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.zip.CRC32;
 
diff --git a/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java b/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
index f851dd6f..cb492f51 100644
--- a/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
+++ b/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
@@ -1,6 +1,6 @@
 package seng302.Networking.MessageDecoders;
 
-import seng302.Networking.BoatLocationMessage;
+import seng302.Networking.Utils.BoatLocationMessage;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java b/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java
index dad8523f..3ef7b905 100644
--- a/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java
+++ b/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java
@@ -1,6 +1,6 @@
 package seng302.Networking.MessageDecoders;
 
-import seng302.Networking.CourseWind;
+import seng302.Networking.Utils.CourseWind;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java b/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java
index 5b3253ec..5199cc44 100644
--- a/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java
+++ b/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java
@@ -1,7 +1,6 @@
 package seng302.Networking.MessageDecoders;
 
-import seng302.Model.BoatInRace;
-import seng302.Networking.BoatStatus;
+import seng302.Networking.Utils.BoatStatus;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/seng302/Networking/RaceVisionByteEncoder.java b/src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java
similarity index 98%
rename from src/main/java/seng302/Networking/RaceVisionByteEncoder.java
rename to src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java
index 66a1f6fe..9afeb4e0 100644
--- a/src/main/java/seng302/Networking/RaceVisionByteEncoder.java
+++ b/src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java
@@ -1,6 +1,9 @@
-package seng302.Networking;
+package seng302.Networking.MessageEncoders;
 
 import seng302.Model.BoatInRace;
+import seng302.Networking.Utils.BoatLocationMessage;
+import seng302.Networking.Utils.CourseWind;
+import seng302.Networking.Utils.RaceMessage;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/src/main/java/seng302/Networking/XMLMessageEncoder.java b/src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java
similarity index 98%
rename from src/main/java/seng302/Networking/XMLMessageEncoder.java
rename to src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java
index 0a28a9ce..570f9a2c 100644
--- a/src/main/java/seng302/Networking/XMLMessageEncoder.java
+++ b/src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java
@@ -1,4 +1,4 @@
-package seng302.Networking;
+package seng302.Networking.MessageEncoders;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/seng302/Networking/BoatLocationMessage.java b/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
similarity index 99%
rename from src/main/java/seng302/Networking/BoatLocationMessage.java
rename to src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
index dfa4291a..0fd59c79 100644
--- a/src/main/java/seng302/Networking/BoatLocationMessage.java
+++ b/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
@@ -1,4 +1,4 @@
-package seng302.Networking;
+package seng302.Networking.Utils;
 
 /**
  * Created by f123 on 21-Apr-17.
diff --git a/src/main/java/seng302/Networking/BoatStatus.java b/src/main/java/seng302/Networking/Utils/BoatStatus.java
similarity index 97%
rename from src/main/java/seng302/Networking/BoatStatus.java
rename to src/main/java/seng302/Networking/Utils/BoatStatus.java
index ba3f9b5d..9de6ef39 100644
--- a/src/main/java/seng302/Networking/BoatStatus.java
+++ b/src/main/java/seng302/Networking/Utils/BoatStatus.java
@@ -1,4 +1,4 @@
-package seng302.Networking;
+package seng302.Networking.Utils;
 
 /**
  * Created by hba56 on 23/04/17.
diff --git a/src/main/java/seng302/Networking/CourseWind.java b/src/main/java/seng302/Networking/Utils/CourseWind.java
similarity index 97%
rename from src/main/java/seng302/Networking/CourseWind.java
rename to src/main/java/seng302/Networking/Utils/CourseWind.java
index 630c05b0..142c7c11 100644
--- a/src/main/java/seng302/Networking/CourseWind.java
+++ b/src/main/java/seng302/Networking/Utils/CourseWind.java
@@ -1,4 +1,4 @@
-package seng302.Networking;
+package seng302.Networking.Utils;
 
 /**
  * Created by fwy13 on 21/04/17.
diff --git a/src/main/java/seng302/Networking/MessageType.java b/src/main/java/seng302/Networking/Utils/MessageType.java
similarity index 92%
rename from src/main/java/seng302/Networking/MessageType.java
rename to src/main/java/seng302/Networking/Utils/MessageType.java
index 18d1746f..fcdff527 100644
--- a/src/main/java/seng302/Networking/MessageType.java
+++ b/src/main/java/seng302/Networking/Utils/MessageType.java
@@ -1,4 +1,4 @@
-package seng302.Networking;
+package seng302.Networking.Utils;
 
 /**
  * Created by hba56 on 21/04/17.
diff --git a/src/main/java/seng302/Networking/RaceMessage.java b/src/main/java/seng302/Networking/Utils/RaceMessage.java
similarity index 92%
rename from src/main/java/seng302/Networking/RaceMessage.java
rename to src/main/java/seng302/Networking/Utils/RaceMessage.java
index 60ed399f..1a705574 100644
--- a/src/main/java/seng302/Networking/RaceMessage.java
+++ b/src/main/java/seng302/Networking/Utils/RaceMessage.java
@@ -1,4 +1,4 @@
-package seng302.Networking;
+package seng302.Networking.Utils;
 
 /**
  * Created by fwy13 on 19/04/17.
diff --git a/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java b/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
index b1af3c55..2976ded6 100644
--- a/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
+++ b/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
@@ -2,8 +2,9 @@ package seng302.Networking;
 
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.*;
 import seng302.Networking.MessageDecoders.XMLMessageDecoder;
+import seng302.Networking.MessageEncoders.XMLMessageEncoder;
+import seng302.Networking.Utils.MessageType;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java b/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java
index 5ce56908..6493c2d8 100644
--- a/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java
+++ b/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java
@@ -2,8 +2,8 @@ package seng302.Networking.MessageDecoders;
 
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.BoatLocationMessage;
-import seng302.Networking.RaceVisionByteEncoder;
+import seng302.Networking.Utils.BoatLocationMessage;
+import seng302.Networking.MessageEncoders.RaceVisionByteEncoder;
 
 
 /**
diff --git a/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java b/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java
index e6556144..bbe6ea8d 100644
--- a/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java
+++ b/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java
@@ -2,11 +2,10 @@ package seng302.Networking.MessageDecoders;
 
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.CourseWind;
-import seng302.Networking.RaceVisionByteEncoder;
+import seng302.Networking.Utils.CourseWind;
+import seng302.Networking.MessageEncoders.RaceVisionByteEncoder;
 
 import java.util.ArrayList;
-import java.util.List;
 
 
 /**
diff --git a/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java b/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java
index d27fb5f0..1dad9635 100644
--- a/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java
+++ b/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java
@@ -2,7 +2,7 @@ package seng302.Networking.MessageDecoders;
 
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.RaceVisionByteEncoder;
+import seng302.Networking.MessageEncoders.RaceVisionByteEncoder;
 
 /**
  * Created by hba56 on 23/04/17.
diff --git a/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java b/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java
index f971b72f..6a0b8e1b 100644
--- a/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java
+++ b/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java
@@ -5,7 +5,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import seng302.Model.BoatInRace;
 import seng302.Model.Leg;
-import seng302.Networking.RaceVisionByteEncoder;
+import seng302.Networking.MessageEncoders.RaceVisionByteEncoder;
 
 import java.util.ArrayList;
 
diff --git a/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java b/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
index 1341173d..ed2011a4 100644
--- a/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
+++ b/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
@@ -2,8 +2,7 @@ package seng302.Networking.MessageDecoders;
 
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.MessageDecoders.XMLMessageDecoder;
-import seng302.Networking.XMLMessageEncoder;
+import seng302.Networking.MessageEncoders.XMLMessageEncoder;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/test/java/seng302/Networking/XMLMessageEncoderTest.java b/src/test/java/seng302/Networking/XMLMessageEncoderTest.java
index e6b06d10..ad64d927 100644
--- a/src/test/java/seng302/Networking/XMLMessageEncoderTest.java
+++ b/src/test/java/seng302/Networking/XMLMessageEncoderTest.java
@@ -2,7 +2,7 @@ package seng302.Networking;
 
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.XMLMessageEncoder;
+import seng302.Networking.MessageEncoders.XMLMessageEncoder;
 
 import java.io.*;