diff --git a/paper-server/patches/features/0001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/paper-server/patches/unapplied/0001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from paper-server/patches/features/0001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to paper-server/patches/unapplied/0001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/paper-server/patches/features/0002-Allow-Saving-of-Oversized-Chunks.patch b/paper-server/patches/unapplied/0002-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from paper-server/patches/features/0002-Allow-Saving-of-Oversized-Chunks.patch
rename to paper-server/patches/unapplied/0002-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch b/paper-server/patches/unapplied/0003-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch
rename to paper-server/patches/unapplied/0003-Entity-Activation-Range-2.0.patch
diff --git a/paper-server/patches/features/0004-Anti-Xray.patch b/paper-server/patches/unapplied/0004-Anti-Xray.patch
similarity index 100%
rename from paper-server/patches/features/0004-Anti-Xray.patch
rename to paper-server/patches/unapplied/0004-Anti-Xray.patch
diff --git a/paper-server/patches/features/0005-Use-Velocity-compression-and-cipher-natives.patch b/paper-server/patches/unapplied/0005-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from paper-server/patches/features/0005-Use-Velocity-compression-and-cipher-natives.patch
rename to paper-server/patches/unapplied/0005-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/paper-server/patches/features/0006-Optimize-Collision-to-not-load-chunks.patch b/paper-server/patches/unapplied/0006-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from paper-server/patches/features/0006-Optimize-Collision-to-not-load-chunks.patch
rename to paper-server/patches/unapplied/0006-Optimize-Collision-to-not-load-chunks.patch
diff --git a/paper-server/patches/features/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/paper-server/patches/unapplied/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from paper-server/patches/features/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to paper-server/patches/unapplied/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/paper-server/patches/features/0008-Optimize-Voxel-Shape-Merging.patch b/paper-server/patches/unapplied/0008-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from paper-server/patches/features/0008-Optimize-Voxel-Shape-Merging.patch
rename to paper-server/patches/unapplied/0008-Optimize-Voxel-Shape-Merging.patch
diff --git a/paper-server/patches/features/0009-Handle-Oversized-block-entities-in-chunks.patch b/paper-server/patches/unapplied/0009-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from paper-server/patches/features/0009-Handle-Oversized-block-entities-in-chunks.patch
rename to paper-server/patches/unapplied/0009-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/paper-server/patches/features/0010-optimize-dirt-and-snow-spreading.patch b/paper-server/patches/unapplied/0010-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from paper-server/patches/features/0010-optimize-dirt-and-snow-spreading.patch
rename to paper-server/patches/unapplied/0010-optimize-dirt-and-snow-spreading.patch
diff --git a/paper-server/patches/features/0011-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/paper-server/patches/unapplied/0011-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from paper-server/patches/features/0011-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to paper-server/patches/unapplied/0011-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/paper-server/patches/features/0012-Optimize-Bit-Operations-by-inlining.patch b/paper-server/patches/unapplied/0012-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from paper-server/patches/features/0012-Optimize-Bit-Operations-by-inlining.patch
rename to paper-server/patches/unapplied/0012-Optimize-Bit-Operations-by-inlining.patch
diff --git a/paper-server/patches/features/0013-Remove-streams-from-hot-code.patch b/paper-server/patches/unapplied/0013-Remove-streams-from-hot-code.patch
similarity index 100%
rename from paper-server/patches/features/0013-Remove-streams-from-hot-code.patch
rename to paper-server/patches/unapplied/0013-Remove-streams-from-hot-code.patch
diff --git a/paper-server/patches/features/0014-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/paper-server/patches/unapplied/0014-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from paper-server/patches/features/0014-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to paper-server/patches/unapplied/0014-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/paper-server/patches/features/0015-Moonrise-optimisation-patches.patch b/paper-server/patches/unapplied/0015-Moonrise-optimisation-patches.patch
similarity index 100%
rename from paper-server/patches/features/0015-Moonrise-optimisation-patches.patch
rename to paper-server/patches/unapplied/0015-Moonrise-optimisation-patches.patch
diff --git a/paper-server/patches/features/0016-Fix-entity-tracker-desync-when-new-players-are-added.patch b/paper-server/patches/unapplied/0016-Fix-entity-tracker-desync-when-new-players-are-added.patch
similarity index 100%
rename from paper-server/patches/features/0016-Fix-entity-tracker-desync-when-new-players-are-added.patch
rename to paper-server/patches/unapplied/0016-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/paper-server/patches/features/0017-Eigencraft-redstone-implementation.patch b/paper-server/patches/unapplied/0017-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from paper-server/patches/features/0017-Eigencraft-redstone-implementation.patch
rename to paper-server/patches/unapplied/0017-Eigencraft-redstone-implementation.patch
diff --git a/paper-server/patches/features/0018-Add-Alternate-Current-redstone-implementation.patch b/paper-server/patches/unapplied/0018-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from paper-server/patches/features/0018-Add-Alternate-Current-redstone-implementation.patch
rename to paper-server/patches/unapplied/0018-Add-Alternate-Current-redstone-implementation.patch
diff --git a/paper-server/patches/features/0019-Improve-exact-choice-recipe-ingredients.patch b/paper-server/patches/unapplied/0019-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from paper-server/patches/features/0019-Improve-exact-choice-recipe-ingredients.patch
rename to paper-server/patches/unapplied/0019-Improve-exact-choice-recipe-ingredients.patch
diff --git a/paper-server/patches/features/0020-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/paper-server/patches/unapplied/0020-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from paper-server/patches/features/0020-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to paper-server/patches/unapplied/0020-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/paper-server/patches/features/0021-Entity-load-save-limit-per-chunk.patch b/paper-server/patches/unapplied/0021-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from paper-server/patches/features/0021-Entity-load-save-limit-per-chunk.patch
rename to paper-server/patches/unapplied/0021-Entity-load-save-limit-per-chunk.patch
diff --git a/paper-server/patches/features/0022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/paper-server/patches/unapplied/0022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from paper-server/patches/features/0022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to paper-server/patches/unapplied/0022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/paper-server/patches/features/0023-Incremental-chunk-and-player-saving.patch b/paper-server/patches/unapplied/0023-Incremental-chunk-and-player-saving.patch
similarity index 100%
rename from paper-server/patches/features/0023-Incremental-chunk-and-player-saving.patch
rename to paper-server/patches/unapplied/0023-Incremental-chunk-and-player-saving.patch
diff --git a/paper-server/patches/features/0024-Optimise-general-POI-access.patch b/paper-server/patches/unapplied/0024-Optimise-general-POI-access.patch
similarity index 100%
rename from paper-server/patches/features/0024-Optimise-general-POI-access.patch
rename to paper-server/patches/unapplied/0024-Optimise-general-POI-access.patch
diff --git a/paper-server/patches/features/0025-Optional-per-player-mob-spawns.patch b/paper-server/patches/unapplied/0025-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from paper-server/patches/features/0025-Optional-per-player-mob-spawns.patch
rename to paper-server/patches/unapplied/0025-Optional-per-player-mob-spawns.patch
diff --git a/paper-server/patches/features/0026-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/paper-server/patches/unapplied/0026-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from paper-server/patches/features/0026-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to paper-server/patches/unapplied/0026-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/paper-server/patches/features/0027-Optimize-Hoppers.patch b/paper-server/patches/unapplied/0027-Optimize-Hoppers.patch
similarity index 100%
rename from paper-server/patches/features/0027-Optimize-Hoppers.patch
rename to paper-server/patches/unapplied/0027-Optimize-Hoppers.patch
diff --git a/paper-server/patches/features/0028-Flush-regionfiles-on-save-configuration-option.patch b/paper-server/patches/unapplied/0028-Flush-regionfiles-on-save-configuration-option.patch
similarity index 100%
rename from paper-server/patches/features/0028-Flush-regionfiles-on-save-configuration-option.patch
rename to paper-server/patches/unapplied/0028-Flush-regionfiles-on-save-configuration-option.patch
diff --git a/paper-server/patches/features/0029-Optimise-collision-checking-in-player-move-packet-ha.patch b/paper-server/patches/unapplied/0029-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from paper-server/patches/features/0029-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to paper-server/patches/unapplied/0029-Optimise-collision-checking-in-player-move-packet-ha.patch