diff --git a/Java/src/main/java/com/gildedrose/AgedBrieItem.java b/Java/src/main/java/com/gildedrose/AgedBrieItem.java
new file mode 100644
index 00000000..410635b6
--- /dev/null
+++ b/Java/src/main/java/com/gildedrose/AgedBrieItem.java
@@ -0,0 +1,10 @@
+package com.gildedrose;
+
+public class AgedBrieItem {
+  public static void handleDay(Item item) {
+    if (item.quality != 50) {
+      item.quality += 1;
+    }
+    item.sellIn -= 1;
+  }
+}
diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java
index 7587ba2d..61587415 100644
--- a/Java/src/main/java/com/gildedrose/GildedRose.java
+++ b/Java/src/main/java/com/gildedrose/GildedRose.java
@@ -21,10 +21,9 @@ class GildedRose {
   private static void handleDay(Item item) {
     switch (item.name) {
       case AGED_BRIE:
-        handleAgedBrie(item);
+        AgedBrieItem.handleDay(item);
         return;
       case SULFURAS:
-        handleSulfuras(item);
         return;
       case BACKSTAGE_PASSES:
         BackstagePassesItem.handleDay(item);
@@ -33,15 +32,4 @@ class GildedRose {
         GenericItem.handleDay(item);
     }
   }
-
-
-  private static void handleSulfuras(Item item) {
-  }
-
-  private static void handleAgedBrie(Item item) {
-    if (item.quality != 50) {
-      item.quality += 1;
-    }
-    item.sellIn -= 1;
-  }
 }
diff --git a/Java/src/main/java/com/gildedrose/SulfurasItem.java b/Java/src/main/java/com/gildedrose/SulfurasItem.java
new file mode 100644
index 00000000..7aaef7cb
--- /dev/null
+++ b/Java/src/main/java/com/gildedrose/SulfurasItem.java
@@ -0,0 +1,4 @@
+package com.gildedrose;
+
+public class SulfurasItem {
+}