diff --git a/patches/unapplied/skipped/0019-Rewrite-chunk-system.patch b/patches/unapplied/server/0019-Rewrite-chunk-system.patch
similarity index 100%
rename from patches/unapplied/skipped/0019-Rewrite-chunk-system.patch
rename to patches/unapplied/server/0019-Rewrite-chunk-system.patch
diff --git a/patches/unapplied/skipped/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/unapplied/skipped/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/unapplied/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/unapplied/skipped/0336-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/unapplied/skipped/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/unapplied/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/unapplied/skipped/0343-Anti-Xray.patch b/patches/unapplied/server/0343-Anti-Xray.patch
similarity index 100%
rename from patches/unapplied/skipped/0343-Anti-Xray.patch
rename to patches/unapplied/server/0343-Anti-Xray.patch
diff --git a/patches/unapplied/skipped/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/unapplied/skipped/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/unapplied/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/unapplied/skipped/0414-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/unapplied/skipped/0414-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/unapplied/skipped/0438-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0438-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/unapplied/skipped/0438-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/unapplied/server/0438-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/unapplied/skipped/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/unapplied/skipped/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/unapplied/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/unapplied/skipped/0587-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0587-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/unapplied/skipped/0587-Entity-load-save-limit-per-chunk.patch
rename to patches/unapplied/server/0587-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/unapplied/skipped/0682-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0682-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/unapplied/skipped/0682-Allow-controlled-flushing-for-network-manager.patch
rename to patches/unapplied/server/0682-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/unapplied/skipped/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/unapplied/skipped/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/unapplied/skipped/0685-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/unapplied/skipped/0685-Optimise-chunk-tick-iteration.patch
rename to patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch
diff --git a/patches/unapplied/skipped/0686-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0686-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/unapplied/skipped/0686-Execute-chunk-tasks-mid-tick.patch
rename to patches/unapplied/server/0686-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/unapplied/skipped/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/unapplied/skipped/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/unapplied/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/unapplied/skipped/0689-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/unapplied/skipped/0689-Detail-more-information-in-watchdog-dumps.patch
rename to patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/unapplied/skipped/0691-Distance-manager-tick-timings.patch b/patches/unapplied/server/0691-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/unapplied/skipped/0691-Distance-manager-tick-timings.patch
rename to patches/unapplied/server/0691-Distance-manager-tick-timings.patch
diff --git a/patches/unapplied/skipped/0694-Add-packet-limiter-config.patch b/patches/unapplied/server/0694-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/unapplied/skipped/0694-Add-packet-limiter-config.patch
rename to patches/unapplied/server/0694-Add-packet-limiter-config.patch
diff --git a/patches/unapplied/skipped/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/unapplied/skipped/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/unapplied/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/unapplied/skipped/0704-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0704-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/unapplied/skipped/0704-Optimise-non-flush-packet-sending.patch
rename to patches/unapplied/server/0704-Optimise-non-flush-packet-sending.patch
diff --git a/patches/unapplied/skipped/0705-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/unapplied/skipped/0705-Optimise-nearby-player-lookups.patch
rename to patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch
diff --git a/patches/unapplied/skipped/0971-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0971-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/unapplied/skipped/0971-Folia-scheduler-and-owned-region-API.patch
rename to patches/unapplied/server/0971-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/unapplied/skipped/0991-Configurable-Region-Compression-Format.patch b/patches/unapplied/server/0991-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/unapplied/skipped/0991-Configurable-Region-Compression-Format.patch
rename to patches/unapplied/server/0991-Configurable-Region-Compression-Format.patch