diff --git a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Watchpoint.scx b/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Watchpoint 1.1.scx
similarity index 71%
rename from CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Watchpoint.scx
rename to CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Watchpoint 1.1.scx
index a5444a3..d173316 100644
Binary files a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Watchpoint.scx and b/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Watchpoint 1.1.scx differ
diff --git a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(3)Frozen Sylphid 1.1.scx b/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(3)Frozen Sylphid 1.1.scx
index 5f262d1..d3db420 100644
Binary files a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(3)Frozen Sylphid 1.1.scx and b/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(3)Frozen Sylphid 1.1.scx differ
diff --git a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Angeltear Strait.scx b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Angeltear Strait.scx
similarity index 93%
rename from CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Angeltear Strait.scx
rename to CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Angeltear Strait.scx
index 97ed4ed..bd2304f 100644
Binary files a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/(2)Angeltear Strait.scx and b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Angeltear Strait.scx differ
diff --git a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/Nonstandard/(2)Bledow.scx b/CMBW-maps/melee/1v1/Compact maps/(2)Bledow.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Class 0 - Testing Grounds/Nonstandard/(2)Bledow.scx
rename to CMBW-maps/melee/1v1/Compact maps/(2)Bledow.scx
diff --git a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/Nonstandard/(2)Enceladus 1.1.scx b/CMBW-maps/melee/1v1/Compact maps/(2)Enceladus 1.1.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Class 0 - Testing Grounds/Nonstandard/(2)Enceladus 1.1.scx
rename to CMBW-maps/melee/1v1/Compact maps/(2)Enceladus 1.1.scx
diff --git a/CMBW-maps/melee/1v1/Class 0 - Testing Grounds/Nonstandard/(2)Plutopia.scx b/CMBW-maps/melee/1v1/Compact maps/(2)Plutopia.scx
similarity index 100%
rename from CMBW-maps/melee/1v1/Class 0 - Testing Grounds/Nonstandard/(2)Plutopia.scx
rename to CMBW-maps/melee/1v1/Compact maps/(2)Plutopia.scx