diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/CrossPlatformStuffImpl.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/CrossPlatformStuffImpl.java
index 6c0cece..265a93e 100644
--- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/CrossPlatformStuffImpl.java
+++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/CrossPlatformStuffImpl.java
@@ -1,6 +1,5 @@
 package io.github.flemmli97.flan.fabric;
 
-import io.github.flemmli97.flan.FabricRegistryWrapper;
 import io.github.flemmli97.flan.SimpleRegistryWrapper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.Registry;
diff --git a/fabric/src/main/java/io/github/flemmli97/flan/FabricRegistryWrapper.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/FabricRegistryWrapper.java
similarity index 86%
rename from fabric/src/main/java/io/github/flemmli97/flan/FabricRegistryWrapper.java
rename to fabric/src/main/java/io/github/flemmli97/flan/fabric/FabricRegistryWrapper.java
index c6b9a5d..ddab4bb 100644
--- a/fabric/src/main/java/io/github/flemmli97/flan/FabricRegistryWrapper.java
+++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/FabricRegistryWrapper.java
@@ -1,5 +1,6 @@
-package io.github.flemmli97.flan;
+package io.github.flemmli97.flan.fabric;
 
+import io.github.flemmli97.flan.SimpleRegistryWrapper;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/fabric/src/main/java/io/github/flemmli97/flan/FlanFabric.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java
similarity index 97%
rename from fabric/src/main/java/io/github/flemmli97/flan/FlanFabric.java
rename to fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java
index b6d8507..896a077 100644
--- a/fabric/src/main/java/io/github/flemmli97/flan/FlanFabric.java
+++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java
@@ -1,5 +1,6 @@
-package io.github.flemmli97.flan;
+package io.github.flemmli97.flan.fabric;
 
+import io.github.flemmli97.flan.Flan;
 import io.github.flemmli97.flan.api.permission.ObjectToPermissionMap;
 import io.github.flemmli97.flan.commands.CommandClaim;
 import io.github.flemmli97.flan.config.ConfigHandler;
diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/CrossPlatformStuffImpl.java b/forge/src/main/java/io/github/flemmli97/flan/forge/CrossPlatformStuffImpl.java
index 69fa1d2..1cbb93d 100644
--- a/forge/src/main/java/io/github/flemmli97/flan/forge/CrossPlatformStuffImpl.java
+++ b/forge/src/main/java/io/github/flemmli97/flan/forge/CrossPlatformStuffImpl.java
@@ -1,6 +1,5 @@
 package io.github.flemmli97.flan.forge;
 
-import io.github.flemmli97.flan.ForgeRegistryWrapper;
 import io.github.flemmli97.flan.SimpleRegistryWrapper;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
diff --git a/forge/src/main/java/io/github/flemmli97/flan/ForgeRegistryWrapper.java b/forge/src/main/java/io/github/flemmli97/flan/forge/ForgeRegistryWrapper.java
similarity index 95%
rename from forge/src/main/java/io/github/flemmli97/flan/ForgeRegistryWrapper.java
rename to forge/src/main/java/io/github/flemmli97/flan/forge/ForgeRegistryWrapper.java
index 9e221f7..7e01f94 100644
--- a/forge/src/main/java/io/github/flemmli97/flan/ForgeRegistryWrapper.java
+++ b/forge/src/main/java/io/github/flemmli97/flan/forge/ForgeRegistryWrapper.java
@@ -1,4 +1,4 @@
-package io.github.flemmli97.flan;
+package io.github.flemmli97.flan.forge;
 
 import io.github.flemmli97.flan.SimpleRegistryWrapper;
 import net.minecraft.resources.ResourceLocation;
diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/mixin/ForgeFireMixin.java b/forge/src/main/java/io/github/flemmli97/flan/forge/mixin/ForgeFireMixin.java
index 08503ee..a8d7fd6 100644
--- a/forge/src/main/java/io/github/flemmli97/flan/forge/mixin/ForgeFireMixin.java
+++ b/forge/src/main/java/io/github/flemmli97/flan/forge/mixin/ForgeFireMixin.java
@@ -19,7 +19,7 @@ public abstract class ForgeFireMixin {
     /**
      * Check for blocks reacting to fire (e.g. tnt)
      */
-    @Inject(method = "tryCatchFire", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "tryCatchFire", at = @At(value = "HEAD"), cancellable = true, remap = false)
     private void spread(Level world, BlockPos pos, int spreadFactor, Random rand, int currentAge, Direction dir, CallbackInfo info) {
         if (!world.isClientSide && !WorldEvents.canFireSpread((ServerLevel) world, pos)) {
             info.cancel();