diff --git a/CMBW-maps/melee/1v1/(2)Crossguard.scx b/CMBW-maps/melee/1v1/(2)Crossguard.scx
index 99ce045..acc69ca 100644
Binary files a/CMBW-maps/melee/1v1/(2)Crossguard.scx and b/CMBW-maps/melee/1v1/(2)Crossguard.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/(2)Death Spiral.scx
deleted file mode 100644
index 525e8ab..0000000
Binary files a/CMBW-maps/melee/1v1/(2)Death Spiral.scx and /dev/null differ
diff --git a/CMBW-maps/melee/1v1/(2)Megalith Empire.scx b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx
index 133c669..bbefd26 100644
Binary files a/CMBW-maps/melee/1v1/(2)Megalith Empire.scx and b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Proxima.scx b/CMBW-maps/melee/1v1/(2)Proxima.scx
index 16e2a6f..83456ac 100644
Binary files a/CMBW-maps/melee/1v1/(2)Proxima.scx and b/CMBW-maps/melee/1v1/(2)Proxima.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx
index e750b77..28ecde6 100644
Binary files a/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx and b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Terminus.scx b/CMBW-maps/melee/1v1/(2)Terminus.scx
index afbd6f8..96b6dd3 100644
Binary files a/CMBW-maps/melee/1v1/(2)Terminus.scx and b/CMBW-maps/melee/1v1/(2)Terminus.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx b/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx
index e2b8df7..70ea69b 100644
Binary files a/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx and b/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx b/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx
index 0e65646..2d2a4ec 100644
Binary files a/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx and b/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Boskevine.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Boskevine.scx
similarity index 91%
rename from CMBW-maps/melee/1v1/(2)Boskevine.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(2)Boskevine.scx
index 24f4944..458a1fb 100644
Binary files a/CMBW-maps/melee/1v1/(2)Boskevine.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Boskevine.scx differ
diff --git a/CMBW-maps/melee/1v1/Competitive Pool/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Death Spiral.scx
new file mode 100644
index 0000000..68677ee
Binary files /dev/null and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Death Spiral.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Equilibrium.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Equilibrium.scx
similarity index 97%
rename from CMBW-maps/melee/1v1/(2)Equilibrium.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(2)Equilibrium.scx
index ee6dd01..4a9599e 100644
Binary files a/CMBW-maps/melee/1v1/(2)Equilibrium.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Equilibrium.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx
similarity index 95%
rename from CMBW-maps/melee/1v1/(2)Infinite Velocity.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx
index 047d37c..b92da8d 100644
Binary files a/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Maim Street.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Maim Street.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/(2)Maim Street.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(2)Maim Street.scx
diff --git a/CMBW-maps/melee/1v1/(2)Nemesis Station.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Nemesis Station.scx
similarity index 95%
rename from CMBW-maps/melee/1v1/(2)Nemesis Station.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(2)Nemesis Station.scx
index d912d0e..87e40c5 100644
Binary files a/CMBW-maps/melee/1v1/(2)Nemesis Station.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Nemesis Station.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Repulsion.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Repulsion.scx
similarity index 94%
rename from CMBW-maps/melee/1v1/(2)Repulsion.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(2)Repulsion.scx
index 7f1afcc..4412a87 100644
Binary files a/CMBW-maps/melee/1v1/(2)Repulsion.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Repulsion.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Competitive Pool/(4)Nitro Valley.scx
similarity index 95%
rename from CMBW-maps/melee/1v1/(4)Nitro Valley.scx
rename to CMBW-maps/melee/1v1/Competitive Pool/(4)Nitro Valley.scx
index 5676c59..f2769d1 100644
Binary files a/CMBW-maps/melee/1v1/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(4)Nitro Valley.scx differ
diff --git a/CMBW-maps/melee/1v1/Needs Testing/(2)Margarine.scx b/CMBW-maps/melee/1v1/Needs Testing/(2)Margarine.scx
new file mode 100644
index 0000000..bd56d6f
Binary files /dev/null and b/CMBW-maps/melee/1v1/Needs Testing/(2)Margarine.scx differ
diff --git a/CMBW-maps/melee/1v1/Needs Testing/(4)Arctic Artifact.scx b/CMBW-maps/melee/1v1/Needs Testing/(4)Arctic Artifact.scx
new file mode 100644
index 0000000..87c1b8a
Binary files /dev/null and b/CMBW-maps/melee/1v1/Needs Testing/(4)Arctic Artifact.scx differ
diff --git a/CMBW-maps/melee/1v1/Needs Testing/(4)Quasar Quartet.scx b/CMBW-maps/melee/1v1/Needs Testing/(4)Quasar Quartet.scx
new file mode 100644
index 0000000..1f80609
Binary files /dev/null and b/CMBW-maps/melee/1v1/Needs Testing/(4)Quasar Quartet.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/2v2/(4)Tandem Tropics.scx b/CMBW-maps/melee/2v2/Needs Testing/(4)Tandem Tropics.scx
similarity index 100%
rename from CMBW-maps/melee/2v2/(4)Tandem Tropics.scx
rename to CMBW-maps/melee/2v2/Needs Testing/(4)Tandem Tropics.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)Augustus.scx b/CMBW-maps/melee/FFA Solo/(4)Augustus.scx
new file mode 100644
index 0000000..e7616c3
Binary files /dev/null and b/CMBW-maps/melee/FFA Solo/(4)Augustus.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Enigma.scx b/CMBW-maps/melee/FFA Solo/(4)Enigma.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/(4)Enigma.scx
rename to CMBW-maps/melee/FFA Solo/(4)Enigma.scx
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