diff --git a/CMBW-maps/melee/TheBeaver99/(2)Boskevine.scx b/CMBW-maps/melee/1v1/(2)Boskevine.scx
similarity index 100%
rename from CMBW-maps/melee/TheBeaver99/(2)Boskevine.scx
rename to CMBW-maps/melee/1v1/(2)Boskevine.scx
diff --git a/CMBW-maps/melee/knightoftherealm/(2)Brimstone Disco.scx b/CMBW-maps/melee/1v1/(2)Brimstone Disco.scx
similarity index 100%
rename from CMBW-maps/melee/knightoftherealm/(2)Brimstone Disco.scx
rename to CMBW-maps/melee/1v1/(2)Brimstone Disco.scx
diff --git a/CMBW-maps/melee/Veeq7/(2)Equilibrium.scx b/CMBW-maps/melee/1v1/(2)Equilibrium.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(2)Equilibrium.scx
rename to CMBW-maps/melee/1v1/(2)Equilibrium.scx
diff --git a/CMBW-maps/melee/TheBeaver99/(2)Everessence.scx b/CMBW-maps/melee/1v1/(2)Everessence.scx
similarity index 100%
rename from CMBW-maps/melee/TheBeaver99/(2)Everessence.scx
rename to CMBW-maps/melee/1v1/(2)Everessence.scx
diff --git a/CMBW-maps/melee/Veeq7/(2)Iceberg.scx b/CMBW-maps/melee/1v1/(2)Iceberg.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(2)Iceberg.scx
rename to CMBW-maps/melee/1v1/(2)Iceberg.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(2)Megalith Empire.scx b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(2)Megalith Empire.scx
rename to CMBW-maps/melee/1v1/(2)Megalith Empire.scx
diff --git a/CMBW-maps/melee/knightoftherealm/(2)Mouth of Hel.scx b/CMBW-maps/melee/1v1/(2)Mouth of Hel.scx
similarity index 100%
rename from CMBW-maps/melee/knightoftherealm/(2)Mouth of Hel.scx
rename to CMBW-maps/melee/1v1/(2)Mouth of Hel.scx
diff --git a/CMBW-maps/melee/Baelethal/(2)Nemesis Station.scx b/CMBW-maps/melee/1v1/(2)Nemesis Station.scx
similarity index 100%
rename from CMBW-maps/melee/Baelethal/(2)Nemesis Station.scx
rename to CMBW-maps/melee/1v1/(2)Nemesis Station.scx
diff --git a/CMBW-maps/melee/Veeq7/(2)Proxima.scx b/CMBW-maps/melee/1v1/(2)Proxima.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(2)Proxima.scx
rename to CMBW-maps/melee/1v1/(2)Proxima.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(2)Rest in Paradise.scx
rename to CMBW-maps/melee/1v1/(2)Rest in Paradise.scx
diff --git a/CMBW-maps/melee/knightoftherealm/(2)Stardust.scx b/CMBW-maps/melee/1v1/(2)Stardust.scx
similarity index 100%
rename from CMBW-maps/melee/knightoftherealm/(2)Stardust.scx
rename to CMBW-maps/melee/1v1/(2)Stardust.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(2)Sun-Starved.scx b/CMBW-maps/melee/1v1/(2)Sun-Starved.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(2)Sun-Starved.scx
rename to CMBW-maps/melee/1v1/(2)Sun-Starved.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(2)Terminus.scx b/CMBW-maps/melee/1v1/(2)Terminus.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(2)Terminus.scx
rename to CMBW-maps/melee/1v1/(2)Terminus.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(2)The Underwood.scx b/CMBW-maps/melee/1v1/(2)The Underwood.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(2)The Underwood.scx
rename to CMBW-maps/melee/1v1/(2)The Underwood.scx
diff --git a/CMBW-maps/melee/Baelethal/(2)Tropical Crossing.scx b/CMBW-maps/melee/1v1/(2)Tropical Crossing.scx
similarity index 100%
rename from CMBW-maps/melee/Baelethal/(2)Tropical Crossing.scx
rename to CMBW-maps/melee/1v1/(2)Tropical Crossing.scx
diff --git a/CMBW-maps/melee/DarkenedFantasies/(2)Wellington.scx b/CMBW-maps/melee/1v1/(2)Wellington.scx
similarity index 100%
rename from CMBW-maps/melee/DarkenedFantasies/(2)Wellington.scx
rename to CMBW-maps/melee/1v1/(2)Wellington.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(3)Excelsior.scx b/CMBW-maps/melee/1v1/(3)Excelsior.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(3)Excelsior.scx
rename to CMBW-maps/melee/1v1/(3)Excelsior.scx
diff --git a/CMBW-maps/melee/knightoftherealm/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/(4)Nitro Valley.scx
similarity index 100%
rename from CMBW-maps/melee/knightoftherealm/(4)Nitro Valley.scx
rename to CMBW-maps/melee/1v1/(4)Nitro Valley.scx
diff --git a/CMBW-maps/melee/knightoftherealm/(4)Perpetua.scx b/CMBW-maps/melee/1v1/(4)Perpetua.scx
similarity index 100%
rename from CMBW-maps/melee/knightoftherealm/(4)Perpetua.scx
rename to CMBW-maps/melee/1v1/(4)Perpetua.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(4)Dead Ringer.scx b/CMBW-maps/melee/2v2/(4)Dead Ringer.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(4)Dead Ringer.scx
rename to CMBW-maps/melee/2v2/(4)Dead Ringer.scx
diff --git a/CMBW-maps/melee/Baelethal/(4)Midnight Outskirts.scx b/CMBW-maps/melee/2v2/(4)Midnight Outskirts.scx
similarity index 100%
rename from CMBW-maps/melee/Baelethal/(4)Midnight Outskirts.scx
rename to CMBW-maps/melee/2v2/(4)Midnight Outskirts.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(4)Parabola.scx b/CMBW-maps/melee/2v2/(4)Parabola.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(4)Parabola.scx
rename to CMBW-maps/melee/2v2/(4)Parabola.scx
diff --git a/CMBW-maps/melee/Veeq7/(4)Spacer.scx b/CMBW-maps/melee/2v2/(4)Spacer.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(4)Spacer.scx
rename to CMBW-maps/melee/2v2/(4)Spacer.scx
diff --git a/CMBW-maps/melee/Veeq7/(4)Yin Yang.scx b/CMBW-maps/melee/2v2/(4)Yin Yang.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(4)Yin Yang.scx
rename to CMBW-maps/melee/2v2/(4)Yin Yang.scx
diff --git a/CMBW-maps/melee/knightoftherealm/(6)Mother Entropy.scx b/CMBW-maps/melee/3v3/(6)Mother Entropy.scx
similarity index 100%
rename from CMBW-maps/melee/knightoftherealm/(6)Mother Entropy.scx
rename to CMBW-maps/melee/3v3/(6)Mother Entropy.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(6)Mouth of Bathala.scx b/CMBW-maps/melee/3v3/(6)Mouth of Bathala.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(6)Mouth of Bathala.scx
rename to CMBW-maps/melee/3v3/(6)Mouth of Bathala.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(6)Tectonic Kingdom.scx b/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(6)Tectonic Kingdom.scx
rename to CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx
diff --git a/CMBW-maps/melee/Veeq7/(6)Umbral Sanctum.scx b/CMBW-maps/melee/3v3/(6)Umbral Sanctum.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(6)Umbral Sanctum.scx
rename to CMBW-maps/melee/3v3/(6)Umbral Sanctum.scx
diff --git a/CMBW-maps/melee/Pr0nogo/(8)Celestial Rift.scx b/CMBW-maps/melee/4v4/(8)Celestial Rift.scx
similarity index 100%
rename from CMBW-maps/melee/Pr0nogo/(8)Celestial Rift.scx
rename to CMBW-maps/melee/4v4/(8)Celestial Rift.scx
diff --git a/CMBW-maps/melee/Veeq7/(8)Death Pit.scx b/CMBW-maps/melee/4v4/(8)Death Pit.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(8)Death Pit.scx
rename to CMBW-maps/melee/4v4/(8)Death Pit.scx
diff --git a/CMBW-maps/melee/Veeq7/(8)Skyborne.scx b/CMBW-maps/melee/4v4/(8)Skyborne.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(8)Skyborne.scx
rename to CMBW-maps/melee/4v4/(8)Skyborne.scx
diff --git a/CMBW-maps/melee/Veeq7/(8)The Mortuary.scx b/CMBW-maps/melee/4v4/(8)The Mortuary.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(8)The Mortuary.scx
rename to CMBW-maps/melee/4v4/(8)The Mortuary.scx
diff --git a/CMBW-maps/melee/Veeq7/(8)The Mothership.scx b/CMBW-maps/melee/4v4/(8)The Mothership.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(8)The Mothership.scx
rename to CMBW-maps/melee/4v4/(8)The Mothership.scx
diff --git a/CMBW-maps/melee/Baelethal/_old/(4)Moonlit Outpost.scx b/CMBW-maps/melee/Baelethal/_old/(4)Moonlit Outpost.scx
deleted file mode 100644
index 1ffef21b..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(4)Moonlit Outpost.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(4)Sheol.scx b/CMBW-maps/melee/Baelethal/_old/(4)Sheol.scx
deleted file mode 100644
index 37b6efbb..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(4)Sheol.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(4)Verdant Temple.scx b/CMBW-maps/melee/Baelethal/_old/(4)Verdant Temple.scx
deleted file mode 100644
index 5266a5f1..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(4)Verdant Temple.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(6)Delta Platform.scx b/CMBW-maps/melee/Baelethal/_old/(6)Delta Platform.scx
deleted file mode 100644
index d12df8c7..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(6)Delta Platform.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(6)Hell Creek.scx b/CMBW-maps/melee/Baelethal/_old/(6)Hell Creek.scx
deleted file mode 100644
index ee292387..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(6)Hell Creek.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(8)Megalopolis.scx b/CMBW-maps/melee/Baelethal/_old/(8)Megalopolis.scx
deleted file mode 100644
index 82e2a1f4..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(8)Megalopolis.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(8)Polar Fortress.scx b/CMBW-maps/melee/Baelethal/_old/(8)Polar Fortress.scx
deleted file mode 100644
index 922aa605..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(8)Polar Fortress.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(8)Sacred Grounds.scx b/CMBW-maps/melee/Baelethal/_old/(8)Sacred Grounds.scx
deleted file mode 100644
index bf477e39..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(8)Sacred Grounds.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(8)Searing Ridge.scx b/CMBW-maps/melee/Baelethal/_old/(8)Searing Ridge.scx
deleted file mode 100644
index 12feff89..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(8)Searing Ridge.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(8)Starlight Station.scx b/CMBW-maps/melee/Baelethal/_old/(8)Starlight Station.scx
deleted file mode 100644
index f62369d6..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(8)Starlight Station.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/_old/(8)Viridian Hills.scx b/CMBW-maps/melee/Baelethal/_old/(8)Viridian Hills.scx
deleted file mode 100644
index 8b7c0214..00000000
Binary files a/CMBW-maps/melee/Baelethal/_old/(8)Viridian Hills.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/(4)Vestal Shrine.scx b/CMBW-maps/melee/FFA/(4)Vestal Shrine.scx
similarity index 100%
rename from CMBW-maps/melee/Baelethal/(4)Vestal Shrine.scx
rename to CMBW-maps/melee/FFA/(4)Vestal Shrine.scx
diff --git a/CMBW-maps/melee/Baelethal/(8)Midas Complex.scx b/CMBW-maps/melee/FFA/(8)Midas Complex.scx
similarity index 100%
rename from CMBW-maps/melee/Baelethal/(8)Midas Complex.scx
rename to CMBW-maps/melee/FFA/(8)Midas Complex.scx
diff --git a/CMBW-maps/melee/Veeq7/(8)Unholy Grail.scx b/CMBW-maps/melee/FFA/(8)Unholy Grail.scx
similarity index 100%
rename from CMBW-maps/melee/Veeq7/(8)Unholy Grail.scx
rename to CMBW-maps/melee/FFA/(8)Unholy Grail.scx
diff --git a/CMBW-maps/melee/Keyan/(8)Braxis Blitz.scx b/CMBW-maps/melee/Keyan/(8)Braxis Blitz.scx
deleted file mode 100644
index 37991676..00000000
Binary files a/CMBW-maps/melee/Keyan/(8)Braxis Blitz.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Keyan/(8)Oases.scx b/CMBW-maps/melee/Keyan/(8)Oases.scx
deleted file mode 100644
index 01f391ff..00000000
Binary files a/CMBW-maps/melee/Keyan/(8)Oases.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Pr0nogo/old/(2)Swamp Rust.scx b/CMBW-maps/melee/Pr0nogo/old/(2)Swamp Rust.scx
deleted file mode 100644
index 0d1549c4..00000000
Binary files a/CMBW-maps/melee/Pr0nogo/old/(2)Swamp Rust.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Pr0nogo/old/(6)Cuckadoo Port.scx b/CMBW-maps/melee/Pr0nogo/old/(6)Cuckadoo Port.scx
deleted file mode 100644
index 9f7f901d..00000000
Binary files a/CMBW-maps/melee/Pr0nogo/old/(6)Cuckadoo Port.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Baelethal/(8)Svartalfheim.scx b/CMBW-maps/melee/Team FFA/(8)Svartalfheim.scx
similarity index 100%
rename from CMBW-maps/melee/Baelethal/(8)Svartalfheim.scx
rename to CMBW-maps/melee/Team FFA/(8)Svartalfheim.scx
diff --git a/CMBW-maps/melee/Veeq7/.gitignore b/CMBW-maps/melee/Veeq7/.gitignore
deleted file mode 100644
index 08c3e864..00000000
--- a/CMBW-maps/melee/Veeq7/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Snapshots/
-*.tmp
-*.rar
-*.zip
\ No newline at end of file
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(2)Entombed Remains.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(2)Entombed Remains.scx
deleted file mode 100644
index 966478cb..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(2)Entombed Remains.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(2)Heated Compound.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(2)Heated Compound.scx
deleted file mode 100644
index aeadb9c9..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(2)Heated Compound.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(2)Valley of the Fallen.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(2)Valley of the Fallen.scx
deleted file mode 100644
index 4e190bf0..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(2)Valley of the Fallen.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(4)Colloseum.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(4)Colloseum.scx
deleted file mode 100644
index f3d4f34a..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(4)Colloseum.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(4)Mossy Islets.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(4)Mossy Islets.scx
deleted file mode 100644
index 9b602bd5..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(4)Mossy Islets.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(4)Treacherous Ruins.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(4)Treacherous Ruins.scx
deleted file mode 100644
index 9a89f241..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(4)Treacherous Ruins.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(6)Permafrost.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(6)Permafrost.scx
deleted file mode 100644
index b2a17e61..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(6)Permafrost.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(8)Radiation Hazard.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(8)Radiation Hazard.scx
deleted file mode 100644
index 426e7377..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(8)Radiation Hazard.scx and /dev/null differ
diff --git a/CMBW-maps/melee/Veeq7/[Outdated]/(8)Snowflake.scx b/CMBW-maps/melee/Veeq7/[Outdated]/(8)Snowflake.scx
deleted file mode 100644
index 10dce610..00000000
Binary files a/CMBW-maps/melee/Veeq7/[Outdated]/(8)Snowflake.scx and /dev/null differ