diff --git a/BetterNether_snapshots_server.launch b/BetterNether_snapshots_server.launch
index db9c9092b..44b7c0f43 100644
--- a/BetterNether_snapshots_server.launch
+++ b/BetterNether_snapshots_server.launch
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/BetterNether_snapshots"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.fabricmc.devlaunchinjector.Main"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="BetterNether_snapshots"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfabric.dli.config=D:\MC_BetterNether_1.15.1\BetterNether_snapshots\.gradle\loom-cache\launch.cfg -Dfabric.dli.env=server -Dfabric.dli.main=net.fabricmc.loader.launch.knot.KnotServer"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:BetterNether_snapshots}/run"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/BetterNether_snapshots"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.fabricmc.devlaunchinjector.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="BetterNether_snapshots"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfabric.dli.config=D:\MC_BetterNether_1.15.1\BetterNether_snapshots\.gradle\loom-cache\launch.cfg -Dfabric.dli.env=server -Dfabric.dli.main=net.fabricmc.loader.launch.knot.KnotServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:BetterNether_snapshots}/run"/>
+</launchConfiguration>
diff --git a/gradle.properties b/gradle.properties
index 82738d663..2b1869cce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.7.8+build.188
 
 # Mod Properties
-	mod_version = 2.5.0
+	mod_version = 2.5.1
 	maven_group = paulevs.betternether
 	archives_base_name = better-nether
 
diff --git a/src/main/java/paulevs/betternether/mixin/BackgroundRenderMixin.java b/src/main/java/paulevs/betternether/mixin/client/BackgroundRenderMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/BackgroundRenderMixin.java
rename to src/main/java/paulevs/betternether/mixin/client/BackgroundRenderMixin.java
index fa6185408..8128414ef 100644
--- a/src/main/java/paulevs/betternether/mixin/BackgroundRenderMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/client/BackgroundRenderMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.client;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/paulevs/betternether/mixin/LavaFluidMixin.java b/src/main/java/paulevs/betternether/mixin/client/LavaFluidMixin.java
similarity index 94%
rename from src/main/java/paulevs/betternether/mixin/LavaFluidMixin.java
rename to src/main/java/paulevs/betternether/mixin/client/LavaFluidMixin.java
index 7f7229df3..0ccb0be97 100644
--- a/src/main/java/paulevs/betternether/mixin/LavaFluidMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/client/LavaFluidMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.client;
 
 import java.util.Random;
 
diff --git a/src/main/java/paulevs/betternether/mixin/PlayerArmorMixin.java b/src/main/java/paulevs/betternether/mixin/client/PlayerArmorMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/PlayerArmorMixin.java
rename to src/main/java/paulevs/betternether/mixin/client/PlayerArmorMixin.java
index a763af64b..0de5b1526 100644
--- a/src/main/java/paulevs/betternether/mixin/PlayerArmorMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/client/PlayerArmorMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.client;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/paulevs/betternether/mixin/StandArmorMixin.java b/src/main/java/paulevs/betternether/mixin/client/StandArmorMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/StandArmorMixin.java
rename to src/main/java/paulevs/betternether/mixin/client/StandArmorMixin.java
index ffc1bbf1c..069ea84cc 100644
--- a/src/main/java/paulevs/betternether/mixin/StandArmorMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/client/StandArmorMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.client;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/paulevs/betternether/mixin/BiomeArrayMixin.java b/src/main/java/paulevs/betternether/mixin/common/BiomeArrayMixin.java
similarity index 91%
rename from src/main/java/paulevs/betternether/mixin/BiomeArrayMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/BiomeArrayMixin.java
index d3f5b097f..3cdfcfcfc 100644
--- a/src/main/java/paulevs/betternether/mixin/BiomeArrayMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/BiomeArrayMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/paulevs/betternether/mixin/BiomeMixin.java b/src/main/java/paulevs/betternether/mixin/common/BiomeMixin.java
similarity index 90%
rename from src/main/java/paulevs/betternether/mixin/BiomeMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/BiomeMixin.java
index 4278bd956..e3aab8508 100644
--- a/src/main/java/paulevs/betternether/mixin/BiomeMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/BiomeMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/paulevs/betternether/mixin/ChunkPopulateMixin.java b/src/main/java/paulevs/betternether/mixin/common/ChunkPopulateMixin.java
similarity index 96%
rename from src/main/java/paulevs/betternether/mixin/ChunkPopulateMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/ChunkPopulateMixin.java
index 1cc5255d2..7722f3cae 100644
--- a/src/main/java/paulevs/betternether/mixin/ChunkPopulateMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/ChunkPopulateMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import java.util.HashSet;
 
diff --git a/src/main/java/paulevs/betternether/mixin/GrassGrowMixin.java b/src/main/java/paulevs/betternether/mixin/common/GrassGrowMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/GrassGrowMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/GrassGrowMixin.java
index a2b71477f..a07937666 100644
--- a/src/main/java/paulevs/betternether/mixin/GrassGrowMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/GrassGrowMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/paulevs/betternether/mixin/LightStorageMixin.java b/src/main/java/paulevs/betternether/mixin/common/LightStorageMixin.java
similarity index 93%
rename from src/main/java/paulevs/betternether/mixin/LightStorageMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/LightStorageMixin.java
index e5fbc17cf..899aa8dd7 100644
--- a/src/main/java/paulevs/betternether/mixin/LightStorageMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/LightStorageMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/paulevs/betternether/mixin/LocateMixin.java b/src/main/java/paulevs/betternether/mixin/common/LocateMixin.java
similarity index 93%
rename from src/main/java/paulevs/betternether/mixin/LocateMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/LocateMixin.java
index 6078767e1..003fddb9e 100644
--- a/src/main/java/paulevs/betternether/mixin/LocateMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/LocateMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/paulevs/betternether/mixin/MapMixin.java b/src/main/java/paulevs/betternether/mixin/common/MapMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/MapMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/MapMixin.java
index 120b12385..aa907f74e 100644
--- a/src/main/java/paulevs/betternether/mixin/MapMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/MapMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/paulevs/betternether/mixin/MapStateMixin.java b/src/main/java/paulevs/betternether/mixin/common/MapStateMixin.java
similarity index 93%
rename from src/main/java/paulevs/betternether/mixin/MapStateMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/MapStateMixin.java
index 72a61cbb7..03ddf74cb 100644
--- a/src/main/java/paulevs/betternether/mixin/MapStateMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/MapStateMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import java.util.Map;
 
diff --git a/src/main/java/paulevs/betternether/mixin/MushroomMixin.java b/src/main/java/paulevs/betternether/mixin/common/MushroomMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/MushroomMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/MushroomMixin.java
index 0c554fb9e..51dbe358c 100644
--- a/src/main/java/paulevs/betternether/mixin/MushroomMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/MushroomMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import java.util.Random;
 
diff --git a/src/main/java/paulevs/betternether/mixin/NetherWartMixin.java b/src/main/java/paulevs/betternether/mixin/common/NetherWartMixin.java
similarity index 95%
rename from src/main/java/paulevs/betternether/mixin/NetherWartMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/NetherWartMixin.java
index 592b1da8b..5c96e4875 100644
--- a/src/main/java/paulevs/betternether/mixin/NetherWartMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/NetherWartMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import java.util.Random;
 
diff --git a/src/main/java/paulevs/betternether/mixin/PlayerEntityMixin.java b/src/main/java/paulevs/betternether/mixin/common/PlayerEntityMixin.java
similarity index 94%
rename from src/main/java/paulevs/betternether/mixin/PlayerEntityMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/PlayerEntityMixin.java
index a5bc3d156..93aa15c78 100644
--- a/src/main/java/paulevs/betternether/mixin/PlayerEntityMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/PlayerEntityMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import java.util.Optional;
 
diff --git a/src/main/java/paulevs/betternether/mixin/StructureMixin.java b/src/main/java/paulevs/betternether/mixin/common/StructureMixin.java
similarity index 93%
rename from src/main/java/paulevs/betternether/mixin/StructureMixin.java
rename to src/main/java/paulevs/betternether/mixin/common/StructureMixin.java
index 61f91e7a9..b5db68ba0 100644
--- a/src/main/java/paulevs/betternether/mixin/StructureMixin.java
+++ b/src/main/java/paulevs/betternether/mixin/common/StructureMixin.java
@@ -1,4 +1,4 @@
-package paulevs.betternether.mixin;
+package paulevs.betternether.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/resources/assets/betternether/models/item/cincinnasite_sword.json b/src/main/resources/assets/betternether/models/item/cincinnasite_sword.json
index 08e59144b..12ee8538e 100644
--- a/src/main/resources/assets/betternether/models/item/cincinnasite_sword.json
+++ b/src/main/resources/assets/betternether/models/item/cincinnasite_sword.json
@@ -1,5 +1,5 @@
 {
-	"parent": "item/generated",
+	"parent": "item/handheld",
     "textures": {
         "layer0": "betternether:item/cincinnasite_sword"
     }
diff --git a/src/main/resources/assets/betternether/models/item/cincinnasite_sword_diamond.json b/src/main/resources/assets/betternether/models/item/cincinnasite_sword_diamond.json
index b2614b02d..463df3107 100644
--- a/src/main/resources/assets/betternether/models/item/cincinnasite_sword_diamond.json
+++ b/src/main/resources/assets/betternether/models/item/cincinnasite_sword_diamond.json
@@ -1,5 +1,5 @@
 {
-	"parent": "item/generated",
+	"parent": "item/handheld",
     "textures": {
         "layer0": "betternether:item/cincinnasite_sword_diamond"
     }
diff --git a/src/main/resources/betternether.mixins.client.json b/src/main/resources/betternether.mixins.client.json
new file mode 100644
index 000000000..bf2bd700a
--- /dev/null
+++ b/src/main/resources/betternether.mixins.client.json
@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "paulevs.betternether.mixin.client",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+	"BackgroundRenderMixin",
+	"LavaFluidMixin",
+	"StandArmorMixin",
+	"PlayerArmorMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/src/main/resources/betternether.mixins.json b/src/main/resources/betternether.mixins.common.json
similarity index 61%
rename from src/main/resources/betternether.mixins.json
rename to src/main/resources/betternether.mixins.common.json
index 913755005..a59fade6b 100644
--- a/src/main/resources/betternether.mixins.json
+++ b/src/main/resources/betternether.mixins.common.json
@@ -1,26 +1,21 @@
 {
   "required": true,
-  "package": "paulevs.betternether.mixin",
+  "package": "paulevs.betternether.mixin.common",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "ChunkPopulateMixin",
+	"ChunkPopulateMixin",
 	"MushroomMixin",
 	"MapMixin",
 	"MapStateMixin",
-	"PlayerArmorMixin",
-	"StandArmorMixin",
 	"LocateMixin",
 	"GrassGrowMixin",
 	"StructureMixin",
-	"BackgroundRenderMixin",
 	"LightStorageMixin",
 	"NetherWartMixin",
 	"BiomeArrayMixin",
 	"BiomeMixin",
-	"LavaFluidMixin",
 	"PlayerEntityMixin"
   ],
-  "client": [],
   "injectors": {
     "defaultRequire": 1
   }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 6c1bef9ef..54861b235 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -30,7 +30,8 @@
 		]
 	},
 	"mixins": [
-		"betternether.mixins.json"
+		"betternether.mixins.common.json",
+		"betternether.mixins.client.json"
 	],
 
 	"depends": {