diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index 48746d0d..4872ef97 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -60,4 +60,32 @@ jobs:
 
       - name: Gradle (Testing)
         # TODO: Add jsIrTest when #4 gets fixed
-        run: gradle --stacktrace --info core:jvmTest
\ No newline at end of file
+        run: gradle --stacktrace --info core:jvmTest
+  release:
+    name: Publish artifacts
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.ref == 'refs/heads/main'
+    env:
+      BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+      BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+      ORG_GRADLE_PROJECT_signingKey: ${{ secrets.signingKey }}
+      ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.signingPassword }}
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Set up JDK 15
+        uses: actions/setup-java@v1
+        with:
+          java-version: 15
+      - name: Publish with Gradle
+        run: gradle publishAllPublicationsToMavenRepository
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..05a245e4
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+lavakord
\ No newline at end of file
diff --git a/.idea/artifacts/core_js_1_0_0_SNAPSHOT.xml b/.idea/artifacts/core_js_1_0_0_SNAPSHOT.xml
index 6c1bf8ad..29605ab7 100644
--- a/.idea/artifacts/core_js_1_0_0_SNAPSHOT.xml
+++ b/.idea/artifacts/core_js_1_0_0_SNAPSHOT.xml
@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="core-js-1.0.0-SNAPSHOT">
-    <output-path>D:\WORK\lavakord\core\build\libs</output-path>
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\core\build\libs</output-path>
     <root id="archive" name="core-js-1.0.0-SNAPSHOT.jar">
       <element id="module-output" name="lavakord.core.jsMain" />
     </root>
diff --git a/.idea/artifacts/core_jvm_1_0_0_SNAPSHOT.xml b/.idea/artifacts/core_jvm_1_0_0_SNAPSHOT.xml
index 21cb270d..0c40da96 100644
--- a/.idea/artifacts/core_jvm_1_0_0_SNAPSHOT.xml
+++ b/.idea/artifacts/core_jvm_1_0_0_SNAPSHOT.xml
@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="core-jvm-1.0.0-SNAPSHOT">
-    <output-path>D:\WORK\lavakord\core\build\libs</output-path>
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\core\build\libs</output-path>
     <root id="archive" name="core-jvm-1.0.0-SNAPSHOT.jar">
       <element id="module-output" name="lavakord.core.jvmMain" />
     </root>
diff --git a/.idea/artifacts/java_jvm_1_0_0_SNAPSHOT.xml b/.idea/artifacts/java_jvm_1_0_0_SNAPSHOT.xml
new file mode 100644
index 00000000..6a8a479c
--- /dev/null
+++ b/.idea/artifacts/java_jvm_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="java-jvm-1.0.0-SNAPSHOT">
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\java\build\libs</output-path>
+    <root id="archive" name="java-jvm-1.0.0-SNAPSHOT.jar">
+      <element id="module-output" name="lavakord.java.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/jda_java_jvm_1_0_0_SNAPSHOT.xml b/.idea/artifacts/jda_java_jvm_1_0_0_SNAPSHOT.xml
new file mode 100644
index 00000000..7b0a8c20
--- /dev/null
+++ b/.idea/artifacts/jda_java_jvm_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="jda-java-jvm-1.0.0-SNAPSHOT">
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\jda-java\build\libs</output-path>
+    <root id="archive" name="jda-java-jvm-1.0.0-SNAPSHOT.jar">
+      <element id="module-output" name="lavakord.jda-java.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/jda_jvm_1_0_0_SNAPSHOT.xml b/.idea/artifacts/jda_jvm_1_0_0_SNAPSHOT.xml
new file mode 100644
index 00000000..2d455157
--- /dev/null
+++ b/.idea/artifacts/jda_jvm_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="jda-jvm-1.0.0-SNAPSHOT">
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\jda\build\libs</output-path>
+    <root id="archive" name="jda-jvm-1.0.0-SNAPSHOT.jar">
+      <element id="module-output" name="lavakord.jda.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/jsExample_1_0_SNAPSHOT.xml b/.idea/artifacts/jsExample_1_0_SNAPSHOT.xml
index 70eda6ae..55daa153 100644
--- a/.idea/artifacts/jsExample_1_0_SNAPSHOT.xml
+++ b/.idea/artifacts/jsExample_1_0_SNAPSHOT.xml
@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="jsExample-1.0-SNAPSHOT">
-    <output-path>D:\WORK\lavakord\jsExample\build\libs</output-path>
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\jsExample\build\libs</output-path>
     <root id="archive" name="jsExample-1.0-SNAPSHOT.jar">
       <element id="module-output" name="lavakord.jsExample.main" />
     </root>
diff --git a/.idea/artifacts/kord_jvm_1_0_0_SNAPSHOT.xml b/.idea/artifacts/kord_jvm_1_0_0_SNAPSHOT.xml
index a97a70d4..3c0c87dd 100644
--- a/.idea/artifacts/kord_jvm_1_0_0_SNAPSHOT.xml
+++ b/.idea/artifacts/kord_jvm_1_0_0_SNAPSHOT.xml
@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="kord-jvm-1.0.0-SNAPSHOT">
-    <output-path>D:\WORK\lavakord\kord\build\libs</output-path>
+    <output-path>C:\Users\micha\IdeaProjects\Lavalink.kt\kord\build\libs</output-path>
     <root id="archive" name="kord-jvm-1.0.0-SNAPSHOT.jar">
       <element id="module-output" name="lavakord.kord.jvmMain" />
     </root>
diff --git a/.idea/aws.xml b/.idea/aws.xml
index 03f1bb6e..8e173182 100644
--- a/.idea/aws.xml
+++ b/.idea/aws.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
     <option name="activeRegion" value="us-east-1" />
     <option name="recentlyUsedProfiles">
       <list>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4f1149a8..443b5d2b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,23 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15">
-      <module name="lavakord-root.commonMain" target="1.8" />
-      <module name="lavakord-root.commonTest" target="1.8" />
-      <module name="lavakord-root.jvmMain" target="1.8" />
-      <module name="lavakord-root.jvmTest" target="1.8" />
-      <module name="lavakord-root.kord.commonMain" target="1.8" />
-      <module name="lavakord-root.kord.commonTest" target="1.8" />
-      <module name="lavakord-root.kord.jvmMain" target="1.8" />
-      <module name="lavakord-root.kord.jvmTest" target="1.8" />
-      <module name="lavakord.commonMain" target="1.8" />
-      <module name="lavakord.commonTest" target="1.8" />
-      <module name="lavakord.jvmMain" target="1.8" />
-      <module name="lavakord.jvmTest" target="1.8" />
-      <module name="lavakord.lavalink.commonMain" target="1.8" />
-      <module name="lavakord.lavalink.commonTest" target="1.8" />
-      <module name="lavakord.lavalink.jvmMain" target="1.8" />
-      <module name="lavakord.lavalink.jvmTest" target="1.8" />
-    </bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.6" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/csv-plugin.xml b/.idea/csv-plugin.xml
new file mode 100644
index 00000000..1e8cd00d
--- /dev/null
+++ b/.idea/csv-plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CsvFileAttributes">
+    <option name="attributeMap">
+      <map>
+        <entry key="\buildSrc\src\main\kotlin\Dependencies.kt">
+          <value>
+            <Attribute>
+              <option name="separator" value=":" />
+            </Attribute>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/CNAME b/CNAME
new file mode 100644
index 00000000..2f8de4db
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+l.mik.wtf
\ No newline at end of file
diff --git a/README.md b/README.md
index 8564de8d..c593a9c0 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@ Lavalink download: [https://github.com/Frederikam/Lavalink](https://github.com/F
 # Download
 
 You can get Lavakord from
-here: [https://package-search.jetbrains.com/package?id=me.schlaubi%3Alavakord](https://package-search.jetbrains.com/package?id=me.schlaubi%3Alavakord) (
-You need `jcenter()` and jitpack though)
+here: https://schlaubi.jfrog.io/ui/repos/tree/General/lavakord%2Fdev%2Fschlaubi%2Flavakord
 
 # Usage
 
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
new file mode 100644
index 00000000..830d202c
--- /dev/null
+++ b/bom/build.gradle.kts
@@ -0,0 +1,42 @@
+plugins {
+    `java-platform`
+    `maven-publish`
+}
+
+applyPublishing()
+
+val me = project
+
+// Without Gradle won't find any project with the publish plugin applied
+javaPlatform.allowDependencies()
+rootProject.subprojects {
+    if (name != me.name) {
+        me.evaluationDependsOn(path)
+    }
+}
+
+dependencies {
+    constraints {
+        rootProject.subprojects.forEach {
+            if (it.plugins.hasPlugin("maven-publish") && it.name != name) {
+                it.publishing.publications.all {
+                    if (this is MavenPublication) {
+                        if (!artifactId.endsWith("-metadata") &&
+                            !artifactId.endsWith("-kotlinMultiplatform")
+                        ) {
+                            api(groupId, artifactId, version)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components.getByName("javaPlatform"))
+        }
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index 7cdb6f03..5130db6f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     `maven-publish`
     kotlin("multiplatform") version Versions.kotlin apply false
     kotlin("plugin.serialization") version Versions.kotlin apply false
-    id("com.jfrog.bintray") version Versions.bintray apply false
     id("org.jetbrains.dokka") version "1.4.20"
     id("kotlinx-atomicfu") version Versions.atomicFu apply false
     id("org.ajoberstar.git-publish") version "2.1.3"
@@ -28,8 +27,8 @@ tasks {
     val docs = task<Copy>("createDocsIndex") {
         dependsOn(dokkaHtmlMultiModule)
         val outputDirectory = dokkaHtmlMultiModule.get().outputDirectory.get()
-        from(outputDirectory)
-        include("-modules.html")
+        from(outputDirectory, rootProject.projectDir)
+        include("CNAME", "-modules.html")
         into(outputDirectory)
 
         rename("-modules.html", "index.html")
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index c260dd86..62f7eb58 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -2,16 +2,15 @@ import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.kotlin.dsl.maven
 
 object Versions {
-    const val kotlin = "1.4.30"
-    const val ktor = "1.4.1"
-    const val coroutines = "1.4.2"
-    const val kotlinxSerialization = "1.0.1"
-    const val kotlinLogging = "2.0.4"
+    const val kotlin = "1.4.31"
+    const val ktor = "1.5.2"
+    const val coroutines = "1.4.3"
+    const val kotlinxSerialization = "1.1.0"
+    const val kotlinLogging = "2.0.5"
     const val kord = "0.7.0-SNAPSHOT"
-    const val bintray = "1.8.5"
-    const val atomicFu = "0.14.4"
+    const val atomicFu = "0.15.2"
 
-    const val junit5 = "5.6.0"
+    const val junit5 = "5.6.2"
     const val junitJupiterEngine = junit5
     const val coroutinesTest = coroutines
     const val slf4j = "1.7.30"
@@ -44,4 +43,4 @@ object Dependencies {
 
 fun RepositoryHandler.jitpack() = maven("https://jitpack.io")
 fun RepositoryHandler.kord() = maven("https://dl.bintray.com/kordlib/Kord")
-fun RepositoryHandler.sonatype() = maven("https://oss.sonatype.org/content/repositories/snapshots/")
\ No newline at end of file
+fun RepositoryHandler.sonatype() = maven("https://oss.sonatype.org/content/repositories/snapshots/")
diff --git a/buildSrc/src/main/kotlin/Publishing.kt b/buildSrc/src/main/kotlin/Publishing.kt
index 6b2ef50a..0a9a2523 100644
--- a/buildSrc/src/main/kotlin/Publishing.kt
+++ b/buildSrc/src/main/kotlin/Publishing.kt
@@ -1,53 +1,9 @@
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.apply
 
-fun Project.applyPublishing() {
-    apply(plugin = "publishing")
-    val configure: PublishingExtension.() -> Unit = {
-        repositories {
-            maven {
-                setUrl("https://schlaubi.jfrog.io/artifactory/lavakord")
+fun Project.applyPublishing(): Unit = apply(from = "../publishing.gradle.kts")
 
-                credentials {
-                    username = System.getenv("BINTRAY_USER")
-                    password = System.getenv("BINTRAY_KEY")
-                }
-            }
-        }
-
-        publications {
-            filterIsInstance<MavenPublication>().forEach { publication ->
-                publication.pom {
-                    name.set(project.name)
-                    description.set("Extension of the official LavaLink-Client to work with Kord")
-                    url.set("https://github.com/DRSchlaubi/lavakord")
-
-                    licenses {
-                        license {
-                            name.set("MIT License")
-                            url.set("https://github.com/DRSchlaubi/Lavakord/blob/master/LICENSE")
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            name.set("Michael Rittmeister")
-                            email.set("mail@schlaubi.me")
-                            organizationUrl.set("https://michael.rittmeister.in")
-                        }
-                    }
-
-                    scm {
-                        connection.set("scm:git:https://github.com/DRSchlaubi/lavakord.git")
-                        developerConnection.set("scm:git:https://github.com/DRSchlaubi/lavakord.git")
-                        url.set("https://github.com/DRSchlaubi/lavakord")
-                    }
-                }
-            }
-        }
-    }
-
-    (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("publishing", configure)
-}
\ No newline at end of file
+val Project.publishing: PublishingExtension
+    get() =
+        (this as org.gradle.api.plugins.ExtensionAware).extensions.getByName("publishing") as PublishingExtension
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index e47f3912..024a1cba 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -28,15 +28,15 @@ kotlin {
     }
 
     // See https://github.com/DRSchlaubi/Lavakord/issues/2
-//    js(IR) {
-//        nodejs()
-//        // browser() doesn't work because the js websocket client does not allowed you to set headers
-//        // Apart from that why would you need Lavalink in your browser?
-//    }
+    js(IR) {
+        nodejs()
+        // browser() doesn't work because the js websocket client does not allowed you to set headers
+        // Apart from that why would you need Lavalink in your browser?
+    }
 
     sourceSets {
         all {
-
+            languageSettings.useExperimentalAnnotation(ExpermientalAnnotations.requiresOptIn)
             languageSettings.useExperimentalAnnotation(ExpermientalAnnotations.experimentalTime)
             repositories {
                 jcenter()
@@ -87,18 +87,18 @@ kotlin {
             }
         }
 
-//        jsMain {
-//            dependencies {
-//                implementation(Dependencies.`ktor-client-js`)
-//
-//            }
-//        }
-//
-//        jsTest {
-//            dependencies {
-//                implementation(kotlin("test-js"))
-//            }
-//        }
+        jsMain {
+            dependencies {
+                implementation(Dependencies.`ktor-client-js`)
+
+            }
+        }
+
+        jsTest {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
     }
 }
 
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/Exceptions.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/Exceptions.kt
similarity index 86%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/Exceptions.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/Exceptions.kt
index 68ffa1b3..c6b1b317 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/Exceptions.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/Exceptions.kt
@@ -1,7 +1,6 @@
-package dev.kord.x.lavalink
+package dev.schlaubi.lavakord
 
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.rest.addressStatus
+import dev.schlaubi.lavakord.audio.Link
 
 
 /**
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/LavaKord.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/LavaKord.kt
similarity index 93%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/LavaKord.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/LavaKord.kt
index 2c340e5c..fdb2ff55 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/LavaKord.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/LavaKord.kt
@@ -1,9 +1,9 @@
-package dev.kord.x.lavalink
+package dev.schlaubi.lavakord
 
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
 import io.ktor.http.*
 import kotlinx.coroutines.CoroutineScope
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
 
 /**
  * Representation of a Lavalink cluster.
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/Options.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/Options.kt
similarity index 96%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/Options.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/Options.kt
index e44fa291..8cb7623e 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/Options.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/Options.kt
@@ -1,8 +1,8 @@
-package dev.kord.x.lavalink
+package dev.schlaubi.lavakord
 
-import dev.kord.x.lavalink.audio.internal.PenaltyProvider
-import dev.kord.x.lavalink.audio.retry.LinearRetry
-import dev.kord.x.lavalink.audio.retry.Retry
+import dev.schlaubi.lavakord.audio.internal.PenaltyProvider
+import dev.schlaubi.lavakord.audio.retry.LinearRetry
+import dev.schlaubi.lavakord.audio.retry.Retry
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/Utils.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/Utils.kt
similarity index 85%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/Utils.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/Utils.kt
index 412b3be9..01429d7a 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/Utils.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/Utils.kt
@@ -1,7 +1,7 @@
-package dev.kord.x.lavalink
+package dev.schlaubi.lavakord
 
-import dev.kord.x.lavalink.audio.internal.WebsocketPlayer
-import dev.kord.x.lavalink.audio.player.Player
+import dev.schlaubi.lavakord.audio.internal.WebsocketPlayer
+import dev.schlaubi.lavakord.audio.player.Player
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/DiscordVoiceServerUpdateData.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/DiscordVoiceServerUpdateData.kt
similarity index 90%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/DiscordVoiceServerUpdateData.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/DiscordVoiceServerUpdateData.kt
index e79a798a..b0691af8 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/DiscordVoiceServerUpdateData.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/DiscordVoiceServerUpdateData.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.audio
+package dev.schlaubi.lavakord.audio
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/EventSource.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/EventSource.kt
similarity index 94%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/EventSource.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/EventSource.kt
index d80ea006..6f8d4ef2 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/EventSource.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/EventSource.kt
@@ -1,6 +1,6 @@
-package dev.kord.x.lavalink.audio
+package dev.schlaubi.lavakord.audio
 
-import dev.kord.x.lavalink.LavaKord
+import dev.schlaubi.lavakord.LavaKord
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Events.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Events.kt
similarity index 95%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Events.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Events.kt
index 8b56366e..33fcdc15 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Events.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Events.kt
@@ -1,12 +1,12 @@
 @file:Suppress("MemberVisibilityCanBePrivate", "UNUSED")
 
-package dev.kord.x.lavalink.audio
+package dev.schlaubi.lavakord.audio
 
-import dev.kord.x.lavalink.RemoteTrackException
-import dev.kord.x.lavalink.audio.StatsEvent.*
-import dev.kord.x.lavalink.audio.TrackEndEvent.EndReason
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
-import dev.kord.x.lavalink.audio.player.Track
+import dev.schlaubi.lavakord.RemoteTrackException
+import dev.schlaubi.lavakord.audio.StatsEvent.*
+import dev.schlaubi.lavakord.audio.TrackEndEvent.EndReason
+import dev.schlaubi.lavakord.audio.internal.GatewayPayload
+import dev.schlaubi.lavakord.audio.player.Track
 import kotlinx.serialization.Serializable
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
@@ -112,7 +112,9 @@ public data class TrackEndEvent(
  * @see TrackEvent
  */
 public data class TrackExceptionEvent(
-    override val guildId: Long, override val track: Track, public val exception: RemoteTrackException
+    override val guildId: Long,
+    override val track: Track,
+    public val exception: RemoteTrackException
 ) : TrackEvent() {
 
     internal companion object {
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Link.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Link.kt
similarity index 93%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Link.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Link.kt
index 1549142a..22b1858e 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Link.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Link.kt
@@ -1,7 +1,8 @@
-package dev.kord.x.lavalink.audio
+package dev.schlaubi.lavakord.audio
 
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.audio.player.Player
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.audio.Link.State
+import dev.schlaubi.lavakord.audio.player.Player
 
 /**
  * Representation of a link between a Guild and a Lavalink node.
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Node.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Node.kt
similarity index 86%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Node.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Node.kt
index 0920180d..b496ec62 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/Node.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/Node.kt
@@ -1,7 +1,6 @@
-package dev.kord.x.lavalink.audio
+package dev.schlaubi.lavakord.audio
 
-import dev.kord.x.lavalink.LavaKord
-import io.ktor.client.*
+import dev.schlaubi.lavakord.LavaKord
 import io.ktor.http.*
 import io.ktor.utils.io.core.*
 
@@ -42,6 +41,6 @@ public interface Node : EventSource<TrackEvent>, Closeable {
     /**
      * The [LavaKord] instance which created this node.
      */
-    public val lavakord: LavaKord
+    public val lavakord: dev.schlaubi.lavakord.LavaKord
 
 }
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/AbstractLavakord.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/AbstractLavakord.kt
similarity index 86%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/AbstractLavakord.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/AbstractLavakord.kt
index bec2b302..2802190e 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/AbstractLavakord.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/AbstractLavakord.kt
@@ -1,13 +1,13 @@
-package dev.kord.x.lavalink.audio.internal
-
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.audio.DiscordVoiceServerUpdateData
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.computeIfAbsent
-import dev.kord.x.lavalink.internal.HttpEngine
-import dev.kord.x.lavalink.rest.RoutePlannerModule
+package dev.schlaubi.lavakord.audio.internal
+
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.audio.DiscordVoiceServerUpdateData
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.computeIfAbsent
+import dev.schlaubi.lavakord.internal.HttpEngine
+import dev.schlaubi.lavakord.rest.RoutePlannerModule
 import io.ktor.client.*
 import io.ktor.client.engine.*
 import io.ktor.client.features.json.*
@@ -61,14 +61,14 @@ public abstract class AbstractLavakord internal constructor(
         install(Logging) {
             level = LogLevel.ALL
             logger = object : Logger {
-                override fun log(message: String) = dev.kord.x.lavalink.rest.LOG.trace { message }
+                override fun log(message: String) = LOG.trace { message }
             }
         }
 
         install(Logging) {
             level = LogLevel.INFO
             logger = object : Logger {
-                override fun log(message: String) = dev.kord.x.lavalink.rest.LOG.debug { message }
+                override fun log(message: String) = LOG.debug { message }
             }
         }
     }
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/AbstractLink.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/AbstractLink.kt
similarity index 85%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/AbstractLink.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/AbstractLink.kt
index 96669b05..d2f95d61 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/AbstractLink.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/AbstractLink.kt
@@ -1,8 +1,8 @@
-package dev.kord.x.lavalink.audio.internal
+package dev.schlaubi.lavakord.audio.internal
 
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.player.Player
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.player.Player
 
 /**
  * Abstract implementation of [Link].
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/GatewayPayloads.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/GatewayPayloads.kt
similarity index 95%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/GatewayPayloads.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/GatewayPayloads.kt
index afcc8599..6c6a1b9e 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/GatewayPayloads.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/GatewayPayloads.kt
@@ -1,14 +1,14 @@
 @file:Suppress("unused")
 
-package dev.kord.x.lavalink.audio.internal
+package dev.schlaubi.lavakord.audio.internal
 
-import dev.kord.x.lavalink.audio.DiscordVoiceServerUpdateData
-import dev.kord.x.lavalink.audio.player.Filters
-import dev.kord.x.lavalink.audio.player.FiltersApi
+import dev.schlaubi.lavakord.audio.DiscordVoiceServerUpdateData
+import dev.schlaubi.lavakord.audio.player.Filters
+import dev.schlaubi.lavakord.audio.player.FiltersApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.modules.SerializersModule
-import dev.kord.x.lavalink.audio.StatsEvent as PublicStatsEvent
+import dev.schlaubi.lavakord.audio.StatsEvent as PublicStatsEvent
 
 internal interface SanitizablePayload<T : GatewayPayload> {
     fun sanitize(): T
@@ -239,7 +239,7 @@ internal sealed class GatewayPayload {
         override val memory: PublicStatsEvent.Memory,
         override val cpu: PublicStatsEvent.Cpu,
         override val frameStats: PublicStatsEvent.FrameStats? = null
-    ) : GatewayPayload(), dev.kord.x.lavalink.audio.StatsEvent {
+    ) : GatewayPayload(), dev.schlaubi.lavakord.audio.StatsEvent {
         override val guildId: String
             get() = throw UnsupportedOperationException("Stats event does not provide a guild id but all other events to thank you Lavalink")
     }
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/LoadBalancer.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/LoadBalancer.kt
similarity index 91%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/LoadBalancer.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/LoadBalancer.kt
index d7d8fa10..58f96728 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/LoadBalancer.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/LoadBalancer.kt
@@ -1,10 +1,13 @@
-package dev.kord.x.lavalink.audio.internal
+package dev.schlaubi.lavakord.audio.internal
 
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.audio.Node
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.audio.Node
 import kotlin.math.pow
 
-internal class LoadBalancer(private val penaltyProviders: List<PenaltyProvider>, private val lavakord: LavaKord) {
+internal class LoadBalancer(
+    private val penaltyProviders: List<PenaltyProvider>,
+    private val lavakord: LavaKord
+) {
 
     fun determineBestNode(guildId: Long): Node {
         val leastPenalty = lavakord.nodes
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/NodeImpl.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/NodeImpl.kt
similarity index 98%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/NodeImpl.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/NodeImpl.kt
index d4dd7018..55edc25e 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/NodeImpl.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/NodeImpl.kt
@@ -1,6 +1,6 @@
-package dev.kord.x.lavalink.audio.internal
+package dev.schlaubi.lavakord.audio.internal
 
-import dev.kord.x.lavalink.audio.*
+import dev.schlaubi.lavakord.audio.*
 import io.ktor.client.*
 import io.ktor.client.engine.*
 import io.ktor.client.features.*
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/WebsocketPlayer.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt
similarity index 86%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/WebsocketPlayer.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt
index c4aa9487..85348991 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/internal/WebsocketPlayer.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt
@@ -1,13 +1,13 @@
-package dev.kord.x.lavalink.audio.internal
-
-import dev.kord.x.lavalink.audio.TrackEndEvent
-import dev.kord.x.lavalink.audio.TrackEvent
-import dev.kord.x.lavalink.audio.TrackStartEvent
-import dev.kord.x.lavalink.audio.on
-import dev.kord.x.lavalink.audio.player.EqualizerBuilder
-import dev.kord.x.lavalink.audio.player.FiltersApi
-import dev.kord.x.lavalink.audio.player.Player
-import dev.kord.x.lavalink.audio.player.Track
+package dev.schlaubi.lavakord.audio.internal
+
+import dev.schlaubi.lavakord.audio.TrackEndEvent
+import dev.schlaubi.lavakord.audio.TrackEvent
+import dev.schlaubi.lavakord.audio.TrackStartEvent
+import dev.schlaubi.lavakord.audio.on
+import dev.schlaubi.lavakord.audio.player.EqualizerBuilder
+import dev.schlaubi.lavakord.audio.player.FiltersApi
+import dev.schlaubi.lavakord.audio.player.Player
+import dev.schlaubi.lavakord.audio.player.Track
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Equalizer.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Equalizer.kt
similarity index 94%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Equalizer.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Equalizer.kt
index 11a64147..f202c236 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Equalizer.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Equalizer.kt
@@ -1,7 +1,7 @@
-package dev.kord.x.lavalink.audio.player
+package dev.schlaubi.lavakord.audio.player
 
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
-import dev.kord.x.lavalink.checkImplementation
+import dev.schlaubi.lavakord.audio.internal.GatewayPayload
+import dev.schlaubi.lavakord.checkImplementation
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Filters.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Filters.kt
similarity index 96%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Filters.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Filters.kt
index a2c3a3de..b4028a92 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Filters.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Filters.kt
@@ -1,7 +1,7 @@
-package dev.kord.x.lavalink.audio.player
+package dev.schlaubi.lavakord.audio.player
 
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
-import dev.kord.x.lavalink.checkImplementation
+import dev.schlaubi.lavakord.audio.internal.GatewayPayload
+import dev.schlaubi.lavakord.checkImplementation
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Player.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Player.kt
similarity index 89%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Player.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Player.kt
index 5b4193fe..fea04406 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Player.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Player.kt
@@ -1,12 +1,10 @@
-package dev.kord.x.lavalink.audio.player
+package dev.schlaubi.lavakord.audio.player
 
-import dev.kord.x.lavalink.audio.EventSource
-import dev.kord.x.lavalink.audio.TrackEvent
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
-import dev.kord.x.lavalink.rest.TrackResponse
+import dev.schlaubi.lavakord.audio.EventSource
+import dev.schlaubi.lavakord.audio.TrackEvent
+import dev.schlaubi.lavakord.rest.TrackResponse
 //import lavalink.client.LavalinkUtil
 import kotlin.time.Duration
-import kotlin.time.ExperimentalTime
 
 /**
  * Interface allowing interaction with Lavalink player.
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Track.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Track.kt
similarity index 98%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Track.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Track.kt
index 1ca8cdef..ac2aba45 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/player/Track.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/player/Track.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.audio.player
+package dev.schlaubi.lavakord.audio.player
 
 import io.ktor.util.*
 import io.ktor.utils.io.*
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/retry/LinearRetry.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/retry/LinearRetry.kt
similarity index 97%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/retry/LinearRetry.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/retry/LinearRetry.kt
index efc92843..ccfb6d60 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/retry/LinearRetry.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/retry/LinearRetry.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.audio.retry
+package dev.schlaubi.lavakord.audio.retry
 
 import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.update
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/retry/Retry.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/retry/Retry.kt
similarity index 92%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/retry/Retry.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/retry/Retry.kt
index 17a94431..54a770e0 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/audio/retry/Retry.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/retry/Retry.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.audio.retry
+package dev.schlaubi.lavakord.audio.retry
 
 /**
  * A strategy for retrying after after a failed action.
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
similarity index 80%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
index 83af05aa..4ef11189 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.internal
+package dev.schlaubi.lavakord.internal
 
 import io.ktor.client.engine.*
 
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/InternalLinkExtensions.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/InternalLinkExtensions.kt
similarity index 90%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/InternalLinkExtensions.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/InternalLinkExtensions.kt
index cccaf6cf..08b059a1 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/InternalLinkExtensions.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/InternalLinkExtensions.kt
@@ -1,7 +1,7 @@
-package dev.kord.x.lavalink.rest
+package dev.schlaubi.lavakord.rest
 
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLavakord
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLavakord
 import io.ktor.client.*
 import io.ktor.client.features.json.*
 import io.ktor.client.features.json.serializer.*
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/LinkRoutePlannerExtensions.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/LinkRoutePlannerExtensions.kt
similarity index 91%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/LinkRoutePlannerExtensions.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/LinkRoutePlannerExtensions.kt
index 2ff5d5e1..b2a99471 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/LinkRoutePlannerExtensions.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/LinkRoutePlannerExtensions.kt
@@ -1,13 +1,11 @@
-package dev.kord.x.lavalink.rest
+package dev.schlaubi.lavakord.rest
 
-import dev.kord.x.lavalink.NoRoutePlannerException
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
+import dev.schlaubi.lavakord.NoRoutePlannerException
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
 import io.ktor.http.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 
 /**
  * Retrieves the current address status of the route planner api. Can be null if no Route planner is set
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/LinkTrackExtensions.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/LinkTrackExtensions.kt
similarity index 83%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/LinkTrackExtensions.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/LinkTrackExtensions.kt
index ec965b91..9c871fc9 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/LinkTrackExtensions.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/LinkTrackExtensions.kt
@@ -1,8 +1,8 @@
-package dev.kord.x.lavalink.rest
+package dev.schlaubi.lavakord.rest
 
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.player.Track
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.player.Track
 
 /**
  * Maps a [List] of [TrackResponse.PartialTrack]s to a List of [Track]s.
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/RoutePlanner.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/RoutePlanner.kt
similarity index 98%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/RoutePlanner.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/RoutePlanner.kt
index 1bc58c7c..dcb0d3d9 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/RoutePlanner.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/RoutePlanner.kt
@@ -1,11 +1,11 @@
-package dev.kord.x.lavalink.rest
+package dev.schlaubi.lavakord.rest
 
+import dev.schlaubi.lavakord.rest.RoutePlannerStatus.Data
+import kotlinx.serialization.Polymorphic
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
-import dev.kord.x.lavalink.rest.RoutePlannerStatus.Data
-import kotlinx.serialization.Polymorphic
-import kotlinx.serialization.SerialName
 
 internal val RoutePlannerModule = SerializersModule {
     polymorphic(RoutePlannerStatus::class) {
diff --git a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/TrackResponse.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/TrackResponse.kt
similarity index 95%
rename from core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/TrackResponse.kt
rename to core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/TrackResponse.kt
index 70bf11d7..6d2f9022 100644
--- a/core/src/commonMain/kotlin/dev/kord/x/lavalink/rest/TrackResponse.kt
+++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/rest/TrackResponse.kt
@@ -1,12 +1,12 @@
-package dev.kord.x.lavalink.rest
+package dev.schlaubi.lavakord.rest
 
-import dev.kord.x.lavalink.rest.TrackResponse.*
-import dev.kord.x.lavalink.rest.TrackResponse.Error.Severity
-import dev.kord.x.lavalink.rest.TrackResponse.PartialTrack.Info
+import dev.schlaubi.lavakord.rest.TrackResponse.*
+import dev.schlaubi.lavakord.rest.TrackResponse.Error.Severity
+import dev.schlaubi.lavakord.rest.TrackResponse.PartialTrack.Info
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlin.jvm.JvmName
-import dev.kord.x.lavalink.audio.player.Track as NewTrack
+import dev.schlaubi.lavakord.audio.player.Track as NewTrack
 
 /**
  * A Response from the Lavalink [Track Loading API](https://github.com/Frederikam/Lavalink/blob/master/IMPLEMENTATION.md#track-loading-api)
diff --git a/core/src/commonMain/kotlin/me/schlaubi/lavakord/Exceptions.kt b/core/src/commonMain/kotlin/me/schlaubi/lavakord/Exceptions.kt
deleted file mode 100644
index f9d8f0c8..00000000
--- a/core/src/commonMain/kotlin/me/schlaubi/lavakord/Exceptions.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package me.schlaubi.lavakord
-
-import dev.kord.x.lavalink.InsufficientPermissionException
-import dev.kord.x.lavalink.NoRoutePlannerException
-import dev.kord.x.lavalink.RemoteTrackException
-import dev.kord.x.lavalink.rest.addressStatus
-import dev.kord.x.lavalink.audio.Link
-
-/**
- * Exception thrown when there is no permission to perform a certain action.
- *
- * @see InsufficientPermissionException
- */
-@Deprecated(
-    "Moved to new package",
-    ReplaceWith("InsufficientPermissionException", "dev.kord.extensions.lavalink.InsufficientPermissionException")
-)
-public typealias InsufficientPermissionException = InsufficientPermissionException
-
-/**
- * Exception thrown on [Link.addressStatus] when there is no route planner set in Lavalink configuration.
- *
- * @see InsufficientPermissionException
- */
-@Deprecated(
-    "Moved to new package",
-    ReplaceWith("NoRoutePlannerException", "dev.kord.extensions.lavalink.NoRoutePlannerException")
-)
-public typealias NoRoutePlannerException = NoRoutePlannerException
-
-/**
- * Forwarded Exception from Lavalink player thrown if an error occurs whilst playing a track.
- *
- * @see InsufficientPermissionException
- */
-@Deprecated(
-    "Moved to new package",
-    ReplaceWith("RemoteTrackException", "dev.kord.extensions.lavalink.RemoteTrackException")
-)
-public typealias RemoteTrackException = RemoteTrackException
diff --git a/core/src/commonTest/kotlin/RetryTest.kt b/core/src/commonTest/kotlin/RetryTest.kt
index 24cdec01..67e1da7e 100644
--- a/core/src/commonTest/kotlin/RetryTest.kt
+++ b/core/src/commonTest/kotlin/RetryTest.kt
@@ -1,4 +1,4 @@
-import dev.kord.x.lavalink.audio.retry.LinearRetry
+import dev.schlaubi.lavakord.audio.retry.LinearRetry
 import kotlinx.coroutines.launch
 //import kotlin.js.JsName
 import kotlin.test.Test
diff --git a/core/src/commonTest/kotlin/TestLavakord.kt b/core/src/commonTest/kotlin/TestLavakord.kt
index 8b1f4cd9..8b342de8 100644
--- a/core/src/commonTest/kotlin/TestLavakord.kt
+++ b/core/src/commonTest/kotlin/TestLavakord.kt
@@ -1,8 +1,8 @@
-import dev.kord.x.lavalink.MutableLavaKordOptions
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLavakord
-import dev.kord.x.lavalink.audio.internal.NodeImpl
+import dev.schlaubi.lavakord.MutableLavaKordOptions
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLavakord
+import dev.schlaubi.lavakord.audio.internal.NodeImpl
 import io.ktor.client.engine.*
 import io.ktor.http.*
 import kotlinx.coroutines.CoroutineScope
diff --git a/core/src/commonTest/kotlin/json/CommandsTest.kt b/core/src/commonTest/kotlin/json/CommandsTest.kt
index 301cdf53..c3bf51aa 100644
--- a/core/src/commonTest/kotlin/json/CommandsTest.kt
+++ b/core/src/commonTest/kotlin/json/CommandsTest.kt
@@ -1,6 +1,6 @@
 package json
 
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
+import dev.schlaubi.lavakord.audio.internal.GatewayPayload
 import json.src.*
 //import kotlin.js.JsName
 import kotlin.test.Test
diff --git a/core/src/commonTest/kotlin/json/EventsTest.kt b/core/src/commonTest/kotlin/json/EventsTest.kt
index 57189872..331dae77 100644
--- a/core/src/commonTest/kotlin/json/EventsTest.kt
+++ b/core/src/commonTest/kotlin/json/EventsTest.kt
@@ -1,6 +1,6 @@
 package json
 
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
+import dev.schlaubi.lavakord.audio.internal.GatewayPayload
 import json.src.*
 //import kotlin.js.JsName
 import kotlin.test.Test
diff --git a/core/src/commonTest/kotlin/json/RoutePlannerTest.kt b/core/src/commonTest/kotlin/json/RoutePlannerTest.kt
index 83972891..7f41cae9 100644
--- a/core/src/commonTest/kotlin/json/RoutePlannerTest.kt
+++ b/core/src/commonTest/kotlin/json/RoutePlannerTest.kt
@@ -1,9 +1,9 @@
 package json
 
-import dev.kord.x.lavalink.rest.NanoIpRoutePlanner
-import dev.kord.x.lavalink.rest.RotatingIpRoutePlanner
-import dev.kord.x.lavalink.rest.RotatingNanoIpRoutePlanner
-import dev.kord.x.lavalink.rest.RoutePlannerStatus
+import dev.schlaubi.lavakord.rest.NanoIpRoutePlanner
+import dev.schlaubi.lavakord.rest.RotatingIpRoutePlanner
+import dev.schlaubi.lavakord.rest.RotatingNanoIpRoutePlanner
+import dev.schlaubi.lavakord.rest.RoutePlannerStatus
 import json.src.NANO_IP_ROUTE_PLANNER
 import json.src.ROTATING_IP_ROUTE_PLANNER
 import json.src.ROTATING_NANO_IP_ROUTE_PLANNER
diff --git a/core/src/commonTest/kotlin/json/TrackParsingTest.kt b/core/src/commonTest/kotlin/json/TrackParsingTest.kt
index d25398b7..e44f9f83 100644
--- a/core/src/commonTest/kotlin/json/TrackParsingTest.kt
+++ b/core/src/commonTest/kotlin/json/TrackParsingTest.kt
@@ -1,7 +1,7 @@
 package json
 
 import Tests.runBlocking
-import dev.kord.x.lavalink.audio.player.Track
+import dev.schlaubi.lavakord.audio.player.Track
 import json.src.TRACK
 //import kotlin.js.JsName
 import kotlin.test.Test
diff --git a/core/src/commonTest/kotlin/json/TrackRestTest.kt b/core/src/commonTest/kotlin/json/TrackRestTest.kt
index 0b99b3a4..aeb71836 100644
--- a/core/src/commonTest/kotlin/json/TrackRestTest.kt
+++ b/core/src/commonTest/kotlin/json/TrackRestTest.kt
@@ -1,10 +1,9 @@
 package json
 
-import dev.kord.x.lavalink.rest.TrackResponse
+import dev.schlaubi.lavakord.rest.TrackResponse
 import json.src.*
 //import kotlin.js.JsName
 import kotlin.test.Test
-import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 val neverGonnaGiveYouUp = TrackResponse.PartialTrack(
diff --git a/core/src/commonTest/kotlin/json/Utils.kt b/core/src/commonTest/kotlin/json/Utils.kt
index 30d790e6..aebc2d2f 100644
--- a/core/src/commonTest/kotlin/json/Utils.kt
+++ b/core/src/commonTest/kotlin/json/Utils.kt
@@ -1,9 +1,9 @@
 package json
 
-import dev.kord.x.lavalink.audio.internal.GatewayModule
-import dev.kord.x.lavalink.audio.internal.GatewayPayload
-import dev.kord.x.lavalink.rest.RoutePlannerModule
-import dev.kord.x.lavalink.rest.RoutePlannerStatus
+import dev.schlaubi.lavakord.audio.internal.GatewayModule
+import dev.schlaubi.lavakord.audio.internal.GatewayPayload
+import dev.schlaubi.lavakord.rest.RoutePlannerModule
+import dev.schlaubi.lavakord.rest.RoutePlannerStatus
 import io.ktor.client.engine.mock.*
 import io.ktor.http.*
 import json.src.GUILD_ID
diff --git a/core/src/commonTest/kotlin/rest/RoutePlannerTest.kt b/core/src/commonTest/kotlin/rest/RoutePlannerTest.kt
index 53e96ceb..c1320300 100644
--- a/core/src/commonTest/kotlin/rest/RoutePlannerTest.kt
+++ b/core/src/commonTest/kotlin/rest/RoutePlannerTest.kt
@@ -4,8 +4,8 @@ import RestTestLavakord
 import TestNode
 import Tests
 import Tests.runBlocking
-import dev.kord.x.lavalink.NoRoutePlannerException
-import dev.kord.x.lavalink.rest.*
+import dev.schlaubi.lavakord.NoRoutePlannerException
+import dev.schlaubi.lavakord.rest.*
 import io.ktor.client.engine.mock.*
 import io.ktor.http.*
 import io.ktor.util.*
@@ -81,7 +81,7 @@ class RoutePlannerTest {
         routePlannerClass.value = null
         Tests.runBlocking {
             assertNull(node.addressStatusOrNull())
-            assertFailsWith<NoRoutePlannerException> { node.addressStatus() }
+            assertFailsWith<dev.schlaubi.lavakord.NoRoutePlannerException> { node.addressStatus() }
         }
     }
 
diff --git a/core/src/commonTest/kotlin/rest/TrackLoadingTest.kt b/core/src/commonTest/kotlin/rest/TrackLoadingTest.kt
index 1ccaa94e..9930d252 100644
--- a/core/src/commonTest/kotlin/rest/TrackLoadingTest.kt
+++ b/core/src/commonTest/kotlin/rest/TrackLoadingTest.kt
@@ -4,9 +4,9 @@ import RestTestLavakord
 import TestNode
 import Tests
 import Tests.runBlocking
-import dev.kord.x.lavalink.audio.internal.AbstractLavakord
-import dev.kord.x.lavalink.rest.TrackResponse
-import dev.kord.x.lavalink.rest.loadItem
+import dev.schlaubi.lavakord.audio.internal.AbstractLavakord
+import dev.schlaubi.lavakord.rest.TrackResponse
+import dev.schlaubi.lavakord.rest.loadItem
 import io.ktor.client.engine.*
 import io.ktor.client.engine.mock.*
 import io.ktor.client.features.json.*
@@ -16,7 +16,6 @@ import json.neverGonnaGiveYouUp
 import json.respondJson
 import json.shouldBe
 import json.src.*
-import mu.KotlinLogging
 //import kotlin.js.JsName
 import kotlin.test.Test
 import kotlin.test.assertFailsWith
diff --git a/core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt b/core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
similarity index 98%
rename from core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt
rename to core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
index 746938a3..15085629 100644
--- a/core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt
+++ b/core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.internal
+package dev.schlaubi.lavakord.internal
 
 import io.ktor.client.engine.*
 import io.ktor.client.engine.js.*
diff --git a/core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/JsWebsocketSession.kt b/core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/JsWebsocketSession.kt
similarity index 99%
rename from core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/JsWebsocketSession.kt
rename to core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/JsWebsocketSession.kt
index 09c69fea..1b93bce8 100644
--- a/core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/JsWebsocketSession.kt
+++ b/core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/JsWebsocketSession.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.internal
+package dev.schlaubi.lavakord.internal
 
 import io.ktor.client.features.websocket.*
 import io.ktor.http.cio.websocket.*
diff --git a/core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/package-info.md b/core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/package-info.md
similarity index 100%
rename from core/src/jsMain/kotlin/dev/kord/x/lavalink/internal/package-info.md
rename to core/src/jsMain/kotlin/dev/schlaubi/lavakord/internal/package-info.md
diff --git a/core/src/jvmMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt b/core/src/jvmMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
similarity index 84%
rename from core/src/jvmMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt
rename to core/src/jvmMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
index 41d0cc3b..33b21a74 100644
--- a/core/src/jvmMain/kotlin/dev/kord/x/lavalink/internal/HttpEngine.kt
+++ b/core/src/jvmMain/kotlin/dev/schlaubi/lavakord/internal/HttpEngine.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.internal
+package dev.schlaubi.lavakord.internal
 
 import io.ktor.client.engine.*
 import io.ktor.client.engine.cio.*
diff --git a/core/src/jvmMain/kotlin/me/schlaubi/lavakord/Builder.kt b/core/src/jvmMain/kotlin/me/schlaubi/lavakord/Builder.kt
deleted file mode 100644
index e4416fae..00000000
--- a/core/src/jvmMain/kotlin/me/schlaubi/lavakord/Builder.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.schlaubi.lavakord
-
-import dev.kord.x.lavalink.LavaKordOptions as NewLavaKordOptions
-import dev.kord.x.lavalink.MutableLavaKordOptions as NewMutableLavaKordOptions
-
-/**
- * Legacy alias to [NewLavaKordOptions].
- *
- * @see NewLavaKordOptions
- */
-@Deprecated(
-    "Migrate to kord package",
-    ReplaceWith("LavaKordOptions", "dev.kord.extensions.lavalink.kord.LavaKordOptions")
-)
-public typealias LavaKordOptions = NewLavaKordOptions
-
-/**
- * Legacy alias to [NewMutableLavaKordOptions].
- *
- * @see NewMutableLavaKordOptions
- */
-@Deprecated(
-    "Migrate to kord package",
-    ReplaceWith("NewMutableLavaKordOptions", "dev.kord.extensions.lavalink.kord.NewMutableLavaKordOptions")
-)
-public typealias MutableLavaKordOptions = NewMutableLavaKordOptions
diff --git a/example/src/main/java/Javakord.java b/example/src/main/java/Javakord.java
index adb2276c..e4668738 100644
--- a/example/src/main/java/Javakord.java
+++ b/example/src/main/java/Javakord.java
@@ -1,7 +1,7 @@
-import dev.kord.x.lavalink.interop.JavaInterop;
-import dev.kord.x.lavalink.interop.JavaLavakord;
-import dev.kord.x.lavalink.interop.TrackUtil;
-import dev.kord.x.lavalink.interop.jda.LavakordJDABuilder;
+import dev.schlaubi.lavakord.interop.JavaInterop;
+import dev.schlaubi.lavakord.interop.JavaLavakord;
+import dev.schlaubi.lavakord.interop.TrackUtil;
+import dev.schlaubi.lavakord.interop.jda.LavakordJDABuilder;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
diff --git a/example/src/main/kotlin/me/schlaubi/lavakord/example/Lavakord.kt b/example/src/main/kotlin/me/schlaubi/lavakord/example/Lavakord.kt
index 321ffd37..860c5e97 100644
--- a/example/src/main/kotlin/me/schlaubi/lavakord/example/Lavakord.kt
+++ b/example/src/main/kotlin/me/schlaubi/lavakord/example/Lavakord.kt
@@ -22,18 +22,18 @@ import dev.kord.x.commands.model.prefix.PrefixConfiguration
 import dev.kord.x.commands.model.prefix.literal
 import dev.kord.x.commands.model.prefix.or
 import dev.kord.x.commands.model.prefix.prefix
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.player.*
-import dev.kord.x.lavalink.kord.connectAudio
-import dev.kord.x.lavalink.kord.getLink
-import dev.kord.x.lavalink.kord.lavakord
-import dev.kord.x.lavalink.rest.TrackResponse
-import dev.kord.x.lavalink.rest.loadItem
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.player.*
+import dev.schlaubi.lavakord.kord.connectAudio
+import dev.schlaubi.lavakord.kord.getLink
+import dev.schlaubi.lavakord.kord.lavakord
+import dev.schlaubi.lavakord.rest.TrackResponse
+import dev.schlaubi.lavakord.rest.loadItem
 import kapt.kotlin.generated.configure
 import kotlin.time.ExperimentalTime
 
-lateinit var lavalink: LavaKord
+lateinit var lavalink: dev.schlaubi.lavakord.LavaKord
 
 suspend fun main(): Unit = bot(System.getenv("token")) {
     configure()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..e708b1c0
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 350c3d2f..8cf6eb5a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,5 @@
-#
-#Fri Nov 20 22:10:13 CET 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 00000000..4f906e0c
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..107acd32
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/CoroutineUtil.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/CoroutineUtil.kt
similarity index 91%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/CoroutineUtil.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/CoroutineUtil.kt
index 47bf9c03..ce5f6bb0 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/CoroutineUtil.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/CoroutineUtil.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.future.future
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/EqualizerBuilder.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/EqualizerBuilder.kt
similarity index 84%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/EqualizerBuilder.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/EqualizerBuilder.kt
index 04e2c92e..8dbc90eb 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/EqualizerBuilder.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/EqualizerBuilder.kt
@@ -1,9 +1,9 @@
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.audio.player.applyEqualizer
-import dev.kord.x.lavalink.audio.player.gain
+import dev.schlaubi.lavakord.audio.player.applyEqualizer
+import dev.schlaubi.lavakord.audio.player.gain
 import java.util.concurrent.CompletableFuture
-import dev.kord.x.lavalink.audio.player.EqualizerBuilder as KotlinEqualizerBuilder
+import dev.schlaubi.lavakord.audio.player.EqualizerBuilder as KotlinEqualizerBuilder
 
 /**
  * Builder for Equalizer configuration.
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaInterop.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaInterop.kt
similarity index 59%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaInterop.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaInterop.kt
index b77feb51..4703ca77 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaInterop.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaInterop.kt
@@ -1,8 +1,7 @@
 @file:JvmName("JavaInterop")
 
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.LavaKord
 import java.util.concurrent.CompletableFuture
 
 /**
@@ -10,4 +9,4 @@ import java.util.concurrent.CompletableFuture
  *
  * For Rest actions please refer to `TrackUtil` and `RoutePlannerUtil`
  */
-public fun createJavaInterface(lavakord: LavaKord): JavaLavakord = JavaLavakord(lavakord)
+public fun createJavaInterface(lavakord: dev.schlaubi.lavakord.LavaKord): JavaLavakord = JavaLavakord(lavakord)
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaLavakord.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaLavakord.kt
similarity index 90%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaLavakord.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaLavakord.kt
index c0523320..9b2fcda6 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaLavakord.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaLavakord.kt
@@ -1,8 +1,8 @@
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.audio.Node
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.audio.Node
 import java.net.URI
 
 /**
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaLink.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaLink.kt
similarity index 87%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaLink.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaLink.kt
index 8d401c64..edc27dbf 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaLink.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaLink.kt
@@ -1,11 +1,11 @@
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.InsufficientPermissionException
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Link.State
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.player.Player
+import dev.schlaubi.lavakord.InsufficientPermissionException
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Link.State
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.player.Player
 import kotlinx.coroutines.CoroutineScope
 import java.util.concurrent.CompletableFuture
 import kotlin.coroutines.CoroutineContext
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaPlayer.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaPlayer.kt
similarity index 94%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaPlayer.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaPlayer.kt
index 3311a7dc..45860eb0 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/JavaPlayer.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/JavaPlayer.kt
@@ -1,8 +1,8 @@
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.audio.player.Player
-import dev.kord.x.lavalink.audio.player.Track
-import dev.kord.x.lavalink.rest.TrackResponse
+import dev.schlaubi.lavakord.audio.player.Player
+import dev.schlaubi.lavakord.audio.player.Track
+import dev.schlaubi.lavakord.rest.TrackResponse
 import kotlinx.coroutines.CoroutineScope
 import java.time.Duration
 import java.util.concurrent.CompletableFuture
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/RoutePlannerUtil.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/RoutePlannerUtil.kt
similarity index 82%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/RoutePlannerUtil.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/RoutePlannerUtil.kt
index b1497e2b..e44c9190 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/RoutePlannerUtil.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/RoutePlannerUtil.kt
@@ -1,13 +1,13 @@
 @file:JvmName("RoutePlannerUtil")
 
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.NoRoutePlannerException
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.rest.RoutePlannerStatus
-import dev.kord.x.lavalink.rest.addressStatusOrNull
-import dev.kord.x.lavalink.rest.unmarkAddress
-import dev.kord.x.lavalink.rest.unmarkAllAddresses
+import dev.schlaubi.lavakord.NoRoutePlannerException
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.rest.RoutePlannerStatus
+import dev.schlaubi.lavakord.rest.addressStatusOrNull
+import dev.schlaubi.lavakord.rest.unmarkAddress
+import dev.schlaubi.lavakord.rest.unmarkAllAddresses
 import java.util.concurrent.CompletableFuture
 
 private fun Node.javaAddressStatusOrNull() =
@@ -34,7 +34,7 @@ public fun addressStatusOrNull(node: Node): CompletableFuture<RoutePlannerStatus
  * @see Node.addressStatusOrNull
  */
 public fun addressStatus(node: Node): CompletableFuture<RoutePlannerStatus<out RoutePlannerStatus.Data>> =
-    node.javaAddressStatusOrNull().thenApply { it ?: throw NoRoutePlannerException() }
+    node.javaAddressStatusOrNull().thenApply { it ?: throw dev.schlaubi.lavakord.NoRoutePlannerException() }
 
 private fun Node.javaUnmarkAllAddresses() = lavakord.run { unmarkAllAddresses() }
 
diff --git a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/TrackUtil.kt b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/TrackUtil.kt
similarity index 84%
rename from java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/TrackUtil.kt
rename to java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/TrackUtil.kt
index 5e554409..d7afab06 100644
--- a/java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/TrackUtil.kt
+++ b/java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/TrackUtil.kt
@@ -1,12 +1,12 @@
 @file:JvmName("TrackUtil")
 
-package dev.kord.x.lavalink.interop
+package dev.schlaubi.lavakord.interop
 
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.player.Track
-import dev.kord.x.lavalink.rest.TrackResponse
-import dev.kord.x.lavalink.rest.loadItem
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.player.Track
+import dev.schlaubi.lavakord.rest.TrackResponse
+import dev.schlaubi.lavakord.rest.loadItem
 import java.time.Duration
 import java.util.concurrent.CompletableFuture
 import kotlin.time.ExperimentalTime
diff --git a/jda-java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/jda/Builder.kt b/jda-java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/jda/Builder.kt
similarity index 87%
rename from jda-java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/jda/Builder.kt
rename to jda-java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/jda/Builder.kt
index ad39d8af..02d3b3e0 100644
--- a/jda-java/src/jvmMain/kotlin/dev/kord/x/lavalink/interop/jda/Builder.kt
+++ b/jda-java/src/jvmMain/kotlin/dev/schlaubi/lavakord/interop/jda/Builder.kt
@@ -1,12 +1,12 @@
 @file:JvmName("LavakordBuilder")
 
-package dev.kord.x.lavalink.interop.jda
+package dev.schlaubi.lavakord.interop.jda
 
-import dev.kord.x.jda.LJDA
-import dev.kord.x.jda.LShardManager
-import dev.kord.x.jda.buildWithLavakord
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.MutableLavaKordOptions
+import dev.schlaubi.lavakord.jda.LJDA
+import dev.schlaubi.lavakord.jda.LShardManager
+import dev.schlaubi.lavakord.jda.buildWithLavakord
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.MutableLavaKordOptions
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.asCoroutineDispatcher
 import net.dv8tion.jda.api.JDA
diff --git a/jda/src/jvmMain/kotlin/dev/kord/x/jda/Utils.kt b/jda/src/jvmMain/kotlin/dev/kord/x/jda/Utils.kt
deleted file mode 100644
index c55a6d55..00000000
--- a/jda/src/jvmMain/kotlin/dev/kord/x/jda/Utils.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.kord.x.jda
-
-import dev.kord.x.lavalink.LavaKord
-
-public fun LavaKord.getShardIdForGuild(snowflake: Long): Int = ((snowflake shr 22) % shardsTotal).toInt()
diff --git a/jda/src/jvmMain/kotlin/dev/kord/x/jda/Builder.kt b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/Builder.kt
similarity index 95%
rename from jda/src/jvmMain/kotlin/dev/kord/x/jda/Builder.kt
rename to jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/Builder.kt
index 15559d9f..b9bd1ae3 100644
--- a/jda/src/jvmMain/kotlin/dev/kord/x/jda/Builder.kt
+++ b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/Builder.kt
@@ -1,7 +1,7 @@
-package dev.kord.x.jda
+package dev.schlaubi.lavakord.jda
 
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.MutableLavaKordOptions
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.MutableLavaKordOptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.asCoroutineDispatcher
diff --git a/jda/src/jvmMain/kotlin/dev/kord/x/jda/JDA.kt b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/JDA.kt
similarity index 81%
rename from jda/src/jvmMain/kotlin/dev/kord/x/jda/JDA.kt
rename to jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/JDA.kt
index 8122bc11..afdc1bca 100644
--- a/jda/src/jvmMain/kotlin/dev/kord/x/jda/JDA.kt
+++ b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/JDA.kt
@@ -1,21 +1,36 @@
-package dev.kord.x.jda
+package dev.schlaubi.lavakord.jda
 
-import dev.kord.x.lavalink.LavaKord
+import dev.schlaubi.lavakord.LavaKord
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.events.GenericEvent
 import net.dv8tion.jda.api.hooks.EventListener
 import net.dv8tion.jda.api.hooks.VoiceDispatchInterceptor
 import net.dv8tion.jda.api.sharding.ShardManager
 
+/**
+ * Response of Lavakord builders
+ *
+ * @property lavakord The [LavaKord] that got built
+ */
 public interface LavakordJdaBase {
     public val lavakord: LavaKord
 }
 
+/**
+ * Result of a JDA Lavakord builder.
+ *
+ * @property jda the [JDA] instance that got built
+ */
 public interface LJDA : LavakordJdaBase {
     public val jda: JDA
 }
 
-public interface LShardManager: LavakordJdaBase {
+/**
+ * Result of a ShardManager Lavakord builder.
+ *
+ * @property shardManager the [ShardManager] instance that got built
+ */
+public interface LShardManager : LavakordJdaBase {
     public val shardManager: ShardManager
 }
 
diff --git a/jda/src/jvmMain/kotlin/dev/kord/x/jda/LavaKordImpl.kt b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/LavaKordImpl.kt
similarity index 89%
rename from jda/src/jvmMain/kotlin/dev/kord/x/jda/LavaKordImpl.kt
rename to jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/LavaKordImpl.kt
index 4f8a1c2e..50d793ad 100644
--- a/jda/src/jvmMain/kotlin/dev/kord/x/jda/LavaKordImpl.kt
+++ b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/LavaKordImpl.kt
@@ -1,10 +1,10 @@
-package dev.kord.x.jda
+package dev.schlaubi.lavakord.jda
 
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.audio.DiscordVoiceServerUpdateData
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLavakord
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.audio.DiscordVoiceServerUpdateData
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLavakord
 import kotlinx.coroutines.launch
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.events.GenericEvent
diff --git a/jda/src/jvmMain/kotlin/dev/kord/x/jda/LinkImpl.kt b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/LinkImpl.kt
similarity index 86%
rename from jda/src/jvmMain/kotlin/dev/kord/x/jda/LinkImpl.kt
rename to jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/LinkImpl.kt
index 6c02bb55..96346dfc 100644
--- a/jda/src/jvmMain/kotlin/dev/kord/x/jda/LinkImpl.kt
+++ b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/LinkImpl.kt
@@ -1,7 +1,7 @@
-package dev.kord.x.jda
+package dev.schlaubi.lavakord.jda
 
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLink
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLink
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.entities.Guild
 
diff --git a/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/Utils.kt b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/Utils.kt
new file mode 100644
index 00000000..d59a0e7c
--- /dev/null
+++ b/jda/src/jvmMain/kotlin/dev/schlaubi/lavakord/jda/Utils.kt
@@ -0,0 +1,9 @@
+package dev.schlaubi.lavakord.jda
+
+import dev.schlaubi.lavakord.LavaKord
+
+/**
+ * Calculates the shard id for the guild with [snowflake] as its id.
+ */
+public fun LavaKord.getShardIdForGuild(snowflake: Long): Int =
+    ((snowflake shr 22) % shardsTotal).toInt()
diff --git a/jsExample/src/main/kotlin/Lavakord.kt b/jsExample/src/main/kotlin/Lavakord.kt
index f18a7006..8b30877f 100644
--- a/jsExample/src/main/kotlin/Lavakord.kt
+++ b/jsExample/src/main/kotlin/Lavakord.kt
@@ -1,10 +1,10 @@
 @file:Suppress("KDocMissingDocumentation")
 
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.player.*
-import dev.kord.x.lavalink.rest.TrackResponse
-import dev.kord.x.lavalink.rest.loadItem
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.player.*
+import dev.schlaubi.lavakord.rest.TrackResponse
+import dev.schlaubi.lavakord.rest.loadItem
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.await
 import kotlinx.coroutines.delay
@@ -42,7 +42,7 @@ suspend fun main() {
 }
 
 @OptIn(ExperimentalTime::class, FiltersApi::class)
-private suspend fun commandHandler(message: Discord.Message, lavakord: LavaKord, client: Discord.Client) {
+private suspend fun commandHandler(message: Discord.Message, lavakord: dev.schlaubi.lavakord.LavaKord, client: Discord.Client) {
     val input = message.content
     val (command, args) = with(input.split("\\s+".toRegex())) { first() to drop(1) }
     val guild = message.guild
@@ -150,7 +150,7 @@ private suspend fun commandHandler(message: Discord.Message, lavakord: LavaKord,
 
 @OptIn(ExperimentalTime::class)
 suspend fun startLavakord(client: Discord.Client) {
-    val lavakord: LavaKord =
+    val lavakord: dev.schlaubi.lavakord.LavaKord =
         client.lavakord { } // In an ideal world we would be able to use Kord here, but we can't see discord-js(-lavakord).kt
     lavakord.addNode("wss://lavakord.eu.ngrok.io", "youshallnotpass")
 
diff --git a/jsExample/src/main/kotlin/discord-js-lavakord.kt b/jsExample/src/main/kotlin/discord-js-lavakord.kt
index f840bf08..e4b4acd8 100644
--- a/jsExample/src/main/kotlin/discord-js-lavakord.kt
+++ b/jsExample/src/main/kotlin/discord-js-lavakord.kt
@@ -1,12 +1,12 @@
 @file:Suppress("KDocMissingDocumentation")
 
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.MutableLavaKordOptions
-import dev.kord.x.lavalink.audio.DiscordVoiceServerUpdateData
-import dev.kord.x.lavalink.audio.Link as ILink
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLavakord
-import dev.kord.x.lavalink.audio.internal.AbstractLink
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.MutableLavaKordOptions
+import dev.schlaubi.lavakord.audio.DiscordVoiceServerUpdateData
+import dev.schlaubi.lavakord.audio.Link as ILink
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLavakord
+import dev.schlaubi.lavakord.audio.internal.AbstractLink
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.await
diff --git a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/Builder.kt b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/Builder.kt
similarity index 68%
rename from kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/Builder.kt
rename to kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/Builder.kt
index 16d25da7..4d5845b7 100644
--- a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/Builder.kt
+++ b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/Builder.kt
@@ -1,9 +1,9 @@
-package dev.kord.x.lavalink.kord
+package dev.schlaubi.lavakord.kord
 
 import dev.kord.core.Kord
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.LavaKordOptions
-import dev.kord.x.lavalink.MutableLavaKordOptions
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.LavaKordOptions
+import dev.schlaubi.lavakord.MutableLavaKordOptions
 
 /**
  * Creates a [LavaKord] instance for this [Kord] instance.
@@ -15,7 +15,7 @@ public fun Kord.lavakord(configure: MutableLavaKordOptions.() -> Unit = {}): Lav
     return KordLavaKord(
         this,
         this.selfId.value,
-        resources.shardCount,
+        resources.shards.totalShards,
         options
     )
 }
diff --git a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/Extensions.kt b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/Extensions.kt
similarity index 86%
rename from kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/Extensions.kt
rename to kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/Extensions.kt
index f9cc7d44..b90eb093 100644
--- a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/Extensions.kt
+++ b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/Extensions.kt
@@ -1,13 +1,13 @@
-package dev.kord.x.lavalink.kord
+package dev.schlaubi.lavakord.kord
 
 import dev.kord.common.entity.Permissions
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.behavior.GuildBehavior
 import dev.kord.core.entity.Guild
 import dev.kord.core.entity.channel.VoiceChannel
-import dev.kord.x.lavalink.InsufficientPermissionException
-import dev.kord.x.lavalink.LavaKord
-import dev.kord.x.lavalink.audio.Link
+import dev.schlaubi.lavakord.InsufficientPermissionException
+import dev.schlaubi.lavakord.LavaKord
+import dev.schlaubi.lavakord.audio.Link
 
 /**
  * Creates or returns an existing [Link] for the guild with the specified [guildId].
diff --git a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/LavaKordImpl.kt b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/LavaKordImpl.kt
similarity index 90%
rename from kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/LavaKordImpl.kt
rename to kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/LavaKordImpl.kt
index f487adf9..48273287 100644
--- a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/LavaKordImpl.kt
+++ b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/LavaKordImpl.kt
@@ -1,4 +1,4 @@
-package dev.kord.x.lavalink.kord
+package dev.schlaubi.lavakord.kord
 
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
@@ -6,14 +6,14 @@ import dev.kord.core.event.gateway.DisconnectEvent
 import dev.kord.core.event.guild.VoiceServerUpdateEvent
 import dev.kord.core.event.user.VoiceStateUpdateEvent
 import dev.kord.core.on
-import dev.kord.x.lavalink.LavaKordOptions
+import dev.schlaubi.lavakord.LavaKordOptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import dev.kord.x.lavalink.audio.DiscordVoiceServerUpdateData
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLavakord
+import dev.schlaubi.lavakord.audio.DiscordVoiceServerUpdateData
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLavakord
 import kotlin.coroutines.CoroutineContext
 
 internal class KordLavaKord(
diff --git a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/LinkImpl.kt b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/LinkImpl.kt
similarity index 83%
rename from kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/LinkImpl.kt
rename to kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/LinkImpl.kt
index 69e1fad8..326ae658 100644
--- a/kord/src/jvmMain/kotlin/dev/kord/x/lavalink/kord/LinkImpl.kt
+++ b/kord/src/jvmMain/kotlin/dev/schlaubi/lavakord/kord/LinkImpl.kt
@@ -1,14 +1,13 @@
-package dev.kord.x.lavalink.kord
+package dev.schlaubi.lavakord.kord
 
 import dev.kord.common.entity.Permission
 import dev.kord.common.entity.Permissions
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.entity.channel.VoiceChannel
-import dev.kord.x.lavalink.InsufficientPermissionException
-import dev.kord.x.lavalink.audio.Link
-import dev.kord.x.lavalink.audio.Node
-import dev.kord.x.lavalink.audio.internal.AbstractLink
 import dev.kord.gateway.UpdateVoiceStatus
+import dev.schlaubi.lavakord.audio.Link
+import dev.schlaubi.lavakord.audio.Node
+import dev.schlaubi.lavakord.audio.internal.AbstractLink
 import kotlinx.coroutines.flow.count
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
@@ -50,7 +49,12 @@ internal class KordLink(
         }
         val permissions = channel.getEffectivePermissions(lavakord.kord.selfId)
         if (!permissions.contains(Permission.Connect) && !permissions.contains(Permission.MoveMembers)) {
-            throw InsufficientPermissionException(Permissions(Permission.Connect, Permission.MoveMembers).code.binary)
+            throw dev.schlaubi.lavakord.InsufficientPermissionException(
+                Permissions(
+                    Permission.Connect,
+                    Permission.MoveMembers
+                ).code.binary
+            )
         }
 
         val voiceState = channel.getGuild().getMember(lavakord.kord.selfId).getVoiceStateOrNull()
@@ -63,7 +67,7 @@ internal class KordLink(
                     && limit >= channel.voiceStates.count()
                     && !permissions.contains(Permission.MoveMembers)
                 )
-                    throw InsufficientPermissionException(Permissions(Permission.MoveMembers).code.binary)
+                    throw dev.schlaubi.lavakord.InsufficientPermissionException(Permissions(Permission.MoveMembers).code.binary)
             }
         }
     }
@@ -82,6 +86,6 @@ internal class KordLink(
 
         command.javaClass.getDeclaredField("channelId").apply { isAccessible = true }
             .set(command, null)
-        guild.gateway!!.send(command)
+        guild.gateway?.send(command)
     }
 }
diff --git a/publishing.gradle.kts b/publishing.gradle.kts
new file mode 100644
index 00000000..19477bf4
--- /dev/null
+++ b/publishing.gradle.kts
@@ -0,0 +1,70 @@
+import java.util.*
+
+apply(plugin = "org.gradle.maven-publish")
+apply(plugin = "org.gradle.signing")
+
+val configurePublishing: PublishingExtension.() -> Unit = {
+    repositories {
+        maven {
+            setUrl("https://schlaubi.jfrog.io/artifactory/forp-artifacts")
+
+            credentials {
+                username = System.getenv("BINTRAY_USER")
+                password = System.getenv("BINTRAY_KEY")
+            }
+        }
+    }
+
+    publications {
+        filterIsInstance<MavenPublication>().forEach { publication ->
+            publication.pom {
+                name.set(project.name)
+                description.set("Kotlin library which can, fetch, find, parse and analyze JVM exception stacktraces")
+                url.set("https://github.com/DRSchlaubi/furry-okto-rotary-phone")
+
+                licenses {
+                    license {
+                        name.set("Apache-2.0 License")
+                        url.set("https://github.com/DRSchlaubi/furry-okto-rotary-phone/blob/main/LICENSE")
+                    }
+                }
+
+                developers {
+                    developer {
+                        name.set("Michael Rittmeister")
+                        email.set("mail@schlaubi.me")
+                        organizationUrl.set("https://michael.rittmeister.in")
+                    }
+                }
+
+                scm {
+                    connection.set("scm:git:https://github.com/DRSchlaubi/furry-okto-rotary-phone.git")
+                    developerConnection.set("scm:git:https://github.com/DRSchlaubi/furry-okto-rotary-phone.git")
+                    url.set("https://github.com/DRSchlaubi/furry-okto-rotary-phone")
+                }
+            }
+        }
+    }
+}
+
+val configureSigning: SigningExtension.() -> Unit = {
+    val signingKey = findProperty("signingKey")?.toString()
+    val signingPassword = findProperty("signingPassword")?.toString()
+    if (signingKey != null && signingPassword != null) {
+        useInMemoryPgpKeys(
+            String(Base64.getDecoder().decode(signingKey.toByteArray())),
+            signingPassword
+        )
+    }
+
+    publishing.publications.withType<MavenPublication> {
+        sign(this)
+    }
+}
+
+extensions.configure("signing", configureSigning)
+extensions.configure("publishing", configurePublishing)
+
+val Project.publishing: PublishingExtension
+    get() =
+        (this as ExtensionAware).extensions.getByName("publishing") as PublishingExtension
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b7f6c297..00f47997 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,11 +1,12 @@
 rootProject.name = "lavakord"
 include("example")
 include("kord")
-//include("jsExample")
+include("jsExample")
 include("core")
 include("java")
 include("jda")
 include("jda-java")
+include("bom")
 
 pluginManagement {
     resolutionStrategy {