diff --git a/common/build.gradle b/core/build.gradle
similarity index 86%
rename from common/build.gradle
rename to core/build.gradle
index 72c7400..19892bf 100644
--- a/common/build.gradle
+++ b/core/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'java-library'
 }
 
+archivesBaseName = project.archives_base_name + "-core"
+
 dependencies {
     api "org.jetbrains:annotations:17.0.0"
     api "org.aperlambda:lambdajcommon:1.7.2"
diff --git a/common/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java b/core/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java
similarity index 100%
rename from common/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java
rename to core/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java
diff --git a/common/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java b/core/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java
similarity index 100%
rename from common/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java
rename to core/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java
diff --git a/elytra/build.gradle b/elytra/build.gradle
index 9e84cb7..a1e5073 100644
--- a/elytra/build.gradle
+++ b/elytra/build.gradle
@@ -11,11 +11,11 @@ repositories {
 }
 
 dependencies {
-    api project(":common")
+    api project(":core")
     implementation "org.mcelytra:elytra-core:1.0.0-SNAPSHOT"
 }
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
\ No newline at end of file
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
index d46db29..52a4e49 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -29,6 +29,10 @@ repositories {
     }
 }
 
+configurations {
+    shadow
+}
+
 dependencies {
     //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -46,8 +50,8 @@ dependencies {
     // Compatibility mods
     modCompile "io.github.joaoh1:okzoomer:2.0.1"
 
-    api project(":common")
-    include project(":common")
+    api project(":core")
+    shadow project(":core")
     include "org.jetbrains:annotations:17.0.0"
     include "org.aperlambda:lambdajcommon:1.7.2"
     include "com.electronwill.night-config:core:3.5.3"
@@ -74,4 +78,12 @@ java {
 
 jar {
     from "../LICENSE"
+
+    from {
+        configurations.shadow.filter {
+            it.getName().contains("lambdacontrols")
+        }.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
 }
diff --git a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java
index cd41081..713d009 100644
--- a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java
+++ b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java
@@ -30,9 +30,8 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
 {
     private boolean lambdacontrols_drifting_prevented = false;
 
-    // Can be mapped as `hasMovementInput` for example.
     @Shadow
-    protected abstract boolean method_22120();
+    protected abstract boolean hasMovementInput();
 
     public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile)
     {
@@ -45,7 +44,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
         LambdaControlsClient mod = LambdaControlsClient.get();
         if (type == MovementType.SELF) {
             if (this.abilities.flying && !mod.config.has_fly_drifting()) {
-                if (!this.method_22120()) {
+                if (!this.hasMovementInput()) {
                     if (!this.lambdacontrols_drifting_prevented) {
                         this.setVelocity(this.getVelocity().multiply(0, 1.0, 0));
                     }
diff --git a/gradle.properties b/gradle.properties
index 0391527..5a612ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 	minecraft_version=1.15.1
-	yarn_mappings=1.15.1+build.35:v2
-	loader_version=0.7.2+build.174
+	yarn_mappings=1.15.1+build.37:v2
+	loader_version=0.7.3+build.176
 
 # Mod Properties
-	mod_version = 1.1.0-test6
+	mod_version = 1.1.0-test7
 	maven_group = me.lambdaurora
 	archives_base_name = lambdacontrols
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.4.26+build.283-1.15
+	fabric_version=0.4.27+build.286-1.15
 	spruceui_version=1.0.1
 
diff --git a/settings.gradle b/settings.gradle
index 4cdc817..fb1505d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,4 +10,4 @@ pluginManagement {
 }
 
 rootProject.name = 'lambdacontrols'
-include 'common', 'fabric', 'elytra'
+include 'core', 'fabric', 'elytra'