diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx
deleted file mode 100644
index 8589f3d4..00000000
Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx and /dev/null differ
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(4)Victory Square.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Work in Progress/(4)Victory Square.scx
rename to CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Nightfall.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Nightfall.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Work in Progress/(2)Nightfall.scx
rename to CMBW-maps/melee/1v1/Competitive Class 2/(2)Nightfall.scx
diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx
index 0d98227d..a527dc2e 100644
Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx differ
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Ashey Alternation.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Ashey Alternation.scx
index 1943304e..781d5e80 100644
Binary files a/CMBW-maps/melee/1v1/Nonstandard/(2)Ashey Alternation.scx and b/CMBW-maps/melee/1v1/Nonstandard/(2)Ashey Alternation.scx differ
diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Boskevine.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Boskevine.scx
diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Death Spiral.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Competitive Class 1/(2)Death Spiral.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Death Spiral.scx
diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Equilibrium.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Equilibrium.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Competitive Class 2/(2)Equilibrium.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Equilibrium.scx
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)False Promises.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)False Promises.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Work in Progress/(2)False Promises.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)False Promises.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Hellstone.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Hellstone.scx
deleted file mode 100644
index 548f9d37..00000000
Binary files a/CMBW-maps/melee/1v1/Nonstandard/(2)Hellstone.scx and /dev/null differ
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Thin Ice.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Thin Ice.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Work in Progress/(2)Thin Ice.scx
rename to CMBW-maps/melee/1v1/Nonstandard/(2)Thin Ice.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Brimstone Disco.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Brimstone Disco.scx
index c75da0a5..e76c78a1 100644
Binary files a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Brimstone Disco.scx and b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Brimstone Disco.scx differ
diff --git a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Crossguard.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Crossguard.scx
index acc69cac..7ed22da5 100644
Binary files a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Crossguard.scx and b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Crossguard.scx differ
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Desert Duality.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Desert Duality.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Desert Duality.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Desert Duality.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Hellstone.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Hellstone.scx
new file mode 100644
index 00000000..bd79092e
Binary files /dev/null and b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Hellstone.scx differ
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Maim Street.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Maim Street.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Maim Street.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Maim Street.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Margarine.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Margarine.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Margarine.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Margarine.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Nemesis Station.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Nemesis Station.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Nemesis Station.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Nemesis Station.scx
diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Proxima.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Proxima.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Competitive Class 2/(2)Proxima.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Proxima.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Sequestered Synagogue.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Sequestered Synagogue.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Sequestered Synagogue.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Sequestered Synagogue.scx
diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Terminus.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Terminus.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Competitive Class 2/(2)Terminus.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Terminus.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Wellington.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Wellington.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Wellington.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Wellington.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Wild Whirlwind.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Wild Whirlwind.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(4)Arctic Artifact.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Arctic Artifact.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(4)Arctic Artifact.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Arctic Artifact.scx
diff --git a/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Godhead.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Godhead.scx
index 733d7da9..a8deda1e 100644
Binary files a/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Godhead.scx and b/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Godhead.scx differ
diff --git a/CMBW-maps/melee/1v1/Nonstandard/(4)Jungles of Jericho.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Jungles of Jericho.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Nonstandard/(4)Jungles of Jericho.scx
rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Jungles of Jericho.scx
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Sideshow.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Sideshow.scx
new file mode 100644
index 00000000..6d6251f4
Binary files /dev/null and b/CMBW-maps/melee/1v1/Work in Progress/(2)Sideshow.scx differ
diff --git a/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx b/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx
index 9ab63139..a1715418 100644
Binary files a/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx and b/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx differ