diff --git a/patches/server-unmapped/0005-Barrels-and-enderchests-6-rows.patch b/patches/server-remapped/0004-Barrels-and-enderchests-6-rows.patch
similarity index 63%
rename from patches/server-unmapped/0005-Barrels-and-enderchests-6-rows.patch
rename to patches/server-remapped/0004-Barrels-and-enderchests-6-rows.patch
index aceec8b11..6ea2a518f 100644
--- a/patches/server-unmapped/0005-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server-remapped/0004-Barrels-and-enderchests-6-rows.patch
@@ -4,14 +4,14 @@ Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Barrels and enderchests 6 rows
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/InventoryEnderChest.java b/src/main/java/net/minecraft/world/inventory/InventoryEnderChest.java
-index 85b9eba1dba3de69ab65b0e1c5ebb8740ce6e9e5..97f6ba97a4b2a35c0b8a003e1e27ad38831d859d 100644
---- a/src/main/java/net/minecraft/world/inventory/InventoryEnderChest.java
-+++ b/src/main/java/net/minecraft/world/inventory/InventoryEnderChest.java
-@@ -28,11 +28,34 @@ public class InventoryEnderChest extends InventorySubcontainer {
+diff --git a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+index 59acb1aab21e2dce0f046942f124b50ac1cb8d0f..a26cb4e4e4e23a06c970ea3c42c1060108708568 100644
+--- a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
++++ b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+@@ -29,11 +29,34 @@ public class PlayerEnderChestContainer extends SimpleContainer {
      }
  
-     public InventoryEnderChest(EntityHuman owner) {
+     public PlayerEnderChestContainer(Player owner) {
 -        super(27);
 +        super(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? 54 : 27); // Purpur
          this.owner = owner;
@@ -20,8 +20,8 @@ index 85b9eba1dba3de69ab65b0e1c5ebb8740ce6e9e5..97f6ba97a4b2a35c0b8a003e1e27ad38
  
 +    // Purpur start
 +    @Override
-+    public int getSize() {
-+        if (net.pl3x.purpur.PurpurConfig.enderChestSixRows && net.pl3x.purpur.PurpurConfig.enderChestPermissionRows && owner != null && owner.getProfile() != null) {
++    public int getContainerSize() {
++        if (net.pl3x.purpur.PurpurConfig.enderChestSixRows && net.pl3x.purpur.PurpurConfig.enderChestPermissionRows && owner != null && owner.getGameProfile() != null) {
 +            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkit = owner.getBukkitEntity();
 +            if (bukkit.hasPermission("purpur.enderchest.rows.six")) {
 +                return 54;
@@ -37,27 +37,19 @@ index 85b9eba1dba3de69ab65b0e1c5ebb8740ce6e9e5..97f6ba97a4b2a35c0b8a003e1e27ad38
 +                return 9;
 +            }
 +        }
-+        return super.getSize();
++        return super.getContainerSize();
 +    }
 +    // Purpur end
 +
-     public void a(TileEntityEnderChest tileentityenderchest) {
-         this.a = tileentityenderchest;
+     public void setActiveChest(EnderChestBlockEntity blockEntity) {
+         this.activeChest = blockEntity;
      }
-diff --git a/src/main/java/net/minecraft/world/level/block/BlockEnderChest.java b/src/main/java/net/minecraft/world/level/block/BlockEnderChest.java
+diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
 index 70d10c492b6ba893d56a463c0e71ac6aa8707f81..34ea9d2aeb9d606d487be796283c9d5ed614a6af 100644
---- a/src/main/java/net/minecraft/world/level/block/BlockEnderChest.java
-+++ b/src/main/java/net/minecraft/world/level/block/BlockEnderChest.java
-@@ -11,6 +11,7 @@ import net.minecraft.world.TileInventory;
- import net.minecraft.world.entity.monster.piglin.PiglinAI;
- import net.minecraft.world.entity.player.EntityHuman;
- import net.minecraft.world.inventory.ContainerChest;
-+import net.minecraft.world.inventory.Containers;
- import net.minecraft.world.inventory.InventoryEnderChest;
- import net.minecraft.world.item.context.BlockActionContext;
- import net.minecraft.world.level.GeneratorAccess;
-@@ -81,6 +82,27 @@ public class BlockEnderChest extends BlockChestAbstract<TileEntityEnderChest> im
- 
+--- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
+@@ -81,6 +82,27 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
+
                  inventoryenderchest.a(tileentityenderchest);
                  entityhuman.openContainer(new TileInventory((i, playerinventory, entityhuman1) -> {
 +                    // Purpur start
@@ -84,42 +76,34 @@ index 70d10c492b6ba893d56a463c0e71ac6aa8707f81..34ea9d2aeb9d606d487be796283c9d5e
                      return ContainerChest.a(i, playerinventory, inventoryenderchest);
                  }, BlockEnderChest.e));
                  entityhuman.a(StatisticList.OPEN_ENDERCHEST);
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBarrel.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBarrel.java
-index 7a6f150490bc3ef8a5ed43c401fd70bcc67f40f0..449d2c38abdd35b782a6732006eebb381815bcba 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBarrel.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBarrel.java
-@@ -14,6 +14,7 @@ import net.minecraft.world.entity.player.EntityHuman;
- import net.minecraft.world.entity.player.PlayerInventory;
- import net.minecraft.world.inventory.Container;
- import net.minecraft.world.inventory.ContainerChest;
-+import net.minecraft.world.inventory.Containers;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.level.block.BlockBarrel;
- import net.minecraft.world.level.block.Blocks;
-@@ -68,7 +69,7 @@ public class TileEntityBarrel extends TileEntityLootable {
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744021f8880 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+@@ -68,7 +68,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
-     private TileEntityBarrel(TileEntityTypes<?> tileentitytypes) {
-         super(tileentitytypes);
--        this.items = NonNullList.a(27, ItemStack.b);
-+        this.items = NonNullList.a(net.pl3x.purpur.PurpurConfig.barrelSixRows ? 54 : 27, ItemStack.b); // Purpur
-     }
- 
-     public TileEntityBarrel() {
-@@ -97,7 +98,7 @@ public class TileEntityBarrel extends TileEntityLootable {
+     public BarrelBlockEntity(BlockPos pos, BlockState state) {
+         super(BlockEntityType.BARREL, pos, state);
+-        this.items = NonNullList.withSize(27, ItemStack.EMPTY);
++        this.items = NonNullList.withSize(net.pl3x.purpur.PurpurConfig.barrelSixRows ? 54 : 27, ItemStack.EMPTY); // Purpur
+         this.openersCounter = new ContainerOpenersCounter() {
+             @Override
+             protected void onOpen(Level world, BlockPos pos, BlockState state) {
+@@ -120,7 +120,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
      @Override
-     public int getSize() {
+     public int getContainerSize() {
 -        return 27;
 +        return net.pl3x.purpur.PurpurConfig.barrelSixRows ? 54 : 27; // Purpur
      }
  
      @Override
-@@ -117,6 +118,7 @@ public class TileEntityBarrel extends TileEntityLootable {
+@@ -140,6 +140,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
      @Override
-     protected Container createContainer(int i, PlayerInventory playerinventory) {
-+        if (net.pl3x.purpur.PurpurConfig.barrelSixRows) return new ContainerChest(Containers.GENERIC_9X6, i, playerinventory, this, 6); // Purpur
-         return ContainerChest.a(i, playerinventory, this);
+     protected AbstractContainerMenu createMenu(int syncId, Inventory playerInventory) {
++        if (net.pl3x.purpur.PurpurConfig.barrelSixRows) return ChestMenu.sixRows(syncId, playerInventory, (Container) this); // Purpur
+         return ChestMenu.threeRows(syncId, playerInventory, (Container) this);
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -159,31 +143,31 @@ index 108be36fc37c04eece6ccb93d19e58a31326ceb0..2f329bae9f09d0ed21a4538fba6b9591
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 614ab2d73db2293116f2272f6cd5c16da446132d..2885dc250f171917393c0356a005b476b23f9c5f 100644
+index 99d52dc4a3619200e8eb864e8ed8f4a6e469b443..dc8b034bbb50789d707968fa5a05434a31696a33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -212,8 +212,10 @@ public class CraftContainer extends Container {
+@@ -165,8 +165,10 @@ public class CraftContainer extends AbstractContainerMenu {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:
-+                delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
++                this.delegate = new ChestMenu(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? MenuType.GENERIC_9x6 : MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9); // Purpur
 +                break; // Purpur
              case BARREL:
--                delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
-+                delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
+-                this.delegate = new ChestMenu(MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
++                this.delegate = new ChestMenu(net.pl3x.purpur.PurpurConfig.barrelSixRows ? MenuType.GENERIC_9x6 : MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9); // Purpur
                  break;
              case DISPENSER:
              case DROPPER:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index f6001047ada8308cfa1d9b26677a7a5d7774de51..922a15097bdfe64be657fdf157145d1e882b6a40 100644
+index 01701e50dd0ce1c46dcc27ea7da8f51d45899a8c..6aa3838ad534dc49b0f591719e395598ad1183bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -82,7 +82,7 @@ public class CraftInventory implements Inventory {
+@@ -80,7 +80,7 @@ public class CraftInventory implements Inventory {
  
      @Override
      public void setContents(ItemStack[] items) {
--        if (getSize() < items.length) {
-+        if (false && getSize() < items.length) { // Purpur
-             throw new IllegalArgumentException("Invalid inventory size; expected " + getSize() + " or less");
+-        if (this.getSize() < items.length) {
++        if (false && this.getSize() < items.length) { // Purpur
+             throw new IllegalArgumentException("Invalid inventory size; expected " + this.getSize() + " or less");
          }
  
diff --git a/patches/server-unmapped/0004-Timings-stuff.patch b/patches/server/0003-Timings-stuff.patch
similarity index 91%
rename from patches/server-unmapped/0004-Timings-stuff.patch
rename to patches/server/0003-Timings-stuff.patch
index 5a09a99c9..89b599a8d 100644
--- a/patches/server-unmapped/0004-Timings-stuff.patch
+++ b/patches/server/0003-Timings-stuff.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Timings stuff
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index e33e889c291d37a821a4fbd40d9aac7bb079de0d..721617c62d156f0ad9f69cb0d1c2737cced1386d 100644
+index 2ff4d4921e2076abf415bd3c8f5173ecd6222168..279cf6a1f9ee6e5ed099eedbf68ee72a51cac621 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -227,9 +227,13 @@ public class TimingsExport extends Thread {
+@@ -226,9 +226,13 @@ public class TimingsExport extends Thread {
          // Information on the users Config
  
          parent.put("config", createObject(
@@ -24,7 +24,7 @@ index e33e889c291d37a821a4fbd40d9aac7bb079de0d..721617c62d156f0ad9f69cb0d1c2737c
          ));
  
          new TimingsExport(listeners, parent, history).start();
-@@ -270,6 +274,19 @@ public class TimingsExport extends Thread {
+@@ -269,6 +273,19 @@ public class TimingsExport extends Thread {
          return timingsCost;
      }
  
@@ -44,7 +44,7 @@ index e33e889c291d37a821a4fbd40d9aac7bb079de0d..721617c62d156f0ad9f69cb0d1c2737c
      private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
  
          JSONObject object = new JSONObject();
-@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
+@@ -305,7 +322,7 @@ public class TimingsExport extends Thread {
          String response = null;
          String timingsURL = null;
          try {