diff --git a/network/pom.xml b/network/pom.xml
new file mode 100644
index 00000000..1f00a82b
--- /dev/null
+++ b/network/pom.xml
@@ -0,0 +1,138 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>seng302</groupId>
+        <artifactId>team-7</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <packaging>jar</packaging>
+    <name>network</name>
+    <artifactId>network</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+
+
+
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.11</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+
+    <repositories>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net repository</name>
+            <url>http://download.java.net/maven/2</url>
+        </repository>
+
+    </repositories>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <transformers>
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Main-Class>seng302.App</Main-Class>
+                                <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+                                <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.6</version>
+                <configuration>
+                    <linkXRef>true</linkXRef>
+                    <targetJdk>${maven.compiler.target}</targetJdk>
+                    <rulesets>
+                        <ruleset>/rulesets/java/basic.xml</ruleset>
+                        <ruleset>/rulesets/java/imports.xml</ruleset>
+                        <ruleset>/rulesets/java/codesize.xml</ruleset>
+                        <ruleset>/rulesets/java/design.xml</ruleset>
+                        <ruleset>/rulesets/java/empty.xml</ruleset>
+                        <ruleset>/rulesets/java/junit.xml</ruleset>
+                        <ruleset>/rulesets/java/unusedcode.xml</ruleset>
+                    </rulesets>
+                    <includeXmlInSite>true</includeXmlInSite>
+                    <sourceEncoding>utf-8</sourceEncoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <configuration>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.19.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.8.1</version>
+            </plugin>
+        </plugins>
+    </reporting>
+</project>
diff --git a/src/main/java/seng302/Networking/BinaryMesageEncoder.java b/network/src/main/java/seng302/Networking/BinaryMesageEncoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/BinaryMesageEncoder.java
rename to network/src/main/java/seng302/Networking/BinaryMesageEncoder.java
diff --git a/src/main/java/seng302/Networking/BinaryMessageDecoder.java b/network/src/main/java/seng302/Networking/BinaryMessageDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/BinaryMessageDecoder.java
rename to network/src/main/java/seng302/Networking/BinaryMessageDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/AverageWindDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/AverageWindDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/AverageWindDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/AverageWindDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/MarkRoundingDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/MarkRoundingDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/MarkRoundingDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/MarkRoundingDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/RaceStatusDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageDecoders/XMLMessageDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/XMLMessageDecoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageDecoders/XMLMessageDecoder.java
rename to network/src/main/java/seng302/Networking/MessageDecoders/XMLMessageDecoder.java
diff --git a/src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java b/network/src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java
rename to network/src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java
diff --git a/src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java b/network/src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java
similarity index 100%
rename from src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java
rename to network/src/main/java/seng302/Networking/MessageEncoders/XMLMessageEncoder.java
diff --git a/src/main/java/seng302/Networking/MockOutput.java b/network/src/main/java/seng302/Networking/MockOutput.java
similarity index 100%
rename from src/main/java/seng302/Networking/MockOutput.java
rename to network/src/main/java/seng302/Networking/MockOutput.java
diff --git a/src/main/java/seng302/Networking/PacketDump/AC35DumpReader.java b/network/src/main/java/seng302/Networking/PacketDump/AC35DumpReader.java
similarity index 100%
rename from src/main/java/seng302/Networking/PacketDump/AC35DumpReader.java
rename to network/src/main/java/seng302/Networking/PacketDump/AC35DumpReader.java
diff --git a/src/main/java/seng302/Networking/PacketDump/AC35Packet.java b/network/src/main/java/seng302/Networking/PacketDump/AC35Packet.java
similarity index 100%
rename from src/main/java/seng302/Networking/PacketDump/AC35Packet.java
rename to network/src/main/java/seng302/Networking/PacketDump/AC35Packet.java
diff --git a/src/main/java/seng302/Networking/Utils/AC35Data.java b/network/src/main/java/seng302/Networking/Utils/AC35Data.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/AC35Data.java
rename to network/src/main/java/seng302/Networking/Utils/AC35Data.java
diff --git a/src/main/java/seng302/Networking/Utils/AverageWind.java b/network/src/main/java/seng302/Networking/Utils/AverageWind.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/AverageWind.java
rename to network/src/main/java/seng302/Networking/Utils/AverageWind.java
diff --git a/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java b/network/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
rename to network/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
diff --git a/src/main/java/seng302/Networking/Utils/BoatStatus.java b/network/src/main/java/seng302/Networking/Utils/BoatStatus.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/BoatStatus.java
rename to network/src/main/java/seng302/Networking/Utils/BoatStatus.java
diff --git a/src/main/java/seng302/Networking/Utils/ByteConverter.java b/network/src/main/java/seng302/Networking/Utils/ByteConverter.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/ByteConverter.java
rename to network/src/main/java/seng302/Networking/Utils/ByteConverter.java
diff --git a/src/main/java/seng302/Networking/Utils/CourseWind.java b/network/src/main/java/seng302/Networking/Utils/CourseWind.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/CourseWind.java
rename to network/src/main/java/seng302/Networking/Utils/CourseWind.java
diff --git a/src/main/java/seng302/Networking/Utils/CourseWinds.java b/network/src/main/java/seng302/Networking/Utils/CourseWinds.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/CourseWinds.java
rename to network/src/main/java/seng302/Networking/Utils/CourseWinds.java
diff --git a/src/main/java/seng302/Networking/Utils/Heartbeat.java b/network/src/main/java/seng302/Networking/Utils/Heartbeat.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/Heartbeat.java
rename to network/src/main/java/seng302/Networking/Utils/Heartbeat.java
diff --git a/src/main/java/seng302/Networking/Utils/MarkRounding.java b/network/src/main/java/seng302/Networking/Utils/MarkRounding.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/MarkRounding.java
rename to network/src/main/java/seng302/Networking/Utils/MarkRounding.java
diff --git a/src/main/java/seng302/Networking/Utils/MessageType.java b/network/src/main/java/seng302/Networking/Utils/MessageType.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/MessageType.java
rename to network/src/main/java/seng302/Networking/Utils/MessageType.java
diff --git a/src/main/java/seng302/Networking/Utils/RaceMessage.java b/network/src/main/java/seng302/Networking/Utils/RaceMessage.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/RaceMessage.java
rename to network/src/main/java/seng302/Networking/Utils/RaceMessage.java
diff --git a/src/main/java/seng302/Networking/Utils/RaceStartStatus.java b/network/src/main/java/seng302/Networking/Utils/RaceStartStatus.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/RaceStartStatus.java
rename to network/src/main/java/seng302/Networking/Utils/RaceStartStatus.java
diff --git a/src/main/java/seng302/Networking/Utils/RaceStatus.java b/network/src/main/java/seng302/Networking/Utils/RaceStatus.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/RaceStatus.java
rename to network/src/main/java/seng302/Networking/Utils/RaceStatus.java
diff --git a/src/main/java/seng302/Networking/Utils/XMLMessage.java b/network/src/main/java/seng302/Networking/Utils/XMLMessage.java
similarity index 100%
rename from src/main/java/seng302/Networking/Utils/XMLMessage.java
rename to network/src/main/java/seng302/Networking/Utils/XMLMessage.java
diff --git a/src/main/java/seng302/Networking/VisualiserInput.java b/network/src/main/java/seng302/Networking/VisualiserInput.java
similarity index 100%
rename from src/main/java/seng302/Networking/VisualiserInput.java
rename to network/src/main/java/seng302/Networking/VisualiserInput.java
diff --git a/src/main/resources/dataDumps/ac35.bin b/network/src/main/resources/dataDumps/ac35.bin
similarity index 100%
rename from src/main/resources/dataDumps/ac35.bin
rename to network/src/main/resources/dataDumps/ac35.bin
diff --git a/src/main/resources/raceXML/Boats.xml b/network/src/main/resources/raceXML/Boats.xml
similarity index 100%
rename from src/main/resources/raceXML/Boats.xml
rename to network/src/main/resources/raceXML/Boats.xml
diff --git a/src/main/resources/raceXML/Race.xml b/network/src/main/resources/raceXML/Race.xml
similarity index 100%
rename from src/main/resources/raceXML/Race.xml
rename to network/src/main/resources/raceXML/Race.xml
diff --git a/src/main/resources/raceXML/Regatta.xml b/network/src/main/resources/raceXML/Regatta.xml
similarity index 100%
rename from src/main/resources/raceXML/Regatta.xml
rename to network/src/main/resources/raceXML/Regatta.xml
diff --git a/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java b/network/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
rename to network/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
diff --git a/src/test/java/seng302/Networking/ByteConverterTest.java b/network/src/test/java/seng302/Networking/ByteConverterTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/ByteConverterTest.java
rename to network/src/test/java/seng302/Networking/ByteConverterTest.java
diff --git a/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java b/network/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java
rename to network/src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java
diff --git a/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java b/network/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java
rename to network/src/test/java/seng302/Networking/MessageDecoders/CourseWindDecoderTest.java
diff --git a/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java b/network/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java
rename to network/src/test/java/seng302/Networking/MessageDecoders/RaceStartStatusDecoderTest.java
diff --git a/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java b/network/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java
rename to network/src/test/java/seng302/Networking/MessageDecoders/RaceStatusDecoderTest.java
diff --git a/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java b/network/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
rename to network/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
diff --git a/src/test/java/seng302/Networking/XMLMessageEncoderTest.java b/network/src/test/java/seng302/Networking/XMLMessageEncoderTest.java
similarity index 100%
rename from src/test/java/seng302/Networking/XMLMessageEncoderTest.java
rename to network/src/test/java/seng302/Networking/XMLMessageEncoderTest.java
diff --git a/src/test/resources/raceXML/Regatta.xml b/network/src/test/resources/raceXML/Regatta.xml
similarity index 100%
rename from src/test/resources/raceXML/Regatta.xml
rename to network/src/test/resources/raceXML/Regatta.xml
diff --git a/pom.xml b/pom.xml
index cd0a669d..4126256e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
     <modules>
         <module>mock</module>
         <module>visualiser</module>
+        <module>network</module>
     </modules>
 
     <url>https://eng-git.canterbury.ac.nz/SENG302-2016/team-7</url>