diff --git a/needles/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.json b/needles/anaconda/install_destination/arabic/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.json
similarity index 100%
rename from needles/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.json
rename to needles/anaconda/install_destination/arabic/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.json
diff --git a/needles/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.png b/needles/anaconda/install_destination/arabic/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.png
similarity index 100%
rename from needles/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.png
rename to needles/anaconda/install_destination/arabic/rocky-anaconda_install_destination_save_passphrase-arabic-20240716.png
diff --git a/needles/rocky-begin_installation_arabic-20240716.json b/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.json
similarity index 100%
rename from needles/rocky-begin_installation_arabic-20240716.json
rename to needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.json
diff --git a/needles/rocky-begin_installation_arabic-20240716.png b/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.png
similarity index 100%
rename from needles/rocky-begin_installation_arabic-20240716.png
rename to needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.png
diff --git a/needles/rocky-anaconda_graphical-server_selected-arabic-20240716.json b/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.json
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-arabic-20240716.json
rename to needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.json
diff --git a/needles/rocky-anaconda_graphical-server_selected-arabic-20240716.png b/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.png
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-arabic-20240716.png
rename to needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.png
diff --git a/needles/rocky-anaconda_graphical-server_selected-french-20240716.json b/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.json
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-french-20240716.json
rename to needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.json
diff --git a/needles/rocky-anaconda_graphical-server_selected-french-20240716.png b/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.png
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-french-20240716.png
rename to needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.png
diff --git a/needles/rocky-anaconda_graphical-server_selected-japanese-20240716.json b/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.json
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-japanese-20240716.json
rename to needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.json
diff --git a/needles/rocky-anaconda_graphical-server_selected-japanese-20240716.png b/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.png
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-japanese-20240716.png
rename to needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.png
diff --git a/needles/rocky-anaconda_graphical-server_selected-russian-20240716.json b/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.json
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-russian-20240716.json
rename to needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.json
diff --git a/needles/rocky-anaconda_graphical-server_selected-russian-20240716.png b/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.png
similarity index 100%
rename from needles/rocky-anaconda_graphical-server_selected-russian-20240716.png
rename to needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.png
diff --git a/needles/rocky-boot_enter_passphrase-arabic-20240716.json b/needles/console/rocky-boot_enter_passphrase-arabic-20240716.json
similarity index 100%
rename from needles/rocky-boot_enter_passphrase-arabic-20240716.json
rename to needles/console/rocky-boot_enter_passphrase-arabic-20240716.json
diff --git a/needles/rocky-boot_enter_passphrase-arabic-20240716.png b/needles/console/rocky-boot_enter_passphrase-arabic-20240716.png
similarity index 100%
rename from needles/rocky-boot_enter_passphrase-arabic-20240716.png
rename to needles/console/rocky-boot_enter_passphrase-arabic-20240716.png
diff --git a/needles/rocky-desktop_input_source_japanese_anthy-20240716.json b/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.json
similarity index 100%
rename from needles/rocky-desktop_input_source_japanese_anthy-20240716.json
rename to needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.json
diff --git a/needles/rocky-desktop_input_source_japanese_anthy-20240716.png b/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.png
similarity index 100%
rename from needles/rocky-desktop_input_source_japanese_anthy-20240716.png
rename to needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.png
diff --git a/needles/rocky-yama_kanji-japanese-20240716.json b/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.json
similarity index 100%
rename from needles/rocky-yama_kanji-japanese-20240716.json
rename to needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.json
diff --git a/needles/rocky-yama_kanji-japanese-20240716.png b/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.png
similarity index 100%
rename from needles/rocky-yama_kanji-japanese-20240716.png
rename to needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.png