diff --git a/Java/build.gradle b/Java/build.gradle
index 616cec6a..2fe871d8 100644
--- a/Java/build.gradle
+++ b/Java/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
 group = 'com.gildedrose'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '1.8'
+sourceCompatibility = '21'
 
 test {
     useJUnitPlatform()
diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java
index 627e753a..bf0e1e92 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.item.Item;
+
 class GildedRose {
 
     public static final String AGED_BRIE = "Aged Brie";
@@ -25,8 +27,7 @@ class GildedRose {
         }
     }
 
-    private static void doUpdateQuality(Item item) {
-        // processing quality
+    private void doUpdateQuality(Item item) {
         boolean isAgedBrie = item.name.equals(AGED_BRIE);
         boolean isBackstagePasses = item.name.equals(BACKSTAGE_PASSES);
         boolean isSulfuras = item.name.equals(SULFURAS);
@@ -94,19 +95,19 @@ class GildedRose {
         }
     }
 
-    private static void decreaseDay(Item item) {
+    private void decreaseDay(Item item) {
         item.sellIn = item.sellIn - 1;
     }
 
-    private static boolean isExpired(Item item) {
+    private boolean isExpired(Item item) {
         return item.sellIn < SELL_IN_EXPIRED;
     }
 
-    private static void decreaseQuality(Item item) {
+    private void decreaseQuality(Item item) {
         item.quality = item.quality - 1;
     }
 
-    private static void increaseQuality(Item item) {
+    private void increaseQuality(Item item) {
         item.quality = item.quality + 1;
     }
 
diff --git a/Java/src/main/java/com/gildedrose/Item.java b/Java/src/main/java/com/gildedrose/item/Item.java
similarity index 92%
rename from Java/src/main/java/com/gildedrose/Item.java
rename to Java/src/main/java/com/gildedrose/item/Item.java
index 465729ec..3f219306 100644
--- a/Java/src/main/java/com/gildedrose/Item.java
+++ b/Java/src/main/java/com/gildedrose/item/Item.java
@@ -1,4 +1,4 @@
-package com.gildedrose;
+package com.gildedrose.item;
 
 public class Item {
 
diff --git a/Java/src/test/java/com/gildedrose/AgedBrieTest.java b/Java/src/test/java/com/gildedrose/AgedBrieTest.java
index 8f7e61a7..69e5e680 100644
--- a/Java/src/test/java/com/gildedrose/AgedBrieTest.java
+++ b/Java/src/test/java/com/gildedrose/AgedBrieTest.java
@@ -1,5 +1,6 @@
 package com.gildedrose;
 
+import com.gildedrose.item.Item;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/Java/src/test/java/com/gildedrose/BackStageTest.java b/Java/src/test/java/com/gildedrose/BackStageTest.java
index 09e12dc2..4fd07cad 100644
--- a/Java/src/test/java/com/gildedrose/BackStageTest.java
+++ b/Java/src/test/java/com/gildedrose/BackStageTest.java
@@ -1,5 +1,6 @@
 package com.gildedrose;
 
+import com.gildedrose.item.Item;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/Java/src/test/java/com/gildedrose/GildedRoseTest.java b/Java/src/test/java/com/gildedrose/GildedRoseTest.java
index 291f717c..cf8ef9f8 100644
--- a/Java/src/test/java/com/gildedrose/GildedRoseTest.java
+++ b/Java/src/test/java/com/gildedrose/GildedRoseTest.java
@@ -1,5 +1,6 @@
 package com.gildedrose;
 
+import com.gildedrose.item.Item;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/Java/src/test/java/com/gildedrose/SulfurasTest.java b/Java/src/test/java/com/gildedrose/SulfurasTest.java
index 4aa242bf..60fc5b13 100644
--- a/Java/src/test/java/com/gildedrose/SulfurasTest.java
+++ b/Java/src/test/java/com/gildedrose/SulfurasTest.java
@@ -1,5 +1,6 @@
 package com.gildedrose;
 
+import com.gildedrose.item.Item;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/Java/src/test/java/com/gildedrose/TexttestFixture.java b/Java/src/test/java/com/gildedrose/TexttestFixture.java
index d059c88f..b682c866 100644
--- a/Java/src/test/java/com/gildedrose/TexttestFixture.java
+++ b/Java/src/test/java/com/gildedrose/TexttestFixture.java
@@ -1,5 +1,7 @@
 package com.gildedrose;
 
+import com.gildedrose.item.Item;
+
 public class TexttestFixture {
     public static void main(String[] args) {
         System.out.println("OMGHAI!");
@@ -18,7 +20,7 @@ public class TexttestFixture {
 
         GildedRose app = new GildedRose(items);
 
-        int days = 2;
+        int days = 3;
         if (args.length > 0) {
             days = Integer.parseInt(args[0]) + 1;
         }