diff --git a/.gitignore b/.gitignore
index 5c1c9cc5b..a1a036d4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,5 @@ classes/
 .settings
 *.launch
 
-**/src/generated/
\ No newline at end of file
+**/src/generated/
+Merged/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 90c70d6c8..03e8ebb7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,18 @@
+import io.github.rancraftplayz.jarmerger.JarMergerPlugin
+
+buildscript {
+    dependencies{
+        classpath files('plugins/DHJarMerger-1.0.jar')
+    }
+}
+
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "0.10.0.195" apply false
 }
 
+apply plugin: JarMergerPlugin
+
 architectury {
     minecraft = rootProject.minecraft_version
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 2166c577e..61b7ac7da 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -125,6 +125,8 @@ shadowJar {
     relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
     relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
 
+    relocate 'com.seibel.lod.common', 'fabric.com.seibel.lod.common'
+
     classifier "dev-shadow"
 }
 
diff --git a/fabric/src/main/java/com/seibel/lod/fabric/Main.java b/fabric/src/main/java/com/seibel/lod/fabric/Main.java
index 8f73e7bb0..5b9fbff23 100644
--- a/fabric/src/main/java/com/seibel/lod/fabric/Main.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/Main.java
@@ -26,12 +26,11 @@ import com.seibel.lod.core.api.ModAccessorApi;
 import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.fabric.modAccessor.ModChecker;
-import com.seibel.lod.fabric.modAccessor.SodiumAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
+import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
 import com.seibel.lod.fabric.wrappers.DependencySetup;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
 
 /**
  * Initialize and setup the Mod. <br>
diff --git a/fabric/src/main/java/com/seibel/lod/fabric/modAccessor/ModChecker.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java
similarity index 87%
rename from fabric/src/main/java/com/seibel/lod/fabric/modAccessor/ModChecker.java
rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java
index de9a07146..a675c8434 100644
--- a/fabric/src/main/java/com/seibel/lod/fabric/modAccessor/ModChecker.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java
@@ -1,5 +1,5 @@
 
-package com.seibel.lod.fabric.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.fabricmc.loader.api.FabricLoader;
diff --git a/fabric/src/main/java/com/seibel/lod/fabric/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java
similarity index 96%
rename from fabric/src/main/java/com/seibel/lod/fabric/modAccessor/SodiumAccessor.java
rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java
index f6284a1e9..5132ff743 100644
--- a/fabric/src/main/java/com/seibel/lod/fabric/modAccessor/SodiumAccessor.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabric.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import java.util.HashSet;
 import java.util.stream.Collectors;
diff --git a/fabric/src/main/resources/lod.mixins.json b/fabric/src/main/resources/fabric.lod.mixins.json
similarity index 100%
rename from fabric/src/main/resources/lod.mixins.json
rename to fabric/src/main/resources/fabric.lod.mixins.json
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index aaa43080b..ed607cc31 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -33,7 +33,7 @@
   },
 
   "mixins": [
-    "lod.mixins.json"
+    "fabric.lod.mixins.json"
   ],
 
   "accessWidener" : "lod.accesswidener",
diff --git a/forge/build.gradle b/forge/build.gradle
index 47b0a427f..30b47ed5d 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -65,6 +65,8 @@ shadowJar {
     relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
 //    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
 
+    relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'
+
     classifier "dev-shadow"
 }
 
diff --git a/plugins/DHJarMerger-1.0.jar b/plugins/DHJarMerger-1.0.jar
new file mode 100644
index 000000000..7d06ddeb9
Binary files /dev/null and b/plugins/DHJarMerger-1.0.jar differ