diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq
index dc51968..5648c80 100644
Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ
diff --git a/CMBW-maps/melee/3v3/Class 2 - Uprising/(3v3)Sub-zero Standoff.scx b/CMBW-maps/melee/3v3/Class 2 - Uprising/(3v3)Sub-zero Standoff.scx
new file mode 100644
index 0000000..bd3312a
Binary files /dev/null and b/CMBW-maps/melee/3v3/Class 2 - Uprising/(3v3)Sub-zero Standoff.scx differ
diff --git a/CMBW-maps/melee/3v3/(6)Waterloo.scx b/CMBW-maps/melee/3v3/Class 2 - Uprising/(3v3)Waterloo.scx
similarity index 100%
rename from CMBW-maps/melee/3v3/(6)Waterloo.scx
rename to CMBW-maps/melee/3v3/Class 2 - Uprising/(3v3)Waterloo.scx
diff --git a/CMBW-maps/melee/3v3/Nonstandard/Retired/(6)Mother Entropy.scx b/CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Mother Entropy.scx
similarity index 100%
rename from CMBW-maps/melee/3v3/Nonstandard/Retired/(6)Mother Entropy.scx
rename to CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Mother Entropy.scx
diff --git a/CMBW-maps/melee/3v3/Nonstandard/(6)Mouth of Bathala.scx b/CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Mouth of Bathala.scx
similarity index 100%
rename from CMBW-maps/melee/3v3/Nonstandard/(6)Mouth of Bathala.scx
rename to CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Mouth of Bathala.scx
diff --git a/CMBW-maps/melee/3v3/Nonstandard/Retired/(6)Ozone.scx b/CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Ozone.scx
similarity index 100%
rename from CMBW-maps/melee/3v3/Nonstandard/Retired/(6)Ozone.scx
rename to CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Ozone.scx
diff --git a/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx b/CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Tectonic Kingdom.scx
similarity index 100%
rename from CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx
rename to CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Tectonic Kingdom.scx
diff --git a/CMBW-maps/melee/3v3/Nonstandard/Retired/(6)Umbral Sanctum.scx b/CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Umbral Sanctum.scx
similarity index 100%
rename from CMBW-maps/melee/3v3/Nonstandard/Retired/(6)Umbral Sanctum.scx
rename to CMBW-maps/melee/3v3/Class 4 - Jester/(3v3)Umbral Sanctum.scx