diff --git a/ap/pom.xml b/ap/pom.xml
deleted file mode 100644
index dce28a7d7..000000000
--- a/ap/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.geysermc</groupId>
-        <artifactId>geyser-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>ap</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-</project>
\ No newline at end of file
diff --git a/ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java b/ap/src/main/java/org/geysermc/geyser/processor/BlockEntityProcessor.java
similarity index 97%
rename from ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java
rename to ap/src/main/java/org/geysermc/geyser/processor/BlockEntityProcessor.java
index 7ab760cec..f9ba68302 100644
--- a/ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java
+++ b/ap/src/main/java/org/geysermc/geyser/processor/BlockEntityProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
diff --git a/ap/src/main/java/org/geysermc/processor/ClassProcessor.java b/ap/src/main/java/org/geysermc/geyser/processor/ClassProcessor.java
similarity index 99%
rename from ap/src/main/java/org/geysermc/processor/ClassProcessor.java
rename to ap/src/main/java/org/geysermc/geyser/processor/ClassProcessor.java
index 0f730aaba..cd9f24ba0 100644
--- a/ap/src/main/java/org/geysermc/processor/ClassProcessor.java
+++ b/ap/src/main/java/org/geysermc/geyser/processor/ClassProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
diff --git a/ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java b/ap/src/main/java/org/geysermc/geyser/processor/CollisionRemapperProcessor.java
similarity index 97%
rename from ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java
rename to ap/src/main/java/org/geysermc/geyser/processor/CollisionRemapperProcessor.java
index 971abd984..84e2e2ffd 100644
--- a/ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java
+++ b/ap/src/main/java/org/geysermc/geyser/processor/CollisionRemapperProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
diff --git a/ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java b/ap/src/main/java/org/geysermc/geyser/processor/ItemRemapperProcessor.java
similarity index 97%
rename from ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java
rename to ap/src/main/java/org/geysermc/geyser/processor/ItemRemapperProcessor.java
index 39d5f9fdf..2dd00506d 100644
--- a/ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java
+++ b/ap/src/main/java/org/geysermc/geyser/processor/ItemRemapperProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
diff --git a/ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java b/ap/src/main/java/org/geysermc/geyser/processor/PacketTranslatorProcessor.java
similarity index 97%
rename from ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java
rename to ap/src/main/java/org/geysermc/geyser/processor/PacketTranslatorProcessor.java
index 97687e981..9b99d679b 100644
--- a/ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java
+++ b/ap/src/main/java/org/geysermc/geyser/processor/PacketTranslatorProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
diff --git a/ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java b/ap/src/main/java/org/geysermc/geyser/processor/SoundHandlerProcessor.java
similarity index 97%
rename from ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java
rename to ap/src/main/java/org/geysermc/geyser/processor/SoundHandlerProcessor.java
index 3e6a7c412..c35c0ee4e 100644
--- a/ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java
+++ b/ap/src/main/java/org/geysermc/geyser/processor/SoundHandlerProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
diff --git a/ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index 463d1efad..1f6475b61 100644
--- a/ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1,5 +1,5 @@
-org.geysermc.processor.BlockEntityProcessor
-org.geysermc.processor.CollisionRemapperProcessor
-org.geysermc.processor.ItemRemapperProcessor
-org.geysermc.processor.PacketTranslatorProcessor
-org.geysermc.processor.SoundHandlerProcessor
\ No newline at end of file
+org.geysermc.geyser.processor.BlockEntityProcessor
+org.geysermc.geyser.processor.CollisionRemapperProcessor
+org.geysermc.geyser.processor.ItemRemapperProcessor
+org.geysermc.geyser.processor.PacketTranslatorProcessor
+org.geysermc.geyser.processor.SoundHandlerProcessor
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
index 211455d31..2f57a97db 100644
--- a/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
@@ -37,5 +37,7 @@ publishing {
         groupId = project.group as String
         artifactId = project.name
         version = project.version as String
+
+        artifact(tasks["jar"])
     }
 }
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 573687c7f..6037f65d3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.accessors.dm.ApProjectDependency
+
 plugins {
     `java-library`
     id("geyser.build-logic")