diff --git a/paper-api-generator/build.gradle.kts b/paper-api-generator/build.gradle.kts
index 57d1018a9984..0eab98b0fe17 100644
--- a/paper-api-generator/build.gradle.kts
+++ b/paper-api-generator/build.gradle.kts
@@ -25,7 +25,7 @@ tasks.register<JavaExec>("generate") {
     dependsOn(tasks.check)
     mainClass.set("io.papermc.generator.Main")
     classpath(sourceSets.main.map { it.runtimeClasspath })
-    args(projectDir.toPath().resolve("generated").toString())
+    args(rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.absolutePath)
     javaLauncher = javaToolchains.defaultJavaLauncher(project)
 }
 
diff --git a/paper-api/build.gradle.kts b/paper-api/build.gradle.kts
index 8b5d559a9930..e86b16b6ce05 100644
--- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts
@@ -93,7 +93,7 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-val generatedApiPath: java.nio.file.Path = rootProject.projectDir.toPath().resolve("paper-api-generator/generated")
+val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
 idea {
     module {
         generatedSourceDirs.add(generatedApiPath.toFile())
diff --git a/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/paper-api/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
similarity index 100%
rename from paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
rename to paper-api/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/AttributeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/AttributeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/BannerPatternKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/BannerPatternKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/BannerPatternKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/BannerPatternKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/BiomeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/BiomeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/BlockTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/BlockTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/BlockTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/BlockTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/CatVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/CatVariantKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/CatVariantKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/CatVariantKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/FluidKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/FluidKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/FrogVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/FrogVariantKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/FrogVariantKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/FrogVariantKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/GameEventKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/GameEventKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/InstrumentKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/InstrumentKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/ItemTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/ItemTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/JukeboxSongKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/JukeboxSongKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/JukeboxSongKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/JukeboxSongKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/MenuTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/MenuTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/MenuTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/MenuTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/PaintingVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/PaintingVariantKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/PaintingVariantKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/PaintingVariantKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/SoundEventKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/SoundEventKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/SoundEventKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/SoundEventKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimMaterialKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimMaterialKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimPatternKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimPatternKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/VillagerProfessionKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerProfessionKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/VillagerProfessionKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerProfessionKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/VillagerTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerTypeKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/VillagerTypeKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerTypeKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfVariantKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfVariantKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/CatVariantTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/CatVariantTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/CatVariantTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/CatVariantTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/FluidTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/FluidTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/FluidTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/FluidTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/StructureTagKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/StructureTagKeys.java
similarity index 100%
rename from paper-api-generator/generated/io/papermc/paper/registry/keys/tags/StructureTagKeys.java
rename to paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/StructureTagKeys.java