diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt
index ea6ff62..e91ed5d 100644
--- a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt
+++ b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt
@@ -3,8 +3,8 @@ package dev.arbjerg.lavalink.client
 import dev.arbjerg.lavalink.client.loadbalancing.ILoadBalancer
 import dev.arbjerg.lavalink.client.loadbalancing.VoiceRegion
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.DefaultLoadBalancer
+import dev.arbjerg.lavalink.client.protocol.ClientEvent
 import dev.arbjerg.lavalink.internal.ReconnectTask
-import dev.arbjerg.lavalink.protocol.v4.Message
 import reactor.core.Disposable
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Sinks
diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt
index 4d569f8..7580e5a 100644
--- a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt
+++ b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt
@@ -1,10 +1,9 @@
 package dev.arbjerg.lavalink.client
 
 import dev.arbjerg.lavalink.client.http.HttpBuilder
-import dev.arbjerg.lavalink.client.protocol.LavalinkLoadResult
+import dev.arbjerg.lavalink.client.protocol.*
 import dev.arbjerg.lavalink.client.protocol.Track
 import dev.arbjerg.lavalink.client.protocol.toCustom
-import dev.arbjerg.lavalink.client.protocol.toLavalinkLoadResult
 import dev.arbjerg.lavalink.internal.*
 import dev.arbjerg.lavalink.internal.error.RestException
 import dev.arbjerg.lavalink.internal.loadbalancing.Penalties
diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/events.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt
similarity index 92%
rename from src/main/kotlin/dev/arbjerg/lavalink/client/events.kt
rename to src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt
index a1b8cd0..0eec410 100644
--- a/src/main/kotlin/dev/arbjerg/lavalink/client/events.kt
+++ b/src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt
@@ -1,9 +1,7 @@
-package dev.arbjerg.lavalink.client
+package dev.arbjerg.lavalink.client.protocol
 
+import dev.arbjerg.lavalink.client.LavalinkNode
 import dev.arbjerg.lavalink.protocol.v4.*
-import dev.arbjerg.lavalink.client.protocol.Track
-import dev.arbjerg.lavalink.client.protocol.TrackException
-import dev.arbjerg.lavalink.client.protocol.toCustom
 import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason
 
 internal fun Message.toClientEvent(node: LavalinkNode) = when (this) {
diff --git a/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt b/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt
index 3a5313c..de826ba 100644
--- a/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt
+++ b/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt
@@ -4,7 +4,7 @@ import dev.arbjerg.lavalink.VERSION as CLIENT_VERSION
 import dev.arbjerg.lavalink.client.LavalinkNode
 import dev.arbjerg.lavalink.client.LinkState
 import dev.arbjerg.lavalink.client.protocol.toCustom
-import dev.arbjerg.lavalink.client.toClientEvent
+import dev.arbjerg.lavalink.client.protocol.toClientEvent
 import dev.arbjerg.lavalink.protocol.v4.Message
 import dev.arbjerg.lavalink.protocol.v4.json
 import okhttp3.Request
diff --git a/src/test/java/JavaJDAExample.java b/src/test/java/JavaJDAExample.java
index c3c0ad4..7c1043d 100644
--- a/src/test/java/JavaJDAExample.java
+++ b/src/test/java/JavaJDAExample.java
@@ -77,7 +77,7 @@ private void registerLavalinkNodes() {
     }
 
     private void registerLavalinkListeners() {
-        this.client.on(dev.arbjerg.lavalink.client.ReadyEvent.class).subscribe((event) -> {
+        this.client.on(dev.arbjerg.lavalink.client.protocol.ReadyEvent.class).subscribe((event) -> {
             final LavalinkNode node = event.getNode();
 
             System.out.printf(
diff --git a/src/test/kotlin/d4jTestScript.kt b/src/test/kotlin/d4jTestScript.kt
index a51aedb..6bff34d 100644
--- a/src/test/kotlin/d4jTestScript.kt
+++ b/src/test/kotlin/d4jTestScript.kt
@@ -1,4 +1,5 @@
 import dev.arbjerg.lavalink.client.*
+import dev.arbjerg.lavalink.client.protocol.TrackStartEvent
 import dev.arbjerg.lavalink.client.protocol.TrackUpdateBuilder
 import dev.arbjerg.lavalink.libraries.discord4j.installVoiceHandler
 import discord4j.core.DiscordClientBuilder
diff --git a/testbot/src/main/java/me/duncte123/testbot/Main.java b/testbot/src/main/java/me/duncte123/testbot/Main.java
index 84005a3..9c74422 100644
--- a/testbot/src/main/java/me/duncte123/testbot/Main.java
+++ b/testbot/src/main/java/me/duncte123/testbot/Main.java
@@ -3,9 +3,9 @@
 import dev.arbjerg.lavalink.client.*;
 import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider;
+import dev.arbjerg.lavalink.client.protocol.*;
 import dev.arbjerg.lavalink.libraries.jda.JDAVoiceUpdateListener;
 import net.dv8tion.jda.api.JDABuilder;
-import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import org.slf4j.Logger;