diff --git a/api/build.gradle b/api/build.gradle
index f0a5b967..028e1d97 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,10 +1,11 @@
+//file:noinspection GroovyAssignabilityCheck
 plugins {
     id 'java-library'
     id 'maven-publish'
 }
 
 dependencies {
-    implementation project(':common')
+    compileOnly project(path: ':common', configuration: 'shadow')
 
     compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
     compileOnly 'org.jetbrains:annotations:22.0.0'
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index 4bf908b2..1fc78e78 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -1,9 +1,7 @@
 dependencies {
-    compileOnly project(':common')
-    compileOnly project(':api')
+    implementation project(':api')
     implementation project(path: ':common', configuration: 'shadow')
 
-    compileOnly 'redis.clients:jedis:3.7.1'
     implementation 'org.bstats:bstats-bukkit:2.2.1'
     implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
 
@@ -13,8 +11,9 @@ dependencies {
 }
 
 shadowJar {
-    relocate 'org.bstats', 'me.William278.husksync.libraries.bstats.bukkit'
-    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown.standard'
-}
+    relocate 'de.themoep', 'me.william278.husksync.libraries'
+    relocate 'org.bstats', 'me.william278.husksync.libraries.bstats'
 
-tasks.register('prepareKotlinBuildScriptModel'){}
\ No newline at end of file
+    relocate 'redis.clients', 'me.william278.husksync.libraries'
+    relocate 'org.apache', 'me.william278.husksync.libraries'
+}
\ No newline at end of file
diff --git a/bungeecord/build.gradle b/bungeecord/build.gradle
index baa8da84..a74da139 100644
--- a/bungeecord/build.gradle
+++ b/bungeecord/build.gradle
@@ -1,8 +1,7 @@
 dependencies {
-    compileOnly project(':common')
     implementation project(path: ':common', configuration: 'shadow')
 
-    compileOnly 'redis.clients:jedis:4.0.1'
+    implementation 'com.zaxxer:HikariCP:5.0.1'
     implementation 'org.bstats:bstats-bungeecord:2.2.1'
     implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
     implementation 'net.byteflux:libby-bungee:1.1.5'
@@ -11,10 +10,17 @@ dependencies {
 }
 
 shadowJar {
-    relocate 'com.zaxxer', 'me.William278.husksync.libraries.hikari'
-    relocate 'org.bstats', 'me.William278.husksync.libraries.bstats.bungee'
-    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown.standard'
-    relocate 'net.byteflux', 'me.William278.husksync.libraries.libby.bungee'
-}
+    relocate 'de.themoep', 'me.william278.husksync.libraries'
+    relocate 'net.byteflux', 'me.william278.husksync.libraries'
+    relocate 'org.bstats', 'me.william278.husksync.libraries.bstats'
+
+    relocate 'redis.clients', 'me.william278.husksync.libraries'
+    relocate 'org.apache', 'me.william278.husksync.libraries'
+
+    relocate 'com.zaxxer', 'me.william278.husksync.libraries'
 
-tasks.register('prepareKotlinBuildScriptModel'){}
\ No newline at end of file
+    dependencies {
+        //noinspection GroovyAssignabilityCheck
+        exclude dependency(':slf4j-api')
+    }
+}
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
index 59274063..c488fde9 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,28 +1,7 @@
 dependencies {
-    implementation 'redis.clients:jedis:4.0.1'
-    implementation 'com.zaxxer:HikariCP:5.0.1'
-}
-
-import org.apache.tools.ant.filters.ReplaceTokens
-task updateVersion(type: Copy) {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        include 'bungee.yml'
-    }
-    into 'build/sources/resources/'
-    filter(ReplaceTokens, tokens: [version: '' + project.version])
-}
-
-processResources {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    dependsOn updateVersion
-    from 'build/sources/resources'
+    compileOnly 'com.zaxxer:HikariCP:5.0.1'
 }
 
 shadowJar {
-    dependsOn processResources
-
-    // Exclude some unnecessary files
-    exclude "**/module-info.class"
-    exclude "module-info.class"
+    relocate 'com.zaxxer', 'me.william278.husksync.libraries'
 }
\ No newline at end of file
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 042f5d91..07a32b67 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -1,30 +1,27 @@
+//file:noinspection GroovyAssignabilityCheck
+plugins {
+    id 'maven-publish'
+}
+
 dependencies {
-    implementation project(path: ":common", configuration: 'shadow')
-    implementation project(path: ":api", configuration: 'shadow')
-    implementation project(path: ":bukkit", configuration: 'shadow')
-    implementation project(path: ":bungeecord", configuration: 'shadow')
-    implementation project(path: ":velocity", configuration: 'shadow')
+    implementation project(path: ':bukkit', configuration: 'shadow')
+    implementation project(path: ':bungeecord', configuration: 'shadow')
+    implementation project(path: ':velocity', configuration: 'shadow')
 }
 
 shadowJar {
-    // Relocations
-    relocate 'redis.clients', 'me.William278.husksync.libraries.jedis'
-
-    destinationDirectory.set(file("$rootDir/target/"))
-    archiveBaseName.set('HuskSync')
-    archiveClassifier.set('')
-
-    build {
-        dependsOn tasks.named("shadowJar")
+    dependencies {
+        exclude dependency(':jedis')
+        exclude dependency(':commons-pool2')
     }
 }
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            groupId = 'me.William278'
-            artifactId = 'HuskSync-plugin'
-            version = "$project.version"
+            groupId = 'me.william278'
+            artifactId = 'husksync-plugin'
+            version = "$rootProject.version"
 
             artifact shadowJar
         }
diff --git a/velocity/build.gradle b/velocity/build.gradle
index 11f94d42..b0b70da2 100644
--- a/velocity/build.gradle
+++ b/velocity/build.gradle
@@ -1,21 +1,26 @@
 dependencies {
-    compileOnly project(':common')
     implementation project(path: ':common', configuration: 'shadow')
 
-    compileOnly 'redis.clients:jedis:4.0.1'
+    implementation 'com.zaxxer:HikariCP:5.0.1'
     implementation 'org.bstats:bstats-velocity:2.2.1'
     implementation 'de.themoep:minedown-adventure:1.7.1-SNAPSHOT'
     implementation 'net.byteflux:libby-velocity:1.1.5'
 
     compileOnly 'com.velocitypowered:velocity-api:3.1.0'
-    annotationProcessor 'com.velocitypowered:velocity-api:3.1.0'
 }
 
 shadowJar {
-    relocate 'com.zaxxer', 'me.William278.husksync.libraries.hikari'
-    relocate 'org.bstats', 'me.William278.husksync.libraries.bstats.velocity'
-    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown.adventure'
-    relocate 'net.byteflux', 'me.William278.husksync.libraries.libby.velocity'
-}
+    relocate 'de.themoep', 'me.william278.husksync.libraries'
+    relocate 'net.byteflux', 'me.william278.husksync.libraries'
+    relocate 'org.bstats', 'me.william278.husksync.libraries.bstats'
+
+    relocate 'redis.clients', 'me.william278.husksync.libraries'
+    relocate 'org.apache', 'me.william278.husksync.libraries'
+
+    relocate 'com.zaxxer', 'me.william278.husksync.libraries'
 
-tasks.register('prepareKotlinBuildScriptModel'){}
\ No newline at end of file
+    dependencies {
+        //noinspection GroovyAssignabilityCheck
+        exclude dependency(':slf4j-api')
+    }
+}
\ No newline at end of file