diff --git a/patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/feature-patches/1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to feature-patches/1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/feature-patches/1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to feature-patches/1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/feature-patches/1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to feature-patches/1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/Allow-Saving-of-Oversized-Chunks.patch b/feature-patches/1041-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/Allow-Saving-of-Oversized-Chunks.patch
rename to feature-patches/1041-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/Flat-bedrock-generator-settings.patch b/feature-patches/1042-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/Flat-bedrock-generator-settings.patch
rename to feature-patches/1042-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/feature-patches/1043-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/Entity-Activation-Range-2.0.patch
rename to feature-patches/1043-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/Anti-Xray.patch b/feature-patches/1044-Anti-Xray.patch
similarity index 100%
rename from patches/server/Anti-Xray.patch
rename to feature-patches/1044-Anti-Xray.patch
diff --git a/patches/server/Use-Velocity-compression-and-cipher-natives.patch b/feature-patches/1045-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/Use-Velocity-compression-and-cipher-natives.patch
rename to feature-patches/1045-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/Optimize-Collision-to-not-load-chunks.patch b/feature-patches/1046-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/Optimize-Collision-to-not-load-chunks.patch
rename to feature-patches/1046-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/feature-patches/1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to feature-patches/1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/Optimize-Hoppers.patch b/feature-patches/1048-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/Optimize-Hoppers.patch
rename to feature-patches/1048-Optimize-Hoppers.patch
diff --git a/patches/server/Optimize-Voxel-Shape-Merging.patch b/feature-patches/1049-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/Optimize-Voxel-Shape-Merging.patch
rename to feature-patches/1049-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/Optimize-Bit-Operations-by-inlining.patch b/feature-patches/1050-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/Optimize-Bit-Operations-by-inlining.patch
rename to feature-patches/1050-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/Remove-streams-from-hot-code.patch b/feature-patches/1051-Remove-streams-from-hot-code.patch
similarity index 100%
rename from patches/server/Remove-streams-from-hot-code.patch
rename to feature-patches/1051-Remove-streams-from-hot-code.patch
diff --git a/patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/feature-patches/1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to feature-patches/1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch b/feature-patches/1053-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch
rename to feature-patches/1053-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/Handle-Oversized-block-entities-in-chunks.patch b/feature-patches/1054-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/server/Handle-Oversized-block-entities-in-chunks.patch
rename to feature-patches/1054-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/Check-distance-in-entity-interactions.patch b/feature-patches/1055-Check-distance-in-entity-interactions.patch
similarity index 100%
rename from patches/server/Check-distance-in-entity-interactions.patch
rename to feature-patches/1055-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/optimize-dirt-and-snow-spreading.patch b/feature-patches/1056-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/optimize-dirt-and-snow-spreading.patch
rename to feature-patches/1056-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch b/feature-patches/1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to feature-patches/1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/Rewrite-dataconverter-system.patch b/feature-patches/1058-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/Rewrite-dataconverter-system.patch
rename to feature-patches/1058-Rewrite-dataconverter-system.patch
diff --git a/patches/server/Moonrise-optimisation-patches.patch b/feature-patches/1059-Moonrise-optimisation-patches.patch
similarity index 100%
rename from patches/server/Moonrise-optimisation-patches.patch
rename to feature-patches/1059-Moonrise-optimisation-patches.patch
diff --git a/patches/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/feature-patches/1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to feature-patches/1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/Improved-Watchdog-Support.patch b/feature-patches/1061-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/Improved-Watchdog-Support.patch
rename to feature-patches/1061-Improved-Watchdog-Support.patch
diff --git a/patches/server/Detail-more-information-in-watchdog-dumps.patch b/feature-patches/1062-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/Detail-more-information-in-watchdog-dumps.patch
rename to feature-patches/1062-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/Entity-load-save-limit-per-chunk.patch b/feature-patches/1063-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/Entity-load-save-limit-per-chunk.patch
rename to feature-patches/1063-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/feature-patches/1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to feature-patches/1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/Improve-performance-of-mass-crafts.patch b/feature-patches/1065-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/Improve-performance-of-mass-crafts.patch
rename to feature-patches/1065-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/Incremental-chunk-and-player-saving.patch b/feature-patches/1066-Incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/Incremental-chunk-and-player-saving.patch
rename to feature-patches/1066-Incremental-chunk-and-player-saving.patch
diff --git a/patches/server/Optimise-general-POI-access.patch b/feature-patches/1067-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/Optimise-general-POI-access.patch
rename to feature-patches/1067-Optimise-general-POI-access.patch
diff --git a/patches/server/Fix-entity-tracker-desync-when-new-players-are-added.patch b/feature-patches/1068-Fix-entity-tracker-desync-when-new-players-are-added.patch
similarity index 100%
rename from patches/server/Fix-entity-tracker-desync-when-new-players-are-added.patch
rename to feature-patches/1068-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/Lag-compensation-ticks.patch b/feature-patches/1069-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/Lag-compensation-ticks.patch
rename to feature-patches/1069-Lag-compensation-ticks.patch
diff --git a/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch b/feature-patches/1070-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch
rename to feature-patches/1070-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/Optional-per-player-mob-spawns.patch b/feature-patches/1071-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/Optional-per-player-mob-spawns.patch
rename to feature-patches/1071-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/feature-patches/1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to feature-patches/1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/Eigencraft-redstone-implementation.patch b/feature-patches/1073-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/Eigencraft-redstone-implementation.patch
rename to feature-patches/1073-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/Add-Alternate-Current-redstone-implementation.patch b/feature-patches/1074-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/Add-Alternate-Current-redstone-implementation.patch
rename to feature-patches/1074-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/Improve-exact-choice-recipe-ingredients.patch b/feature-patches/1075-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/Improve-exact-choice-recipe-ingredients.patch
rename to feature-patches/1075-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/Implement-chunk-view-API.patch b/feature-patches/1076-Implement-chunk-view-API.patch
similarity index 100%
rename from patches/server/Implement-chunk-view-API.patch
rename to feature-patches/1076-Implement-chunk-view-API.patch