[Libosinfo] [PATCH osinfo-db 1/6] tests: isodata: use predictable file layout

[Cole Robinson]

Right now the structure is roughly

    isodata/$distro/$shortid/...

but a few $distro cases are wrong. Fix them

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 .../{altlinux => alt}/alt.p8/alt-p8-builder-20180912-i586.iso.txt | 0
 .../alt.p8/alt-p8-builder-20180912-x86_64.iso.txt                 | 0
 .../alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt                  | 0
 .../alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt                | 0
 .../alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt             | 0
 .../alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt           | 0
 .../{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt  | 0
 .../alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt                  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt | 0
 .../alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt                 | 0
 .../{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-i586.iso.txt   | 0
 .../{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt | 0
 .../{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-mate-20180913-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-i586.iso.txt  | 0
 .../alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt                  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-server-20180913-i586.iso.txt  | 0
 .../alt.p8/alt-p8-server-20180913-x86_64.iso.txt                  | 0
 .../alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt              | 0
 .../alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt                  | 0
 .../alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt                | 0
 .../alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt                 | 0
 .../alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt               | 0
 .../{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt  | 0
 .../alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt                  | 0
 .../{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-i586.iso.txt    | 0
 .../{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt  | 0
 .../alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt           | 0
 .../alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt         | 0
 .../alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt      | 0
 .../alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt    | 0
 .../alt.sisyphus/regular-gnome3-20181017-i586.iso.txt             | 0
 .../alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt           | 0
 .../alt.sisyphus/regular-gnustep-20181017-i586.iso.txt            | 0
 .../alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt          | 0
 .../alt.sisyphus/regular-icewm-20181017-i586.iso.txt              | 0
 .../alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt            | 0
 .../alt.sisyphus/regular-jeos-20181017-i586.iso.txt               | 0
 .../alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt             | 0
 .../alt.sisyphus/regular-kde5-20181017-i586.iso.txt               | 0
 .../alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt             | 0
 .../alt.sisyphus/regular-lxde-20181017-i586.iso.txt               | 0
 .../alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt             | 0
 .../alt.sisyphus/regular-lxqt-20181017-i586.iso.txt               | 0
 .../alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt             | 0
 .../alt.sisyphus/regular-mate-20181017-i586.iso.txt               | 0
 .../alt.sisyphus/regular-mate-20181017-x86_64.iso.txt             | 0
 .../alt.sisyphus/regular-rescue-20181017-i586.iso.txt             | 0
 .../alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt           | 0
 .../alt.sisyphus/regular-wmaker-20181017-i586.iso.txt             | 0
 .../alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt           | 0
 .../alt.sisyphus/regular-xfce-20181017-i586.iso.txt               | 0
 .../alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt             | 0
 .../{altlinux => alt}/alt8.0/alt-education-8.0-i586.iso.txt       | 0
 .../{altlinux => alt}/alt8.0/alt-education-8.0-x86_64.iso.txt     | 0
 .../alt8.1/alt-kworkstation-8.1-install-i586.iso.txt              | 0
 .../alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt            | 0
 .../alt8.1/alt-kworkstation-8.1-live-i586.iso.txt                 | 0
 .../alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt               | 0
 .../{altlinux => alt}/alt8.1/alt-workstation-8.1-i586.iso.txt     | 0
 .../{altlinux => alt}/alt8.1/alt-workstation-8.1-x86_64.iso.txt   | 0
 .../alt8.2/alt-kworkstation-8.2-install-i586.iso.txt              | 0
 .../alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt            | 0
 .../alt8.2/alt-kworkstation-8.2-live-i586.iso.txt                 | 0
 .../alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt               | 0
 .../isodata/{altlinux => alt}/alt8.2/alt-server-8.2-i586.iso.txt  | 0
 .../{altlinux => alt}/alt8.2/alt-server-8.2-x86_64.iso.txt        | 0
 .../{altlinux => alt}/alt8.2/alt-simply-8.2.0-i586.iso.txt        | 0
 .../{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-i586.iso.txt   | 0
 .../{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt | 0
 .../{altlinux => alt}/alt8.2/alt-simply-8.2.0-x86_64.iso.txt      | 0
 .../{altlinux => alt}/alt8.2/alt-workstation-8.2-i586.iso.txt     | 0
 .../{altlinux => alt}/alt8.2/alt-workstation-8.2-x86_64.iso.txt   | 0
 .../caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt    | 0
 .../caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt    | 0
 .../caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt    | 0
 .../sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt            | 0
 .../sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt            | 0
 .../sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt              | 0
 .../sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt             | 0
 ...-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt | 0
 ...-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt | 0
 ...cation_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt | 0
 ...cation_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt | 0
 .../win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt       | 0
 .../win10/en_windows_10_education_x86_dvd_6848121.iso.txt         | 0
 .../en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt  | 0
 .../en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt    | 0
 .../win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt      | 0
 .../win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt        | 0
 .../win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt        | 0
 ...ition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt | 0
 .../win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt | 0
 ...editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt | 0
 .../en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt     | 0
 ...terprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt | 0
 tests/isodata/{windows => win}/win2k/Win2000S-disk.iso.txt        | 0
 ...hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt | 0
 .../en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt       | 0
 ...ll_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt | 0
 ...windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt | 0
 ...rver_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt | 0
 .../win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt      | 0
 .../win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt         | 0
 ...t_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt | 0
 .../en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt   | 0
 ...n_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt | 0
 ...erver_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt | 0
 ..._server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt | 0
 .../en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt  | 0
 ..._windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt | 0
 .../en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt          | 0
 .../en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt | 0
 .../en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt | 0
 .../win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt   | 0
 ..._and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt | 0
 ..._server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt | 0
 ...1119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt | 0
 .../win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt        | 0
 .../win2k3/en_windows_server_2003_enterprise_x64.iso.txt          | 0
 .../win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt             | 0
 .../win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt              | 0
 .../win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt              | 0
 .../win2k3/en_windows_server_2003_standard.iso.txt                | 0
 .../win2k3/en_windows_server_2003_standard_x64.iso.txt            | 0
 .../win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt     | 0
 .../win2k3/en_windows_server_2003_with_sp1_standard.iso.txt       | 0
 .../win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt            | 0
 .../win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt            | 0
 .../en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt  | 0
 .../en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt  | 0
 .../win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt        | 0
 .../win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt        | 0
 ..._win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt | 0
 ..._win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt | 0
 .../win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt              | 0
 .../win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt              | 0
 .../en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt    | 0
 .../en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt    | 0
 .../win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt          | 0
 .../win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt          | 0
 ...en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt | 0
 ...en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt | 0
 ...r_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt | 0
 ...2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt | 0
 ...2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt | 0
 ..._2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt | 0
 ..._2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt | 0
 .../win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt | 0
 .../win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt | 0
 .../win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt   | 0
 .../win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt   | 0
 ...dows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt | 0
 ...2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt | 0
 .../win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt | 0
 ..._enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt | 0
 ...andard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt | 0
 ...terprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt | 0
 ..._r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt | 0
 .../en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt     | 0
 .../win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt  | 0
 ...dows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt | 0
 tests/isodata/{windows => win}/win7/Win7ProX86.iso.txt            | 0
 .../cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng   | 0
 .../cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt   | 0
 .../cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng   | 0
 .../cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt   | 0
 .../win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt  | 0
 .../win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt  | 0
 .../en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng   | 0
 .../en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt   | 0
 .../en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt   | 0
 .../win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng      | 0
 .../win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt      | 0
 .../win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng      | 0
 .../win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt      | 0
 .../en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt     | 0
 .../en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt     | 0
 .../win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng        | 0
 .../win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt        | 0
 .../win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng        | 0
 .../win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt        | 0
 .../en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt     | 0
 .../win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt        | 0
 .../en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt | 0
 .../en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt | 0
 .../win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt    | 0
 .../win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt    | 0
 .../en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt   | 0
 .../en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt   | 0
 .../win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt      | 0
 .../win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt      | 0
 .../en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt | 0
 .../en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng | 0
 .../en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt | 0
 .../win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt    | 0
 .../win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt    | 0
 .../en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt  | 0
 .../en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt  | 0
 ...dows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt | 0
 ...dows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt | 0
 .../en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng   | 0
 .../en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt   | 0
 .../en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng   | 0
 .../en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt   | 0
 .../win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt      | 0
 .../win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt | 0
 .../win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt         | 0
 .../win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt   | 0
 .../win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt           | 0
 .../en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt     | 0
 .../en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng     | 0
 .../en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt     | 0
 .../win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt        | 0
 .../win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt        | 0
 .../win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt  | 0
 .../win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt  | 0
 .../win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt            | 0
 .../win7/en_windows_7_ultimate_x64_dvd_unknown.lng                | 0
 .../win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng          | 0
 .../win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt          | 0
 .../win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt            | 0
 .../win7/en_windows_7_ultimate_x86_dvd_unknown.lng                | 0
 .../win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng          | 0
 .../win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt          | 0
 ..._windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt | 0
 ..._windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt | 0
 ...dows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng | 0
 ...dows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt | 0
 ...dows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng | 0
 ...dows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt | 0
 .../fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng | 0
 .../fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt | 0
 .../ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng     | 0
 .../ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt     | 0
 .../win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng  | 0
 .../win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt  | 0
 ...-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt | 0
 .../win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt | 0
 .../win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt | 0
 .../win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt   | 0
 .../win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt   | 0
 .../win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt            | 0
 .../win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt            | 0
 .../win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt     | 0
 .../win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt     | 0
 .../win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt       | 0
 .../win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt       | 0
 .../win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt              | 0
 .../win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt              | 0
 ...n_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt | 0
 ...n_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt | 0
 .../en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt | 0
 .../win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt   | 0
 .../win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt   | 0
 .../en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt   | 0
 .../en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt   | 0
 .../en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt     | 0
 .../en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt     | 0
 .../win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt     | 0
 .../win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt   | 0
 .../win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt   | 0
 ...n_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt | 0
 ...n_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt | 0
 ...windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt | 0
 ...windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt | 0
 .../win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt    | 0
 .../win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt    | 0
 .../win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt    | 0
 .../win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt    | 0
 .../win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt      | 0
 .../win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt      | 0
 .../win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt      | 0
 .../win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt      | 0
 .../win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt | 0
 .../win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt | 0
 .../win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt   | 0
 .../win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt               | 0
 .../win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt               | 0
 .../win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt        | 0
 .../win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt        | 0
 .../win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt        | 0
 .../win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt        | 0
 .../win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt          | 0
 .../win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt          | 0
 .../win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt          | 0
 .../win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt          | 0
 .../win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt                 | 0
 .../win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt                 | 0
 .../win8/Windows8-ConsumerPreview-32bit-English.iso.lng           | 0
 .../win8/Windows8-ConsumerPreview-32bit-English.iso.txt           | 0
 .../win8/Windows8-ConsumerPreview-64bit-English.iso.lng           | 0
 .../win8/Windows8-ConsumerPreview-64bit-English.iso.txt           | 0
 .../win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng         | 0
 .../win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt         | 0
 .../win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt      | 0
 .../win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt      | 0
 .../win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt        | 0
 .../win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt        | 0
 .../win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt                 | 0
 .../win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt                 | 0
 .../win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt          | 0
 .../win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt          | 0
 .../win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt            | 0
 .../win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt            | 0
 .../{windows => win}/win8/en-gb_windows_8_x64_dvd_915412.iso.txt  | 0
 .../{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.lng  | 0
 .../{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.txt  | 0
 .../win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng  | 0
 .../win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt  | 0
 .../win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng  | 0
 .../win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt  | 0
 ...indows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng | 0
 ...indows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt | 0
 ...indows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng | 0
 ...indows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt | 0
 ...dows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng | 0
 ...dows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt | 0
 ...dows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng | 0
 ...dows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt | 0
 .../win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng         | 0
 .../win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt         | 0
 .../win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng         | 0
 .../win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt         | 0
 .../win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng           | 0
 .../win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt           | 0
 .../win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng           | 0
 .../win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt           | 0
 .../en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng     | 0
 .../en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt     | 0
 .../en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng     | 0
 .../en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt     | 0
 .../{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.lng   | 0
 .../{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.txt   | 0
 .../{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.lng   | 0
 .../{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.txt   | 0
 .../win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng             | 0
 .../win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt             | 0
 .../win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng             | 0
 .../win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt             | 0
 .../win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng               | 0
 .../win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt               | 0
 .../win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng               | 0
 .../win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt               | 0
 .../{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.lng     | 0
 .../{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.txt     | 0
 .../{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.lng     | 0
 .../{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.txt     | 0
 .../{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.lng     | 0
 .../{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.txt     | 0
 .../winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt | 0
 .../winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt | 0
 ...s_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt | 0
 ...s_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt | 0
 .../en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt        | 0
 .../en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt        | 0
 ...s_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt | 0
 ...vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt | 0
 ...s_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt | 0
 ...vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt | 0
 ...s_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt | 0
 .../en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt  | 0
 .../winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt           | 0
 .../winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt           | 0
 .../winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt           | 0
 .../winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt           | 0
 ...s_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt | 0
 .../isodata/{windows => win}/winxp/cz_winxp_pro_with_sp2.iso.txt  | 0
 .../{windows => win}/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt | 0
 tests/isodata/{windows => win}/winxp/en_win_xp_pro_n.iso.txt      | 0
 ...xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt | 0
 ...p_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt | 0
 ...s_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt | 0
 .../{windows => win}/winxp/en_windows_xp_professional_x64.iso.txt | 0
 .../winxp/en_windows_xp_professional_x64_chk.iso.txt              | 0
 .../isodata/{windows => win}/winxp/en_winxp_mce_2005_cd1.iso.txt  | 0
 .../isodata/{windows => win}/winxp/en_winxp_mce_2005_cd2.iso.txt  | 0
 .../isodata/{windows => win}/winxp/en_winxp_pro_with_sp2.iso.txt  | 0
 .../{windows => win}/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt    | 0
 .../{windows => win}/winxp/en_winxp_tablet_2005_CD1.iso.txt       | 0
 .../{windows => win}/winxp/en_winxp_tablet_2005_CD2.iso.txt       | 0
 tests/isodata/{windows => win}/winxp/en_winxp_tablet_cd2.iso.txt  | 0
 ...u_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt | 0
 393 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-builder-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-mate-20180913-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-20180913-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-20180913-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-icewm-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-jeos-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-kde5-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxde-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-mate-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-rescue-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-xfce-20181017-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.0/alt-education-8.0-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.0/alt-education-8.0-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.1/alt-workstation-8.1-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.1/alt-workstation-8.1-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-server-8.2-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-server-8.2-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-x86_64.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-workstation-8.2-i586.iso.txt (100%)
 rename tests/isodata/{altlinux => alt}/alt8.2/alt-workstation-8.2-x86_64.iso.txt (100%)
 rename tests/isodata/{sles => caasp}/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{sles => caasp}/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{sles => caasp}/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt (100%)
 rename tests/isodata/{windows => win}/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_education_x86_dvd_6848121.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt (100%)
 rename tests/isodata/{windows => win}/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k/Win2000S-disk.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt (100%)
 rename tests/isodata/{windows => win}/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_enterprise_x64.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_standard.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_standard_x64.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt (100%)
 rename tests/isodata/{windows => win}/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt (100%)
 rename tests/isodata/{windows => win}/win7/Win7ProX86.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_unknown.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_unknown.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt (100%)
 rename tests/isodata/{windows => win}/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng (100%)
 rename tests/isodata/{windows => win}/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-32bit-English.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-32bit-English.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-64bit-English.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-64bit-English.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x64_dvd_915412.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.txt (100%)
 rename tests/isodata/{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.lng (100%)
 rename tests/isodata/{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt (100%)
 rename tests/isodata/{windows => win}/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/cz_winxp_pro_with_sp2.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_win_xp_pro_n.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_x64.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_x64_chk.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_mce_2005_cd1.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_mce_2005_cd2.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_pro_with_sp2.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_2005_CD1.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_2005_CD2.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_cd2.iso.txt (100%)
 rename tests/isodata/{windows => win}/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt (100%)

diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-builder-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-builder-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-mate-20180913-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-mate-20180913-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-server-20180913-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-server-20180913-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-mate-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-mate-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.0/alt-education-8.0-i586.iso.txt b/tests/isodata/alt/alt8.0/alt-education-8.0-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.0/alt-education-8.0-i586.iso.txt
rename to tests/isodata/alt/alt8.0/alt-education-8.0-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.0/alt-education-8.0-x86_64.iso.txt b/tests/isodata/alt/alt8.0/alt-education-8.0-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.0/alt-education-8.0-x86_64.iso.txt
rename to tests/isodata/alt/alt8.0/alt-education-8.0-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-workstation-8.1-i586.iso.txt b/tests/isodata/alt/alt8.1/alt-workstation-8.1-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-workstation-8.1-i586.iso.txt
rename to tests/isodata/alt/alt8.1/alt-workstation-8.1-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-workstation-8.1-x86_64.iso.txt b/tests/isodata/alt/alt8.1/alt-workstation-8.1-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-workstation-8.1-x86_64.iso.txt
rename to tests/isodata/alt/alt8.1/alt-workstation-8.1-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-server-8.2-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-server-8.2-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-server-8.2-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-server-8.2-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-server-8.2-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-server-8.2-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-server-8.2-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-server-8.2-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-workstation-8.2-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-workstation-8.2-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-workstation-8.2-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-workstation-8.2-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-workstation-8.2-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-workstation-8.2-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-workstation-8.2-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-workstation-8.2-x86_64.iso.txt
diff --git a/tests/isodata/sles/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/caasp/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/caasp/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/caasp/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/caasp/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/caasp/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/caasp/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt b/tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
similarity index 100%
rename from tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
rename to tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
diff --git a/tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt b/tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
similarity index 100%
rename from tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
rename to tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt b/tests/isodata/win/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt b/tests/isodata/win/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt b/tests/isodata/win/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt b/tests/isodata/win/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt b/tests/isodata/win/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
rename to tests/isodata/win/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt b/tests/isodata/win/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
rename to tests/isodata/win/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt b/tests/isodata/win/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
rename to tests/isodata/win/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt b/tests/isodata/win/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
rename to tests/isodata/win/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
diff --git a/tests/isodata/windows/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt b/tests/isodata/win/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
rename to tests/isodata/win/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
diff --git a/tests/isodata/windows/win2k/Win2000S-disk.iso.txt b/tests/isodata/win/win2k/Win2000S-disk.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k/Win2000S-disk.iso.txt
rename to tests/isodata/win/win2k/Win2000S-disk.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt b/tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
rename to tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt b/tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
rename to tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt b/tests/isodata/win/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
rename to tests/isodata/win/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt b/tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
rename to tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt b/tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
rename to tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt b/tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt b/tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
diff --git a/tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt b/tests/isodata/win/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
similarity index 100%
rename from tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
rename to tests/isodata/win/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
diff --git a/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt b/tests/isodata/win/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
rename to tests/isodata/win/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_enterprise_x64.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_standard.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_standard.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_standard.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_standard.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_standard_x64.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_standard_x64.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_standard_x64.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_standard_x64.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt b/tests/isodata/win/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
rename to tests/isodata/win/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt b/tests/isodata/win/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
rename to tests/isodata/win/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt b/tests/isodata/win/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
rename to tests/isodata/win/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt b/tests/isodata/win/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
rename to tests/isodata/win/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
diff --git a/tests/isodata/windows/win7/Win7ProX86.iso.txt b/tests/isodata/win/win7/Win7ProX86.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/Win7ProX86.iso.txt
rename to tests/isodata/win/win7/Win7ProX86.iso.txt
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt b/tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
rename to tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt b/tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
rename to tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt b/tests/isodata/win/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt b/tests/isodata/win/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng b/tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
rename to tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng b/tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt b/tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
rename to tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt b/tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
rename to tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
diff --git a/tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng b/tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
rename to tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
diff --git a/tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt b/tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
rename to tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
diff --git a/tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng b/tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
rename to tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
diff --git a/tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt b/tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
rename to tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
diff --git a/tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng b/tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
rename to tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
diff --git a/tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt b/tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
rename to tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.lng b/tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.txt b/tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.lng b/tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.txt b/tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
diff --git a/tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng b/tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
rename to tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
diff --git a/tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt b/tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
rename to tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.lng b/tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
rename to tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.lng b/tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.txt b/tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.lng b/tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.txt b/tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.lng b/tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.lng
rename to tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.txt b/tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.txt
rename to tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.lng b/tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.lng
rename to tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.txt b/tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.txt
rename to tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.txt
diff --git a/tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.lng b/tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.lng
rename to tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.lng
diff --git a/tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.txt b/tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.txt
rename to tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
diff --git a/tests/isodata/windows/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt b/tests/isodata/win/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
rename to tests/isodata/win/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
diff --git a/tests/isodata/windows/winxp/cz_winxp_pro_with_sp2.iso.txt b/tests/isodata/win/winxp/cz_winxp_pro_with_sp2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/cz_winxp_pro_with_sp2.iso.txt
rename to tests/isodata/win/winxp/cz_winxp_pro_with_sp2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt b/tests/isodata/win/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
rename to tests/isodata/win/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
diff --git a/tests/isodata/windows/winxp/en_win_xp_pro_n.iso.txt b/tests/isodata/win/winxp/en_win_xp_pro_n.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_win_xp_pro_n.iso.txt
rename to tests/isodata/win/winxp/en_win_xp_pro_n.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_x64.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_x64.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_x64_chk.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_x64_chk.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt b/tests/isodata/win/winxp/en_winxp_mce_2005_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt
rename to tests/isodata/win/winxp/en_winxp_mce_2005_cd1.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt b/tests/isodata/win/winxp/en_winxp_mce_2005_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_mce_2005_cd2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt b/tests/isodata/win/winxp/en_winxp_pro_with_sp2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_pro_with_sp2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt b/tests/isodata/win/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
rename to tests/isodata/win/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_tablet_2005_CD1.iso.txt b/tests/isodata/win/winxp/en_winxp_tablet_2005_CD1.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_tablet_2005_CD1.iso.txt
rename to tests/isodata/win/winxp/en_winxp_tablet_2005_CD1.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_tablet_2005_CD2.iso.txt b/tests/isodata/win/winxp/en_winxp_tablet_2005_CD2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_tablet_2005_CD2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_tablet_2005_CD2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_tablet_cd2.iso.txt b/tests/isodata/win/winxp/en_winxp_tablet_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_tablet_cd2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_tablet_cd2.iso.txt
diff --git a/tests/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt b/tests/isodata/win/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
rename to tests/isodata/win/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
-- 
2.21.0