diff --git a/Equations.iml b/Equations.iml
index 805e6dc..d139d41 100644
--- a/Equations.iml
+++ b/Equations.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
index 2575c24..edd213a 100644
--- a/src/META-INF/MANIFEST.MF
+++ b/src/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: main.io.github.ethankelly.Main
+Main-Class: io.github.ethankelly.Main
 
diff --git a/src/main/io/github/ethankelly/Equations.java b/src/io/github/ethankelly/Equations.java
similarity index 98%
rename from src/main/io/github/ethankelly/Equations.java
rename to src/io/github/ethankelly/Equations.java
index 42cbe1c..141ae1c 100644
--- a/src/main/io/github/ethankelly/Equations.java
+++ b/src/io/github/ethankelly/Equations.java
@@ -1,7 +1,7 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.symbols.Greek;
-import main.io.github.ethankelly.symbols.Maths;
+import io.github.ethankelly.symbols.Greek;
+import io.github.ethankelly.symbols.Maths;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/io/github/ethankelly/Graph.java b/src/io/github/ethankelly/Graph.java
similarity index 99%
rename from src/main/io/github/ethankelly/Graph.java
rename to src/io/github/ethankelly/Graph.java
index 0d6465e..418da13 100644
--- a/src/main/io/github/ethankelly/Graph.java
+++ b/src/io/github/ethankelly/Graph.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
 import java.text.MessageFormat;
 import java.util.*;
diff --git a/src/main/io/github/ethankelly/GraphGenerator.java b/src/io/github/ethankelly/GraphGenerator.java
similarity index 99%
rename from src/main/io/github/ethankelly/GraphGenerator.java
rename to src/io/github/ethankelly/GraphGenerator.java
index 0ccd34e..e85894f 100644
--- a/src/main/io/github/ethankelly/GraphGenerator.java
+++ b/src/io/github/ethankelly/GraphGenerator.java
@@ -1,8 +1,8 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.std.Set;
-import main.io.github.ethankelly.std.Rand;
-import main.io.github.ethankelly.std.MinPriorityQueue;
+import io.github.ethankelly.std.MinPriorityQueue;
+import io.github.ethankelly.std.Rand;
+import io.github.ethankelly.std.Set;
 
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
diff --git a/src/main/io/github/ethankelly/Main.java b/src/io/github/ethankelly/Main.java
similarity index 97%
rename from src/main/io/github/ethankelly/Main.java
rename to src/io/github/ethankelly/Main.java
index 01ab72a..656ecca 100644
--- a/src/main/io/github/ethankelly/Main.java
+++ b/src/io/github/ethankelly/Main.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
diff --git a/src/main/io/github/ethankelly/Tuple.java b/src/io/github/ethankelly/Tuple.java
similarity index 99%
rename from src/main/io/github/ethankelly/Tuple.java
rename to src/io/github/ethankelly/Tuple.java
index e49a085..0d5f7d6 100644
--- a/src/main/io/github/ethankelly/Tuple.java
+++ b/src/io/github/ethankelly/Tuple.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/io/github/ethankelly/Vertex.java b/src/io/github/ethankelly/Vertex.java
similarity index 98%
rename from src/main/io/github/ethankelly/Vertex.java
rename to src/io/github/ethankelly/Vertex.java
index 3692a4b..0e33dcf 100644
--- a/src/main/io/github/ethankelly/Vertex.java
+++ b/src/io/github/ethankelly/Vertex.java
@@ -1,6 +1,6 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.symbols.Maths;
+import io.github.ethankelly.symbols.Maths;
 
 import java.util.List;
 import java.util.stream.IntStream;
diff --git a/src/main/io/github/ethankelly/std/In.java b/src/io/github/ethankelly/std/In.java
similarity index 99%
rename from src/main/io/github/ethankelly/std/In.java
rename to src/io/github/ethankelly/std/In.java
index dab09e8..f5937cb 100644
--- a/src/main/io/github/ethankelly/std/In.java
+++ b/src/io/github/ethankelly/std/In.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.util.*;
 import java.util.regex.Pattern;
diff --git a/src/main/io/github/ethankelly/std/MinPriorityQueue.java b/src/io/github/ethankelly/std/MinPriorityQueue.java
similarity index 99%
rename from src/main/io/github/ethankelly/std/MinPriorityQueue.java
rename to src/io/github/ethankelly/std/MinPriorityQueue.java
index 002d293..4bf4655 100644
--- a/src/main/io/github/ethankelly/std/MinPriorityQueue.java
+++ b/src/io/github/ethankelly/std/MinPriorityQueue.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.util.Comparator;
 import java.util.Iterator;
diff --git a/src/main/io/github/ethankelly/std/Out.java b/src/io/github/ethankelly/std/Out.java
similarity index 99%
rename from src/main/io/github/ethankelly/std/Out.java
rename to src/io/github/ethankelly/std/Out.java
index 9c568eb..9fd8e15 100644
--- a/src/main/io/github/ethankelly/std/Out.java
+++ b/src/io/github/ethankelly/std/Out.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
diff --git a/src/main/io/github/ethankelly/std/Queue.java b/src/io/github/ethankelly/std/Queue.java
similarity index 99%
rename from src/main/io/github/ethankelly/std/Queue.java
rename to src/io/github/ethankelly/std/Queue.java
index aca1a1a..461112f 100644
--- a/src/main/io/github/ethankelly/std/Queue.java
+++ b/src/io/github/ethankelly/std/Queue.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/src/main/io/github/ethankelly/std/Rand.java b/src/io/github/ethankelly/std/Rand.java
similarity index 99%
rename from src/main/io/github/ethankelly/std/Rand.java
rename to src/io/github/ethankelly/std/Rand.java
index 89443cd..6f856d4 100644
--- a/src/main/io/github/ethankelly/std/Rand.java
+++ b/src/io/github/ethankelly/std/Rand.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 /**
  * The {@code StdRandom} class provides static methods for generating pseudo-random numbers from various discrete and
diff --git a/src/main/io/github/ethankelly/std/Set.java b/src/io/github/ethankelly/std/Set.java
similarity index 99%
rename from src/main/io/github/ethankelly/std/Set.java
rename to src/io/github/ethankelly/std/Set.java
index cd2337c..6482627 100644
--- a/src/main/io/github/ethankelly/std/Set.java
+++ b/src/io/github/ethankelly/std/Set.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 
 import java.util.Iterator;
diff --git a/src/main/io/github/ethankelly/symbols/Greek.java b/src/io/github/ethankelly/symbols/Greek.java
similarity index 95%
rename from src/main/io/github/ethankelly/symbols/Greek.java
rename to src/io/github/ethankelly/symbols/Greek.java
index a493450..1a59694 100644
--- a/src/main/io/github/ethankelly/symbols/Greek.java
+++ b/src/io/github/ethankelly/symbols/Greek.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.symbols;
+package io.github.ethankelly.symbols;
 
 @SuppressWarnings("unused")
 public enum Greek {
diff --git a/src/main/io/github/ethankelly/symbols/Maths.java b/src/io/github/ethankelly/symbols/Maths.java
similarity index 90%
rename from src/main/io/github/ethankelly/symbols/Maths.java
rename to src/io/github/ethankelly/symbols/Maths.java
index 62b0b45..c756b2e 100644
--- a/src/main/io/github/ethankelly/symbols/Maths.java
+++ b/src/io/github/ethankelly/symbols/Maths.java
@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.symbols;
+package io.github.ethankelly.symbols;
 
 public enum Maths {
 
diff --git a/src/test/io/github/ethankelly/EquationsTest.java b/test/io/github/ethankelly/EquationsTest.java
similarity index 98%
rename from src/test/io/github/ethankelly/EquationsTest.java
rename to test/io/github/ethankelly/EquationsTest.java
index 3a40659..b4ea113 100644
--- a/src/test/io/github/ethankelly/EquationsTest.java
+++ b/test/io/github/ethankelly/EquationsTest.java
@@ -1,6 +1,5 @@
-package test.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.Equations;
 import org.junit.jupiter.api.Assertions;
 
 class EquationsTest {
diff --git a/src/test/io/github/ethankelly/GraphTest.java b/test/io/github/ethankelly/GraphTest.java
similarity index 72%
rename from src/test/io/github/ethankelly/GraphTest.java
rename to test/io/github/ethankelly/GraphTest.java
index c952bb5..a75d346 100644
--- a/src/test/io/github/ethankelly/GraphTest.java
+++ b/test/io/github/ethankelly/GraphTest.java
@@ -1,7 +1,5 @@
-package test.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.Graph;
-import main.io.github.ethankelly.GraphGenerator;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;