diff --git a/divinemc-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch b/divinemc-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch
index 587acd0..a593e52 100644
--- a/divinemc-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch
+++ b/divinemc-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2342,6 +_,13 @@
+@@ -2346,6 +_,13 @@
          }
          // Purpur end
  
diff --git a/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch b/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
index ee38ed3..b2303e3 100644
--- a/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
+++ b/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -4047,4 +_,14 @@
+@@ -4021,4 +_,14 @@
          sendDeathScreen(message);
      }
      // Purpur end
diff --git a/divinemc-server/minecraft-patches/features/0010-Petal-Async-Pathfinding.patch b/divinemc-server/minecraft-patches/features/0010-Petal-Async-Pathfinding.patch
index d51eba9..22c58f1 100644
--- a/divinemc-server/minecraft-patches/features/0010-Petal-Async-Pathfinding.patch
+++ b/divinemc-server/minecraft-patches/features/0010-Petal-Async-Pathfinding.patch
@@ -576,10 +576,10 @@ index d5727999eb67ff30dbf47865d59452483338e170..ddbee0f0f42fae0a26321bb324d22f5e
          }
      }
 diff --git a/net/minecraft/world/entity/animal/frog/Frog.java b/net/minecraft/world/entity/animal/frog/Frog.java
-index d286d4a45b6c8d5c684ad11500d2ad1a10a70c18..9c97f7bd3eaf1a962793287d1b6c7911cdf149fd 100644
+index 87d21e142c3f1522a60bc3e8a0ff3b4954cf5ec9..d71437ec950af094059969537687c27892d01202 100644
 --- a/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -496,6 +496,17 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
+@@ -497,6 +497,17 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
              super(mob, level);
          }
  
@@ -597,7 +597,7 @@ index d286d4a45b6c8d5c684ad11500d2ad1a10a70c18..9c97f7bd3eaf1a962793287d1b6c7911
          @Override
          public boolean canCutCorner(PathType pathType) {
              return pathType != PathType.WATER_BORDER && super.canCutCorner(pathType);
-@@ -504,6 +515,11 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
+@@ -505,6 +516,11 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
          @Override
          protected PathFinder createPathFinder(int maxVisitedNodes) {
              this.nodeEvaluator = new Frog.FrogNodeEvaluator(true);
diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raid.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raid.java.patch
index 93d2ae9..43de7f4 100644
--- a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raid.java.patch
+++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raid.java.patch
@@ -21,7 +21,7 @@
              if (this.status == Raid.RaidStatus.ONGOING) {
                  boolean flag = this.active;
                  this.active = this.level.hasChunkAt(this.center);
-@@ -587,9 +_,15 @@
+@@ -580,9 +_,15 @@
          }
      }
  
diff --git a/divinemc-server/paper-patches/features/0002-DivineMC-Configuration.patch b/divinemc-server/paper-patches/features/0002-DivineMC-Configuration.patch
index 8295eec..c081aee 100644
--- a/divinemc-server/paper-patches/features/0002-DivineMC-Configuration.patch
+++ b/divinemc-server/paper-patches/features/0002-DivineMC-Configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] DivineMC Configuration
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d072bd2e46abfa9366bc973028e068849c0a0a45..55f9267c83427dbe4ab28580ec515539565f3bdb 100644
+index d429c5d34fb4b91749705b6a17c4b12d1a5220e1..87af0d7b87caca4a3828359388ac3eeda7b3d76f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1103,6 +1103,7 @@ public final class CraftServer implements Server {
@@ -24,7 +24,7 @@ index d072bd2e46abfa9366bc973028e068849c0a0a45..55f9267c83427dbe4ab28580ec515539
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -3130,6 +3132,13 @@ public final class CraftServer implements Server {
+@@ -3120,6 +3122,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -39,7 +39,7 @@ index d072bd2e46abfa9366bc973028e068849c0a0a45..55f9267c83427dbe4ab28580ec515539
          @Override
          public YamlConfiguration getPurpurConfig() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 90fb036607e752fcf43575be4f03bbf00bbb05c7..cefb51630b26cac0dd3d69973437b14532f59710 100644
+index 2e1b7f613de8876095ef39bb0341a3f9520c8d5d..8c619b7d72cb153a3204cb9e215f7f5de83e8347 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -183,6 +183,15 @@ public class Main {
diff --git a/divinemc-server/paper-patches/features/0003-Optimize-default-values-for-configs.patch b/divinemc-server/paper-patches/features/0003-Optimize-default-values-for-configs.patch
index 1f0bf79..68a84e1 100644
--- a/divinemc-server/paper-patches/features/0003-Optimize-default-values-for-configs.patch
+++ b/divinemc-server/paper-patches/features/0003-Optimize-default-values-for-configs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize default values for configs
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index d4a0b684e7e5a5d7ea1106d0adeccf12d501676c..5ff509211843028ed692b37e286db425607bfed3 100644
+index bacd1d90a0703576924fb50cc8c9a89cbd376175..2d8bbb9094c284221735e7e77cdfce3b147a7ae0 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -340,9 +340,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -341,9 +341,9 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean fixEntityPositionDesync = true;
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)
diff --git a/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch b/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch
index 9a76b84..d2bafb0 100644
--- a/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch
+++ b/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing purpur config options
 
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 44f0f572ea99f670ba4eeaf74294919b3502a442..916a1a64011390db814cb59d32a10a35386001ad 100644
+index 168361632d4af27c2144864ade539ce7ea217217..48248e1a7eb9f63220dd619c1868dcca3150c345 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -327,6 +327,7 @@ public class PurpurConfig {
@@ -25,10 +25,10 @@ index 44f0f572ea99f670ba4eeaf74294919b3502a442..916a1a64011390db814cb59d32a10a35
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfee4c24a79 100644
+index 1dd74216ec8bfaca080bd6ae67169815e9a9b855..286844cfad8b993f1fbc26a13e1a67381b24ff49 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1144,12 +1144,20 @@ public class PurpurWorldConfig {
+@@ -1146,12 +1146,20 @@ public class PurpurWorldConfig {
      public boolean allayControllable = true;
      public double allayMaxHealth = 20.0D;
      public double allayScale = 1.0D;
@@ -49,7 +49,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      }
  
      public boolean armadilloRidable = false;
-@@ -1304,6 +1312,10 @@ public class PurpurWorldConfig {
+@@ -1306,6 +1314,10 @@ public class PurpurWorldConfig {
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
      public int camelBreedingTicks = 6000;
@@ -60,7 +60,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      private void camelSettings() {
          camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
          camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
-@@ -1313,6 +1325,10 @@ public class PurpurWorldConfig {
+@@ -1315,6 +1327,10 @@ public class PurpurWorldConfig {
          camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
          camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
          camelBreedingTicks = getInt("mobs.camel.breeding-delay-ticks", camelBreedingTicks);
@@ -71,7 +71,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      }
  
      public boolean catRidable = false;
-@@ -1769,12 +1785,22 @@ public class PurpurWorldConfig {
+@@ -1771,12 +1787,22 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -94,7 +94,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      }
  
      public boolean ghastRidable = false;
-@@ -2781,6 +2807,10 @@ public class PurpurWorldConfig {
+@@ -2804,6 +2830,10 @@ public class PurpurWorldConfig {
      public double snifferMaxHealth = 14.0D;
      public double snifferScale = 1.0D;
      public int snifferBreedingTicks = 6000;
@@ -105,7 +105,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      private void snifferSettings() {
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
-@@ -2788,6 +2818,10 @@ public class PurpurWorldConfig {
+@@ -2811,6 +2841,10 @@ public class PurpurWorldConfig {
          snifferMaxHealth = getDouble("mobs.sniffer.attributes.max_health", snifferMaxHealth);
          snifferScale = Mth.clamp(getDouble("mobs.sniffer.attributes.scale", snifferScale), 0.0625D, 16.0D);
          snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", snifferBreedingTicks);
@@ -116,7 +116,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      }
  
      public boolean squidRidable = false;
-@@ -2889,10 +2923,20 @@ public class PurpurWorldConfig {
+@@ -2912,10 +2946,20 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -137,7 +137,7 @@ index 13d8dce80166ece056f93e424473c5a147163867..eabce3c1e7772982d94c0ef3f927ddfe
      }
  
      public boolean traderLlamaRidable = false;
-@@ -3121,10 +3165,20 @@ public class PurpurWorldConfig {
+@@ -3144,10 +3188,20 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;
diff --git a/divinemc-archived-patches/removed/1.19.2/server/0002-Global-Eula-file.patch b/patches/removed/1.19.2/server/0002-Global-Eula-file.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.2/server/0002-Global-Eula-file.patch
rename to patches/removed/1.19.2/server/0002-Global-Eula-file.patch
diff --git a/divinemc-archived-patches/removed/1.19.2/server/0004-Reduce-constants-allocations.patch b/patches/removed/1.19.2/server/0004-Reduce-constants-allocations.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.2/server/0004-Reduce-constants-allocations.patch
rename to patches/removed/1.19.2/server/0004-Reduce-constants-allocations.patch
diff --git a/divinemc-archived-patches/removed/1.19.2/server/0007-lithium-CompactSineLUT.patch b/patches/removed/1.19.2/server/0007-lithium-CompactSineLUT.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.2/server/0007-lithium-CompactSineLUT.patch
rename to patches/removed/1.19.2/server/0007-lithium-CompactSineLUT.patch
diff --git a/divinemc-archived-patches/removed/1.19.2/server/0008-lithium-fast-retrieval.patch b/patches/removed/1.19.2/server/0008-lithium-fast-retrieval.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.2/server/0008-lithium-fast-retrieval.patch
rename to patches/removed/1.19.2/server/0008-lithium-fast-retrieval.patch
diff --git a/divinemc-archived-patches/removed/1.19.2/server/0042-lithium-replace-AI-goal-set-with-optimized-collectio.patch b/patches/removed/1.19.2/server/0042-lithium-replace-AI-goal-set-with-optimized-collectio.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.2/server/0042-lithium-replace-AI-goal-set-with-optimized-collectio.patch
rename to patches/removed/1.19.2/server/0042-lithium-replace-AI-goal-set-with-optimized-collectio.patch
diff --git a/divinemc-archived-patches/removed/1.19.2/server/0060-lithium-gen.patch b/patches/removed/1.19.2/server/0060-lithium-gen.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.2/server/0060-lithium-gen.patch
rename to patches/removed/1.19.2/server/0060-lithium-gen.patch
diff --git a/divinemc-archived-patches/removed/1.19.3/api/0003-Update-Bungeecord-Chat-API.patch b/patches/removed/1.19.3/api/0003-Update-Bungeecord-Chat-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.3/api/0003-Update-Bungeecord-Chat-API.patch
rename to patches/removed/1.19.3/api/0003-Update-Bungeecord-Chat-API.patch
diff --git a/divinemc-archived-patches/removed/1.19.3/server/0011-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/removed/1.19.3/server/0011-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.3/server/0011-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/removed/1.19.3/server/0011-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/divinemc-archived-patches/removed/1.19.3/server/0012-Remove-TickTask.patch b/patches/removed/1.19.3/server/0012-Remove-TickTask.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.3/server/0012-Remove-TickTask.patch
rename to patches/removed/1.19.3/server/0012-Remove-TickTask.patch
diff --git a/divinemc-archived-patches/removed/1.19.3/server/0014-Completely-remove-bootstrapExecutor.patch b/patches/removed/1.19.3/server/0014-Completely-remove-bootstrapExecutor.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.3/server/0014-Completely-remove-bootstrapExecutor.patch
rename to patches/removed/1.19.3/server/0014-Completely-remove-bootstrapExecutor.patch
diff --git a/divinemc-archived-patches/removed/1.19.3/server/0017-Remove-sync-chunk-writes-in-server.properties.patch b/patches/removed/1.19.3/server/0017-Remove-sync-chunk-writes-in-server.properties.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.19.3/server/0017-Remove-sync-chunk-writes-in-server.properties.patch
rename to patches/removed/1.19.3/server/0017-Remove-sync-chunk-writes-in-server.properties.patch
diff --git a/divinemc-archived-patches/removed/1.20/api/0002-Bump-Bungeecord-Chat-API-to-1.19-R0.1-SNAPSHOT.patch b/patches/removed/1.20/api/0002-Bump-Bungeecord-Chat-API-to-1.19-R0.1-SNAPSHOT.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/api/0002-Bump-Bungeecord-Chat-API-to-1.19-R0.1-SNAPSHOT.patch
rename to patches/removed/1.20/api/0002-Bump-Bungeecord-Chat-API-to-1.19-R0.1-SNAPSHOT.patch
diff --git a/divinemc-archived-patches/removed/1.20/api/0002-Rework-Spigot-Deprecations.patch b/patches/removed/1.20/api/0002-Rework-Spigot-Deprecations.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/api/0002-Rework-Spigot-Deprecations.patch
rename to patches/removed/1.20/api/0002-Rework-Spigot-Deprecations.patch
diff --git a/divinemc-archived-patches/removed/1.20/api/0003-Paper-PR-Add-Movement-Direction-API.patch b/patches/removed/1.20/api/0003-Paper-PR-Add-Movement-Direction-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/api/0003-Paper-PR-Add-Movement-Direction-API.patch
rename to patches/removed/1.20/api/0003-Paper-PR-Add-Movement-Direction-API.patch
diff --git a/divinemc-archived-patches/removed/1.20/api/0004-Paper-PR-BoneMeal-API.patch b/patches/removed/1.20/api/0004-Paper-PR-BoneMeal-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/api/0004-Paper-PR-BoneMeal-API.patch
rename to patches/removed/1.20/api/0004-Paper-PR-BoneMeal-API.patch
diff --git a/divinemc-archived-patches/removed/1.20/api/0005-Additional-pathfinding-API.patch b/patches/removed/1.20/api/0005-Additional-pathfinding-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/api/0005-Additional-pathfinding-API.patch
rename to patches/removed/1.20/api/0005-Additional-pathfinding-API.patch
diff --git a/divinemc-archived-patches/removed/1.20/api/0006-Optimize-spigot-event-bus.patch b/patches/removed/1.20/api/0006-Optimize-spigot-event-bus.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/api/0006-Optimize-spigot-event-bus.patch
rename to patches/removed/1.20/api/0006-Optimize-spigot-event-bus.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0003-Accept-EULA.patch b/patches/removed/1.20/server/0003-Accept-EULA.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0003-Accept-EULA.patch
rename to patches/removed/1.20/server/0003-Accept-EULA.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0007-Fix-entity-serialization.patch b/patches/removed/1.20/server/0007-Fix-entity-serialization.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0007-Fix-entity-serialization.patch
rename to patches/removed/1.20/server/0007-Fix-entity-serialization.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0009-EMC-Allow-negative-Amplifier-values.patch b/patches/removed/1.20/server/0009-EMC-Allow-negative-Amplifier-values.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0009-EMC-Allow-negative-Amplifier-values.patch
rename to patches/removed/1.20/server/0009-EMC-Allow-negative-Amplifier-values.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0010-Use-unused-ghast-sound.patch b/patches/removed/1.20/server/0010-Use-unused-ghast-sound.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0010-Use-unused-ghast-sound.patch
rename to patches/removed/1.20/server/0010-Use-unused-ghast-sound.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch b/patches/removed/1.20/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
rename to patches/removed/1.20/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0013-Paper-PR-Add-Movement-Direction-API.patch b/patches/removed/1.20/server/0013-Paper-PR-Add-Movement-Direction-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0013-Paper-PR-Add-Movement-Direction-API.patch
rename to patches/removed/1.20/server/0013-Paper-PR-Add-Movement-Direction-API.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0014-Paper-PR-BoneMeal-API.patch b/patches/removed/1.20/server/0014-Paper-PR-BoneMeal-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0014-Paper-PR-BoneMeal-API.patch
rename to patches/removed/1.20/server/0014-Paper-PR-BoneMeal-API.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch b/patches/removed/1.20/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
rename to patches/removed/1.20/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0016-Additional-pathfinding-API.patch b/patches/removed/1.20/server/0016-Additional-pathfinding-API.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0016-Additional-pathfinding-API.patch
rename to patches/removed/1.20/server/0016-Additional-pathfinding-API.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0019-Better-Impaling.patch b/patches/removed/1.20/server/0019-Better-Impaling.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0019-Better-Impaling.patch
rename to patches/removed/1.20/server/0019-Better-Impaling.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/removed/1.20/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch
rename to patches/removed/1.20/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0022-Paper-PR-Optimize-Varints.patch b/patches/removed/1.20/server/0022-Paper-PR-Optimize-Varints.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0022-Paper-PR-Optimize-Varints.patch
rename to patches/removed/1.20/server/0022-Paper-PR-Optimize-Varints.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0023-Bump-Dependencies.patch b/patches/removed/1.20/server/0023-Bump-Dependencies.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0023-Bump-Dependencies.patch
rename to patches/removed/1.20/server/0023-Bump-Dependencies.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0028-lithium-collections.attributes.patch b/patches/removed/1.20/server/0028-lithium-collections.attributes.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0028-lithium-collections.attributes.patch
rename to patches/removed/1.20/server/0028-lithium-collections.attributes.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0028-lithium-collections.goals.patch b/patches/removed/1.20/server/0028-lithium-collections.goals.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0028-lithium-collections.goals.patch
rename to patches/removed/1.20/server/0028-lithium-collections.goals.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0030-lithium-collections.attributes.patch b/patches/removed/1.20/server/0030-lithium-collections.attributes.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0030-lithium-collections.attributes.patch
rename to patches/removed/1.20/server/0030-lithium-collections.attributes.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0031-lithium-gen.cached_generator_settings.patch b/patches/removed/1.20/server/0031-lithium-gen.cached_generator_settings.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0031-lithium-gen.cached_generator_settings.patch
rename to patches/removed/1.20/server/0031-lithium-gen.cached_generator_settings.patch
diff --git a/divinemc-archived-patches/removed/1.20/server/0032-Replace-shape-full-block-cache-with-hashtable.patch b/patches/removed/1.20/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.20/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
rename to patches/removed/1.20/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
diff --git a/divinemc-archived-patches/removed/1.21.4/server/0024-Boat-Settings.patch b/patches/removed/1.21.4/server/0024-Boat-Settings.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21.4/server/0024-Boat-Settings.patch
rename to patches/removed/1.21.4/server/0024-Boat-Settings.patch
diff --git a/divinemc-archived-patches/removed/1.21.4/server/0026-Reduce-sensor-work.patch b/patches/removed/1.21.4/server/0026-Reduce-sensor-work.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21.4/server/0026-Reduce-sensor-work.patch
rename to patches/removed/1.21.4/server/0026-Reduce-sensor-work.patch
diff --git a/divinemc-archived-patches/removed/1.21.4/server/0036-C2ME-opts-math.patch b/patches/removed/1.21.4/server/0036-C2ME-opts-math.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21.4/server/0036-C2ME-opts-math.patch
rename to patches/removed/1.21.4/server/0036-C2ME-opts-math.patch
diff --git a/divinemc-archived-patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch b/patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
rename to patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0005-Fix-MC-98160-and-MC-105103.patch b/patches/removed/1.21/server/0005-Fix-MC-98160-and-MC-105103.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0005-Fix-MC-98160-and-MC-105103.patch
rename to patches/removed/1.21/server/0005-Fix-MC-98160-and-MC-105103.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0009-Fix-MC-2025.patch b/patches/removed/1.21/server/0009-Fix-MC-2025.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0009-Fix-MC-2025.patch
rename to patches/removed/1.21/server/0009-Fix-MC-2025.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0011-Fix-MC-93018.patch b/patches/removed/1.21/server/0011-Fix-MC-93018.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0011-Fix-MC-93018.patch
rename to patches/removed/1.21/server/0011-Fix-MC-93018.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0021-lithium-precompute-shape-arrays.patch b/patches/removed/1.21/server/0021-lithium-precompute-shape-arrays.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0021-lithium-precompute-shape-arrays.patch
rename to patches/removed/1.21/server/0021-lithium-precompute-shape-arrays.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0022-lithium-cached_hashcode.patch b/patches/removed/1.21/server/0022-lithium-cached_hashcode.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0022-lithium-cached_hashcode.patch
rename to patches/removed/1.21/server/0022-lithium-cached_hashcode.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0040-Carpet-Fixes-Sheep-Optimization.patch b/patches/removed/1.21/server/0040-Carpet-Fixes-Sheep-Optimization.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0040-Carpet-Fixes-Sheep-Optimization.patch
rename to patches/removed/1.21/server/0040-Carpet-Fixes-Sheep-Optimization.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch b/patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch
rename to patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch b/patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
rename to patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
diff --git a/divinemc-archived-patches/removed/1.21/server/0057-Fix-MC-167242.patch b/patches/removed/1.21/server/0057-Fix-MC-167242.patch
similarity index 100%
rename from divinemc-archived-patches/removed/1.21/server/0057-Fix-MC-167242.patch
rename to patches/removed/1.21/server/0057-Fix-MC-167242.patch