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 a884a6089..3573e8427 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
@@ -41,6 +41,7 @@ import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.dfsek.terra.fabric.handle.FabricItemHandle;
 import com.dfsek.terra.fabric.handle.FabricWorldHandle;
 import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor;
+import com.dfsek.terra.fabric.util.FabricUtil;
 import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.exception.DuplicateEntryException;
@@ -308,7 +309,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
     @Addon("Terra-Fabric")
     @Author("Terra")
     @Version("1.0.0")
-    static final class FabricAddon extends TerraAddon implements EventListener {
+    public static final class FabricAddon extends TerraAddon implements EventListener {
 
         private final TerraPlugin main;
 
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PackFeatureOptionsTemplate.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PackFeatureOptionsTemplate.java
index 998fd25a0..48e1c9cb9 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PackFeatureOptionsTemplate.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PackFeatureOptionsTemplate.java
@@ -5,11 +5,10 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import net.minecraft.util.Identifier;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
+@SuppressWarnings("FieldMayBeFinal")
 public class PackFeatureOptionsTemplate implements ConfigTemplate {
     @Value("features.inject-registry.enable")
     @Default
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java
index d0fdfbdcc..a124ebada 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java
@@ -3,7 +3,7 @@ package com.dfsek.terra.fabric.generation;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.fabric.FabricUtil;
+import com.dfsek.terra.fabric.util.FabricUtil;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java
similarity index 98%
rename from platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java
rename to platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java
index de8afe407..224f616ba 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java
@@ -1,8 +1,9 @@
-package com.dfsek.terra.fabric;
+package com.dfsek.terra.fabric.util;
 
 import com.dfsek.terra.config.builder.BiomeBuilder;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.config.PackFeatureOptionsTemplate;
 import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
 import net.minecraft.util.Identifier;