diff --git a/src/main/java/dev/zontreck/wmd/WatchMyDurability.java b/src/main/java/dev/zontreck/wmd/WatchMyDurability.java
index 17d84ef..07c8b6c 100644
--- a/src/main/java/dev/zontreck/wmd/WatchMyDurability.java
+++ b/src/main/java/dev/zontreck/wmd/WatchMyDurability.java
@@ -4,7 +4,13 @@ import com.mojang.logging.LogUtils;
 
 import dev.zontreck.ariaslib.util.DelayedExecutorService;
 import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.wmd.checkers.CheckHealth;
+import dev.zontreck.wmd.checkers.CheckHunger;
+import dev.zontreck.wmd.checkers.CheckInventory;
 import dev.zontreck.wmd.configs.WMDClientConfig;
+import dev.zontreck.wmd.types.Health;
+import dev.zontreck.wmd.types.Hunger;
+import dev.zontreck.wmd.types.ItemRegistry;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.User;
 import net.minecraft.sounds.SoundEvent;
diff --git a/src/main/java/dev/zontreck/wmd/CheckHealth.java b/src/main/java/dev/zontreck/wmd/checkers/CheckHealth.java
similarity index 92%
rename from src/main/java/dev/zontreck/wmd/CheckHealth.java
rename to src/main/java/dev/zontreck/wmd/checkers/CheckHealth.java
index 4fd8899..590246a 100644
--- a/src/main/java/dev/zontreck/wmd/CheckHealth.java
+++ b/src/main/java/dev/zontreck/wmd/checkers/CheckHealth.java
@@ -1,8 +1,9 @@
-package dev.zontreck.wmd;
+package dev.zontreck.wmd.checkers;
 
 import dev.zontreck.ariaslib.terminal.Task;
-import dev.zontreck.ariaslib.util.DelayedExecutorService;
 import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.wmd.types.Health;
+import dev.zontreck.wmd.WatchMyDurability;
 import dev.zontreck.wmd.configs.WMDClientConfig;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/dev/zontreck/wmd/CheckHunger.java b/src/main/java/dev/zontreck/wmd/checkers/CheckHunger.java
similarity index 91%
rename from src/main/java/dev/zontreck/wmd/CheckHunger.java
rename to src/main/java/dev/zontreck/wmd/checkers/CheckHunger.java
index 51fea8b..c43557f 100644
--- a/src/main/java/dev/zontreck/wmd/CheckHunger.java
+++ b/src/main/java/dev/zontreck/wmd/checkers/CheckHunger.java
@@ -1,8 +1,9 @@
-package dev.zontreck.wmd;
+package dev.zontreck.wmd.checkers;
 
 import dev.zontreck.ariaslib.terminal.Task;
-import dev.zontreck.ariaslib.util.DelayedExecutorService;
 import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.wmd.types.Hunger;
+import dev.zontreck.wmd.WatchMyDurability;
 import dev.zontreck.wmd.configs.WMDClientConfig;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/dev/zontreck/wmd/CheckInventory.java b/src/main/java/dev/zontreck/wmd/checkers/CheckInventory.java
similarity index 97%
rename from src/main/java/dev/zontreck/wmd/CheckInventory.java
rename to src/main/java/dev/zontreck/wmd/checkers/CheckInventory.java
index 6429464..e5703f7 100644
--- a/src/main/java/dev/zontreck/wmd/CheckInventory.java
+++ b/src/main/java/dev/zontreck/wmd/checkers/CheckInventory.java
@@ -1,13 +1,14 @@
-package dev.zontreck.wmd;
+package dev.zontreck.wmd.checkers;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import dev.zontreck.ariaslib.terminal.Task;
-import dev.zontreck.ariaslib.util.DelayedExecutorService;
 import dev.zontreck.libzontreck.chat.ChatColor;
 import dev.zontreck.libzontreck.chat.HoverTip;
+import dev.zontreck.wmd.types.ItemRegistry;
+import dev.zontreck.wmd.WatchMyDurability;
 import dev.zontreck.wmd.configs.WMDClientConfig;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.NonNullList;
diff --git a/src/main/java/dev/zontreck/wmd/Health.java b/src/main/java/dev/zontreck/wmd/types/Health.java
similarity index 95%
rename from src/main/java/dev/zontreck/wmd/Health.java
rename to src/main/java/dev/zontreck/wmd/types/Health.java
index 1786b2a..d13121a 100644
--- a/src/main/java/dev/zontreck/wmd/Health.java
+++ b/src/main/java/dev/zontreck/wmd/types/Health.java
@@ -1,4 +1,4 @@
-package dev.zontreck.wmd;
+package dev.zontreck.wmd.types;
 
 import net.minecraft.world.entity.player.Player;
 
diff --git a/src/main/java/dev/zontreck/wmd/Hunger.java b/src/main/java/dev/zontreck/wmd/types/Hunger.java
similarity index 88%
rename from src/main/java/dev/zontreck/wmd/Hunger.java
rename to src/main/java/dev/zontreck/wmd/types/Hunger.java
index b566926..cb5bfb6 100644
--- a/src/main/java/dev/zontreck/wmd/Hunger.java
+++ b/src/main/java/dev/zontreck/wmd/types/Hunger.java
@@ -1,5 +1,6 @@
-package dev.zontreck.wmd;
+package dev.zontreck.wmd.types;
 
+import dev.zontreck.wmd.WatchMyDurability;
 import net.minecraft.world.entity.player.Player;
 
 public class Hunger
diff --git a/src/main/java/dev/zontreck/wmd/ItemRegistry.java b/src/main/java/dev/zontreck/wmd/types/ItemRegistry.java
similarity index 97%
rename from src/main/java/dev/zontreck/wmd/ItemRegistry.java
rename to src/main/java/dev/zontreck/wmd/types/ItemRegistry.java
index d791527..eebba51 100644
--- a/src/main/java/dev/zontreck/wmd/ItemRegistry.java
+++ b/src/main/java/dev/zontreck/wmd/types/ItemRegistry.java
@@ -1,8 +1,9 @@
-package dev.zontreck.wmd;
+package dev.zontreck.wmd.types;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import dev.zontreck.wmd.WatchMyDurability;
 import net.minecraft.world.item.ItemStack;
 
 public class ItemRegistry {