diff --git a/Mods/hbo/CAD/tri-zero_skirts.f3z b/Mods/hbo/SkirtsCollection/CAD/tri-zero_skirts.f3z
similarity index 100%
rename from Mods/hbo/CAD/tri-zero_skirts.f3z
rename to Mods/hbo/SkirtsCollection/CAD/tri-zero_skirts.f3z
diff --git a/Mods/hbo/CAD/tri-zero_skirts.step.zip b/Mods/hbo/SkirtsCollection/CAD/tri-zero_skirts.step.zip
similarity index 100%
rename from Mods/hbo/CAD/tri-zero_skirts.step.zip
rename to Mods/hbo/SkirtsCollection/CAD/tri-zero_skirts.step.zip
diff --git a/Mods/hbo/Images/reset-switch.png b/Mods/hbo/SkirtsCollection/Images/reset-switch.png
similarity index 100%
rename from Mods/hbo/Images/reset-switch.png
rename to Mods/hbo/SkirtsCollection/Images/reset-switch.png
diff --git a/Mods/hbo/Images/tri-zero-fans.png b/Mods/hbo/SkirtsCollection/Images/tri-zero-fans.png
similarity index 100%
rename from Mods/hbo/Images/tri-zero-fans.png
rename to Mods/hbo/SkirtsCollection/Images/tri-zero-fans.png
diff --git a/Mods/hbo/Images/tri-zero-headless.png b/Mods/hbo/SkirtsCollection/Images/tri-zero-headless.png
similarity index 100%
rename from Mods/hbo/Images/tri-zero-headless.png
rename to Mods/hbo/SkirtsCollection/Images/tri-zero-headless.png
diff --git a/Mods/hbo/Images/tri-zero-rear-details.png b/Mods/hbo/SkirtsCollection/Images/tri-zero-rear-details.png
similarity index 100%
rename from Mods/hbo/Images/tri-zero-rear-details.png
rename to Mods/hbo/SkirtsCollection/Images/tri-zero-rear-details.png
diff --git a/Mods/hbo/Images/tri-zero-rear.png b/Mods/hbo/SkirtsCollection/Images/tri-zero-rear.png
similarity index 100%
rename from Mods/hbo/Images/tri-zero-rear.png
rename to Mods/hbo/SkirtsCollection/Images/tri-zero-rear.png
diff --git a/Mods/hbo/Images/tri-zero-skirt.png b/Mods/hbo/SkirtsCollection/Images/tri-zero-skirt.png
similarity index 100%
rename from Mods/hbo/Images/tri-zero-skirt.png
rename to Mods/hbo/SkirtsCollection/Images/tri-zero-skirt.png
diff --git a/Mods/hbo/Images/tri-zero-waveshare.png b/Mods/hbo/SkirtsCollection/Images/tri-zero-waveshare.png
similarity index 100%
rename from Mods/hbo/Images/tri-zero-waveshare.png
rename to Mods/hbo/SkirtsCollection/Images/tri-zero-waveshare.png
diff --git a/Mods/hbo/README.md b/Mods/hbo/SkirtsCollection/README.md
similarity index 100%
rename from Mods/hbo/README.md
rename to Mods/hbo/SkirtsCollection/README.md
diff --git a/Mods/hbo/STLs/[a]Skirt_Bottom_Plates_x4.stl b/Mods/hbo/SkirtsCollection/STLs/[a]Skirt_Bottom_Plates_x4.stl
similarity index 100%
rename from Mods/hbo/STLs/[a]Skirt_Bottom_Plates_x4.stl
rename to Mods/hbo/SkirtsCollection/STLs/[a]Skirt_Bottom_Plates_x4.stl
diff --git a/Mods/hbo/STLs/[a]Skirt_Fan_Mount_x2.stl b/Mods/hbo/SkirtsCollection/STLs/[a]Skirt_Fan_Mount_x2.stl
similarity index 100%
rename from Mods/hbo/STLs/[a]Skirt_Fan_Mount_x2.stl
rename to Mods/hbo/SkirtsCollection/STLs/[a]Skirt_Fan_Mount_x2.stl
diff --git a/Mods/hbo/STLs/[a]gt2_cover_20mm_shaft_x2.stl b/Mods/hbo/SkirtsCollection/STLs/[a]gt2_cover_20mm_shaft_x2.stl
similarity index 100%
rename from Mods/hbo/STLs/[a]gt2_cover_20mm_shaft_x2.stl
rename to Mods/hbo/SkirtsCollection/STLs/[a]gt2_cover_20mm_shaft_x2.stl
diff --git a/Mods/hbo/STLs/[a]gt2_cover_24mm_shaft.stl b/Mods/hbo/SkirtsCollection/STLs/[a]gt2_cover_24mm_shaft.stl
similarity index 100%
rename from Mods/hbo/STLs/[a]gt2_cover_24mm_shaft.stl
rename to Mods/hbo/SkirtsCollection/STLs/[a]gt2_cover_24mm_shaft.stl
diff --git a/Mods/hbo/STLs/[a]waveshare_display_mount.stl b/Mods/hbo/SkirtsCollection/STLs/[a]waveshare_display_mount.stl
similarity index 100%
rename from Mods/hbo/STLs/[a]waveshare_display_mount.stl
rename to Mods/hbo/SkirtsCollection/STLs/[a]waveshare_display_mount.stl
diff --git a/Mods/hbo/STLs/motor_mount_headless_left.stl b/Mods/hbo/SkirtsCollection/STLs/motor_mount_headless_left.stl
similarity index 100%
rename from Mods/hbo/STLs/motor_mount_headless_left.stl
rename to Mods/hbo/SkirtsCollection/STLs/motor_mount_headless_left.stl
diff --git a/Mods/hbo/STLs/motor_mount_headless_right.stl b/Mods/hbo/SkirtsCollection/STLs/motor_mount_headless_right.stl
similarity index 100%
rename from Mods/hbo/STLs/motor_mount_headless_right.stl
rename to Mods/hbo/SkirtsCollection/STLs/motor_mount_headless_right.stl
diff --git a/Mods/hbo/STLs/rear_skirt_keystone.stl b/Mods/hbo/SkirtsCollection/STLs/rear_skirt_keystone.stl
similarity index 100%
rename from Mods/hbo/STLs/rear_skirt_keystone.stl
rename to Mods/hbo/SkirtsCollection/STLs/rear_skirt_keystone.stl
diff --git a/Mods/hbo/STLs/rear_skirt_power_inlet.stl b/Mods/hbo/SkirtsCollection/STLs/rear_skirt_power_inlet.stl
similarity index 100%
rename from Mods/hbo/STLs/rear_skirt_power_inlet.stl
rename to Mods/hbo/SkirtsCollection/STLs/rear_skirt_power_inlet.stl
diff --git a/Mods/hbo/STLs/waveshare_display_mount_left.stl b/Mods/hbo/SkirtsCollection/STLs/waveshare_display_mount_left.stl
similarity index 100%
rename from Mods/hbo/STLs/waveshare_display_mount_left.stl
rename to Mods/hbo/SkirtsCollection/STLs/waveshare_display_mount_left.stl
diff --git a/Mods/hbo/STLs/waveshare_display_mount_right.stl b/Mods/hbo/SkirtsCollection/STLs/waveshare_display_mount_right.stl
similarity index 100%
rename from Mods/hbo/STLs/waveshare_display_mount_right.stl
rename to Mods/hbo/SkirtsCollection/STLs/waveshare_display_mount_right.stl
diff --git a/Mods/hbo/STLs/waveshare_motor_corner_left.stl b/Mods/hbo/SkirtsCollection/STLs/waveshare_motor_corner_left.stl
similarity index 100%
rename from Mods/hbo/STLs/waveshare_motor_corner_left.stl
rename to Mods/hbo/SkirtsCollection/STLs/waveshare_motor_corner_left.stl
diff --git a/Mods/hbo/STLs/waveshare_motor_corner_right.stl b/Mods/hbo/SkirtsCollection/STLs/waveshare_motor_corner_right.stl
similarity index 100%
rename from Mods/hbo/STLs/waveshare_motor_corner_right.stl
rename to Mods/hbo/SkirtsCollection/STLs/waveshare_motor_corner_right.stl