diff --git a/leaves-server/unapplied/0001-Build-changes.patch b/leaves-server/minecraft-patches/features/0001-Build-changes.patch
similarity index 88%
rename from leaves-server/unapplied/0001-Build-changes.patch
rename to leaves-server/minecraft-patches/features/0001-Build-changes.patch
index b63bea7a..71135f39 100644
--- a/leaves-server/unapplied/0001-Build-changes.patch
+++ b/leaves-server/minecraft-patches/features/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
-index b9b774a3ca600cee3d0e967063ea2f72c7ab184f..dfc582444cd7273afb78b250d9fa12317591d8aa 100644
+index 42899a91b9061b85985fbbd0de4032c757f4aa8f..a93f00d1a64e4deb9b89435bab258f3bad487e2f 100644
 --- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
 +++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
 @@ -29,7 +29,7 @@ import net.minecraft.world.phys.AABB;
@@ -15,13 +15,13 @@ index b9b774a3ca600cee3d0e967063ea2f72c7ab184f..dfc582444cd7273afb78b250d9fa1231
 -public final class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks {
 +public class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks { // Leaves - not final
  
-     @Override
-     public String getBrand() {
+     private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger();
+ 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index f1373fd5fdebb9f4600ba7f32a5df6188de3a0e9..4e5b27f2d00a6be6da6db461471395a515dc9b38 100644
+index 52fa5112cd90ba766c94512a02401dd3aee82cc9..53c435238465c6f628874b64f0fa275bbb50ab73 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1190,7 +1190,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1193,7 +1193,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.info("*************************************************************************************");
                  LOGGER.info("This is the first time you're starting this server.");
                  LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
@@ -30,7 +30,7 @@ index f1373fd5fdebb9f4600ba7f32a5df6188de3a0e9..4e5b27f2d00a6be6da6db461471395a5
                  LOGGER.info("*************************************************************************************");
              }
              // Paper end - Add onboarding message for initial server start
-@@ -1853,7 +1853,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1854,7 +1854,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -40,7 +40,7 @@ index f1373fd5fdebb9f4600ba7f32a5df6188de3a0e9..4e5b27f2d00a6be6da6db461471395a5
  
      public SystemReport fillSystemReport(SystemReport systemReport) {
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 31e02f50edd46220dac81500dbb273f1ccdbe0b9..c22234df51a61954d1728b8406545f753dd8a3c2 100644
+index 98927d4a5fba2a0dcdb147ac10b82c3286ccdc6b..461dc90ac9ae7f9af693653bc56a8cf448b7823e 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -182,9 +182,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/leaves-server/unapplied/0002-Leaves-Server-Config-And-Command.patch b/leaves-server/minecraft-patches/features/0002-Leaves-Server-Config-And-Command.patch
similarity index 100%
rename from leaves-server/unapplied/0002-Leaves-Server-Config-And-Command.patch
rename to leaves-server/minecraft-patches/features/0002-Leaves-Server-Config-And-Command.patch
diff --git a/leaves-server/paper-patches/features/0013-Leaves-plugin.patch b/leaves-server/paper-patches/features/0013-Leaves-plugin.patch
index 818b409d..907f0cca 100644
--- a/leaves-server/paper-patches/features/0013-Leaves-plugin.patch
+++ b/leaves-server/paper-patches/features/0013-Leaves-plugin.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Leaves plugin
 This patch is licensed under the MIT license.
 
 diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
-index 41c95f00b4b2bea6d31f85e268c33d7f6184823e..a9154645554379d80b43171562f6f64a01ed3792 100644
+index d0a4e1642d1be33cd9e832f961301ab267e216bc..417bb69104dc24bfb314799d84119fee2d7e9378 100644
 --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
-@@ -172,28 +172,41 @@ public class PaperPluginsCommand extends BukkitCommand {
- 
+@@ -174,28 +174,41 @@ public class PaperPluginsCommand {
+         final CommandSender sender = context.getSource().getSender();
          final TreeMap<String, PluginProvider<JavaPlugin>> paperPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
          final TreeMap<String, PluginProvider<JavaPlugin>> spigotPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 +        // Leaves start - leaves plugin
@@ -54,7 +54,7 @@ index 41c95f00b4b2bea6d31f85e268c33d7f6184823e..a9154645554379d80b43171562f6f64a
          }
  
          for (final Component component : formatProviders(paperPlugins)) {
-@@ -201,8 +214,9 @@ public class PaperPluginsCommand extends BukkitCommand {
+@@ -203,8 +216,9 @@ public class PaperPluginsCommand {
          }
  
          if (!spigotPlugins.isEmpty()) {
diff --git a/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch
index 493379ad..9bc7ce82 100644
--- a/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch
+++ b/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SculkCatalyst exp skip
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 03778c286144d8f04147f37aa59fb73fcc584833..daea37a117101a9f3b463e87bfc8f0f9db394aca 100644
+index d74ce689380246eb176596f5905275fa5187aace..4e456eb1740a674eaf4e2ed37c16f6aa4714b11a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -851,7 +851,7 @@ public class CraftEventFactory {
+@@ -862,7 +862,7 @@ public class CraftEventFactory {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource);
          CraftWorld world = (CraftWorld) entity.getWorld();
@@ -17,7 +17,7 @@ index 03778c286144d8f04147f37aa59fb73fcc584833..daea37a117101a9f3b463e87bfc8f0f9
          populateFields(victim, event); // Paper - make cancellable
          Bukkit.getServer().getPluginManager().callEvent(event);
  
-@@ -862,6 +862,7 @@ public class CraftEventFactory {
+@@ -873,6 +873,7 @@ public class CraftEventFactory {
          playDeathSound(victim, event, damageSource);
          // Paper end
          victim.expToDrop = event.getDroppedExp();
@@ -25,7 +25,7 @@ index 03778c286144d8f04147f37aa59fb73fcc584833..daea37a117101a9f3b463e87bfc8f0f9
          lootCheck.run(); // Paper - advancement triggers before destroying items
  
          // Paper start - Restore vanilla drops behavior
-@@ -901,6 +902,7 @@ public class CraftEventFactory {
+@@ -912,6 +913,7 @@ public class CraftEventFactory {
          victim.newLevel = event.getNewLevel();
          victim.newTotalExp = event.getNewTotalExp();
          victim.expToDrop = event.getDroppedExp();
diff --git a/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch b/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch
index 39743d72..f6598a18 100644
--- a/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch
+++ b/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Config API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb49cf958cbbd1d53f0bb4556ade8bc407ae7a20..6fbcde3248ec35d0188eea0e99922759d5f1d5cf 100644
+index 164830c0d9bae7849a4953e489ea144919d9911a..ac1632cd332f08499b7f8feb5f8c2004b89179dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3238,4 +3238,11 @@ public final class CraftServer implements Server {
+@@ -3215,4 +3215,11 @@ public final class CraftServer implements Server {
          return internalBytebufHandler;
      }
      // Leaves end - Bytebuf API