diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java
index e3dbb2ce2..a5631c7d5 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.registry;
 
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
+
 public interface CheckedRegistry<T> extends Registry<T> {
     /**
      * Add a value to this registry, checking whether it is present first.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java
index f15ebd3db..739712afc 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.registry;
 
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
+
 public interface OpenRegistry<T> extends Registry<T> {
     /**
      * Add a value to this registry.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/DuplicateEntryException.java b/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java
similarity index 89%
rename from common/api/src/main/java/com/dfsek/terra/api/registry/DuplicateEntryException.java
rename to common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java
index e384fe8e5..4154ecd0f 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/registry/DuplicateEntryException.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.registry;
+package com.dfsek.terra.api.registry.exception;
 
 /**
  * Thrown when a duplicate entry is found in a registry.
diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
index 20cb9b0b3..108c0290a 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
@@ -3,7 +3,7 @@ package com.dfsek.terra.registry;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.registry.OpenRegistry;
 
 import java.lang.reflect.Type;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
index 2622d010a..a64de9ac7 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.registry;
 
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.registry.OpenRegistry;
 
 import java.lang.reflect.Type;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
index 0f00a007c..1b8ef7d76 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.inject.InjectorImpl;
 import com.dfsek.terra.api.injection.exception.InjectionException;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.registry.OpenRegistryImpl;
 
 import java.io.File;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java
index b50547658..264e085d4 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitTree;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
index 8184ebcfc..6386f431c 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -27,7 +27,7 @@ import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.transform.TransformerImpl;
 import com.dfsek.terra.api.transform.Validator;
 import com.dfsek.terra.api.util.generic.pair.Pair;