diff --git a/patches/api-unmapped/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/api-unmapped/Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/api/Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/api-unmapped/Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 100%
rename from patches/api-unmapped/Expose-WorldBorder-isInBounds-Location-check.patch
rename to patches/api/Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/server-remapped/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/server-remapped/Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server-remapped/Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 81%
rename from patches/server-remapped/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index f2a9ff8aa1..b5204e8ce5 100644
--- a/patches/server-remapped/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -29,16 +29,16 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          switch (packet.getAction()) {
              case PRESS_SHIFT_KEY:
                  this.player.setShiftKeyDown(true);
 +
-+            // Paper start - Hang on!
-+            if (this.player.level.paperConfig.parrotsHangOnBetter) {
-+                this.player.removeEntitiesOnShoulder();
-+            }
-+            // Paper end
++                // Paper start - Hang on!
++                if (this.player.level.paperConfig.parrotsHangOnBetter) {
++                    this.player.removeEntitiesOnShoulder();
++                }
++                // Paper end
 +
                  break;
              case RELEASE_SHIFT_KEY:
@@ -50,9 +50,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
          this.playShoulderEntityAmbientSound(this.getShoulderEntityLeft());
          this.playShoulderEntityAmbientSound(this.getShoulderEntityRight());
-         if (!this.level.isClientSide && (this.fallDistance > 0.5F || this.isInWater()) || this.abilities.flying || this.isSleeping()) {
+         if (!this.level.isClientSide && (this.fallDistance > 0.5F || this.isInWater()) || this.abilities.flying || this.isSleeping() || this.isInPowderSnow) {
 -            this.removeEntitiesOnShoulder();
 +            if (!this.level.paperConfig.parrotsHangOnBetter) this.removeEntitiesOnShoulder(); // Paper - Hang on!
          }
  
      }
+@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
+         }
+     }
+ 
+-    protected void removeEntitiesOnShoulder() {
++    public void removeEntitiesOnShoulder() { // Paper - protected -> public
+         if (this.timeEntitySatOnShoulder + 20L < this.level.getGameTime()) {
+             // CraftBukkit start
+             if (this.spawnEntityFromShoulder(this.getShoulderEntityLeft())) {
diff --git a/patches/server-remapped/Add-system-property-to-disable-book-size-limits.patch b/patches/server/Add-system-property-to-disable-book-size-limits.patch
similarity index 78%
rename from patches/server-remapped/Add-system-property-to-disable-book-size-limits.patch
rename to patches/server/Add-system-property-to-disable-book-size-limits.patch
index 9ace767d1f..b50595ff39 100644
--- a/patches/server-remapped/Add-system-property-to-disable-book-size-limits.patch
+++ b/patches/server/Add-system-property-to-disable-book-size-limits.patch
@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (title == null) {
              this.title = null;
              return true;
--        } else if (title.length() > MAX_TITLE_LENGTH) {
-+        } else if (title.length() > MAX_TITLE_LENGTH && !OVERRIDE_CHECKS) { // Paper - Add override
+-        } else if (title.length() > CraftMetaBook.MAX_TITLE_LENGTH) {
++        } else if (title.length() > CraftMetaBook.MAX_TITLE_LENGTH && !CraftMetaBook.OVERRIDE_CHECKS) { // Paper - Add override
              return false;
          }
  
@@ -35,8 +35,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      String validatePage(String page) {
          if (page == null) {
              page = "";
--        } else if (page.length() > MAX_PAGE_LENGTH) {
-+        } else if (page.length() > MAX_PAGE_LENGTH && !OVERRIDE_CHECKS) { // Paper - Add override
+-        } else if (page.length() > CraftMetaBook.MAX_PAGE_LENGTH) {
++        } else if (page.length() > CraftMetaBook.MAX_PAGE_LENGTH && !CraftMetaBook.OVERRIDE_CHECKS) { // Paper - Add override
              page = page.substring(0, MAX_PAGE_LENGTH);
          }
          return page;
@@ -44,8 +44,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          // asserted: page != null
          if (this.pages == null) {
              this.pages = new ArrayList<String>();
--        } else if (this.pages.size() >= MAX_PAGES) {
-+        } else if (this.pages.size() >= MAX_PAGES && !OVERRIDE_CHECKS) {// Paper - Add override
+-        } else if (this.pages.size() >= CraftMetaBook.MAX_PAGES) {
++        } else if (this.pages.size() >= CraftMetaBook.MAX_PAGES && !CraftMetaBook.OVERRIDE_CHECKS) { // Paper - Add override
              return;
          }
          this.pages.add(page);