diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_btn_add_mountpoint-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_btn_add_mountpoint-20211005.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_btn_add_mountpoint-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_btn_add_mountpoint-20211005.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.png
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211005.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211005.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.png
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.png
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_add-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_add-20211005.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_add-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_add-20211005.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.png
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype-20211006.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype-20211006.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.png
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.json
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.png
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_fs-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_fs-20211006.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_fs-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_part_fs-20211006.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.png
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_efi_filesystem-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_efi_filesystem-20211006.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.json
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_efi_filesystem-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_efi_filesystem-20211006.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.png
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_ext4-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_ext4-20211005.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.json
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_ext4-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_ext4-20211005.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.png
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_swap-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_swap-20211006.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.json
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_swap-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_fs_swap-20211006.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.png
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211005.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211005.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211005.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211005.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211005.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211005.png
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211007.json
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211007.json
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211007.png
similarity index 100%
rename from needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.png
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size_unit-20211007.png