diff --git a/plugins/fancyvisuals/api/build.gradle.kts b/plugins/fancyvisuals/api/build.gradle.kts
deleted file mode 100644
index a1e49d69..00000000
--- a/plugins/fancyvisuals/api/build.gradle.kts
+++ /dev/null
@@ -1,57 +0,0 @@
-plugins {
-    id("java-library")
-    id("maven-publish")
-}
-
-dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
-}
-
-tasks {
-    publishing {
-        repositories {
-            maven {
-                name = "fancypluginsReleases"
-                url = uri("https://repo.fancyplugins.de/releases")
-                credentials(PasswordCredentials::class)
-                authentication {
-                    isAllowInsecureProtocol = true
-                    create<BasicAuthentication>("basic")
-                }
-            }
-
-            maven {
-                name = "fancypluginsSnapshots"
-                url = uri("https://repo.fancyplugins.de/snapshots")
-                credentials(PasswordCredentials::class)
-                authentication {
-                    isAllowInsecureProtocol = true
-                    create<BasicAuthentication>("basic")
-                }
-            }
-        }
-        publications {
-            create<MavenPublication>("maven") {
-                groupId = "de.oliver"
-                artifactId = "FancyVisuals"
-                version = findProperty("fancyvisualsVersion") as String
-                from(project.components["java"])
-            }
-        }
-    }
-
-    java {
-        withSourcesJar()
-        withJavadocJar()
-    }
-
-    javadoc {
-        options.encoding = Charsets.UTF_8.name()
-    }
-
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-        options.release = 21
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/fancyvisuals/build.gradle.kts b/plugins/fancyvisuals/build.gradle.kts
index 38de10e4..ed0e81c0 100644
--- a/plugins/fancyvisuals/build.gradle.kts
+++ b/plugins/fancyvisuals/build.gradle.kts
@@ -28,10 +28,11 @@ allprojects {
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
-    implementation(project(":plugins:fancyvisuals:api"))
-
-    compileOnly("de.oliver:FancyLib:33") // loaded in FancyVisualLoader
-    compileOnly("de.oliver:FancySitula:0.0.13") // loaded in FancyVisualLoader
+    implementation(project(":libraries:common"))
+    implementation(project(":libraries:plugin-tests"))
+    implementation(project(":libraries:jdb"))
+    implementation(project(":libraries:packets:api"))
+    implementation(project(":libraries:packets:factories"))
     compileOnly("de.oliver.FancyAnalytics:api:0.0.8") // loaded in FancyVisualLoader
     compileOnly("de.oliver.FancyAnalytics:logger:0.0.5") // loaded in FancyVisualLoader
 
@@ -87,7 +88,6 @@ tasks {
 
     shadowJar {
         archiveClassifier.set("")
-        dependsOn(":plugins:fancyvisuals:api:jar")
     }
 
     compileJava {
diff --git a/plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/Context.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/Context.java
similarity index 100%
rename from plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/Context.java
rename to plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/Context.java
diff --git a/plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/FancyVisualsAPI.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/FancyVisualsAPI.java
similarity index 100%
rename from plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/FancyVisualsAPI.java
rename to plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/FancyVisualsAPI.java
diff --git a/plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/nametags/Nametag.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/nametags/Nametag.java
similarity index 100%
rename from plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/nametags/Nametag.java
rename to plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/nametags/Nametag.java
diff --git a/plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagRepository.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagRepository.java
similarity index 100%
rename from plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagRepository.java
rename to plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagRepository.java
diff --git a/plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagStore.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagStore.java
similarity index 100%
rename from plugins/fancyvisuals/api/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagStore.java
rename to plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/api/nametags/NametagStore.java
diff --git a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagRepository.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagRepository.java
index f25e21fe..e82c8da2 100644
--- a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagRepository.java
+++ b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagRepository.java
@@ -1,11 +1,11 @@
 package de.oliver.fancyvisuals.nametags.store;
 
-import de.oliver.fancylib.jdb.JDB;
 import de.oliver.fancyvisuals.api.Context;
 import de.oliver.fancyvisuals.api.nametags.Nametag;
 import de.oliver.fancyvisuals.api.nametags.NametagRepository;
 import de.oliver.fancyvisuals.api.nametags.NametagStore;
 import de.oliver.fancyvisuals.utils.VaultHelper;
+import de.oliver.jdb.JDB;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java
index 4eba8a27..409cc6a1 100644
--- a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java
+++ b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java
@@ -1,10 +1,10 @@
 package de.oliver.fancyvisuals.nametags.store;
 
-import de.oliver.fancylib.jdb.JDB;
 import de.oliver.fancyvisuals.FancyVisuals;
 import de.oliver.fancyvisuals.api.Context;
 import de.oliver.fancyvisuals.api.nametags.Nametag;
 import de.oliver.fancyvisuals.api.nametags.NametagStore;
+import de.oliver.jdb.JDB;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/playerConfig/JsonPlayerConfigStore.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/playerConfig/JsonPlayerConfigStore.java
index d88b44da..56f2daed 100644
--- a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/playerConfig/JsonPlayerConfigStore.java
+++ b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/playerConfig/JsonPlayerConfigStore.java
@@ -1,7 +1,7 @@
 package de.oliver.fancyvisuals.playerConfig;
 
-import de.oliver.fancylib.jdb.JDB;
 import de.oliver.fancyvisuals.FancyVisuals;
+import de.oliver.jdb.JDB;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4d367a6a..088fc9fd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,6 @@ include(":plugins:fancyholograms:implementation_1_20_1")
 include(":plugins:fancyholograms:implementation_1_19_4")
 
 include(":plugins:fancyvisuals")
-include(":plugins:fancyvisuals:api")
 
 include(":libraries:common")
 include(":libraries:jdb")