diff --git a/build.gradle.kts b/build.gradle.kts
index 3c45817..0574e8a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,7 @@ version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
+    scrowRepo()
 }
 
 subprojects {
@@ -31,18 +32,7 @@ subprojects {
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
             name = "spigotmc-repo"
         }
-        maven {
-            name = "scrow"
-            url = uri("http://forge.kentoj.de/api/packages/scrow/maven")
-            isAllowInsecureProtocol = true
-            credentials(HttpHeaderCredentials::class) {
-                name = "Authorization"
-                value = "token $scrowToken"
-            }
-            authentication {
-                create<HttpHeaderAuthentication>("header")
-            }
-        }
+        scrowRepo()
     }
 
     dependencies {
@@ -60,4 +50,17 @@ subprojects {
         implementation(platform("org.mongodb:mongodb-driver-bom:5.6.1"))
         implementation("org.mongodb:mongodb-driver-reactivestreams")
     }
-}
\ No newline at end of file
+}
+
+fun RepositoryHandler.scrowRepo() = this.maven {
+    name = "scrow"
+    url = uri("http://forge.kentoj.de/api/packages/scrow/maven")
+    isAllowInsecureProtocol = true
+    credentials(HttpHeaderCredentials::class) {
+        name = "Authorization"
+        value = "token $scrowToken"
+    }
+    authentication {
+        create<HttpHeaderAuthentication>("header")
+    }
+}
diff --git a/core-bukkit-api/build.gradle.kts b/core-bukkit-api/build.gradle.kts
index f76f62c..d73d155 100644
--- a/core-bukkit-api/build.gradle.kts
+++ b/core-bukkit-api/build.gradle.kts
@@ -1,6 +1,3 @@
-val scrowToken = providers.gradleProperty("scrowMavenToken")
-    .orElse(providers.environmentVariable("SCROW_MAVEN_TOKEN"))
-
 plugins {
     id("java")
     id("java-library")
@@ -12,20 +9,6 @@ version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
-    maven {
-        name = "scrow"
-        url = uri("http://forge.kentoj.de/api/packages/scrow/maven")
-        isAllowInsecureProtocol = true
-
-        credentials(HttpHeaderCredentials::class) {
-            name = "Authorization"
-            value = "token $scrowToken"
-        }
-
-        authentication {
-            create<HttpHeaderAuthentication>("header")
-        }
-    }
 }
 
 dependencies {
diff --git a/core-velocity/build.gradle.kts b/core-velocity-impl/build.gradle.kts
similarity index 100%
rename from core-velocity/build.gradle.kts
rename to core-velocity-impl/build.gradle.kts
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocity.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocity.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocity.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocity.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/SendPlayerWatchdog.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/SendPlayerWatchdog.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/SendPlayerWatchdog.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/SendPlayerWatchdog.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/ServerRegisterWatchdog.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/ServerRegisterWatchdog.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/ServerRegisterWatchdog.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/ServerRegisterWatchdog.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/LastTargetCache.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivmsgHelper.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivmsgHelper.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivmsgHelper.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/PrivmsgHelper.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
diff --git a/core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyKenCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyKenCommand.java
similarity index 100%
rename from core-velocity/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyKenCommand.java
rename to core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyKenCommand.java