diff --git a/patches/server/0001-Divine-Branding.patch b/patches/todo/server/0001-Divine-Branding.patch
similarity index 100%
rename from patches/server/0001-Divine-Branding.patch
rename to patches/todo/server/0001-Divine-Branding.patch
diff --git a/patches/server/0001-fixup.patch b/patches/todo/server/0001-fixup.patch
similarity index 100%
rename from patches/server/0001-fixup.patch
rename to patches/todo/server/0001-fixup.patch
diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/todo/server/0002-Divine-Configuration.patch
similarity index 100%
rename from patches/server/0002-Divine-Configuration.patch
rename to patches/todo/server/0002-Divine-Configuration.patch
diff --git a/patches/server/0002-fixup-build.gradle.patch b/patches/todo/server/0002-fixup-build.gradle.patch
similarity index 100%
rename from patches/server/0002-fixup-build.gradle.patch
rename to patches/todo/server/0002-fixup-build.gradle.patch
diff --git a/patches/server/0003-Accept-EULA.patch b/patches/todo/server/0003-Accept-EULA.patch
similarity index 100%
rename from patches/server/0003-Accept-EULA.patch
rename to patches/todo/server/0003-Accept-EULA.patch
diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/todo/server/0004-Optimize-default-values-for-configs.patch
similarity index 100%
rename from patches/server/0004-Optimize-default-values-for-configs.patch
rename to patches/todo/server/0004-Optimize-default-values-for-configs.patch
diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/todo/server/0005-Add-missing-purpur-config-options.patch
similarity index 100%
rename from patches/server/0005-Add-missing-purpur-config-options.patch
rename to patches/todo/server/0005-Add-missing-purpur-config-options.patch
diff --git a/patches/server/0006-Fix-MC-98160-and-MC-105103.patch b/patches/todo/server/0006-Fix-MC-98160-and-MC-105103.patch
similarity index 100%
rename from patches/server/0006-Fix-MC-98160-and-MC-105103.patch
rename to patches/todo/server/0006-Fix-MC-98160-and-MC-105103.patch
diff --git a/patches/server/0007-Fix-MC-93826.patch b/patches/todo/server/0007-Fix-MC-93826.patch
similarity index 100%
rename from patches/server/0007-Fix-MC-93826.patch
rename to patches/todo/server/0007-Fix-MC-93826.patch
diff --git a/patches/server/0008-Fix-entity-serialization.patch b/patches/todo/server/0008-Fix-entity-serialization.patch
similarity index 100%
rename from patches/server/0008-Fix-entity-serialization.patch
rename to patches/todo/server/0008-Fix-entity-serialization.patch
diff --git a/patches/server/0009-Boat-Settings.patch b/patches/todo/server/0009-Boat-Settings.patch
similarity index 100%
rename from patches/server/0009-Boat-Settings.patch
rename to patches/todo/server/0009-Boat-Settings.patch
diff --git a/patches/server/0010-Use-unused-ghast-sound.patch b/patches/todo/server/0010-Use-unused-ghast-sound.patch
similarity index 100%
rename from patches/server/0010-Use-unused-ghast-sound.patch
rename to patches/todo/server/0010-Use-unused-ghast-sound.patch
diff --git a/patches/server/0011-Don-t-save-Fireworks.patch b/patches/todo/server/0011-Don-t-save-Fireworks.patch
similarity index 100%
rename from patches/server/0011-Don-t-save-Fireworks.patch
rename to patches/todo/server/0011-Don-t-save-Fireworks.patch
diff --git a/patches/server/0012-Remove-Spigot-tick-limiter.patch b/patches/todo/server/0012-Remove-Spigot-tick-limiter.patch
similarity index 100%
rename from patches/server/0012-Remove-Spigot-tick-limiter.patch
rename to patches/todo/server/0012-Remove-Spigot-tick-limiter.patch
diff --git a/patches/server/0013-Paper-PR-Add-Movement-Direction-API.patch b/patches/todo/server/0013-Paper-PR-Add-Movement-Direction-API.patch
similarity index 100%
rename from patches/server/0013-Paper-PR-Add-Movement-Direction-API.patch
rename to patches/todo/server/0013-Paper-PR-Add-Movement-Direction-API.patch
diff --git a/patches/server/0014-Paper-PR-BoneMeal-API.patch b/patches/todo/server/0014-Paper-PR-BoneMeal-API.patch
similarity index 100%
rename from patches/server/0014-Paper-PR-BoneMeal-API.patch
rename to patches/todo/server/0014-Paper-PR-BoneMeal-API.patch
diff --git a/patches/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch b/patches/todo/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
similarity index 100%
rename from patches/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
rename to patches/todo/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
diff --git a/patches/server/0016-Additional-pathfinding-API.patch b/patches/todo/server/0016-Additional-pathfinding-API.patch
similarity index 100%
rename from patches/server/0016-Additional-pathfinding-API.patch
rename to patches/todo/server/0016-Additional-pathfinding-API.patch
diff --git a/patches/server/0017-EMC-Allow-negative-Amplifier-values.patch b/patches/todo/server/0017-EMC-Allow-negative-Amplifier-values.patch
similarity index 100%
rename from patches/server/0017-EMC-Allow-negative-Amplifier-values.patch
rename to patches/todo/server/0017-EMC-Allow-negative-Amplifier-values.patch
diff --git a/patches/server/0018-Fix-MC-110386.patch b/patches/todo/server/0018-Fix-MC-110386.patch
similarity index 100%
rename from patches/server/0018-Fix-MC-110386.patch
rename to patches/todo/server/0018-Fix-MC-110386.patch
diff --git a/patches/server/0019-Fallback-to-Dimension-if-World-UUID-is-unknown.patch b/patches/todo/server/0019-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
similarity index 100%
rename from patches/server/0019-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
rename to patches/todo/server/0019-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
diff --git a/patches/server/0020-Allow-any-username.patch b/patches/todo/server/0020-Allow-any-username.patch
similarity index 100%
rename from patches/server/0020-Allow-any-username.patch
rename to patches/todo/server/0020-Allow-any-username.patch
diff --git a/patches/server/0021-Fix-memory-leak.patch b/patches/todo/server/0021-Fix-memory-leak.patch
similarity index 100%
rename from patches/server/0021-Fix-memory-leak.patch
rename to patches/todo/server/0021-Fix-memory-leak.patch
diff --git a/patches/server/0022-Optimize-spigot-event-bus.patch b/patches/todo/server/0022-Optimize-spigot-event-bus.patch
similarity index 100%
rename from patches/server/0022-Optimize-spigot-event-bus.patch
rename to patches/todo/server/0022-Optimize-spigot-event-bus.patch
diff --git a/patches/server/0023-Better-Impaling.patch b/patches/todo/server/0023-Better-Impaling.patch
similarity index 100%
rename from patches/server/0023-Better-Impaling.patch
rename to patches/todo/server/0023-Better-Impaling.patch
diff --git a/patches/server/0024-Despawn-shulker-bullets-on-owner-death.patch b/patches/todo/server/0024-Despawn-shulker-bullets-on-owner-death.patch
similarity index 100%
rename from patches/server/0024-Despawn-shulker-bullets-on-owner-death.patch
rename to patches/todo/server/0024-Despawn-shulker-bullets-on-owner-death.patch
diff --git a/patches/server/0025-Fix-MC-31819.patch b/patches/todo/server/0025-Fix-MC-31819.patch
similarity index 100%
rename from patches/server/0025-Fix-MC-31819.patch
rename to patches/todo/server/0025-Fix-MC-31819.patch
diff --git a/patches/server/0026-lithium-collections.goals.patch b/patches/todo/server/0026-lithium-collections.goals.patch
similarity index 100%
rename from patches/server/0026-lithium-collections.goals.patch
rename to patches/todo/server/0026-lithium-collections.goals.patch
diff --git a/patches/server/0027-lithium-collections.gamerules.patch b/patches/todo/server/0027-lithium-collections.gamerules.patch
similarity index 100%
rename from patches/server/0027-lithium-collections.gamerules.patch
rename to patches/todo/server/0027-lithium-collections.gamerules.patch
diff --git a/patches/server/0028-lithium-collections.attributes.patch b/patches/todo/server/0028-lithium-collections.attributes.patch
similarity index 100%
rename from patches/server/0028-lithium-collections.attributes.patch
rename to patches/todo/server/0028-lithium-collections.attributes.patch
diff --git a/patches/server/0029-lithium-cached_hashcode.patch b/patches/todo/server/0029-lithium-cached_hashcode.patch
similarity index 100%
rename from patches/server/0029-lithium-cached_hashcode.patch
rename to patches/todo/server/0029-lithium-cached_hashcode.patch
diff --git a/patches/server/0030-lithium-ai.raid.patch b/patches/todo/server/0030-lithium-ai.raid.patch
similarity index 100%
rename from patches/server/0030-lithium-ai.raid.patch
rename to patches/todo/server/0030-lithium-ai.raid.patch
diff --git a/patches/server/0031-lithium-gen.cached_generator_settings.patch b/patches/todo/server/0031-lithium-gen.cached_generator_settings.patch
similarity index 100%
rename from patches/server/0031-lithium-gen.cached_generator_settings.patch
rename to patches/todo/server/0031-lithium-gen.cached_generator_settings.patch
diff --git a/patches/server/0032-Replace-shape-full-block-cache-with-hashtable.patch b/patches/todo/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
similarity index 100%
rename from patches/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
rename to patches/todo/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
diff --git a/patches/server/0033-Paper-PR-Optimize-Varints.patch b/patches/todo/server/0033-Paper-PR-Optimize-Varints.patch
similarity index 100%
rename from patches/server/0033-Paper-PR-Optimize-Varints.patch
rename to patches/todo/server/0033-Paper-PR-Optimize-Varints.patch