diff --git a/src/main/java/com/gildedrose/items/AgedBrieItem.java b/src/main/java/com/gildedrose/items/AgedBrieItem.java
index dda5725c..505f3312 100644
--- a/src/main/java/com/gildedrose/items/AgedBrieItem.java
+++ b/src/main/java/com/gildedrose/items/AgedBrieItem.java
@@ -1,8 +1,8 @@
 package com.gildedrose.items;
 
-import com.gildedrose.main.Item;
 import com.gildedrose.item_helpers.ItemHandler;
 import com.gildedrose.item_helpers.ItemType;
+import com.gildedrose.main.Item;
 
 public class AgedBrieItem implements ItemType {
 
diff --git a/src/test/java/com/gildedrose/items/helper/TestHelper.java b/src/test/java/com/gildedrose/helper/TestHelper.java
similarity index 96%
rename from src/test/java/com/gildedrose/items/helper/TestHelper.java
rename to src/test/java/com/gildedrose/helper/TestHelper.java
index 838fa069..c460a520 100644
--- a/src/test/java/com/gildedrose/items/helper/TestHelper.java
+++ b/src/test/java/com/gildedrose/helper/TestHelper.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.helper;
+package com.gildedrose.helper;
 
 import com.gildedrose.main.GildedRose;
 import com.gildedrose.main.Item;
diff --git a/src/test/java/com/gildedrose/items/items/AgedBrieItemTest.java b/src/test/java/com/gildedrose/items/AgedBrieItemTest.java
similarity index 82%
rename from src/test/java/com/gildedrose/items/items/AgedBrieItemTest.java
rename to src/test/java/com/gildedrose/items/AgedBrieItemTest.java
index 1b71cebe..083096f2 100644
--- a/src/test/java/com/gildedrose/items/items/AgedBrieItemTest.java
+++ b/src/test/java/com/gildedrose/items/AgedBrieItemTest.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.items;
+package com.gildedrose.items;
 
 import com.gildedrose.main.Item;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -6,9 +6,9 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static com.gildedrose.helper.TestHelper.testItem;
+import static com.gildedrose.helper.TestHelper.testItemException;
 import static com.gildedrose.item_helpers.ItemName.AGED_BRIE;
-import static com.gildedrose.items.helper.TestHelper.testItem;
-import static com.gildedrose.items.helper.TestHelper.testItemException;
 
 @TestMethodOrder(OrderAnnotation.class)
 class AgedBrieItemTest {
diff --git a/src/test/java/com/gildedrose/items/items/BackstagePassItemTest.java b/src/test/java/com/gildedrose/items/BackstagePassItemTest.java
similarity index 86%
rename from src/test/java/com/gildedrose/items/items/BackstagePassItemTest.java
rename to src/test/java/com/gildedrose/items/BackstagePassItemTest.java
index f78c2f51..bdb7f280 100644
--- a/src/test/java/com/gildedrose/items/items/BackstagePassItemTest.java
+++ b/src/test/java/com/gildedrose/items/BackstagePassItemTest.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.items;
+package com.gildedrose.items;
 
 import com.gildedrose.main.Item;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -6,9 +6,9 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static com.gildedrose.helper.TestHelper.testItem;
+import static com.gildedrose.helper.TestHelper.testItemException;
 import static com.gildedrose.item_helpers.ItemName.BACKSTAGE_PASS;
-import static com.gildedrose.items.helper.TestHelper.testItem;
-import static com.gildedrose.items.helper.TestHelper.testItemException;
 
 @TestMethodOrder(OrderAnnotation.class)
 class BackstagePassItemTest {
diff --git a/src/test/java/com/gildedrose/items/items/ConjuredItemTest.java b/src/test/java/com/gildedrose/items/ConjuredItemTest.java
similarity index 82%
rename from src/test/java/com/gildedrose/items/items/ConjuredItemTest.java
rename to src/test/java/com/gildedrose/items/ConjuredItemTest.java
index 8fc4684e..e2d1c7b9 100644
--- a/src/test/java/com/gildedrose/items/items/ConjuredItemTest.java
+++ b/src/test/java/com/gildedrose/items/ConjuredItemTest.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.items;
+package com.gildedrose.items;
 
 import com.gildedrose.main.Item;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -6,9 +6,9 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static com.gildedrose.helper.TestHelper.testItem;
+import static com.gildedrose.helper.TestHelper.testItemException;
 import static com.gildedrose.item_helpers.ItemName.CONJURED;
-import static com.gildedrose.items.helper.TestHelper.testItem;
-import static com.gildedrose.items.helper.TestHelper.testItemException;
 
 @TestMethodOrder(OrderAnnotation.class)
 class ConjuredItemTest {
diff --git a/src/test/java/com/gildedrose/items/items/LegendaryItemTest.java b/src/test/java/com/gildedrose/items/LegendaryItemTest.java
similarity index 90%
rename from src/test/java/com/gildedrose/items/items/LegendaryItemTest.java
rename to src/test/java/com/gildedrose/items/LegendaryItemTest.java
index db5cb8b9..70e21dc2 100644
--- a/src/test/java/com/gildedrose/items/items/LegendaryItemTest.java
+++ b/src/test/java/com/gildedrose/items/LegendaryItemTest.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.items;
+package com.gildedrose.items;
 
 import com.gildedrose.main.GildedRose;
 import com.gildedrose.main.Item;
@@ -7,11 +7,11 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static com.gildedrose.helper.TestHelper.testItem;
+import static com.gildedrose.helper.TestHelper.testItemException;
 import static com.gildedrose.item_helpers.ItemName.LEGENDARY;
 import static com.gildedrose.items.LegendaryItem.LEGENDARY_ITEM_QUALITY;
 import static com.gildedrose.items.LegendaryItem.NOT_LEGENDARY_ITEM_ERROR_MESSAGE;
-import static com.gildedrose.items.helper.TestHelper.testItem;
-import static com.gildedrose.items.helper.TestHelper.testItemException;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/src/test/java/com/gildedrose/items/items/NormalItemTest.java b/src/test/java/com/gildedrose/items/NormalItemTest.java
similarity index 82%
rename from src/test/java/com/gildedrose/items/items/NormalItemTest.java
rename to src/test/java/com/gildedrose/items/NormalItemTest.java
index ff62d726..04b10aaa 100644
--- a/src/test/java/com/gildedrose/items/items/NormalItemTest.java
+++ b/src/test/java/com/gildedrose/items/NormalItemTest.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.items;
+package com.gildedrose.items;
 
 import com.gildedrose.main.Item;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -6,9 +6,9 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static com.gildedrose.helper.TestHelper.testItem;
+import static com.gildedrose.helper.TestHelper.testItemException;
 import static com.gildedrose.item_helpers.ItemName.NORMAL;
-import static com.gildedrose.items.helper.TestHelper.testItem;
-import static com.gildedrose.items.helper.TestHelper.testItemException;
 
 @TestMethodOrder(OrderAnnotation.class)
 class NormalItemTest {
diff --git a/src/test/java/com/gildedrose/items/main/ItemClassTest.java b/src/test/java/com/gildedrose/main/ItemClassTest.java
similarity index 91%
rename from src/test/java/com/gildedrose/items/main/ItemClassTest.java
rename to src/test/java/com/gildedrose/main/ItemClassTest.java
index 2785d5b4..0722fc0c 100644
--- a/src/test/java/com/gildedrose/items/main/ItemClassTest.java
+++ b/src/test/java/com/gildedrose/main/ItemClassTest.java
@@ -1,6 +1,5 @@
-package com.gildedrose.items.main;
+package com.gildedrose.main;
 
-import com.gildedrose.main.Item;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/gildedrose/items/multiple_items/MultipleItemsTest.java b/src/test/java/com/gildedrose/multiple_items/MultipleItemsTest.java
similarity index 98%
rename from src/test/java/com/gildedrose/items/multiple_items/MultipleItemsTest.java
rename to src/test/java/com/gildedrose/multiple_items/MultipleItemsTest.java
index 3f2d5061..a8a5ac81 100644
--- a/src/test/java/com/gildedrose/items/multiple_items/MultipleItemsTest.java
+++ b/src/test/java/com/gildedrose/multiple_items/MultipleItemsTest.java
@@ -1,4 +1,4 @@
-package com.gildedrose.items.multiple_items;
+package com.gildedrose.multiple_items;
 
 import com.gildedrose.main.GildedRose;
 import com.gildedrose.main.Item;