diff --git a/build.gradle b/build.gradle
index 37c2c85..28944d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,20 @@
-subprojects {
+plugins {
+    id "java"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "xyz.jpenilla.run-paper" version "2.0.1"
+}
+
+dependencies {
+    implementation project(path: ":spigot", configuration: "shadow")
+    implementation project(":api")
+    implementation project(":folia")
+}
+
+runServer {
+    minecraftVersion "1.19.4"
+}
+
+allprojects {
     apply plugin: "java"
 
     group "lol.pyr"
@@ -19,5 +35,14 @@ subprojects {
         maven {
             url "https://repo.papermc.io/repository/maven-public/"
         }
+        maven {
+            url "https://repo.extendedclip.com/content/repositories/placeholderapi/"
+        }
+        maven {
+            url "https://jitpack.io/"
+        }
     }
-}
\ No newline at end of file
+}
+
+tasks.assemble.dependsOn shadowJar
+tasks.compileJava.dependsOn clean
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
deleted file mode 100644
index d214f85..0000000
--- a/common/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
-    compileOnly "org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT"
-}
\ No newline at end of file
diff --git a/folia/build.gradle b/folia/build.gradle
index 98aa04f..cc0ecff 100644
--- a/folia/build.gradle
+++ b/folia/build.gradle
@@ -1,4 +1,3 @@
 dependencies {
     compileOnly "dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT"
-    compileOnly project(":common")
 }
diff --git a/common/src/main/java/lol/pyr/znpcsplus/scheduling/TaskScheduler.java b/folia/src/main/java/lol/pyr/znpcsplus/scheduling/TaskScheduler.java
similarity index 100%
rename from common/src/main/java/lol/pyr/znpcsplus/scheduling/TaskScheduler.java
rename to folia/src/main/java/lol/pyr/znpcsplus/scheduling/TaskScheduler.java
diff --git a/settings.gradle b/settings.gradle
index cc12245..fea8846 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = "ZNPCsPlus"
 
-include "api", "spigot", "folia", "common"
\ No newline at end of file
+include "api", "spigot", "folia"
\ No newline at end of file
diff --git a/spigot/build.gradle b/spigot/build.gradle
index 525ebaf..2af31fb 100644
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@@ -1,15 +1,5 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "xyz.jpenilla.run-paper" version "2.0.1"
-}
-
-repositories {
-    maven {
-        url "https://repo.extendedclip.com/content/repositories/placeholderapi/"
-    }
-    maven {
-        url "https://jitpack.io/"
-    }
 }
 
 dependencies {
@@ -28,15 +18,14 @@ dependencies {
     implementation "com.github.retrooper.packetevents:spigot:2.0.0-SNAPSHOT"
     implementation "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1"
 
-    implementation project(":api")
-    implementation project(":common")
-    implementation project(":folia")
+    compileOnly project(":api")
+    compileOnly project(":folia")
 }
 
 shadowJar {
     archiveClassifier.set ""
     relocate "org.bstats", "lol.pyr.znpcsplus.lib.bstats"
-    relocate "org.apache.commons", "lol.pyr.znpcsplus.lib.commons"
+    relocate "org.apache.commons.io", "lol.pyr.znpcsplus.lib.commonsio"
     relocate "me.robertlit.spigotresources", "lol.pyr.znpcsplus.lib.spigotresources"
     relocate "net.kyori", "lol.pyr.znpcsplus.lib.kyori"
     relocate "org.checkerframework", "lol.pyr.znpcsplus.lib.checkerframework"
@@ -49,15 +38,4 @@ shadowJar {
     relocate "org.yaml.snakeyaml", "lol.pyr.znpcsplus.lib.snakeyaml"
     relocate "space.arim.dazzleconf", "lol.pyr.znpcsplus.lib.dazzleconf"
     minimize()
-}
-
-processResources {
-    expand("version": version)
-}
-
-runServer {
-    minecraftVersion "1.19.4"
-}
-
-tasks.assemble.dependsOn shadowJar
-tasks.compileJava.dependsOn clean
\ No newline at end of file
+}
\ No newline at end of file