diff --git a/mods/cnc/maps/african-gambit.oramap b/mods/cnc/maps/african-gambit.oramap
new file mode 100644
index 0000000000..e8109aaac4
Binary files /dev/null and b/mods/cnc/maps/african-gambit.oramap differ
diff --git a/mods/cnc/maps/anvil-of-war.oramap b/mods/cnc/maps/anvil-of-war.oramap
new file mode 100644
index 0000000000..c67c15fda8
Binary files /dev/null and b/mods/cnc/maps/anvil-of-war.oramap differ
diff --git a/mods/cnc/maps/armageddon.oramap b/mods/cnc/maps/armageddon.oramap
new file mode 100644
index 0000000000..5ebbfc20e8
Binary files /dev/null and b/mods/cnc/maps/armageddon.oramap differ
diff --git a/mods/cnc/maps/avocado.oramap b/mods/cnc/maps/avocado.oramap
deleted file mode 100644
index 8f00cfff68..0000000000
Binary files a/mods/cnc/maps/avocado.oramap and /dev/null differ
diff --git a/mods/cnc/maps/badland-ridges.oramap b/mods/cnc/maps/badland-ridges.oramap
new file mode 100644
index 0000000000..701ce7d1ad
Binary files /dev/null and b/mods/cnc/maps/badland-ridges.oramap differ
diff --git a/mods/cnc/maps/contra.oramap b/mods/cnc/maps/contra.oramap
deleted file mode 100644
index aee94aa71f..0000000000
Binary files a/mods/cnc/maps/contra.oramap and /dev/null differ
diff --git a/mods/cnc/maps/dead-in-motion.oramap b/mods/cnc/maps/dead-in-motion.oramap
deleted file mode 100644
index e4ea36d0fe..0000000000
Binary files a/mods/cnc/maps/dead-in-motion.oramap and /dev/null differ
diff --git a/mods/cnc/maps/desert-invasion.oramap b/mods/cnc/maps/desert-invasion.oramap
new file mode 100644
index 0000000000..770098c450
Binary files /dev/null and b/mods/cnc/maps/desert-invasion.oramap differ
diff --git a/mods/cnc/maps/desert-lakes.oramap b/mods/cnc/maps/desert-lakes.oramap
deleted file mode 100644
index bf4787520d..0000000000
Binary files a/mods/cnc/maps/desert-lakes.oramap and /dev/null differ
diff --git a/mods/cnc/maps/desert-mandarins.oramap b/mods/cnc/maps/desert-mandarins.oramap
new file mode 100644
index 0000000000..df7d113ee0
Binary files /dev/null and b/mods/cnc/maps/desert-mandarins.oramap differ
diff --git a/mods/cnc/maps/deserted-outpost.oramap b/mods/cnc/maps/deserted-outpost.oramap
new file mode 100644
index 0000000000..4a3e3a07bb
Binary files /dev/null and b/mods/cnc/maps/deserted-outpost.oramap differ
diff --git a/mods/cnc/maps/elysian-expanse.oramap b/mods/cnc/maps/elysian-expanse.oramap
new file mode 100644
index 0000000000..ddc85757c7
Binary files /dev/null and b/mods/cnc/maps/elysian-expanse.oramap differ
diff --git a/mods/cnc/maps/fight-win-prevail.oramap b/mods/cnc/maps/fight-win-prevail.oramap
new file mode 100644
index 0000000000..d77365c610
Binary files /dev/null and b/mods/cnc/maps/fight-win-prevail.oramap differ
diff --git a/mods/cnc/maps/frostways.oramap b/mods/cnc/maps/frostways.oramap
deleted file mode 100644
index 951d9a3772..0000000000
Binary files a/mods/cnc/maps/frostways.oramap and /dev/null differ
diff --git a/mods/cnc/maps/letters-from-lexington.oramap b/mods/cnc/maps/letters-from-lexington.oramap
deleted file mode 100644
index fee323a0bb..0000000000
Binary files a/mods/cnc/maps/letters-from-lexington.oramap and /dev/null differ
diff --git a/mods/cnc/maps/master-alert.oramap b/mods/cnc/maps/master-alert.oramap
new file mode 100644
index 0000000000..d8e43946e7
Binary files /dev/null and b/mods/cnc/maps/master-alert.oramap differ
diff --git a/mods/cnc/maps/master-of-the-jungle-book.oramap b/mods/cnc/maps/master-of-the-jungle-book.oramap
new file mode 100644
index 0000000000..901871deba
Binary files /dev/null and b/mods/cnc/maps/master-of-the-jungle-book.oramap differ
diff --git a/mods/cnc/maps/plan-b.oramap b/mods/cnc/maps/plan-b.oramap
deleted file mode 100644
index 0ddaa6b444..0000000000
Binary files a/mods/cnc/maps/plan-b.oramap and /dev/null differ
diff --git a/mods/cnc/maps/reaching-out.oramap b/mods/cnc/maps/reaching-out.oramap
new file mode 100644
index 0000000000..0fd4e40b9f
Binary files /dev/null and b/mods/cnc/maps/reaching-out.oramap differ
diff --git a/mods/cnc/maps/thawed-front.oramap b/mods/cnc/maps/thawed-front.oramap
deleted file mode 100644
index e698cfd1a9..0000000000
Binary files a/mods/cnc/maps/thawed-front.oramap and /dev/null differ
diff --git a/mods/cnc/maps/the-new-mandarins.oramap b/mods/cnc/maps/the-new-mandarins.oramap
deleted file mode 100644
index 1aa037fdab..0000000000
Binary files a/mods/cnc/maps/the-new-mandarins.oramap and /dev/null differ
diff --git a/mods/cnc/maps/tiberium-canopy.oramap b/mods/cnc/maps/tiberium-canopy.oramap
deleted file mode 100644
index 4878417c3e..0000000000
Binary files a/mods/cnc/maps/tiberium-canopy.oramap and /dev/null differ
diff --git a/mods/cnc/maps/tiberium-forest.oramap b/mods/cnc/maps/tiberium-forest.oramap
new file mode 100644
index 0000000000..e18cf8b3b9
Binary files /dev/null and b/mods/cnc/maps/tiberium-forest.oramap differ
diff --git a/mods/cnc/maps/tiberium-rift.oramap b/mods/cnc/maps/tiberium-rift.oramap
new file mode 100644
index 0000000000..b3e414578b
Binary files /dev/null and b/mods/cnc/maps/tiberium-rift.oramap differ
diff --git a/mods/cnc/maps/twisted-peak.oramap b/mods/cnc/maps/twisted-peak.oramap
deleted file mode 100644
index 4cb54cd307..0000000000
Binary files a/mods/cnc/maps/twisted-peak.oramap and /dev/null differ
diff --git a/mods/cnc/maps/understanding-power.oramap b/mods/cnc/maps/understanding-power.oramap
deleted file mode 100644
index aa8ae563b0..0000000000
Binary files a/mods/cnc/maps/understanding-power.oramap and /dev/null differ
diff --git a/mods/cnc/maps/valley-of-gold-6p.oramap b/mods/cnc/maps/valley-of-gold-6p.oramap
new file mode 100644
index 0000000000..7c83ea8d87
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-6p.oramap differ
diff --git a/mods/cnc/maps/winters-end.oramap b/mods/cnc/maps/winters-end.oramap
deleted file mode 100644
index 0417221ff3..0000000000
Binary files a/mods/cnc/maps/winters-end.oramap and /dev/null differ