diff --git a/CMBW-maps/scenario/Keyan/(3)Alpha Squadron.scx b/CMBW-maps/co-op/(3)Alpha Squadron.scx
similarity index 87%
rename from CMBW-maps/scenario/Keyan/(3)Alpha Squadron.scx
rename to CMBW-maps/co-op/(3)Alpha Squadron.scx
index dc6515f9..fa26f210 100644
Binary files a/CMBW-maps/scenario/Keyan/(3)Alpha Squadron.scx and b/CMBW-maps/co-op/(3)Alpha Squadron.scx differ
diff --git a/CMBW-maps/scenario/Keyan/(3)Duskcallers.scx b/CMBW-maps/co-op/(3)Duskcallers.scx
similarity index 91%
rename from CMBW-maps/scenario/Keyan/(3)Duskcallers.scx
rename to CMBW-maps/co-op/(3)Duskcallers.scx
index b3489cbc..9fdf8972 100644
Binary files a/CMBW-maps/scenario/Keyan/(3)Duskcallers.scx and b/CMBW-maps/co-op/(3)Duskcallers.scx differ
diff --git a/CMBW-maps/scenario/Keyan/(3)Eclipsed-Hard.scx b/CMBW-maps/co-op/(3)Eclipsed-Hard.scx
similarity index 100%
rename from CMBW-maps/scenario/Keyan/(3)Eclipsed-Hard.scx
rename to CMBW-maps/co-op/(3)Eclipsed-Hard.scx
diff --git a/CMBW-maps/scenario/Keyan/(3)Eclipsed.scx b/CMBW-maps/co-op/(3)Eclipsed.scx
similarity index 95%
rename from CMBW-maps/scenario/Keyan/(3)Eclipsed.scx
rename to CMBW-maps/co-op/(3)Eclipsed.scx
index dc06b03c..f1772428 100644
Binary files a/CMBW-maps/scenario/Keyan/(3)Eclipsed.scx and b/CMBW-maps/co-op/(3)Eclipsed.scx differ
diff --git a/CMBW-maps/scenario/Keyan/Just Another HYDRA Map/JAHM Vol 2.scx b/CMBW-maps/co-op/(3)JAHM Vol 2.scx
similarity index 100%
rename from CMBW-maps/scenario/Keyan/Just Another HYDRA Map/JAHM Vol 2.scx
rename to CMBW-maps/co-op/(3)JAHM Vol 2.scx
diff --git a/CMBW-maps/scenario/Baelethal/Legion Assault.scx b/CMBW-maps/co-op/(4)Legion Assault.scx
similarity index 100%
rename from CMBW-maps/scenario/Baelethal/Legion Assault.scx
rename to CMBW-maps/co-op/(4)Legion Assault.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/(5)Mountaintop Massacre.scx b/CMBW-maps/co-op/(5)Mountaintop Massacre.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/(5)Mountaintop Massacre.scx
rename to CMBW-maps/co-op/(5)Mountaintop Massacre.scx
diff --git a/CMBW-maps/scenario/Veeq7/(1-7)Fraudscendence.scx b/CMBW-maps/scenario/(1-7T)Fraudscendence.scx
similarity index 100%
rename from CMBW-maps/scenario/Veeq7/(1-7)Fraudscendence.scx
rename to CMBW-maps/scenario/(1-7T)Fraudscendence.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Autistic Years.scx b/CMBW-maps/scenario/Birthdays/(1)Autistic Years.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Autistic Years.scx
rename to CMBW-maps/scenario/Birthdays/(1)Autistic Years.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Equipment Check.scx b/CMBW-maps/scenario/Birthdays/(1)Equipment Check.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Equipment Check.scx
rename to CMBW-maps/scenario/Birthdays/(1)Equipment Check.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Nuclear Fun Detected.scx b/CMBW-maps/scenario/Birthdays/(1)Nuclear Fun Detected.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Nuclear Fun Detected.scx
rename to CMBW-maps/scenario/Birthdays/(1)Nuclear Fun Detected.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Pasta Masta.scx b/CMBW-maps/scenario/Birthdays/(1)Pasta Masta.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Pasta Masta.scx
rename to CMBW-maps/scenario/Birthdays/(1)Pasta Masta.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Smoochie Man.scx b/CMBW-maps/scenario/Birthdays/(1)Smoochie Man.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Smoochie Man.scx
rename to CMBW-maps/scenario/Birthdays/(1)Smoochie Man.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)The Lost Hand of God.scx b/CMBW-maps/scenario/Birthdays/(1)The Lost Hand of God.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)The Lost Hand of God.scx
rename to CMBW-maps/scenario/Birthdays/(1)The Lost Hand of God.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Three Hong Kong!.scx b/CMBW-maps/scenario/Birthdays/(1)Three Hong Kong!.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Three Hong Kong!.scx
rename to CMBW-maps/scenario/Birthdays/(1)Three Hong Kong!.scx
diff --git a/CMBW-maps/scenario/Pr0nogo/birthdays/(1)Wall Street War.scx b/CMBW-maps/scenario/Birthdays/(1)Wall Street War.scx
similarity index 100%
rename from CMBW-maps/scenario/Pr0nogo/birthdays/(1)Wall Street War.scx
rename to CMBW-maps/scenario/Birthdays/(1)Wall Street War.scx
diff --git a/CMBW-maps/scenario/Keyan/(6)Breeding Grounds.scx b/CMBW-maps/scenario/FFA Solo/(6)Breeding Grounds.scx
similarity index 100%
rename from CMBW-maps/scenario/Keyan/(6)Breeding Grounds.scx
rename to CMBW-maps/scenario/FFA Solo/(6)Breeding Grounds.scx
diff --git a/CMBW-maps/scenario/FFA Team/(4)Torrents of Molten Blood.scx b/CMBW-maps/scenario/FFA Team/(4)Torrents of Molten Blood.scx
new file mode 100644
index 00000000..26102218
Binary files /dev/null and b/CMBW-maps/scenario/FFA Team/(4)Torrents of Molten Blood.scx differ
diff --git a/CMBW-maps/scenario/Keyan/(6)Crowdad Megaplex.scx b/CMBW-maps/scenario/FFA Team/(6)Crowdad Megaplex.scx
similarity index 100%
rename from CMBW-maps/scenario/Keyan/(6)Crowdad Megaplex.scx
rename to CMBW-maps/scenario/FFA Team/(6)Crowdad Megaplex.scx
diff --git a/CMBW-maps/scenario/Keyan/Just Another HYDRA Map/JAHM Vol 1.scx b/CMBW-maps/scenario/FFA Team/(6)JAHM Vol 1.scx
similarity index 100%
rename from CMBW-maps/scenario/Keyan/Just Another HYDRA Map/JAHM Vol 1.scx
rename to CMBW-maps/scenario/FFA Team/(6)JAHM Vol 1.scx
diff --git a/CMBW-maps/scenario/Keyan/(2)Midnight Warfare.scx b/CMBW-maps/scenario/FFA Team/(8)Midnight Warfare.scx
similarity index 100%
rename from CMBW-maps/scenario/Keyan/(2)Midnight Warfare.scx
rename to CMBW-maps/scenario/FFA Team/(8)Midnight Warfare.scx
diff --git a/CMBW-maps/scenario/One vs All/(5)Nemesis Crowborne.scx b/CMBW-maps/scenario/One vs All/(5)Nemesis Crowborne.scx
new file mode 100644
index 00000000..46873128
Binary files /dev/null and b/CMBW-maps/scenario/One vs All/(5)Nemesis Crowborne.scx differ
diff --git a/CMBW-maps/scenario/Btyb88/(5)Omnikin.scx b/CMBW-maps/scenario/One vs All/(5)Omnikin.scx
similarity index 100%
rename from CMBW-maps/scenario/Btyb88/(5)Omnikin.scx
rename to CMBW-maps/scenario/One vs All/(5)Omnikin.scx
diff --git a/CMBW-maps/scenario/Veeq7/(1)Lethe.scx b/CMBW-maps/scenario/Singleplayer/(1)Lethe.scx
similarity index 100%
rename from CMBW-maps/scenario/Veeq7/(1)Lethe.scx
rename to CMBW-maps/scenario/Singleplayer/(1)Lethe.scx
diff --git a/CMBW-maps/scenario/Keyan/(6)First Strike.scx b/CMBW-maps/scenario/Team vs Team/(6)First Strike.scx
similarity index 82%
rename from CMBW-maps/scenario/Keyan/(6)First Strike.scx
rename to CMBW-maps/scenario/Team vs Team/(6)First Strike.scx
index 7e894bfc..eb2b2c29 100644
Binary files a/CMBW-maps/scenario/Keyan/(6)First Strike.scx and b/CMBW-maps/scenario/Team vs Team/(6)First Strike.scx differ
diff --git a/CMBW-maps/scenario/Keyan/(8)Braxis Blitz.scx b/CMBW-maps/scenario/Team vs Team/(8)Braxis Blitz.scx
similarity index 84%
rename from CMBW-maps/scenario/Keyan/(8)Braxis Blitz.scx
rename to CMBW-maps/scenario/Team vs Team/(8)Braxis Blitz.scx
index 95ab7e97..4d2bf1fc 100644
Binary files a/CMBW-maps/scenario/Keyan/(8)Braxis Blitz.scx and b/CMBW-maps/scenario/Team vs Team/(8)Braxis Blitz.scx differ
diff --git a/CMBW-maps/scenario/Veeq7/(2)Venatus Ignis.scx b/CMBW-maps/scenario/Veeq7/(2)Venatus Ignis.scx
deleted file mode 100644
index 3cc77f8a..00000000
Binary files a/CMBW-maps/scenario/Veeq7/(2)Venatus Ignis.scx and /dev/null differ
diff --git a/CMBW-maps/scenario/Veeq7/(3)Scorching Embers.scx b/CMBW-maps/scenario/Veeq7/(3)Scorching Embers.scx
deleted file mode 100644
index 2e2672bc..00000000
Binary files a/CMBW-maps/scenario/Veeq7/(3)Scorching Embers.scx and /dev/null differ
diff --git a/CMBW-maps/scenario/Veeq7/(4)Torrents of Molten Blood.scx b/CMBW-maps/scenario/Veeq7/(4)Torrents of Molten Blood.scx
deleted file mode 100644
index 38d06606..00000000
Binary files a/CMBW-maps/scenario/Veeq7/(4)Torrents of Molten Blood.scx and /dev/null differ
diff --git a/CMBW-maps/scenario/Veeq7/(5)Nemesis Crowborne.scx b/CMBW-maps/scenario/Veeq7/(5)Nemesis Crowborne.scx
deleted file mode 100644
index a5fbff3e..00000000
Binary files a/CMBW-maps/scenario/Veeq7/(5)Nemesis Crowborne.scx and /dev/null differ
diff --git a/CMBW-maps/scenario/Veeq7/Old/(1)Fraudscendence.scx b/CMBW-maps/scenario/Veeq7/Old/(1)Fraudscendence.scx
deleted file mode 100644
index d553640e..00000000
Binary files a/CMBW-maps/scenario/Veeq7/Old/(1)Fraudscendence.scx and /dev/null differ
diff --git a/CMBW-maps/scenario/Veeq7/Old/(2)Fraudscendence.scx b/CMBW-maps/scenario/Veeq7/Old/(2)Fraudscendence.scx
deleted file mode 100644
index b5a78aaf..00000000
Binary files a/CMBW-maps/scenario/Veeq7/Old/(2)Fraudscendence.scx and /dev/null differ