diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java
index 3674b843..ec3b09e9 100644
--- a/Java/src/main/java/com/gildedrose/GildedRose.java
+++ b/Java/src/main/java/com/gildedrose/GildedRose.java
@@ -1,5 +1,7 @@
 package com.gildedrose;
 
+import com.gildedrose.strategy.*;
+
 import java.util.HashMap;
 
 class GildedRose {
diff --git a/Java/src/main/java/com/gildedrose/AgedBrieUpdateStrategy.java b/Java/src/main/java/com/gildedrose/strategy/AgedBrieUpdateStrategy.java
similarity index 85%
rename from Java/src/main/java/com/gildedrose/AgedBrieUpdateStrategy.java
rename to Java/src/main/java/com/gildedrose/strategy/AgedBrieUpdateStrategy.java
index 10b3826a..06842418 100644
--- a/Java/src/main/java/com/gildedrose/AgedBrieUpdateStrategy.java
+++ b/Java/src/main/java/com/gildedrose/strategy/AgedBrieUpdateStrategy.java
@@ -1,4 +1,6 @@
-package com.gildedrose;
+package com.gildedrose.strategy;
+
+import com.gildedrose.Item;
 
 public class AgedBrieUpdateStrategy implements ItemUpdateStrategy {
     @Override
diff --git a/Java/src/main/java/com/gildedrose/BackstagePassesUpdateStrategy.java b/Java/src/main/java/com/gildedrose/strategy/BackstagePassesUpdateStrategy.java
similarity index 90%
rename from Java/src/main/java/com/gildedrose/BackstagePassesUpdateStrategy.java
rename to Java/src/main/java/com/gildedrose/strategy/BackstagePassesUpdateStrategy.java
index 0c54454b..757dae33 100644
--- a/Java/src/main/java/com/gildedrose/BackstagePassesUpdateStrategy.java
+++ b/Java/src/main/java/com/gildedrose/strategy/BackstagePassesUpdateStrategy.java
@@ -1,4 +1,6 @@
-package com.gildedrose;
+package com.gildedrose.strategy;
+
+import com.gildedrose.Item;
 
 public class BackstagePassesUpdateStrategy implements ItemUpdateStrategy {
     @Override
diff --git a/Java/src/main/java/com/gildedrose/ItemUpdateStrategy.java b/Java/src/main/java/com/gildedrose/strategy/ItemUpdateStrategy.java
similarity index 52%
rename from Java/src/main/java/com/gildedrose/ItemUpdateStrategy.java
rename to Java/src/main/java/com/gildedrose/strategy/ItemUpdateStrategy.java
index 76ec383f..a1337b33 100644
--- a/Java/src/main/java/com/gildedrose/ItemUpdateStrategy.java
+++ b/Java/src/main/java/com/gildedrose/strategy/ItemUpdateStrategy.java
@@ -1,4 +1,6 @@
-package com.gildedrose;
+package com.gildedrose.strategy;
+
+import com.gildedrose.Item;
 
 public interface ItemUpdateStrategy {
     void update(Item item);
diff --git a/Java/src/main/java/com/gildedrose/StandardItemUpdateStrategy.java b/Java/src/main/java/com/gildedrose/strategy/StandardItemUpdateStrategy.java
similarity index 83%
rename from Java/src/main/java/com/gildedrose/StandardItemUpdateStrategy.java
rename to Java/src/main/java/com/gildedrose/strategy/StandardItemUpdateStrategy.java
index 85372521..611923d6 100644
--- a/Java/src/main/java/com/gildedrose/StandardItemUpdateStrategy.java
+++ b/Java/src/main/java/com/gildedrose/strategy/StandardItemUpdateStrategy.java
@@ -1,4 +1,6 @@
-package com.gildedrose;
+package com.gildedrose.strategy;
+
+import com.gildedrose.Item;
 
 public class StandardItemUpdateStrategy implements ItemUpdateStrategy {
     @Override
diff --git a/Java/src/main/java/com/gildedrose/SulfurasUpdateStrategy.java b/Java/src/main/java/com/gildedrose/strategy/SulfurasUpdateStrategy.java
similarity index 77%
rename from Java/src/main/java/com/gildedrose/SulfurasUpdateStrategy.java
rename to Java/src/main/java/com/gildedrose/strategy/SulfurasUpdateStrategy.java
index 35dfaad2..9ea84889 100644
--- a/Java/src/main/java/com/gildedrose/SulfurasUpdateStrategy.java
+++ b/Java/src/main/java/com/gildedrose/strategy/SulfurasUpdateStrategy.java
@@ -1,4 +1,6 @@
-package com.gildedrose;
+package com.gildedrose.strategy;
+
+import com.gildedrose.Item;
 
 public class SulfurasUpdateStrategy implements ItemUpdateStrategy {
     @Override