diff --git a/.gitignore b/.gitignore
index fab23599..366e4851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 # Compiled class file
 *.class
 
+# Jooq
+/pathfinder-core/src/main/jooq/
+
 # Log file
 *.log
 
@@ -140,4 +143,4 @@ gradle-app.setting
 *.hprof
 
 ### Run-Task ###
-run/
\ No newline at end of file
+run/
diff --git a/pathfinder-bukkit/build.gradle.kts b/pathfinder-bukkit/build.gradle.kts
index c161bd9b..7dff9ede 100644
--- a/pathfinder-bukkit/build.gradle.kts
+++ b/pathfinder-bukkit/build.gradle.kts
@@ -221,6 +221,8 @@ tasks {
         }
 
         relocate("org.bstats", "bstats")
+        relocate("net.kyori", "kyori")
+        relocate("com.google.gson", "gson")
         relocate("xyz.xenondevs.particle", "particle")
         relocate("dev.jorel.commandapi", "commandapi")
         relocate("de.cubbossa.translations", "translations")
diff --git a/pathfinder-editmode/build.gradle.kts b/pathfinder-editmode/build.gradle.kts
index 32c66392..9ae567f9 100644
--- a/pathfinder-editmode/build.gradle.kts
+++ b/pathfinder-editmode/build.gradle.kts
@@ -51,7 +51,6 @@ dependencies {
 
     // Client ArmorStands
     implementation("de.cubbossa:ClientEntities:1.3.2")
-    implementation("com.github.retrooper.packetevents:spigot:2.3.1-SNAPSHOT")
 }
 
 tasks {
@@ -76,8 +75,6 @@ tasks {
             include(dependency("xyz.xenondevs:particle:.*"))
             include(dependency("de.tr7zw:item-nbt-api:.*"))
             include(dependency("de.item-nbt-api:.*"))
-            include(dependency("com.github.retrooper.packetevents:spigot:.*"))
-            include(dependency("com.github.retrooper.packetevents:api:.*"))
         }
 
         fun relocate(from: String, to: String) {
@@ -88,8 +85,6 @@ tasks {
         relocate("de.cubbossa.cliententities", "cliententities")
         relocate("xyz.xenondevs.particle", "particle")
         relocate("de.tr7zw.changeme.nbtapi", "nbtapi")
-        relocate("com.github.retrooper.packetevents", "packetevents.api")
-        relocate("io.github.retrooper.packetevents", "packetevents.impl")
     }
     test {
         useJUnitPlatform()
diff --git a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java
index 0f6c309a..d92d9633 100644
--- a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java
+++ b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java
@@ -1,6 +1,7 @@
 package de.cubbossa.pathfinder.editmode;
 
-import com.github.retrooper.packetevents.PacketEvents;
+import de.cubbossa.cliententities.lib.packetevents.api.PacketEvents;
+import de.cubbossa.cliententities.lib.packetevents.impl.factory.spigot.SpigotPacketEventsBuilder;
 import de.cubbossa.menuframework.GUIHandler;
 import de.cubbossa.pathfinder.AbstractPathFinder;
 import de.cubbossa.pathfinder.BukkitPathFinder;
@@ -9,7 +10,6 @@
 import de.cubbossa.pathfinder.PathFinderExtensionBase;
 import de.cubbossa.pathfinder.PathFinderPlugin;
 import de.cubbossa.pathfinder.misc.NamespacedKey;
-import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.pf4j.Extension;
 
@@ -25,8 +25,6 @@ public NamespacedKey getKey() {
   @Override
   public void onLoad(PathFinder pathPlugin) {
     if (pathPlugin instanceof BukkitPathFinder bukkitPathFinder) {
-      de.cubbossa.cliententities.lib.packetevents.api.PacketEvents.setAPI(de.cubbossa.cliententities.lib.packetevents.impl.factory.spigot.SpigotPacketEventsBuilder
-          .build(bukkitPathFinder.getJavaPlugin()));
       PacketEvents.setAPI(SpigotPacketEventsBuilder.build(bukkitPathFinder.getJavaPlugin()));
       PacketEvents.getAPI().getSettings()
           .checkForUpdates(true)
diff --git a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/ParticleEdgeRenderer.java b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/ParticleEdgeRenderer.java
index d3850ae9..d9ebd982 100644
--- a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/ParticleEdgeRenderer.java
+++ b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/ParticleEdgeRenderer.java
@@ -1,6 +1,7 @@
 package de.cubbossa.pathfinder.editmode.renderer;
 
-import com.github.retrooper.packetevents.protocol.particle.type.ParticleTypes;
+import de.cubbossa.cliententities.lib.packetevents.api.protocol.particle.type.ParticleTypes;
+import de.cubbossa.cliententities.lib.packetevents.impl.util.SpigotConversionUtil;
 import de.cubbossa.pathfinder.PathFinder;
 import de.cubbossa.pathfinder.PathFinderConfig;
 import de.cubbossa.pathfinder.PathFinderConfigImpl;
@@ -16,7 +17,6 @@
 import de.cubbossa.pathfinder.util.FutureUtils;
 import de.cubbossa.pathfinder.util.LerpUtils;
 import de.cubbossa.pathfinder.util.MultiMap;
-import io.github.retrooper.packetevents.util.SpigotConversionUtil;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;