diff --git a/leaf-api/paper-patches/features/0003-Gale-configuration.patch b/leaf-api/paper-patches/features/0002-Gale-configuration.patch
similarity index 67%
rename from leaf-api/paper-patches/features/0003-Gale-configuration.patch
rename to leaf-api/paper-patches/features/0002-Gale-configuration.patch
index 91fa6dd4..c186dd7d 100644
--- a/leaf-api/paper-patches/features/0003-Gale-configuration.patch
+++ b/leaf-api/paper-patches/features/0002-Gale-configuration.patch
@@ -13,22 +13,28 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 68e2cf06b59b1e3353ad57544d7edfeebcfc3ae0..c1e4f01dbec2a796025ef35b6fdd68a82fa319d1 100644
+index ed899c4cb4b5261ceff56bbc9ca806e20904508e..618287712f3504a50dd8a5987629523fc9f17a88 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2378,6 +2378,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2378,6 +2378,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          {
              throw new UnsupportedOperationException("Not supported yet.");
          }
 +
 +        // Gale start - Gale configuration - API
++        /**
++         * @deprecated Server config options may be renamed or removed without notice. Another API will be provided
++         * once the APIs of other configurations change.
++         *
++         * @return The server's gale config.
++         */
++        @Deprecated(since = "1.21.4", forRemoval = true)
 +        @NotNull
-+        public org.bukkit.configuration.file.YamlConfiguration getGaleConfig()
-+        {
++        public org.bukkit.configuration.file.YamlConfiguration getGaleConfig() {
 +            throw new UnsupportedOperationException("Not supported yet.");
 +        }
 +        // Gale end - Gale configuration - API
 +
          // Paper end
  
-         // Leaf start - Leaf config - API
+         /**
diff --git a/leaf-api/paper-patches/features/0002-Leaf-config.patch b/leaf-api/paper-patches/features/0002-Leaf-config.patch
deleted file mode 100644
index 58fed9a8..00000000
--- a/leaf-api/paper-patches/features/0002-Leaf-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
-Date: Thu, 11 Aug 2022 04:13:27 +0800
-Subject: [PATCH] Leaf config
-
-
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ed899c4cb4b5261ceff56bbc9ca806e20904508e..68e2cf06b59b1e3353ad57544d7edfeebcfc3ae0 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -2380,6 +2380,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-         }
-         // Paper end
- 
-+        // Leaf start - Leaf config - API
-+        @NotNull
-+        public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-+        {
-+            throw new UnsupportedOperationException("Not supported yet.");
-+        }
-+        // Leaf end - Leaf config - API
-+
-         /**
-          * Sends the component to the player
-          *
diff --git a/leaf-api/paper-patches/features/0004-Paper-Avoid-and-discourage-use-of-Maven-Central-as-a.patch b/leaf-api/paper-patches/features/0003-Paper-Avoid-and-discourage-use-of-Maven-Central-as-a.patch
similarity index 99%
rename from leaf-api/paper-patches/features/0004-Paper-Avoid-and-discourage-use-of-Maven-Central-as-a.patch
rename to leaf-api/paper-patches/features/0003-Paper-Avoid-and-discourage-use-of-Maven-Central-as-a.patch
index a58071fc..6a19d820 100644
--- a/leaf-api/paper-patches/features/0004-Paper-Avoid-and-discourage-use-of-Maven-Central-as-a.patch
+++ b/leaf-api/paper-patches/features/0003-Paper-Avoid-and-discourage-use-of-Maven-Central-as-a.patch
@@ -16,7 +16,6 @@ Also see `Configurable LibraryLoader maven repos` patch,
 able to match googleapi mirror urls, to replace to repo url we custom defined.
 This able to switch back to maven central repo, to prevent
 situation that dependencies exist in maven central, but not in mirror.
----
 
 Default LibraryLoader to Google's Maven Central mirror, add MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR, and warn on use of Maven Central with MavenLibraryResolver
 
diff --git a/leaf-api/paper-patches/features/0006-SIMD-support.patch b/leaf-api/paper-patches/features/0004-SIMD-support.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0006-SIMD-support.patch
rename to leaf-api/paper-patches/features/0004-SIMD-support.patch
diff --git a/leaf-api/paper-patches/features/0007-Vectorized-map-color-conversion.patch b/leaf-api/paper-patches/features/0005-Vectorized-map-color-conversion.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0007-Vectorized-map-color-conversion.patch
rename to leaf-api/paper-patches/features/0005-Vectorized-map-color-conversion.patch
diff --git a/leaf-api/paper-patches/features/0008-Do-not-log-plugin-library-loads.patch b/leaf-api/paper-patches/features/0006-Do-not-log-plugin-library-loads.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0008-Do-not-log-plugin-library-loads.patch
rename to leaf-api/paper-patches/features/0006-Do-not-log-plugin-library-loads.patch
diff --git a/leaf-api/paper-patches/features/0009-Player-canSee-by-entity-UUID.patch b/leaf-api/paper-patches/features/0007-Player-canSee-by-entity-UUID.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0009-Player-canSee-by-entity-UUID.patch
rename to leaf-api/paper-patches/features/0007-Player-canSee-by-entity-UUID.patch
diff --git a/leaf-api/paper-patches/features/0010-Specific-interval-TPS-API.patch b/leaf-api/paper-patches/features/0008-Specific-interval-TPS-API.patch
similarity index 96%
rename from leaf-api/paper-patches/features/0010-Specific-interval-TPS-API.patch
rename to leaf-api/paper-patches/features/0008-Specific-interval-TPS-API.patch
index fd013efa..ddf69b09 100644
--- a/leaf-api/paper-patches/features/0010-Specific-interval-TPS-API.patch
+++ b/leaf-api/paper-patches/features/0008-Specific-interval-TPS-API.patch
@@ -47,7 +47,7 @@ index c9ea6559f809a6732588b8908001807be3d91196..1e810d7f61e07cddd99d3f827673b724
       * Get a sample of the servers last tick times (in nanos)
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c1e4f01dbec2a796025ef35b6fdd68a82fa319d1..cfe600ed503994376284d71d6754d1a736048401 100644
+index 618287712f3504a50dd8a5987629523fc9f17a88..7eaeb956ca9ce223a3e2d24caa258ae57d59a476 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2126,6 +2126,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/leaf-api/paper-patches/features/0011-5-second-TPS-average.patch b/leaf-api/paper-patches/features/0009-5-second-TPS-average.patch
similarity index 97%
rename from leaf-api/paper-patches/features/0011-5-second-TPS-average.patch
rename to leaf-api/paper-patches/features/0009-5-second-TPS-average.patch
index dc31011d..362507a3 100644
--- a/leaf-api/paper-patches/features/0011-5-second-TPS-average.patch
+++ b/leaf-api/paper-patches/features/0009-5-second-TPS-average.patch
@@ -72,7 +72,7 @@ index 1e810d7f61e07cddd99d3f827673b724ac93b6b5..f998208e0b26132d29d79fc2653d9f55
       * Gets the average server TPS over the last 1 minute
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cfe600ed503994376284d71d6754d1a736048401..d57a77ff531e8bc5c0fa41e66c64c28f9a4a1515 100644
+index 7eaeb956ca9ce223a3e2d24caa258ae57d59a476..65e2a97096f6f625ad347678ebac1c3b912cb862 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2126,7 +2126,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/leaf-api/paper-patches/features/0012-Last-tick-time-API.patch b/leaf-api/paper-patches/features/0010-Last-tick-time-API.patch
similarity index 95%
rename from leaf-api/paper-patches/features/0012-Last-tick-time-API.patch
rename to leaf-api/paper-patches/features/0010-Last-tick-time-API.patch
index 96f4cc79..ccc02f5f 100644
--- a/leaf-api/paper-patches/features/0012-Last-tick-time-API.patch
+++ b/leaf-api/paper-patches/features/0010-Last-tick-time-API.patch
@@ -48,10 +48,10 @@ index f998208e0b26132d29d79fc2653d9f5572046f70..2e316238da9377c046105249273b2609
       * @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
       */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d57a77ff531e8bc5c0fa41e66c64c28f9a4a1515..e8f192bad2ffa3cb1c5217293420a863d57b5377 100644
+index 65e2a97096f6f625ad347678ebac1c3b912cb862..db8c2d3ded812e8d96b8752d4890006d022e72a6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2776,4 +2776,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2774,4 +2774,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping
diff --git a/leaf-api/paper-patches/features/0013-Pufferfish-Sentry.patch b/leaf-api/paper-patches/features/0011-Pufferfish-Sentry.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0013-Pufferfish-Sentry.patch
rename to leaf-api/paper-patches/features/0011-Pufferfish-Sentry.patch
diff --git a/leaf-api/paper-patches/features/0014-Purpur-API-Changes.patch b/leaf-api/paper-patches/features/0012-Purpur-API-Changes.patch
similarity index 99%
rename from leaf-api/paper-patches/features/0014-Purpur-API-Changes.patch
rename to leaf-api/paper-patches/features/0012-Purpur-API-Changes.patch
index 87eb0b2f..440acf59 100644
--- a/leaf-api/paper-patches/features/0014-Purpur-API-Changes.patch
+++ b/leaf-api/paper-patches/features/0012-Purpur-API-Changes.patch
@@ -443,10 +443,10 @@ index 6f83097b1097d0ffa81a95e6f0300cb410dfee2b..c1f19d5c1b819873fce1185b4fbf4c72
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e8f192bad2ffa3cb1c5217293420a863d57b5377..002c998368dea33872d65beb79eb4931ce1158d2 100644
+index db8c2d3ded812e8d96b8752d4890006d022e72a6..b4d8bc92cf99dbc470e259f569be20e2d0ce00c8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2432,6 +2432,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2438,6 +2438,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
          // Paper end
  
@@ -462,10 +462,10 @@ index e8f192bad2ffa3cb1c5217293420a863d57b5377..002c998368dea33872d65beb79eb4931
 +        }
 +        // Purpur end
 +
-         // Leaf start - Leaf config - API
-         @NotNull
-         public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-@@ -2801,4 +2813,121 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         /**
+          * Sends the component to the player
+          *
+@@ -2799,4 +2811,121 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
diff --git a/leaf-api/paper-patches/features/0015-Remove-Timings.patch b/leaf-api/paper-patches/features/0013-Remove-Timings.patch
similarity index 98%
rename from leaf-api/paper-patches/features/0015-Remove-Timings.patch
rename to leaf-api/paper-patches/features/0013-Remove-Timings.patch
index f03ab68e..d6c3127a 100644
--- a/leaf-api/paper-patches/features/0015-Remove-Timings.patch
+++ b/leaf-api/paper-patches/features/0013-Remove-Timings.patch
@@ -7,10 +7,10 @@ Completely remove the Timings, since it wastes too much performance. Use Spark i
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 deleted file mode 100644
-index d8dfaf5041ccf3f360e0bd94bf03580a8b3d9a38..0000000000000000000000000000000000000000
+index 73b125979e2f2dfd13cbf689a90b29cc68a36e09..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/FullServerTickHandler.java
 +++ /dev/null
-@@ -1,87 +0,0 @@
+@@ -1,89 +0,0 @@
 -package co.aikar.timings;
 -
 -import static co.aikar.timings.TimingsManager.*;
@@ -35,7 +35,8 @@ index d8dfaf5041ccf3f360e0bd94bf03580a8b3d9a38..00000000000000000000000000000000
 -    }
 -
 -    @NotNull
--    public Timing startTimingFullServerTick() { // Gale - final timings calls
+-    @Override
+-    public Timing startTiming() {
 -        if (TimingsManager.needsFullReset) {
 -            TimingsManager.resetTimings();
 -        } else if (TimingsManager.needsRecheckEnabled) {
@@ -44,7 +45,8 @@ index d8dfaf5041ccf3f360e0bd94bf03580a8b3d9a38..00000000000000000000000000000000
 -        return super.startTiming();
 -    }
 -
--    public void stopTimingFullServerTick() { // Gale - final timings calls
+-    @Override
+-    public void stopTiming() {
 -        super.stopTiming();
 -        if (!isEnabled()) {
 -            return;
@@ -497,7 +499,7 @@ index a5d13a1e44edb861f45c83a9b4309fbf799d407d..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 deleted file mode 100644
-index 51d54b87106aa17c2de9ab22eae22d176c7d0bfc..0000000000000000000000000000000000000000
+index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/TimingHandler.java
 +++ /dev/null
 @@ -1,226 +0,0 @@
@@ -600,7 +602,7 @@ index 51d54b87106aa17c2de9ab22eae22d176c7d0bfc..00000000000000000000000000000000
 -    }
 -
 -    @NotNull
--    public final Timing startTiming() { // Gale - final timings calls
+-    public Timing startTiming() {
 -        if (!enabled || !Bukkit.isPrimaryThread()) {
 -            return this;
 -        }
@@ -612,7 +614,7 @@ index 51d54b87106aa17c2de9ab22eae22d176c7d0bfc..00000000000000000000000000000000
 -        return this;
 -    }
 -
--    public final void stopTiming() { // Gale - final timings calls
+-    public void stopTiming() {
 -        if (!enabled || timingDepth <= 0 || start == 0 || !Bukkit.isPrimaryThread()) {
 -            return;
 -        }
@@ -1277,30 +1279,30 @@ index df142a89b8c43acb81eb383eac0ef048a1f49a6e..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
-index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d9e0af3e5 100644
+index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..39bf165646f6482c8f609b34977c4518023a3297 100644
 --- a/src/main/java/co/aikar/timings/Timings.java
 +++ b/src/main/java/co/aikar/timings/Timings.java
-@@ -23,303 +23,48 @@
+@@ -23,303 +23,42 @@
   */
  package co.aikar.timings;
  
 -import com.google.common.base.Preconditions;
 -import com.google.common.collect.EvictingQueue;
 -import com.google.common.collect.Lists;
- import net.kyori.adventure.text.Component;
+-import net.kyori.adventure.text.Component;
 -import net.kyori.adventure.text.event.ClickEvent;
 -import net.kyori.adventure.text.format.TextColor;
 -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 -import org.bukkit.Bukkit;
- import org.bukkit.command.CommandSender;
+-import org.bukkit.command.CommandSender;
 -import org.bukkit.plugin.Plugin;
- 
+-
 -import java.util.List;
 -import java.util.Queue;
 -import java.util.logging.Level;
 -import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
+-import org.jetbrains.annotations.Nullable;
+-
 +// Leaf start - Remove Timings
  /**
   * @deprecated Timings will be removed in the future
@@ -1415,7 +1417,7 @@ index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d
 -        }
      }
 -
-     public static Component deprecationMessage() {
+-    public static Component deprecationMessage() {
 -        return Component.text()
 -            .color(TextColor.color(0xffc93a))
 -            .append(Component.text("[!] The timings profiler is in no-op mode and will be fully removed in a later update."))
@@ -1430,7 +1432,8 @@ index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d
 -                            .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/discussions/10565")))
 -            )
 -            .build();
-+        return Component.empty();
++    public static net.kyori.adventure.text.Component deprecationMessage() {
++        return net.kyori.adventure.text.Component.empty();
      }
 -
 -    /**
@@ -1535,7 +1538,7 @@ index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d
 -     */
      public static void reset() {
 -        TimingsManager.reset();
-     }
+-    }
 -
 -    /**
 -     * Generates a report and sends it to the specified command sender.
@@ -1543,7 +1546,7 @@ index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d
 -     * If sender is null, ConsoleCommandSender will be used.
 -     * @param sender The sender to send to, or null to use the ConsoleCommandSender
 -     */
-     public static void generateReport(@Nullable CommandSender sender) {
+-    public static void generateReport(@Nullable CommandSender sender) {
 -        if (sender == null) {
 -            sender = Bukkit.getConsoleSender();
 -        }
@@ -1558,7 +1561,7 @@ index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d
 -    public static void generateReport(@NotNull TimingsReportListener sender) {
 -        Preconditions.checkNotNull(sender);
 -        requestingReport.add(sender);
--    }
+     }
 -
 -    /*
 -    =================
@@ -1588,10 +1591,11 @@ index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..908b610bfdfe911675748211b74b809d
 -    @NotNull
 -    static TimingHandler ofSafe(@Nullable String groupName, @NotNull String name, @Nullable Timing groupHandler) {
 -        return TimingsManager.getHandler(groupName, name, groupHandler);
++    public static void generateReport(@org.jetbrains.annotations.Nullable org.bukkit.command.CommandSender sender) {
      }
 +    // Leaf end - Remove Timings
  }
- 
+-
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 deleted file mode 100644
 index b83e5ff7ada8771fdf27ba9807c77ba6a4ce12da..0000000000000000000000000000000000000000
@@ -2021,10 +2025,10 @@ index df066d6f8d55afbc0c1897c486d638657a5f8df9..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 deleted file mode 100644
-index 49180ea7879c64af3cd5143a34783d564746b504..0000000000000000000000000000000000000000
+index 632c4961515f5052551f841cfa840e60bba7a257..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 +++ /dev/null
-@@ -1,26 +0,0 @@
+@@ -1,53 +0,0 @@
 -/*
 - * This file is licensed under the MIT License (MIT).
 - *
@@ -2050,7 +2054,34 @@ index 49180ea7879c64af3cd5143a34783d564746b504..00000000000000000000000000000000
 - */
 -package co.aikar.timings;
 -
--class UnsafeTimingHandler {} // Gale - final timings calls
+-import org.bukkit.Bukkit;
+-import org.jetbrains.annotations.NotNull;
+-
+-class UnsafeTimingHandler extends TimingHandler {
+-
+-    UnsafeTimingHandler(@NotNull TimingIdentifier id) {
+-        super(id);
+-    }
+-
+-    private static void checkThread() {
+-        if (!Bukkit.isPrimaryThread()) {
+-            throw new IllegalStateException("Calling Timings from Async Operation");
+-        }
+-    }
+-
+-    @NotNull
+-    @Override
+-    public Timing startTiming() {
+-        checkThread();
+-        return super.startTiming();
+-    }
+-
+-    @Override
+-    public void stopTiming() {
+-        checkThread();
+-        super.stopTiming();
+-    }
+-}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 deleted file mode 100644
 index dae84243804b4b076cafb3e1b29bdcf614efc93f..0000000000000000000000000000000000000000
diff --git a/leaf-api/paper-patches/features/0016-KeYi-Player-Skull-API.patch b/leaf-api/paper-patches/features/0014-KeYi-Player-Skull-API.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0016-KeYi-Player-Skull-API.patch
rename to leaf-api/paper-patches/features/0014-KeYi-Player-Skull-API.patch
diff --git a/leaf-api/paper-patches/features/0017-Slice-Smooth-Teleports.patch b/leaf-api/paper-patches/features/0015-Slice-Smooth-Teleports.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0017-Slice-Smooth-Teleports.patch
rename to leaf-api/paper-patches/features/0015-Slice-Smooth-Teleports.patch
diff --git a/leaf-api/paper-patches/features/0018-Configurable-LibraryLoader-maven-repos.patch b/leaf-api/paper-patches/features/0016-Configurable-LibraryLoader-maven-repos.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0018-Configurable-LibraryLoader-maven-repos.patch
rename to leaf-api/paper-patches/features/0016-Configurable-LibraryLoader-maven-repos.patch
diff --git a/leaf-api/paper-patches/features/0019-Leaves-Replay-Mod-API.patch b/leaf-api/paper-patches/features/0017-Leaves-Replay-Mod-API.patch
similarity index 90%
rename from leaf-api/paper-patches/features/0019-Leaves-Replay-Mod-API.patch
rename to leaf-api/paper-patches/features/0017-Leaves-Replay-Mod-API.patch
index ae56bc5a..862ef580 100644
--- a/leaf-api/paper-patches/features/0019-Leaves-Replay-Mod-API.patch
+++ b/leaf-api/paper-patches/features/0017-Leaves-Replay-Mod-API.patch
@@ -26,10 +26,10 @@ index 98cfd68226494dbb1a2eaa6680e23a76c2129a62..0f8a1b82dc9d3f4911a0aaa092ef0638
 +    // Leaves end - Photographer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 002c998368dea33872d65beb79eb4931ce1158d2..b11bd139e2ca7015207145c022b5822e184d8fd0 100644
+index b4d8bc92cf99dbc470e259f569be20e2d0ce00c8..64a94b228fe70ff81b2b9af337339bc7ea15b958 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2930,4 +2930,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2928,4 +2928,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      void clearBlockHighlights();
      // Purpur end - Debug Marker API
diff --git a/leaf-api/paper-patches/features/0020-Async-structure-locate-api.patch b/leaf-api/paper-patches/features/0018-Async-structure-locate-api.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0020-Async-structure-locate-api.patch
rename to leaf-api/paper-patches/features/0018-Async-structure-locate-api.patch
diff --git a/leaf-api/paper-patches/features/0021-PlayerInventoryOverflowEvent.patch b/leaf-api/paper-patches/features/0019-PlayerInventoryOverflowEvent.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0021-PlayerInventoryOverflowEvent.patch
rename to leaf-api/paper-patches/features/0019-PlayerInventoryOverflowEvent.patch
diff --git a/leaf-api/paper-patches/features/0022-Raytrace-AntiXray-SDK-integration.patch b/leaf-api/paper-patches/features/0020-Raytrace-AntiXray-SDK-integration.patch
similarity index 100%
rename from leaf-api/paper-patches/features/0022-Raytrace-AntiXray-SDK-integration.patch
rename to leaf-api/paper-patches/features/0020-Raytrace-AntiXray-SDK-integration.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0051-Fix-MC-26678.patch b/leaf-archived-patches/removed/1.20.2/server/0051-Fix-MC-26678.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0051-Fix-MC-26678.patch
rename to leaf-archived-patches/removed/1.20.2/server/0051-Fix-MC-26678.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch b/leaf-archived-patches/removed/1.20.4/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch
rename to leaf-archived-patches/removed/1.20.4/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0056-Fix-MC-2025.patch b/leaf-archived-patches/removed/1.20.4/server/0056-Fix-MC-2025.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0056-Fix-MC-2025.patch
rename to leaf-archived-patches/removed/1.20.4/server/0056-Fix-MC-2025.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0094-Fix-Nova-compatibility.patch b/leaf-archived-patches/removed/1.20.4/server/0094-Fix-Nova-compatibility.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0094-Fix-Nova-compatibility.patch
rename to leaf-archived-patches/removed/1.20.4/server/0094-Fix-Nova-compatibility.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0065-Fix-MC-249136-lag-when-attempting-to-locate-a-buried.patch b/leaf-archived-patches/removed/1.20.5/server/0065-Fix-MC-249136-lag-when-attempting-to-locate-a-buried.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0065-Fix-MC-249136-lag-when-attempting-to-locate-a-buried.patch
rename to leaf-archived-patches/removed/1.20.5/server/0065-Fix-MC-249136-lag-when-attempting-to-locate-a-buried.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0068-Fix-MC-172047.patch b/leaf-archived-patches/removed/1.20.5/server/0068-Fix-MC-172047.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0068-Fix-MC-172047.patch
rename to leaf-archived-patches/removed/1.20.5/server/0068-Fix-MC-172047.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0081-Replace-AI-goal-set-with-optimized-collection.patch b/leaf-archived-patches/removed/1.20.5/server/0081-Replace-AI-goal-set-with-optimized-collection.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0081-Replace-AI-goal-set-with-optimized-collection.patch
rename to leaf-archived-patches/removed/1.20.5/server/0081-Replace-AI-goal-set-with-optimized-collection.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0036-Fix-Make-log4j-compatible-with-future-release.patch b/leaf-archived-patches/removed/1.20.6/server/0036-Fix-Make-log4j-compatible-with-future-release.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0036-Fix-Make-log4j-compatible-with-future-release.patch
rename to leaf-archived-patches/removed/1.20.6/server/0036-Fix-Make-log4j-compatible-with-future-release.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0048-Fix-keepalive-kicked-name.patch b/leaf-archived-patches/removed/1.20.6/server/0048-Fix-keepalive-kicked-name.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0048-Fix-keepalive-kicked-name.patch
rename to leaf-archived-patches/removed/1.20.6/server/0048-Fix-keepalive-kicked-name.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0063-Redirect-to-Gale-s-method-to-fix-plugin-incompatibil.patch b/leaf-archived-patches/removed/1.20.6/server/0063-Redirect-to-Gale-s-method-to-fix-plugin-incompatibil.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0063-Redirect-to-Gale-s-method-to-fix-plugin-incompatibil.patch
rename to leaf-archived-patches/removed/1.20.6/server/0063-Redirect-to-Gale-s-method-to-fix-plugin-incompatibil.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch b/leaf-archived-patches/removed/1.20.6/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch
rename to leaf-archived-patches/removed/1.20.6/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0108-Make-max-interaction-distance-configurable.patch b/leaf-archived-patches/removed/1.20.6/server/0108-Make-max-interaction-distance-configurable.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0108-Make-max-interaction-distance-configurable.patch
rename to leaf-archived-patches/removed/1.20.6/server/0108-Make-max-interaction-distance-configurable.patch
diff --git a/leaf-archived-patches/removed/legacy/api/0007-KTP-Allow-unknown-event-thread-execution.patch b/leaf-archived-patches/removed/1.21.1/api/0007-KTP-Allow-unknown-event-thread-execution.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/api/0007-KTP-Allow-unknown-event-thread-execution.patch
rename to leaf-archived-patches/removed/1.21.1/api/0007-KTP-Allow-unknown-event-thread-execution.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0020-KTP-Allow-unknown-event-thread-execution.patch b/leaf-archived-patches/removed/1.21.1/sever/0020-KTP-Allow-unknown-event-thread-execution.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0020-KTP-Allow-unknown-event-thread-execution.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0020-KTP-Allow-unknown-event-thread-execution.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0023-Improve-fluid-direction-caching.patch b/leaf-archived-patches/removed/1.21.1/sever/0023-Improve-fluid-direction-caching.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0023-Improve-fluid-direction-caching.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0023-Improve-fluid-direction-caching.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0026-Improve-container-checking-with-a-bitset.patch b/leaf-archived-patches/removed/1.21.1/sever/0026-Improve-container-checking-with-a-bitset.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0026-Improve-container-checking-with-a-bitset.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0026-Improve-container-checking-with-a-bitset.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0068-Block-log4j-rce-exploit-in-chat.patch b/leaf-archived-patches/removed/1.21.1/sever/0068-Block-log4j-rce-exploit-in-chat.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0068-Block-log4j-rce-exploit-in-chat.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0068-Block-log4j-rce-exploit-in-chat.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0069-Fix-NPE-during-creating-GUI-graph.patch b/leaf-archived-patches/removed/1.21.1/sever/0069-Fix-NPE-during-creating-GUI-graph.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0069-Fix-NPE-during-creating-GUI-graph.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0069-Fix-NPE-during-creating-GUI-graph.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaf-archived-patches/removed/1.21.1/sever/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0079-Optimize-villager-data-storage.patch b/leaf-archived-patches/removed/1.21.1/sever/0079-Optimize-villager-data-storage.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0079-Optimize-villager-data-storage.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0079-Optimize-villager-data-storage.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0083-Ignore-terminal-provider-warning.patch b/leaf-archived-patches/removed/1.21.1/sever/0083-Ignore-terminal-provider-warning.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0083-Ignore-terminal-provider-warning.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0083-Ignore-terminal-provider-warning.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0084-Fix-console-freeze-above-JAVA-22.patch b/leaf-archived-patches/removed/1.21.1/sever/0084-Fix-console-freeze-above-JAVA-22.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0084-Fix-console-freeze-above-JAVA-22.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0084-Fix-console-freeze-above-JAVA-22.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch b/leaf-archived-patches/removed/1.21.1/sever/0085-Fix-console-output-display-on-Pterodactyl-panel.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0085-Fix-console-output-display-on-Pterodactyl-panel.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch b/leaf-archived-patches/removed/1.21.1/sever/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
rename to leaf-archived-patches/removed/1.21.1/sever/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
diff --git a/leaf-archived-patches/removed/legacy/api/0010-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch b/leaf-archived-patches/removed/1.21.3/api/0010-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/api/0010-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch
rename to leaf-archived-patches/removed/1.21.3/api/0010-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0010-Pufferfish-Entity-TTL.patch b/leaf-archived-patches/removed/1.21.3/server/0010-Pufferfish-Entity-TTL.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0010-Pufferfish-Entity-TTL.patch
rename to leaf-archived-patches/removed/1.21.3/server/0010-Pufferfish-Entity-TTL.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0027-Inline-level-height.patch b/leaf-archived-patches/removed/1.21.3/server/0027-Inline-level-height.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0027-Inline-level-height.patch
rename to leaf-archived-patches/removed/1.21.3/server/0027-Inline-level-height.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0028-Remove-streams-and-iterators-from-range-check.patch b/leaf-archived-patches/removed/1.21.3/server/0028-Remove-streams-and-iterators-from-range-check.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0028-Remove-streams-and-iterators-from-range-check.patch
rename to leaf-archived-patches/removed/1.21.3/server/0028-Remove-streams-and-iterators-from-range-check.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch b/leaf-archived-patches/removed/1.21.3/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch
rename to leaf-archived-patches/removed/1.21.3/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0059-Fix-MC-31819.patch b/leaf-archived-patches/removed/1.21.3/server/0059-Fix-MC-31819.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0059-Fix-MC-31819.patch
rename to leaf-archived-patches/removed/1.21.3/server/0059-Fix-MC-31819.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0060-Fix-MC-26304.patch b/leaf-archived-patches/removed/1.21.3/server/0060-Fix-MC-26304.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0060-Fix-MC-26304.patch
rename to leaf-archived-patches/removed/1.21.3/server/0060-Fix-MC-26304.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0060-Moonrise-Bitstorage-optimisations.patch b/leaf-archived-patches/removed/1.21.3/server/0060-Moonrise-Bitstorage-optimisations.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0060-Moonrise-Bitstorage-optimisations.patch
rename to leaf-archived-patches/removed/1.21.3/server/0060-Moonrise-Bitstorage-optimisations.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0062-Moonrise-block-counting-optimisations.patch b/leaf-archived-patches/removed/1.21.3/server/0062-Moonrise-block-counting-optimisations.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0062-Moonrise-block-counting-optimisations.patch
rename to leaf-archived-patches/removed/1.21.3/server/0062-Moonrise-block-counting-optimisations.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch b/leaf-archived-patches/removed/1.21.3/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch
rename to leaf-archived-patches/removed/1.21.3/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch b/leaf-archived-patches/removed/1.21.3/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch
rename to leaf-archived-patches/removed/1.21.3/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch b/leaf-archived-patches/removed/1.21.3/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch
rename to leaf-archived-patches/removed/1.21.3/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0066-Moonrise-Optimise-checkInsideBlocks.patch b/leaf-archived-patches/removed/1.21.3/server/0066-Moonrise-Optimise-checkInsideBlocks.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0066-Moonrise-Optimise-checkInsideBlocks.patch
rename to leaf-archived-patches/removed/1.21.3/server/0066-Moonrise-Optimise-checkInsideBlocks.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch b/leaf-archived-patches/removed/1.21.3/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
rename to leaf-archived-patches/removed/1.21.3/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch b/leaf-archived-patches/removed/1.21.3/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch
rename to leaf-archived-patches/removed/1.21.3/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0069-Moonrise-fluid-method-optimisations.patch b/leaf-archived-patches/removed/1.21.3/server/0069-Moonrise-fluid-method-optimisations.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0069-Moonrise-fluid-method-optimisations.patch
rename to leaf-archived-patches/removed/1.21.3/server/0069-Moonrise-fluid-method-optimisations.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0070-Moonrise-optimise-palette-reads.patch b/leaf-archived-patches/removed/1.21.3/server/0070-Moonrise-optimise-palette-reads.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0070-Moonrise-optimise-palette-reads.patch
rename to leaf-archived-patches/removed/1.21.3/server/0070-Moonrise-optimise-palette-reads.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0090-Remove-stream-in-RecipeManager-getRecipeFor.patch b/leaf-archived-patches/removed/1.21.3/server/0090-Remove-stream-in-RecipeManager-getRecipeFor.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0090-Remove-stream-in-RecipeManager-getRecipeFor.patch
rename to leaf-archived-patches/removed/1.21.3/server/0090-Remove-stream-in-RecipeManager-getRecipeFor.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch b/leaf-archived-patches/removed/1.21.3/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch
rename to leaf-archived-patches/removed/1.21.3/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0110-Fix-MC-183518.patch b/leaf-archived-patches/removed/1.21.3/server/0110-Fix-MC-183518.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0110-Fix-MC-183518.patch
rename to leaf-archived-patches/removed/1.21.3/server/0110-Fix-MC-183518.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch b/leaf-archived-patches/removed/1.21.3/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch
rename to leaf-archived-patches/removed/1.21.3/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/leaf-archived-patches/removed/1.21.3/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
rename to leaf-archived-patches/removed/1.21.3/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0125-Paper-Improve-performance-of-RecipeManager-removeRec.patch b/leaf-archived-patches/removed/1.21.3/server/0125-Paper-Improve-performance-of-RecipeManager-removeRec.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0125-Paper-Improve-performance-of-RecipeManager-removeRec.patch
rename to leaf-archived-patches/removed/1.21.3/server/0125-Paper-Improve-performance-of-RecipeManager-removeRec.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch b/leaf-archived-patches/removed/1.21.3/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch
rename to leaf-archived-patches/removed/1.21.3/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0143-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch b/leaf-archived-patches/removed/1.21.3/server/0143-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0143-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch
rename to leaf-archived-patches/removed/1.21.3/server/0143-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch b/leaf-archived-patches/removed/1.21.3/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch
rename to leaf-archived-patches/removed/1.21.3/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0151-Better-inline-world-height.patch b/leaf-archived-patches/removed/1.21.3/server/0151-Better-inline-world-height.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0151-Better-inline-world-height.patch
rename to leaf-archived-patches/removed/1.21.3/server/0151-Better-inline-world-height.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0002-Decompile-fix.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0002-Decompile-fix.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0002-Decompile-fix.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0002-Decompile-fix.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0002-Dev-import-deobfuscation-fixes.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0002-Dev-import-deobfuscation-fixes.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0002-Dev-import-deobfuscation-fixes.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0002-Dev-import-deobfuscation-fixes.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0020-Reduce-entity-allocations.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0020-Reduce-entity-allocations.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0020-Reduce-entity-allocations.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0020-Reduce-entity-allocations.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0021-Remove-iterators-from-Inventory-contains.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0021-Remove-iterators-from-Inventory-contains.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0021-Remove-iterators-from-Inventory-contains.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0021-Remove-iterators-from-Inventory-contains.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0025-Leaves-Disable-moved-wrongly-threshold.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0025-Leaves-Disable-moved-wrongly-threshold.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0025-Leaves-Disable-moved-wrongly-threshold.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0025-Leaves-Disable-moved-wrongly-threshold.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0044-Faster-Natural-Spawning.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0044-Faster-Natural-Spawning.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0044-Faster-Natural-Spawning.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0044-Faster-Natural-Spawning.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0049-PaperPR-Rewrite-framed-map-tracker-ticking.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0049-PaperPR-Rewrite-framed-map-tracker-ticking.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0049-PaperPR-Rewrite-framed-map-tracker-ticking.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0049-PaperPR-Rewrite-framed-map-tracker-ticking.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0056-Fix-cow-rotation-when-shearing-mooshroom.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0056-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0056-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0056-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0058-Fix-MC-110386.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0058-Fix-MC-110386.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0058-Fix-MC-110386.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0058-Fix-MC-110386.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0064-Cache-world-generator-sea-level.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0064-Cache-world-generator-sea-level.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0064-Cache-world-generator-sea-level.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0064-Cache-world-generator-sea-level.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0074-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0074-Airplane-Remove-stream-in-PoiCompetitorScan.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0074-Airplane-Remove-stream-in-PoiCompetitorScan.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0074-Airplane-Remove-stream-in-PoiCompetitorScan.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0097-Server-thread-priority-environment-variable.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0097-Server-thread-priority-environment-variable.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0097-Server-thread-priority-environment-variable.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0097-Server-thread-priority-environment-variable.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0098-Fix-MC-177381.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0098-Fix-MC-177381.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0098-Fix-MC-177381.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0098-Fix-MC-177381.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0099-Fix-MC-150224.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0099-Fix-MC-150224.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0099-Fix-MC-150224.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0099-Fix-MC-150224.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0100-Smooth-teleport-config.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0100-Smooth-teleport-config.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0100-Smooth-teleport-config.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0100-Smooth-teleport-config.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0101-Collect-then-startEachNonRunningBehavior-in-Brain.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0101-Collect-then-startEachNonRunningBehavior-in-Brain.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0101-Collect-then-startEachNonRunningBehavior-in-Brain.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0101-Collect-then-startEachNonRunningBehavior-in-Brain.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0103-Hide-specified-item-components-to-clients.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0103-Hide-specified-item-components-to-clients.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0103-Hide-specified-item-components-to-clients.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0103-Hide-specified-item-components-to-clients.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0111-Change-max-stack-count.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0111-Change-max-stack-count.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0111-Change-max-stack-count.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0111-Change-max-stack-count.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0113-Add-xor-shift-random.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0113-Add-xor-shift-random.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0113-Add-xor-shift-random.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0113-Add-xor-shift-random.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0127-Lithium-HashedList.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0127-Lithium-HashedList.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0127-Lithium-HashedList.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0127-Lithium-HashedList.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0146-Validate-recipe-display-index-before-retrieving-it.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0146-Validate-recipe-display-index-before-retrieving-it.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0146-Validate-recipe-display-index-before-retrieving-it.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0146-Validate-recipe-display-index-before-retrieving-it.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0166-Save-world-async-properly.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0166-Save-world-async-properly.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0166-Save-world-async-properly.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0166-Save-world-async-properly.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0184-preload-mob-spawning-position.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0184-preload-mob-spawning-position.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0184-preload-mob-spawning-position.patch
rename to leaf-archived-patches/removed/1.21.4/mcserver/0184-preload-mob-spawning-position.patch
diff --git a/leaf-api/paper-patches/features/0005-Make-timings-calls-final.patch b/leaf-archived-patches/removed/1.21.5/api/0004-Make-timings-calls-final.patch
similarity index 98%
rename from leaf-api/paper-patches/features/0005-Make-timings-calls-final.patch
rename to leaf-archived-patches/removed/1.21.5/api/0004-Make-timings-calls-final.patch
index 4b74cb6d..65f1190f 100644
--- a/leaf-api/paper-patches/features/0005-Make-timings-calls-final.patch
+++ b/leaf-archived-patches/removed/1.21.5/api/0004-Make-timings-calls-final.patch
@@ -3,6 +3,8 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Sat, 24 Dec 2022 22:37:29 +0100
 Subject: [PATCH] Make timings calls final
 
+Removed since Leaf 1.21.5, useless
+
 License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
diff --git a/leaf-archived-patches/removed/hardfork/server/0041-Softly-log-invalid-pool-element-errors.patch b/leaf-archived-patches/removed/1.21.5/mcserver/0041-Softly-log-invalid-pool-element-errors.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0041-Softly-log-invalid-pool-element-errors.patch
rename to leaf-archived-patches/removed/1.21.5/mcserver/0041-Softly-log-invalid-pool-element-errors.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0081-Skip-unnecessary-mob-spawning-computations.patch b/leaf-archived-patches/removed/1.21.5/mcserver/0081-Skip-unnecessary-mob-spawning-computations.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0081-Skip-unnecessary-mob-spawning-computations.patch
rename to leaf-archived-patches/removed/1.21.5/mcserver/0081-Skip-unnecessary-mob-spawning-computations.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0084-Don-t-spawn-if-lastSpawnState-is-null.patch b/leaf-archived-patches/removed/1.21.5/mcserver/0084-Don-t-spawn-if-lastSpawnState-is-null.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0084-Don-t-spawn-if-lastSpawnState-is-null.patch
rename to leaf-archived-patches/removed/1.21.5/mcserver/0084-Don-t-spawn-if-lastSpawnState-is-null.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0280-Paper-Fix-infinite-loop-in-RegionFile-IO.patch b/leaf-archived-patches/removed/1.21.5/mcserver/0280-Paper-Fix-infinite-loop-in-RegionFile-IO.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0280-Paper-Fix-infinite-loop-in-RegionFile-IO.patch
rename to leaf-archived-patches/removed/1.21.5/mcserver/0280-Paper-Fix-infinite-loop-in-RegionFile-IO.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/1160-PaperPR-Fix-save-load-NaN-Entity-Motion.patch b/leaf-archived-patches/removed/1.21.5/mcserver/1160-PaperPR-Fix-save-load-NaN-Entity-Motion.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/1160-PaperPR-Fix-save-load-NaN-Entity-Motion.patch
rename to leaf-archived-patches/removed/1.21.5/mcserver/1160-PaperPR-Fix-save-load-NaN-Entity-Motion.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/1161-PaperPR-Fix-unnecessary-map-data-saves.patch b/leaf-archived-patches/removed/1.21.5/mcserver/1161-PaperPR-Fix-unnecessary-map-data-saves.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/1161-PaperPR-Fix-unnecessary-map-data-saves.patch
rename to leaf-archived-patches/removed/1.21.5/mcserver/1161-PaperPR-Fix-unnecessary-map-data-saves.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0011-Include-time-in-startup-logs.patch b/leaf-archived-patches/removed/1.21/server/0011-Include-time-in-startup-logs.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0011-Include-time-in-startup-logs.patch
rename to leaf-archived-patches/removed/1.21/server/0011-Include-time-in-startup-logs.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0012-Include-server.properties-in-timings.patch b/leaf-archived-patches/removed/1.21/server/0012-Include-server.properties-in-timings.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0012-Include-server.properties-in-timings.patch
rename to leaf-archived-patches/removed/1.21/server/0012-Include-server.properties-in-timings.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0013-Include-hardware-specs-in-timings.patch b/leaf-archived-patches/removed/1.21/server/0013-Include-hardware-specs-in-timings.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0013-Include-hardware-specs-in-timings.patch
rename to leaf-archived-patches/removed/1.21/server/0013-Include-hardware-specs-in-timings.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0014-Use-timin.gs-by-default.patch b/leaf-archived-patches/removed/1.21/server/0014-Use-timin.gs-by-default.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0014-Use-timin.gs-by-default.patch
rename to leaf-archived-patches/removed/1.21/server/0014-Use-timin.gs-by-default.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0015-Recommend-disabling-timings-on-startup.patch b/leaf-archived-patches/removed/1.21/server/0015-Recommend-disabling-timings-on-startup.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0015-Recommend-disabling-timings-on-startup.patch
rename to leaf-archived-patches/removed/1.21/server/0015-Recommend-disabling-timings-on-startup.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0016-Make-timings-calls-final.patch b/leaf-archived-patches/removed/1.21/server/0016-Make-timings-calls-final.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0016-Make-timings-calls-final.patch
rename to leaf-archived-patches/removed/1.21/server/0016-Make-timings-calls-final.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/leaf-archived-patches/removed/1.21/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch
rename to leaf-archived-patches/removed/1.21/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0038-Leaves-Fix-vehicle-teleport-by-end-gateway.patch b/leaf-archived-patches/removed/1.21/server/0038-Leaves-Fix-vehicle-teleport-by-end-gateway.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0038-Leaves-Fix-vehicle-teleport-by-end-gateway.patch
rename to leaf-archived-patches/removed/1.21/server/0038-Leaves-Fix-vehicle-teleport-by-end-gateway.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0041-Petal-Multithreaded-Tracker.patch b/leaf-archived-patches/removed/1.21/server/0041-Petal-Multithreaded-Tracker.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0041-Petal-Multithreaded-Tracker.patch
rename to leaf-archived-patches/removed/1.21/server/0041-Petal-Multithreaded-Tracker.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0057-SparklyPaper-Cache-coordinate-key-used-for-nearby-pl.patch b/leaf-archived-patches/removed/1.21/server/0057-SparklyPaper-Cache-coordinate-key-used-for-nearby-pl.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0057-SparklyPaper-Cache-coordinate-key-used-for-nearby-pl.patch
rename to leaf-archived-patches/removed/1.21/server/0057-SparklyPaper-Cache-coordinate-key-used-for-nearby-pl.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch b/leaf-archived-patches/removed/1.21/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch
rename to leaf-archived-patches/removed/1.21/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0080-Replace-shape-full-block-cache-with-hashtable.patch b/leaf-archived-patches/removed/1.21/server/0080-Replace-shape-full-block-cache-with-hashtable.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0080-Replace-shape-full-block-cache-with-hashtable.patch
rename to leaf-archived-patches/removed/1.21/server/0080-Replace-shape-full-block-cache-with-hashtable.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0083-Tracking-Optimize-Reduce-expensive-iteration.patch b/leaf-archived-patches/removed/1.21/server/0083-Tracking-Optimize-Reduce-expensive-iteration.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0083-Tracking-Optimize-Reduce-expensive-iteration.patch
rename to leaf-archived-patches/removed/1.21/server/0083-Tracking-Optimize-Reduce-expensive-iteration.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0092-Optimize-world-generation-chunk-and-block-access.patch b/leaf-archived-patches/removed/1.21/server/0092-Optimize-world-generation-chunk-and-block-access.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0092-Optimize-world-generation-chunk-and-block-access.patch
rename to leaf-archived-patches/removed/1.21/server/0092-Optimize-world-generation-chunk-and-block-access.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0136-Instantly-continue-on-world-upgrade-finish.patch b/leaf-archived-patches/removed/1.21/server/0136-Instantly-continue-on-world-upgrade-finish.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0136-Instantly-continue-on-world-upgrade-finish.patch
rename to leaf-archived-patches/removed/1.21/server/0136-Instantly-continue-on-world-upgrade-finish.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0002-Leaf-Config-v1.patch b/leaf-archived-patches/removed/misc/0002-Leaf-Config-v1.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0002-Leaf-Config-v1.patch
rename to leaf-archived-patches/removed/misc/0002-Leaf-Config-v1.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0003-Leaf-Config-v2.patch b/leaf-archived-patches/removed/misc/0003-Leaf-Config-v2.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0003-Leaf-Config-v2.patch
rename to leaf-archived-patches/removed/misc/0003-Leaf-Config-v2.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0004-Leaf-Config-legacy-converter.patch b/leaf-archived-patches/removed/misc/0004-Leaf-Config-legacy-converter.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0004-Leaf-Config-legacy-converter.patch
rename to leaf-archived-patches/removed/misc/0004-Leaf-Config-legacy-converter.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0039-NachoSpigot-Async-Explosion.patch b/leaf-archived-patches/removed/misc/0039-NachoSpigot-Async-Explosion.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0039-NachoSpigot-Async-Explosion.patch
rename to leaf-archived-patches/removed/misc/0039-NachoSpigot-Async-Explosion.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0048-PandaSpigot-Configurable-knockback.patch b/leaf-archived-patches/removed/misc/0048-PandaSpigot-Configurable-knockback.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0048-PandaSpigot-Configurable-knockback.patch
rename to leaf-archived-patches/removed/misc/0048-PandaSpigot-Configurable-knockback.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0053-LinearPurpur-Add-Linear-region-format.patch b/leaf-archived-patches/removed/misc/0053-LinearPurpur-Add-Linear-region-format.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0053-LinearPurpur-Add-Linear-region-format.patch
rename to leaf-archived-patches/removed/misc/0053-LinearPurpur-Add-Linear-region-format.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0054-LinearPurpur-Just-remove-all-locks-on-region-files.patch b/leaf-archived-patches/removed/misc/0054-LinearPurpur-Just-remove-all-locks-on-region-files.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0054-LinearPurpur-Just-remove-all-locks-on-region-files.patch
rename to leaf-archived-patches/removed/misc/0054-LinearPurpur-Just-remove-all-locks-on-region-files.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0070-Configurable-bamboo-collision.patch b/leaf-archived-patches/removed/misc/0070-Configurable-bamboo-collision.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0070-Configurable-bamboo-collision.patch
rename to leaf-archived-patches/removed/misc/0070-Configurable-bamboo-collision.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0081-Implement-Noisium.patch b/leaf-archived-patches/removed/misc/0081-Implement-Noisium.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0081-Implement-Noisium.patch
rename to leaf-archived-patches/removed/misc/0081-Implement-Noisium.patch
diff --git a/leaf-archived-patches/removed/legacy/server/0102-Remove-stream-in-PlacedFeature.patch b/leaf-archived-patches/removed/misc/0102-Remove-stream-in-PlacedFeature.patch
similarity index 100%
rename from leaf-archived-patches/removed/legacy/server/0102-Remove-stream-in-PlacedFeature.patch
rename to leaf-archived-patches/removed/misc/0102-Remove-stream-in-PlacedFeature.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0110-Cache-ItemStack-max-stack-size.patch b/leaf-archived-patches/removed/misc/0110-Cache-ItemStack-max-stack-size.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0110-Cache-ItemStack-max-stack-size.patch
rename to leaf-archived-patches/removed/misc/0110-Cache-ItemStack-max-stack-size.patch
diff --git a/leaf-archived-patches/removed/hardfork/server/0120-Replace-criterion-listener-map-with-optimized-collec.patch b/leaf-archived-patches/removed/misc/0120-Replace-criterion-listener-map-with-optimized-collec.patch
similarity index 100%
rename from leaf-archived-patches/removed/hardfork/server/0120-Replace-criterion-listener-map-with-optimized-collec.patch
rename to leaf-archived-patches/removed/misc/0120-Replace-criterion-listener-map-with-optimized-collec.patch
diff --git a/leaf-archived-patches/ver/README.md b/leaf-archived-patches/ver/README.md
deleted file mode 100644
index 79719212..00000000
--- a/leaf-archived-patches/ver/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Note
-
-If you want to check those patches under api or server folder of a previous MC version.
-
-You can switch git branch to look into them.