diff --git a/patches/removed/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch b/patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch
similarity index 97%
rename from patches/removed/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch
rename to patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch
index 4c782d6..afb0c79 100644
--- a/patches/removed/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch
+++ b/patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch
@@ -19,7 +19,7 @@ index d4a8c1bbb8fef27ac42bdf27dde495b4c649e6cb..865c61accf211d28be3c82dcf158fec9
  
      @Override
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index 94dc68182ec5f6dc1294ad15523427836228086a..07075cea760562c901d4469a7f88271c3ffa30bb 100644
+index 2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99..c5ac6cda91a81d3075f5c763e30dc009b6be7936 100644
 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
diff --git a/patches/removed/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
similarity index 100%
rename from patches/removed/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
rename to patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
diff --git a/patches/removed/0005-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch
similarity index 90%
rename from patches/removed/0005-Fixes-the-Blank-SkullOwner-exploit.patch
rename to patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch
index e6a1f74..d6fe747 100644
--- a/patches/removed/0005-Fixes-the-Blank-SkullOwner-exploit.patch
+++ b/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes the Blank SkullOwner exploit
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 92b56f16b4d8107ccf206be6b81a98dc58986c10..e6d0cd263aa5769805426825df7e49724aa05809 100644
+index 2771dd62c04c8da890724fe03f836fdeba440c55..023916ec8dc85b30e521874bcc2104e89832282a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -9,6 +9,9 @@ import java.util.UUID;
@@ -18,7 +18,7 @@ index 92b56f16b4d8107ccf206be6b81a98dc58986c10..e6d0cd263aa5769805426825df7e4972
  import org.bukkit.Bukkit;
  import org.bukkit.Material;
  import org.bukkit.OfflinePlayer;
-@@ -61,7 +64,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -63,7 +66,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
          if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
              this.setProfile(NbtUtils.readGameProfile(tag.getCompound(SKULL_OWNER.NBT)));
diff --git a/patches/removed/0006-Removes-useless-spammy-error-logging.patch b/patches/server/0006-Removes-useless-spammy-error-logging.patch
similarity index 91%
rename from patches/removed/0006-Removes-useless-spammy-error-logging.patch
rename to patches/server/0006-Removes-useless-spammy-error-logging.patch
index 6c64f0b..a8026bc 100644
--- a/patches/removed/0006-Removes-useless-spammy-error-logging.patch
+++ b/patches/server/0006-Removes-useless-spammy-error-logging.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Removes useless spammy error logging
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 3c4dadd0012c11191c873fe25a7625193563915d..d8eb84f28761dce95330afc32e4c011a4ab89b18 100644
+index 90d7e8415f158c3176a705749f0aa36a729d3b38..96edb6aa717df1a6d30a8bf7b0c9c554988381b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1792,8 +1792,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/removed/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch b/patches/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch
similarity index 100%
rename from patches/removed/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch
rename to patches/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch