diff --git a/CMBW-maps/melee/1v1/(4)Augustus.scx b/CMBW-maps/melee/1v1/(4)Augustus.scx
new file mode 100644
index 00000000..030dc617
Binary files /dev/null and b/CMBW-maps/melee/1v1/(4)Augustus.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(2)Badlands Brawl.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Badlands Brawl.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Badlands Brawl.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Badlands Brawl.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Brimstone Disco.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Brimstone Disco.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Brimstone Disco.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Brimstone Disco.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Desert Duality.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Desert Duality.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Desert Duality.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Desert Duality.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Everessence.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Everessence.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Everessence.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Everessence.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Iceberg.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Iceberg.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Iceberg.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Iceberg.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Jungle Jammed.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Jungle Jammed.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Jungle Jammed.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Jungle Jammed.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Mouth of Hel.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Mouth of Hel.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Mouth of Hel.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Mouth of Hel.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Stardust.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Stardust.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Stardust.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Stardust.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Sun-Starved.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Sun-Starved.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Sun-Starved.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Sun-Starved.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)The Underwood.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)The Underwood.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)The Underwood.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)The Underwood.scx
diff --git a/CMBW-maps/melee/Nonstandard/(2)Tropical Crossing.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Tropical Crossing.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(2)Tropical Crossing.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Tropical Crossing.scx
diff --git a/CMBW-maps/melee/Nonstandard/(4)Godhead.scx b/CMBW-maps/melee/1v1/Nonstandard/(4)Godhead.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(4)Godhead.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(4)Godhead.scx
diff --git a/CMBW-maps/melee/Nonstandard/(4)Perpetua.scx b/CMBW-maps/melee/1v1/Nonstandard/(4)Perpetua.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(4)Perpetua.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(4)Perpetua.scx
diff --git a/CMBW-maps/melee/Nonstandard/(4)Dead Ringer.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Dead Ringer.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(4)Dead Ringer.scx
rename to CMBW-maps/melee/2v2/Nonstandard/(4)Dead Ringer.scx
diff --git a/CMBW-maps/melee/Nonstandard/(4)Spacer.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Spacer.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(4)Spacer.scx
rename to CMBW-maps/melee/2v2/Nonstandard/(4)Spacer.scx
diff --git a/CMBW-maps/melee/Nonstandard/(6)Umbral Sanctum.scx b/CMBW-maps/melee/3v3/Nonstandard/(6)Umbral Sanctum.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(6)Umbral Sanctum.scx
rename to CMBW-maps/melee/3v3/Nonstandard/(6)Umbral Sanctum.scx
diff --git a/CMBW-maps/melee/FFA Solo/(4)Enigma.scx b/CMBW-maps/melee/FFA Solo/(4)Enigma.scx
new file mode 100644
index 00000000..463b44fd
Binary files /dev/null and b/CMBW-maps/melee/FFA Solo/(4)Enigma.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(4)Platform of Peace.scx b/CMBW-maps/melee/FFA Solo/Nonstandard/(4)Platform of Peace.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(4)Platform of Peace.scx
rename to CMBW-maps/melee/FFA Solo/Nonstandard/(4)Platform of Peace.scx
diff --git a/CMBW-maps/melee/Nonstandard/(4)Yin Yang.scx b/CMBW-maps/melee/FFA Solo/Nonstandard/(4)Yin Yang.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(4)Yin Yang.scx
rename to CMBW-maps/melee/FFA Solo/Nonstandard/(4)Yin Yang.scx
diff --git a/CMBW-maps/melee/Nonstandard/(6)Platform of Peace 96.scx b/CMBW-maps/melee/FFA Solo/Nonstandard/(6)Platform of Peace 96.scx
similarity index 100%
rename from CMBW-maps/melee/Nonstandard/(6)Platform of Peace 96.scx
rename to CMBW-maps/melee/FFA Solo/Nonstandard/(6)Platform of Peace 96.scx