diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts
index f6ee11f11..b55db49b6 100644
--- a/platforms/bukkit/build.gradle.kts
+++ b/platforms/bukkit/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle)
 
     shaded(project(":platforms:bukkit:common"))
-    shaded(project(":platforms:bukkit:nms:v1_21_9"))
+    shaded(project(":platforms:bukkit:nms"))
     shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
diff --git a/platforms/bukkit/nms/v1_21_9/build.gradle.kts b/platforms/bukkit/nms/build.gradle.kts
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/build.gradle.kts
rename to platforms/bukkit/nms/build.gradle.kts
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/AwfulBukkitHacks.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/AwfulBukkitHacks.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/AwfulBukkitHacks.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/AwfulBukkitHacks.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSAddon.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSAddon.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSAddon.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSAddon.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInfo.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInfo.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInfo.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInfo.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInjector.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInjector.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInjector.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeInjector.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeProvider.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeProvider.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeProvider.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSBiomeProvider.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSChunkGeneratorDelegate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSChunkGeneratorDelegate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSChunkGeneratorDelegate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSInjectListener.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSInjectListener.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSInjectListener.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSInjectListener.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSPlatform.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSPlatform.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSPlatform.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSPlatform.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSWorldProperties.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSWorldProperties.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/NMSWorldProperties.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/NMSWorldProperties.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/Reflection.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/Reflection.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/Reflection.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/Reflection.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/RegistryFetcher.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/RegistryFetcher.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/RegistryFetcher.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/RegistryFetcher.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeAdditionsSoundTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeAdditionsSoundTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeAdditionsSoundTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeAdditionsSoundTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeMoodSoundTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeMoodSoundTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeMoodSoundTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeMoodSoundTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeParticleConfigTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeParticleConfigTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeParticleConfigTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/BiomeParticleConfigTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/EntityTypeTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/EntityTypeTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/EntityTypeTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/EntityTypeTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/MusicSoundTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/MusicSoundTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/MusicSoundTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/MusicSoundTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SoundEventTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SoundEventTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SoundEventTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SoundEventTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnCostConfig.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnCostConfig.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnCostConfig.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnCostConfig.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnEntryConfig.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnEntryConfig.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnEntryConfig.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnEntryConfig.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnSettingsTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnSettingsTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnSettingsTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnSettingsTemplate.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnTypeConfig.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnTypeConfig.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnTypeConfig.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/SpawnTypeConfig.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/VanillaBiomeProperties.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/VanillaBiomeProperties.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/VanillaBiomeProperties.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/VanillaBiomeProperties.java
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/VillagerTypeTemplate.java b/platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/VillagerTypeTemplate.java
similarity index 100%
rename from platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/config/VillagerTypeTemplate.java
rename to platforms/bukkit/nms/src/main/java/com/dfsek/terra/bukkit/nms/config/VillagerTypeTemplate.java