diff --git a/README.md b/README.md
index 49754f6..cb37cdb 100644
--- a/README.md
+++ b/README.md
@@ -122,15 +122,13 @@ src
 │   └── resources                     
 └── test
     └── java
-        ├── MainTests
-        │  ├── TestPartitions.java   # MUST PASS
-        │  ├── TestTriangle.java     # MUST PASS
-        │  └── TestTraversal.java    # MUST PASS
-        ├── BonusTests
-        │  ├── TestDates.java        # OPTIONAL
-        │  ├── TestEmail.java        # OPTIONAL
-        │  ├── TestPalindromes.java  # OPTIONAL
-        │  └── TestPasswords.java    # OPTIONAL
+        ├── MainTestPartitions.java   # MUST PASS
+        ├── MainTestTriangle.java     # MUST PASS
+        ├── MainTestTraversal.java    # MUST PASS
+        ├── BonusTestDates.java        # OPTIONAL
+        ├── BonusTestEmail.java        # OPTIONAL
+        ├── BonusTestPalindromes.java  # OPTIONAL
+        └── BonusTestPasswords.java    # OPTIONAL
 ```
 
 ### 7. Commit Your Work Locally
diff --git a/src/test/java/BonusTests/TestDates.java b/src/test/java/BonusTestDates.java
similarity index 96%
rename from src/test/java/BonusTests/TestDates.java
rename to src/test/java/BonusTestDates.java
index fc0c3e7..664d9b2 100644
--- a/src/test/java/BonusTests/TestDates.java
+++ b/src/test/java/BonusTestDates.java
@@ -1,12 +1,10 @@
-package BonusTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class TestDates {
+public class BonusTestDates {
     static BonusExercises ex;
 
     @BeforeAll
diff --git a/src/test/java/BonusTests/TestEmail.java b/src/test/java/BonusTestEmail.java
similarity index 94%
rename from src/test/java/BonusTests/TestEmail.java
rename to src/test/java/BonusTestEmail.java
index ebfb0f1..78a8ef7 100644
--- a/src/test/java/BonusTests/TestEmail.java
+++ b/src/test/java/BonusTestEmail.java
@@ -1,12 +1,10 @@
-package BonusTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestEmail {
+public class BonusTestEmail {
     static BonusExercises ex;
 
     @BeforeAll
diff --git a/src/test/java/BonusTests/TestPalindromes.java b/src/test/java/BonusTestPalindromes.java
similarity index 97%
rename from src/test/java/BonusTests/TestPalindromes.java
rename to src/test/java/BonusTestPalindromes.java
index ef03efa..3294f72 100644
--- a/src/test/java/BonusTests/TestPalindromes.java
+++ b/src/test/java/BonusTestPalindromes.java
@@ -1,5 +1,3 @@
-package BonusTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -8,7 +6,7 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPalindromes {
+public class BonusTestPalindromes {
     static BonusExercises ex;
 
     @BeforeAll
diff --git a/src/test/java/BonusTests/TestPasswords.java b/src/test/java/BonusTestPasswords.java
similarity index 96%
rename from src/test/java/BonusTests/TestPasswords.java
rename to src/test/java/BonusTestPasswords.java
index 5b76591..688550d 100644
--- a/src/test/java/BonusTests/TestPasswords.java
+++ b/src/test/java/BonusTestPasswords.java
@@ -1,11 +1,9 @@
-package BonusTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPasswords {
+public class BonusTestPasswords {
     static BonusExercises ex;
 
     @BeforeAll
diff --git a/src/test/java/MainTests/TestPartitions.java b/src/test/java/MainTestPartitions.java
similarity index 93%
rename from src/test/java/MainTests/TestPartitions.java
rename to src/test/java/MainTestPartitions.java
index dbc523c..875e184 100644
--- a/src/test/java/MainTests/TestPartitions.java
+++ b/src/test/java/MainTestPartitions.java
@@ -1,16 +1,14 @@
-package MainTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-public class TestPartitions {
-    static Exercises ex;
+public class MainTestPartitions {
+    static MainExercises ex;
 
     @BeforeAll
     static void setUp() {
-        ex = new Exercises();
+        ex = new MainExercises();
     }
 
     @Test
diff --git a/src/test/java/MainTests/TestTraversal.java b/src/test/java/MainTestTraversal.java
similarity index 94%
rename from src/test/java/MainTests/TestTraversal.java
rename to src/test/java/MainTestTraversal.java
index c27f9a3..b10b214 100644
--- a/src/test/java/MainTests/TestTraversal.java
+++ b/src/test/java/MainTestTraversal.java
@@ -1,16 +1,14 @@
-package MainTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-public class TestTraversal {
-    static Exercises ex;
+public class MainTestTraversal {
+    static MainExercises ex;
 
     @BeforeAll
     static void setUp() {
-        ex = new Exercises();
+        ex = new MainExercises();
     }
 
     @Test
diff --git a/src/test/java/MainTests/TestTriangle.java b/src/test/java/MainTestTriangle.java
similarity index 92%
rename from src/test/java/MainTests/TestTriangle.java
rename to src/test/java/MainTestTriangle.java
index b1e2d59..ea7173f 100644
--- a/src/test/java/MainTests/TestTriangle.java
+++ b/src/test/java/MainTestTriangle.java
@@ -1,16 +1,14 @@
-package MainTests;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-public class TestTriangle {
-    static Exercises ex;
+public class MainTestTriangle {
+    static MainExercises ex;
 
     @BeforeAll
     static void setUp() {
-        ex = new Exercises();
+        ex = new MainExercises();
     }
 
     @Test