eg instead of platforms/qemu.org/qemu-1.2.0.xml we just have
platform/qemu.org/qemu-1.2.0. The top level directory name
now matches the entity name exactly
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
configure.ac | 80 +-
data/Makefile.am | 2 +-
data/{datamaps => datamap}/Makefile.am | 0
.../xen.org => datamap/microsoft.com}/Makefile.am | 0
.../microsoft.com/win-7-l10n-language.xml.in | 0
.../win-8-l10n-language-reverse.xml.in | 0
.../microsoft.com/win-8-l10n-language.xml.in | 0
.../redhat.com => datamap/x.org}/Makefile.am | 0
.../x.org/x11-keyboard.xml.in | 0
data/{devices => device}/Makefile.am | 0
.../ibasetechnologies.net}/Makefile.am | 0
.../ibasetechnologies.net/isa-ib700.xml.in | 0
.../linux-kvm.org => device/ibm.com}/Makefile.am | 0
.../ibm.com/ps2-keyboard.xml.in | 0
data/{devices => device}/ibm.com/ps2-mouse.xml.in | 0
.../ubuntu.com => device/pcisig.com}/Makefile.am | 0
.../pcisig.com/pci-1000-0012.xml.in | 0
.../pcisig.com/pci-1013-00b8.xml.in | 0
.../pcisig.com/pci-1022-2000.xml.in | 0
.../pcisig.com/pci-10ec-8029.xml.in | 0
.../pcisig.com/pci-10ec-8139.xml.in | 0
.../pcisig.com/pci-1234-1111.xml.in | 0
.../pcisig.com/pci-1274-5000.xml.in | 0
.../pcisig.com/pci-15ad-0710.xml.in | 0
.../pcisig.com/pci-1af4-1000.xml.in | 0
.../pcisig.com/pci-1af4-1001.xml.in | 0
.../pcisig.com/pci-1af4-1002.xml.in | 0
.../pcisig.com/pci-1af4-1003.xml.in | 0
.../pcisig.com/pci-1af4-1009.xml.in | 0
.../pcisig.com/pci-1b36-0100.xml.in | 0
.../pcisig.com/pci-8086-100e.xml.in | 0
.../pcisig.com/pci-8086-2415.xml.in | 0
.../pcisig.com/pci-8086-25ab.xml.in | 0
.../pcisig.com/pci-8086-2668.xml.in | 0
data/{oses/suse.com => device/usb.org}/Makefile.am | 0
.../usb.org/usb-80ee-0021.xml.in | 0
data/{oses/sun.com => device/xen.org}/Makefile.am | 0
.../{devices => device}/xen.org/xen-console.xml.in | 0
data/{devices => device}/xen.org/xen-pci.xml.in | 0
data/{devices => device}/xen.org/xen-vbd.xml.in | 0
data/{devices => device}/xen.org/xen-vfb.xml.in | 0
data/{devices => device}/xen.org/xen-vif.xml.in | 0
data/{devices => device}/xen.org/xen-vkbd.xml.in | 0
data/{devices => device}/xen.org/xen-vscsi.xml.in | 0
data/{devices => device}/xen.org/xen-vtpm.xml.in | 0
.../Makefile.am | 0
.../debian.org}/Makefile.am | 0
.../debian.org/debian-preseed-desktop.xml.in | 0
.../debian.org/debian-preseed-jeos.xml.in | 0
.../fedoraproject.org}/Makefile.am | 0
.../fedora-kickstart-desktop.xml.in | 0
.../fedoraproject.org/fedora-kickstart-jeos.xml.in | 0
.../microsoft.com}/Makefile.am | 0
.../microsoft.com/windows-cmd-desktop.xml.in | 0
.../microsoft.com/windows-reg-desktop.xml.in | 0
.../microsoft.com/windows-sif-desktop.xml.in | 0
.../microsoft.com/windows-sif-jeos.xml.in | 0
.../microsoft.com/windows-unattend-desktop.xml.in | 0
.../microsoft.com/windows-unattend-jeos.xml.in | 0
.../redhat.com}/Makefile.am | 0
.../redhat.com/rhel-kickstart-desktop.xml.in | 0
.../redhat.com/rhel-kickstart-jeos.xml.in | 0
.../ubuntu.com}/Makefile.am | 0
.../ubuntu.com/ubuntu-preseed-jeos.xml.in | 0
data/{oses => os}/Makefile.am | 0
.../netbsd.org => os/altlinux.org}/Makefile.am | 0
data/{oses => os}/altlinux.org/altlinux-1.0.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-2.0.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-2.2.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-2.4.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-3.0.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-4.0.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-4.1.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-5.0.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-6.0.xml.in | 0
data/{oses => os}/altlinux.org/altlinux-7.0.xml.in | 0
.../microsoft.com => os/apple.com}/Makefile.am | 0
data/{oses => os}/apple.com/macosx-10.0.xml.in | 0
data/{oses => os}/apple.com/macosx-10.1.xml.in | 0
data/{oses => os}/apple.com/macosx-10.2.xml.in | 0
data/{oses => os}/apple.com/macosx-10.3.xml.in | 0
data/{oses => os}/apple.com/macosx-10.4.xml.in | 0
data/{oses => os}/apple.com/macosx-10.5.xml.in | 0
data/{oses => os}/apple.com/macosx-10.6.xml.in | 0
data/{oses => os}/apple.com/macosx-10.7.xml.in | 0
.../mandriva.com => os/centos.org}/Makefile.am | 0
data/{oses => os}/centos.org/centos-6.0.xml.in | 0
data/{oses => os}/centos.org/centos-6.1.xml.in | 0
data/{oses => os}/centos.org/centos-6.2.xml.in | 0
data/{oses => os}/centos.org/centos-6.3.xml.in | 0
data/{oses => os}/centos.org/centos-6.4.xml.in | 0
data/{oses => os}/centos.org/centos-6.5.xml.in | 0
data/{oses => os}/centos.org/centos-7.0.xml.in | 0
.../{oses/mageia.org => os/debian.org}/Makefile.am | 0
data/{oses => os}/debian.org/debian-1.1.xml.in | 0
data/{oses => os}/debian.org/debian-1.2.xml.in | 0
data/{oses => os}/debian.org/debian-1.3.xml.in | 0
data/{oses => os}/debian.org/debian-2.0.xml.in | 0
data/{oses => os}/debian.org/debian-2.1.xml.in | 0
data/{oses => os}/debian.org/debian-2.2.xml.in | 0
data/{oses => os}/debian.org/debian-3.1.xml.in | 0
data/{oses => os}/debian.org/debian-3.xml.in | 0
data/{oses => os}/debian.org/debian-4.xml.in | 0
data/{oses => os}/debian.org/debian-5.xml.in | 0
data/{oses => os}/debian.org/debian-6.xml.in | 0
data/{oses => os}/debian.org/debian-7.xml.in | 0
data/{oses => os}/debian.org/debian-8.xml.in | 0
.../gnome.org => os/fedoraproject.org}/Makefile.am | 0
.../{oses => os}/fedoraproject.org/fedora-1.xml.in | 0
.../fedoraproject.org/fedora-10.xml.in | 0
.../fedoraproject.org/fedora-11.xml.in | 0
.../fedoraproject.org/fedora-12.xml.in | 0
.../fedoraproject.org/fedora-13.xml.in | 0
.../fedoraproject.org/fedora-14.xml.in | 0
.../fedoraproject.org/fedora-15.xml.in | 0
.../fedoraproject.org/fedora-16.xml.in | 0
.../fedoraproject.org/fedora-17.xml.in | 0
.../fedoraproject.org/fedora-18.xml.in | 0
.../fedoraproject.org/fedora-19.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-2.xml.in | 0
.../fedoraproject.org/fedora-20.xml.in | 0
.../fedoraproject.org/fedora-21.xml.in | 0
.../fedoraproject.org/fedora-22.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-3.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-4.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-5.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-6.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-7.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-8.xml.in | 0
.../{oses => os}/fedoraproject.org/fedora-9.xml.in | 0
.../fedoraproject.org/fedora-unknown.xml.in | 0
data/{oses => os}/freebsd.org/Makefile.am | 0
data/{oses => os}/freebsd.org/freebsd-1.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-10.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-10.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-2.0.5.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-2.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-2.2.8.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-2.2.9.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-3.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-3.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.10.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.11.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.3.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.4.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.5.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.6.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.7.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.8.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-4.9.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.2.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.3.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.4.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-5.5.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-6.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-6.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-6.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-6.3.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-6.4.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-7.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-7.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-7.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-7.3.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-7.4.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-8.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-8.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-8.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-8.3.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-8.4.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-9.0.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-9.1.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-9.2.xml.in | 0
data/{oses => os}/freebsd.org/freebsd-9.3.xml.in | 0
.../fedoraproject.org => os/gnome.org}/Makefile.am | 0
data/{oses => os}/gnome.org/gnome-3.6.xml.in | 0
data/{oses => os}/gnome.org/gnome-3.8.xml.in | 0
.../gnome.org/gnome-continuous-3.10.xml.in | 0
.../gnome.org/gnome-continuous-3.12.xml.in | 0
.../gnome.org/gnome-continuous-3.14.xml.in | 0
.../{oses/debian.org => os/mageia.org}/Makefile.am | 0
data/{oses => os}/mageia.org/mageia-1.xml.in | 0
data/{oses => os}/mageia.org/mageia-2.xml.in | 0
data/{oses => os}/mageia.org/mageia-3.xml.in | 0
.../centos.org => os/mandriva.com}/Makefile.am | 0
.../{oses => os}/mandriva.com/mandrake-10.0.xml.in | 0
.../{oses => os}/mandriva.com/mandrake-10.1.xml.in | 0
.../{oses => os}/mandriva.com/mandrake-10.2.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-5.1.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-5.2.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-5.3.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-6.0.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-6.1.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-7.0.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-7.1.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-7.2.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-8.0.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-8.1.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-8.2.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-9.0.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-9.1.xml.in | 0
data/{oses => os}/mandriva.com/mandrake-9.2.xml.in | 0
.../mandriva.com/mandriva-2006.0.xml.in | 0
.../mandriva.com/mandriva-2007.1.xml.in | 0
.../{oses => os}/mandriva.com/mandriva-2007.xml.in | 0
.../mandriva.com/mandriva-2008.0.xml.in | 0
.../mandriva.com/mandriva-2008.1.xml.in | 0
.../mandriva.com/mandriva-2009.0.xml.in | 0
.../mandriva.com/mandriva-2009.1.xml.in | 0
.../mandriva.com/mandriva-2010.0.xml.in | 0
.../mandriva.com/mandriva-2010.1.xml.in | 0
.../mandriva.com/mandriva-2010.2.xml.in | 0
.../{oses => os}/mandriva.com/mandriva-2011.xml.in | 0
data/{oses => os}/mandriva.com/mbs-1.0.xml.in | 0
data/{oses => os}/mandriva.com/mes-5.0.xml.in | 0
data/{oses => os}/mandriva.com/mes-5.1.xml.in | 0
.../apple.com => os/microsoft.com}/Makefile.am | 0
data/{oses => os}/microsoft.com/msdos-6.22.xml.in | 0
data/{oses => os}/microsoft.com/win-1.0.xml.in | 0
data/{oses => os}/microsoft.com/win-10.xml.in | 0
data/{oses => os}/microsoft.com/win-2.0.xml.in | 0
data/{oses => os}/microsoft.com/win-2.1.xml.in | 0
data/{oses => os}/microsoft.com/win-2k.xml.in | 0
data/{oses => os}/microsoft.com/win-2k12.xml.in | 0
data/{oses => os}/microsoft.com/win-2k12r2.xml.in | 0
data/{oses => os}/microsoft.com/win-2k3.xml.in | 0
data/{oses => os}/microsoft.com/win-2k3r2.xml.in | 0
data/{oses => os}/microsoft.com/win-2k8.xml.in | 0
data/{oses => os}/microsoft.com/win-2k8r2.xml.in | 0
data/{oses => os}/microsoft.com/win-3.1.xml.in | 0
data/{oses => os}/microsoft.com/win-7.xml.in | 0
data/{oses => os}/microsoft.com/win-8.1.xml.in | 0
data/{oses => os}/microsoft.com/win-8.xml.in | 0
data/{oses => os}/microsoft.com/win-95.xml.in | 0
data/{oses => os}/microsoft.com/win-98.xml.in | 0
data/{oses => os}/microsoft.com/win-me.xml.in | 0
data/{oses => os}/microsoft.com/win-vista.xml.in | 0
data/{oses => os}/microsoft.com/win-xp.xml.in | 0
data/{oses => os}/microsoft.com/winnt-3.1.xml.in | 0
data/{oses => os}/microsoft.com/winnt-3.5.xml.in | 0
data/{oses => os}/microsoft.com/winnt-3.51.xml.in | 0
data/{oses => os}/microsoft.com/winnt-4.0.xml.in | 0
.../altlinux.org => os/netbsd.org}/Makefile.am | 0
data/{oses => os}/netbsd.org/netbsd-0.8.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-0.9.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.0.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.1.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.2.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.3.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.4.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.5.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-1.6.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-2.0.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-3.0.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-4.0.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-5.0.xml.in | 0
data/{oses => os}/netbsd.org/netbsd-5.1.xml.in | 0
.../ubuntu.com => os/novell.com}/Makefile.am | 0
data/{oses => os}/novell.com/netware-4.xml.in | 0
data/{oses => os}/novell.com/netware-5.xml.in | 0
data/{oses => os}/novell.com/netware-6.xml.in | 0
.../redhat.com => os/openbsd.org}/Makefile.am | 0
data/{oses => os}/openbsd.org/openbsd-4.2.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-4.3.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-4.4.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-4.5.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-4.8.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-4.9.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.0.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.1.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.2.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.3.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.4.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.5.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.6.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.7.xml.in | 0
data/{oses => os}/openbsd.org/openbsd-5.8.xml.in | 0
.../microsoft.com => os/opensuse.org}/Makefile.am | 0
.../{oses => os}/opensuse.org/opensuse-10.2.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-10.3.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-11.0.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-11.1.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-11.2.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-11.3.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-11.4.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-12.1.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-12.2.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-12.3.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-13.1.xml.in | 0
.../{oses => os}/opensuse.org/opensuse-13.2.xml.in | 0
.../opensuse.org/opensuse-factory.xml.in | 0
.../opensuse.org/opensuse-unknown.xml.in | 0
.../oracle.com}/Makefile.am | 0
data/{oses => os}/oracle.com/solaris-11.xml.in | 0
.../debian.org => os/redhat.com}/Makefile.am | 0
data/{oses => os}/redhat.com/rhel-2.1.1.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.2.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.3.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.4.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.5.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.6.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.7.xml.in | 0
data/{oses => os}/redhat.com/rhel-2.1.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.1.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.2.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.3.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.4.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.5.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.6.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.7.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.8.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.9.xml.in | 0
data/{oses => os}/redhat.com/rhel-3.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.0.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.1.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.2.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.3.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.4.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.5.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.6.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.7.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.8.xml.in | 0
data/{oses => os}/redhat.com/rhel-4.9.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.0.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.1.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.10.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.11.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.2.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.3.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.4.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.5.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.6.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.7.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.8.xml.in | 0
data/{oses => os}/redhat.com/rhel-5.9.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.0.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.1.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.2.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.3.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.4.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.5.xml.in | 0
data/{oses => os}/redhat.com/rhel-6.6.xml.in | 0
data/{oses => os}/redhat.com/rhel-7.0.xml.in | 0
data/{oses => os}/redhat.com/rhel-7.1.xml.in | 0
.../{oses => os}/redhat.com/rhel-atomic-7.0.xml.in | 0
.../{oses => os}/redhat.com/rhel-atomic-7.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-1.0.xml.in | 0
data/{oses => os}/redhat.com/rhl-1.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-2.0.xml.in | 0
data/{oses => os}/redhat.com/rhl-2.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-3.0.3.xml.in | 0
data/{oses => os}/redhat.com/rhl-4.0.xml.in | 0
data/{oses => os}/redhat.com/rhl-4.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-4.2.xml.in | 0
data/{oses => os}/redhat.com/rhl-5.0.xml.in | 0
data/{oses => os}/redhat.com/rhl-5.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-5.2.xml.in | 0
data/{oses => os}/redhat.com/rhl-6.0.xml.in | 0
data/{oses => os}/redhat.com/rhl-6.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-6.2.xml.in | 0
data/{oses => os}/redhat.com/rhl-7.1.xml.in | 0
data/{oses => os}/redhat.com/rhl-7.2.xml.in | 0
data/{oses => os}/redhat.com/rhl-7.3.xml.in | 0
data/{oses => os}/redhat.com/rhl-7.xml.in | 0
data/{oses => os}/redhat.com/rhl-8.0.xml.in | 0
data/{oses => os}/redhat.com/rhl-9.xml.in | 0
data/{devices/xen.org => os/sun.com}/Makefile.am | 0
.../sun.com/opensolaris-2009.06.xml.in | 0
data/{oses => os}/sun.com/solaris-10.xml.in | 0
data/{oses => os}/sun.com/solaris-9.xml.in | 0
data/{devices/usb.org => os/suse.com}/Makefile.am | 0
data/{oses => os}/suse.com/sled-10.xml.in | 0
data/{oses => os}/suse.com/sled-11.1.xml.in | 0
data/{oses => os}/suse.com/sled-11.2.xml.in | 0
data/{oses => os}/suse.com/sled-11.3.xml.in | 0
data/{oses => os}/suse.com/sled-11.4.xml.in | 0
data/{oses => os}/suse.com/sled-11.xml.in | 0
data/{oses => os}/suse.com/sled-12.xml.in | 0
data/{oses => os}/suse.com/sled-9.xml.in | 0
data/{oses => os}/suse.com/sles-10.xml.in | 0
data/{oses => os}/suse.com/sles-11.1.xml.in | 0
data/{oses => os}/suse.com/sles-11.2.xml.in | 0
data/{oses => os}/suse.com/sles-11.3.xml.in | 0
data/{oses => os}/suse.com/sles-11.4.xml.in | 0
data/{oses => os}/suse.com/sles-11.xml.in | 0
data/{oses => os}/suse.com/sles-12.xml.in | 0
data/{oses => os}/suse.com/sles-9.xml.in | 0
.../pcisig.com => os/ubuntu.com}/Makefile.am | 0
data/{oses => os}/ubuntu.com/ubuntu-10.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-10.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-11.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-11.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-12.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-12.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-13.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-13.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-14.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-14.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-15.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-15.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-4.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-5.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-5.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-6.06.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-6.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-7.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-7.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-8.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-8.10.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-9.04.xml.in | 0
data/{oses => os}/ubuntu.com/ubuntu-9.10.xml.in | 0
data/{platforms => platform}/Makefile.am | 0
.../ibm.com => platform/linux-kvm.org}/Makefile.am | 0
.../linux-kvm.org/qemu-kvm-1.0.1.xml.in | 0
.../linux-kvm.org/qemu-kvm-1.0.xml.in | 0
.../linux-kvm.org/qemu-kvm-1.1.0.xml.in | 0
.../linux-kvm.org/qemu-kvm-1.1.1.xml.in | 0
.../linux-kvm.org/qemu-kvm-1.1.2.xml.in | 0
.../linux-kvm.org/qemu-kvm-1.2.0.xml.in | 0
.../qemu.org}/Makefile.am | 0
.../qemu.org/qemu-1.0.1.xml.in | 0
.../qemu.org/qemu-1.0.xml.in | 0
.../qemu.org/qemu-1.1.1-1.xml.in | 0
.../qemu.org/qemu-1.1.1.xml.in | 0
.../qemu.org/qemu-1.1.2.xml.in | 0
.../qemu.org/qemu-1.1.xml.in | 0
.../qemu.org/qemu-1.2.0.xml.in | 0
.../qemu.org/qemu-1.2.1.xml.in | 0
.../qemu.org/qemu-1.2.2.xml.in | 0
.../qemu.org/qemu-1.3.0.xml.in | 0
.../qemu.org/qemu-1.3.1.xml.in | 0
.../qemu.org/qemu-1.4.0.xml.in | 0
.../qemu.org/qemu-1.4.1.xml.in | 0
.../qemu.org/qemu-1.4.2.xml.in | 0
.../qemu.org/qemu-1.5.0.xml.in | 0
.../qemu.org/qemu-1.5.1.xml.in | 0
.../qemu.org/qemu-1.5.2.xml.in | 0
.../qemu.org/qemu-1.5.3.xml.in | 0
.../qemu.org/qemu-1.6.0.xml.in | 0
.../qemu.org/qemu-1.6.1.xml.in | 0
.../qemu.org/qemu-1.6.2.xml.in | 0
.../qemu.org/qemu-1.7.0.xml.in | 0
.../qemu.org/qemu-1.7.1.xml.in | 0
.../qemu.org/qemu-1.7.2.xml.in | 0
.../qemu.org/qemu-2.0.0.xml.in | 0
.../qemu.org/qemu-2.0.1.xml.in | 0
.../qemu.org/qemu-2.0.2.xml.in | 0
.../qemu.org/qemu-2.1.0.xml.in | 0
.../qemu.org/qemu-2.1.1.xml.in | 0
.../qemu.org/qemu-2.1.2.xml.in | 0
.../qemu.org/qemu-2.1.3.xml.in | 0
.../qemu.org/qemu-2.2.0.xml.in | 0
.../qemu.org/qemu-2.2.1.xml.in | 0
.../qemu.org/qemu-2.3.0.xml.in | 0
.../x.org => platform/redhat.com}/Makefile.am | 0
.../redhat.com/xen-rhel-3.0.3.5.0.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.1.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.2.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.3.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.4.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.5.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.6.xml.in | 0
.../redhat.com/xen-rhel-3.1.0.5.7.xml.in | 0
.../microsoft.com => platform/xen.org}/Makefile.am | 0
.../xen.org/xen-3.0.2.xml.in | 0
.../xen.org/xen-3.0.3.xml.in | 0
.../xen.org/xen-3.0.4.xml.in | 0
.../xen.org/xen-3.1.0.xml.in | 0
.../xen.org/xen-3.1.3.xml.in | 0
.../xen.org/xen-3.1.4.xml.in | 0
.../xen.org/xen-3.2.0.xml.in | 0
.../xen.org/xen-3.2.1.xml.in | 0
.../xen.org/xen-3.2.2.xml.in | 0
.../xen.org/xen-3.2.3.xml.in | 0
.../xen.org/xen-3.3.0.xml.in | 0
.../xen.org/xen-3.3.1.xml.in | 0
.../xen.org/xen-3.3.2.xml.in | 0
.../xen.org/xen-3.4.0.xml.in | 0
.../xen.org/xen-3.4.1.xml.in | 0
.../xen.org/xen-3.4.2.xml.in | 0
.../xen.org/xen-3.4.3.xml.in | 0
.../xen.org/xen-4.0.0.xml.in | 0
.../xen.org/xen-4.0.1.xml.in | 0
.../xen.org/xen-4.1.0.xml.in | 0
libosinfo.spec.in | 10 +-
mingw-libosinfo.spec.in | 20 +-
po/POTFILES.in | 806 ++++++++++-----------
test/test-xml-validate | 2 +-
493 files changed, 460 insertions(+), 460 deletions(-)
rename data/{datamaps => datamap}/Makefile.am (100%)
rename data/{platforms/xen.org => datamap/microsoft.com}/Makefile.am (100%)
rename data/{datamaps => datamap}/microsoft.com/win-7-l10n-language.xml.in (100%)
rename data/{datamaps => datamap}/microsoft.com/win-8-l10n-language-reverse.xml.in (100%)
rename data/{datamaps => datamap}/microsoft.com/win-8-l10n-language.xml.in (100%)
rename data/{platforms/redhat.com => datamap/x.org}/Makefile.am (100%)
rename data/{datamaps => datamap}/x.org/x11-keyboard.xml.in (100%)
rename data/{devices => device}/Makefile.am (100%)
rename data/{platforms/qemu.org => device/ibasetechnologies.net}/Makefile.am (100%)
rename data/{devices => device}/ibasetechnologies.net/isa-ib700.xml.in (100%)
rename data/{platforms/linux-kvm.org => device/ibm.com}/Makefile.am (100%)
rename data/{devices => device}/ibm.com/ps2-keyboard.xml.in (100%)
rename data/{devices => device}/ibm.com/ps2-mouse.xml.in (100%)
rename data/{oses/ubuntu.com => device/pcisig.com}/Makefile.am (100%)
rename data/{devices => device}/pcisig.com/pci-1000-0012.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1013-00b8.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1022-2000.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-10ec-8029.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-10ec-8139.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1234-1111.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1274-5000.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-15ad-0710.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1af4-1000.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1af4-1001.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1af4-1002.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1af4-1003.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1af4-1009.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-1b36-0100.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-8086-100e.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-8086-2415.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-8086-25ab.xml.in (100%)
rename data/{devices => device}/pcisig.com/pci-8086-2668.xml.in (100%)
rename data/{oses/suse.com => device/usb.org}/Makefile.am (100%)
rename data/{devices => device}/usb.org/usb-80ee-0021.xml.in (100%)
rename data/{oses/sun.com => device/xen.org}/Makefile.am (100%)
rename data/{devices => device}/xen.org/xen-console.xml.in (100%)
rename data/{devices => device}/xen.org/xen-pci.xml.in (100%)
rename data/{devices => device}/xen.org/xen-vbd.xml.in (100%)
rename data/{devices => device}/xen.org/xen-vfb.xml.in (100%)
rename data/{devices => device}/xen.org/xen-vif.xml.in (100%)
rename data/{devices => device}/xen.org/xen-vkbd.xml.in (100%)
rename data/{devices => device}/xen.org/xen-vscsi.xml.in (100%)
rename data/{devices => device}/xen.org/xen-vtpm.xml.in (100%)
rename data/{install-scripts => install-script}/Makefile.am (100%)
rename data/{oses/redhat.com => install-script/debian.org}/Makefile.am (100%)
rename data/{install-scripts => install-script}/debian.org/debian-preseed-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/debian.org/debian-preseed-jeos.xml.in (100%)
rename data/{oses/oracle.com => install-script/fedoraproject.org}/Makefile.am (100%)
rename data/{install-scripts => install-script}/fedoraproject.org/fedora-kickstart-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/fedoraproject.org/fedora-kickstart-jeos.xml.in (100%)
rename data/{oses/opensuse.org => install-script/microsoft.com}/Makefile.am (100%)
rename data/{install-scripts => install-script}/microsoft.com/windows-cmd-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/microsoft.com/windows-reg-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/microsoft.com/windows-sif-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/microsoft.com/windows-sif-jeos.xml.in (100%)
rename data/{install-scripts => install-script}/microsoft.com/windows-unattend-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/microsoft.com/windows-unattend-jeos.xml.in (100%)
rename data/{oses/openbsd.org => install-script/redhat.com}/Makefile.am (100%)
rename data/{install-scripts => install-script}/redhat.com/rhel-kickstart-desktop.xml.in (100%)
rename data/{install-scripts => install-script}/redhat.com/rhel-kickstart-jeos.xml.in (100%)
rename data/{oses/novell.com => install-script/ubuntu.com}/Makefile.am (100%)
rename data/{install-scripts => install-script}/ubuntu.com/ubuntu-preseed-jeos.xml.in (100%)
rename data/{oses => os}/Makefile.am (100%)
rename data/{oses/netbsd.org => os/altlinux.org}/Makefile.am (100%)
rename data/{oses => os}/altlinux.org/altlinux-1.0.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-2.0.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-2.2.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-2.4.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-3.0.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-4.0.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-4.1.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-5.0.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-6.0.xml.in (100%)
rename data/{oses => os}/altlinux.org/altlinux-7.0.xml.in (100%)
rename data/{oses/microsoft.com => os/apple.com}/Makefile.am (100%)
rename data/{oses => os}/apple.com/macosx-10.0.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.1.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.2.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.3.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.4.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.5.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.6.xml.in (100%)
rename data/{oses => os}/apple.com/macosx-10.7.xml.in (100%)
rename data/{oses/mandriva.com => os/centos.org}/Makefile.am (100%)
rename data/{oses => os}/centos.org/centos-6.0.xml.in (100%)
rename data/{oses => os}/centos.org/centos-6.1.xml.in (100%)
rename data/{oses => os}/centos.org/centos-6.2.xml.in (100%)
rename data/{oses => os}/centos.org/centos-6.3.xml.in (100%)
rename data/{oses => os}/centos.org/centos-6.4.xml.in (100%)
rename data/{oses => os}/centos.org/centos-6.5.xml.in (100%)
rename data/{oses => os}/centos.org/centos-7.0.xml.in (100%)
rename data/{oses/mageia.org => os/debian.org}/Makefile.am (100%)
rename data/{oses => os}/debian.org/debian-1.1.xml.in (100%)
rename data/{oses => os}/debian.org/debian-1.2.xml.in (100%)
rename data/{oses => os}/debian.org/debian-1.3.xml.in (100%)
rename data/{oses => os}/debian.org/debian-2.0.xml.in (100%)
rename data/{oses => os}/debian.org/debian-2.1.xml.in (100%)
rename data/{oses => os}/debian.org/debian-2.2.xml.in (100%)
rename data/{oses => os}/debian.org/debian-3.1.xml.in (100%)
rename data/{oses => os}/debian.org/debian-3.xml.in (100%)
rename data/{oses => os}/debian.org/debian-4.xml.in (100%)
rename data/{oses => os}/debian.org/debian-5.xml.in (100%)
rename data/{oses => os}/debian.org/debian-6.xml.in (100%)
rename data/{oses => os}/debian.org/debian-7.xml.in (100%)
rename data/{oses => os}/debian.org/debian-8.xml.in (100%)
rename data/{oses/gnome.org => os/fedoraproject.org}/Makefile.am (100%)
rename data/{oses => os}/fedoraproject.org/fedora-1.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-10.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-11.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-12.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-13.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-14.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-15.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-16.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-17.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-18.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-19.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-2.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-20.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-21.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-22.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-3.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-4.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-5.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-6.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-7.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-8.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-9.xml.in (100%)
rename data/{oses => os}/fedoraproject.org/fedora-unknown.xml.in (100%)
rename data/{oses => os}/freebsd.org/Makefile.am (100%)
rename data/{oses => os}/freebsd.org/freebsd-1.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-10.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-10.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-2.0.5.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-2.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-2.2.8.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-2.2.9.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-3.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-3.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.10.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.11.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.3.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.4.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.5.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.6.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.7.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.8.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-4.9.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.2.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.3.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.4.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-5.5.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-6.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-6.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-6.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-6.3.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-6.4.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-7.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-7.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-7.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-7.3.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-7.4.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-8.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-8.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-8.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-8.3.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-8.4.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-9.0.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-9.1.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-9.2.xml.in (100%)
rename data/{oses => os}/freebsd.org/freebsd-9.3.xml.in (100%)
rename data/{oses/fedoraproject.org => os/gnome.org}/Makefile.am (100%)
rename data/{oses => os}/gnome.org/gnome-3.6.xml.in (100%)
rename data/{oses => os}/gnome.org/gnome-3.8.xml.in (100%)
rename data/{oses => os}/gnome.org/gnome-continuous-3.10.xml.in (100%)
rename data/{oses => os}/gnome.org/gnome-continuous-3.12.xml.in (100%)
rename data/{oses => os}/gnome.org/gnome-continuous-3.14.xml.in (100%)
rename data/{oses/debian.org => os/mageia.org}/Makefile.am (100%)
rename data/{oses => os}/mageia.org/mageia-1.xml.in (100%)
rename data/{oses => os}/mageia.org/mageia-2.xml.in (100%)
rename data/{oses => os}/mageia.org/mageia-3.xml.in (100%)
rename data/{oses/centos.org => os/mandriva.com}/Makefile.am (100%)
rename data/{oses => os}/mandriva.com/mandrake-10.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-10.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-10.2.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-5.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-5.2.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-5.3.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-6.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-6.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-7.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-7.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-7.2.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-8.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-8.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-8.2.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-9.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-9.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandrake-9.2.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2006.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2007.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2007.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2008.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2008.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2009.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2009.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2010.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2010.1.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2010.2.xml.in (100%)
rename data/{oses => os}/mandriva.com/mandriva-2011.xml.in (100%)
rename data/{oses => os}/mandriva.com/mbs-1.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mes-5.0.xml.in (100%)
rename data/{oses => os}/mandriva.com/mes-5.1.xml.in (100%)
rename data/{oses/apple.com => os/microsoft.com}/Makefile.am (100%)
rename data/{oses => os}/microsoft.com/msdos-6.22.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-1.0.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-10.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2.0.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2.1.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k12.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k12r2.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k3.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k3r2.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k8.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-2k8r2.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-3.1.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-7.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-8.1.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-8.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-95.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-98.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-me.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-vista.xml.in (100%)
rename data/{oses => os}/microsoft.com/win-xp.xml.in (100%)
rename data/{oses => os}/microsoft.com/winnt-3.1.xml.in (100%)
rename data/{oses => os}/microsoft.com/winnt-3.5.xml.in (100%)
rename data/{oses => os}/microsoft.com/winnt-3.51.xml.in (100%)
rename data/{oses => os}/microsoft.com/winnt-4.0.xml.in (100%)
rename data/{oses/altlinux.org => os/netbsd.org}/Makefile.am (100%)
rename data/{oses => os}/netbsd.org/netbsd-0.8.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-0.9.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.0.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.1.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.2.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.3.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.4.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.5.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-1.6.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-2.0.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-3.0.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-4.0.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-5.0.xml.in (100%)
rename data/{oses => os}/netbsd.org/netbsd-5.1.xml.in (100%)
rename data/{install-scripts/ubuntu.com => os/novell.com}/Makefile.am (100%)
rename data/{oses => os}/novell.com/netware-4.xml.in (100%)
rename data/{oses => os}/novell.com/netware-5.xml.in (100%)
rename data/{oses => os}/novell.com/netware-6.xml.in (100%)
rename data/{install-scripts/redhat.com => os/openbsd.org}/Makefile.am (100%)
rename data/{oses => os}/openbsd.org/openbsd-4.2.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-4.3.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-4.4.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-4.5.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-4.8.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-4.9.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.0.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.1.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.2.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.3.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.4.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.5.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.6.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.7.xml.in (100%)
rename data/{oses => os}/openbsd.org/openbsd-5.8.xml.in (100%)
rename data/{install-scripts/microsoft.com => os/opensuse.org}/Makefile.am (100%)
rename data/{oses => os}/opensuse.org/opensuse-10.2.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-10.3.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-11.0.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-11.1.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-11.2.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-11.3.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-11.4.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-12.1.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-12.2.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-12.3.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-13.1.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-13.2.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-factory.xml.in (100%)
rename data/{oses => os}/opensuse.org/opensuse-unknown.xml.in (100%)
rename data/{install-scripts/fedoraproject.org => os/oracle.com}/Makefile.am (100%)
rename data/{oses => os}/oracle.com/solaris-11.xml.in (100%)
rename data/{install-scripts/debian.org => os/redhat.com}/Makefile.am (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.4.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.5.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.6.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.7.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-2.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.4.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.5.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.6.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.7.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.8.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.9.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.4.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.5.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.6.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.7.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.8.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-4.9.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.10.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.11.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.4.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.5.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.6.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.7.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.8.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-5.9.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.4.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.5.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-6.6.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-7.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-7.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-atomic-7.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhel-atomic-7.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-1.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-1.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-2.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-2.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-3.0.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-4.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-4.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-4.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-5.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-5.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-5.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-6.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-6.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-6.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-7.1.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-7.2.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-7.3.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-7.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-8.0.xml.in (100%)
rename data/{oses => os}/redhat.com/rhl-9.xml.in (100%)
rename data/{devices/xen.org => os/sun.com}/Makefile.am (100%)
rename data/{oses => os}/sun.com/opensolaris-2009.06.xml.in (100%)
rename data/{oses => os}/sun.com/solaris-10.xml.in (100%)
rename data/{oses => os}/sun.com/solaris-9.xml.in (100%)
rename data/{devices/usb.org => os/suse.com}/Makefile.am (100%)
rename data/{oses => os}/suse.com/sled-10.xml.in (100%)
rename data/{oses => os}/suse.com/sled-11.1.xml.in (100%)
rename data/{oses => os}/suse.com/sled-11.2.xml.in (100%)
rename data/{oses => os}/suse.com/sled-11.3.xml.in (100%)
rename data/{oses => os}/suse.com/sled-11.4.xml.in (100%)
rename data/{oses => os}/suse.com/sled-11.xml.in (100%)
rename data/{oses => os}/suse.com/sled-12.xml.in (100%)
rename data/{oses => os}/suse.com/sled-9.xml.in (100%)
rename data/{oses => os}/suse.com/sles-10.xml.in (100%)
rename data/{oses => os}/suse.com/sles-11.1.xml.in (100%)
rename data/{oses => os}/suse.com/sles-11.2.xml.in (100%)
rename data/{oses => os}/suse.com/sles-11.3.xml.in (100%)
rename data/{oses => os}/suse.com/sles-11.4.xml.in (100%)
rename data/{oses => os}/suse.com/sles-11.xml.in (100%)
rename data/{oses => os}/suse.com/sles-12.xml.in (100%)
rename data/{oses => os}/suse.com/sles-9.xml.in (100%)
rename data/{devices/pcisig.com => os/ubuntu.com}/Makefile.am (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-10.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-10.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-11.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-11.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-12.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-12.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-13.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-13.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-14.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-14.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-15.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-15.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-4.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-5.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-5.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-6.06.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-6.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-7.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-7.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-8.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-8.10.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-9.04.xml.in (100%)
rename data/{oses => os}/ubuntu.com/ubuntu-9.10.xml.in (100%)
rename data/{platforms => platform}/Makefile.am (100%)
rename data/{devices/ibm.com => platform/linux-kvm.org}/Makefile.am (100%)
rename data/{platforms => platform}/linux-kvm.org/qemu-kvm-1.0.1.xml.in (100%)
rename data/{platforms => platform}/linux-kvm.org/qemu-kvm-1.0.xml.in (100%)
rename data/{platforms => platform}/linux-kvm.org/qemu-kvm-1.1.0.xml.in (100%)
rename data/{platforms => platform}/linux-kvm.org/qemu-kvm-1.1.1.xml.in (100%)
rename data/{platforms => platform}/linux-kvm.org/qemu-kvm-1.1.2.xml.in (100%)
rename data/{platforms => platform}/linux-kvm.org/qemu-kvm-1.2.0.xml.in (100%)
rename data/{devices/ibasetechnologies.net => platform/qemu.org}/Makefile.am (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.0.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.1.1-1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.1.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.1.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.2.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.2.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.2.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.3.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.3.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.4.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.4.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.4.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.5.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.5.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.5.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.5.3.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.6.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.6.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.6.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.7.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.7.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-1.7.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.0.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.0.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.0.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.1.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.1.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.1.2.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.1.3.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.2.0.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.2.1.xml.in (100%)
rename data/{platforms => platform}/qemu.org/qemu-2.3.0.xml.in (100%)
rename data/{datamaps/x.org => platform/redhat.com}/Makefile.am (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.0.3.5.0.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.1.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.2.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.3.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.4.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.5.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.6.xml.in (100%)
rename data/{platforms => platform}/redhat.com/xen-rhel-3.1.0.5.7.xml.in (100%)
rename data/{datamaps/microsoft.com => platform/xen.org}/Makefile.am (100%)
rename data/{platforms => platform}/xen.org/xen-3.0.2.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.0.3.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.0.4.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.1.0.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.1.3.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.1.4.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.2.0.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.2.1.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.2.2.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.2.3.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.3.0.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.3.1.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.3.2.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.4.0.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.4.1.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.4.2.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-3.4.3.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-4.0.0.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-4.0.1.xml.in (100%)
rename data/{platforms => platform}/xen.org/xen-4.1.0.xml.in (100%)
diff --git a/configure.ac b/configure.ac
index 2af5e07..465a16c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,46 +167,46 @@ AC_CONFIG_FILES([
osinfo/libosinfo-1.0.pc
osinfo/osinfo_version.h
data/Makefile
- data/datamaps/Makefile
- data/datamaps/microsoft.com/Makefile
- data/datamaps/x.org/Makefile
- data/devices/Makefile
- data/devices/ibasetechnologies.net/Makefile
- data/devices/ibm.com/Makefile
- data/devices/pcisig.com/Makefile
- data/devices/usb.org/Makefile
- data/devices/xen.org/Makefile
- data/platforms/Makefile
- data/platforms/linux-kvm.org/Makefile
- data/platforms/qemu.org/Makefile
- data/platforms/redhat.com/Makefile
- data/platforms/xen.org/Makefile
- data/install-scripts/Makefile
- data/install-scripts/debian.org/Makefile
- data/install-scripts/fedoraproject.org/Makefile
- data/install-scripts/microsoft.com/Makefile
- data/install-scripts/redhat.com/Makefile
- data/install-scripts/ubuntu.com/Makefile
- data/oses/Makefile
- data/oses/altlinux.org/Makefile
- data/oses/apple.com/Makefile
- data/oses/centos.org/Makefile
- data/oses/debian.org/Makefile
- data/oses/fedoraproject.org/Makefile
- data/oses/freebsd.org/Makefile
- data/oses/gnome.org/Makefile
- data/oses/mageia.org/Makefile
- data/oses/mandriva.com/Makefile
- data/oses/microsoft.com/Makefile
- data/oses/netbsd.org/Makefile
- data/oses/novell.com/Makefile
- data/oses/openbsd.org/Makefile
- data/oses/opensuse.org/Makefile
- data/oses/oracle.com/Makefile
- data/oses/redhat.com/Makefile
- data/oses/sun.com/Makefile
- data/oses/suse.com/Makefile
- data/oses/ubuntu.com/Makefile
+ data/datamap/Makefile
+ data/datamap/microsoft.com/Makefile
+ data/datamap/x.org/Makefile
+ data/device/Makefile
+ data/device/ibasetechnologies.net/Makefile
+ data/device/ibm.com/Makefile
+ data/device/pcisig.com/Makefile
+ data/device/usb.org/Makefile
+ data/device/xen.org/Makefile
+ data/platform/Makefile
+ data/platform/linux-kvm.org/Makefile
+ data/platform/qemu.org/Makefile
+ data/platform/redhat.com/Makefile
+ data/platform/xen.org/Makefile
+ data/install-script/Makefile
+ data/install-script/debian.org/Makefile
+ data/install-script/fedoraproject.org/Makefile
+ data/install-script/microsoft.com/Makefile
+ data/install-script/redhat.com/Makefile
+ data/install-script/ubuntu.com/Makefile
+ data/os/Makefile
+ data/os/altlinux.org/Makefile
+ data/os/apple.com/Makefile
+ data/os/centos.org/Makefile
+ data/os/debian.org/Makefile
+ data/os/fedoraproject.org/Makefile
+ data/os/freebsd.org/Makefile
+ data/os/gnome.org/Makefile
+ data/os/mageia.org/Makefile
+ data/os/mandriva.com/Makefile
+ data/os/microsoft.com/Makefile
+ data/os/netbsd.org/Makefile
+ data/os/novell.com/Makefile
+ data/os/openbsd.org/Makefile
+ data/os/opensuse.org/Makefile
+ data/os/oracle.com/Makefile
+ data/os/redhat.com/Makefile
+ data/os/sun.com/Makefile
+ data/os/suse.com/Makefile
+ data/os/ubuntu.com/Makefile
data/schemas/Makefile
tools/Makefile
test/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index a29fde1..2001b42 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
INSTALL_DATA_HOOK_DEPS =
-SUBDIRS = datamaps devices oses platforms install-scripts schemas
+SUBDIRS = datamap device os platform install-script schemas
EXTRA_DIST = usb.ids pci.ids
CLEANFILES = usb.ids pci.ids
diff --git a/data/datamaps/Makefile.am b/data/datamap/Makefile.am
similarity index 100%
rename from data/datamaps/Makefile.am
rename to data/datamap/Makefile.am
diff --git a/data/platforms/xen.org/Makefile.am b/data/datamap/microsoft.com/Makefile.am
similarity index 100%
rename from data/platforms/xen.org/Makefile.am
rename to data/datamap/microsoft.com/Makefile.am
diff --git a/data/datamaps/microsoft.com/win-7-l10n-language.xml.in b/data/datamap/microsoft.com/win-7-l10n-language.xml.in
similarity index 100%
rename from data/datamaps/microsoft.com/win-7-l10n-language.xml.in
rename to data/datamap/microsoft.com/win-7-l10n-language.xml.in
diff --git a/data/datamaps/microsoft.com/win-8-l10n-language-reverse.xml.in b/data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in
similarity index 100%
rename from data/datamaps/microsoft.com/win-8-l10n-language-reverse.xml.in
rename to data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in
diff --git a/data/datamaps/microsoft.com/win-8-l10n-language.xml.in b/data/datamap/microsoft.com/win-8-l10n-language.xml.in
similarity index 100%
rename from data/datamaps/microsoft.com/win-8-l10n-language.xml.in
rename to data/datamap/microsoft.com/win-8-l10n-language.xml.in
diff --git a/data/platforms/redhat.com/Makefile.am b/data/datamap/x.org/Makefile.am
similarity index 100%
rename from data/platforms/redhat.com/Makefile.am
rename to data/datamap/x.org/Makefile.am
diff --git a/data/datamaps/x.org/x11-keyboard.xml.in b/data/datamap/x.org/x11-keyboard.xml.in
similarity index 100%
rename from data/datamaps/x.org/x11-keyboard.xml.in
rename to data/datamap/x.org/x11-keyboard.xml.in
diff --git a/data/devices/Makefile.am b/data/device/Makefile.am
similarity index 100%
rename from data/devices/Makefile.am
rename to data/device/Makefile.am
diff --git a/data/platforms/qemu.org/Makefile.am b/data/device/ibasetechnologies.net/Makefile.am
similarity index 100%
rename from data/platforms/qemu.org/Makefile.am
rename to data/device/ibasetechnologies.net/Makefile.am
diff --git a/data/devices/ibasetechnologies.net/isa-ib700.xml.in b/data/device/ibasetechnologies.net/isa-ib700.xml.in
similarity index 100%
rename from data/devices/ibasetechnologies.net/isa-ib700.xml.in
rename to data/device/ibasetechnologies.net/isa-ib700.xml.in
diff --git a/data/platforms/linux-kvm.org/Makefile.am b/data/device/ibm.com/Makefile.am
similarity index 100%
rename from data/platforms/linux-kvm.org/Makefile.am
rename to data/device/ibm.com/Makefile.am
diff --git a/data/devices/ibm.com/ps2-keyboard.xml.in b/data/device/ibm.com/ps2-keyboard.xml.in
similarity index 100%
rename from data/devices/ibm.com/ps2-keyboard.xml.in
rename to data/device/ibm.com/ps2-keyboard.xml.in
diff --git a/data/devices/ibm.com/ps2-mouse.xml.in b/data/device/ibm.com/ps2-mouse.xml.in
similarity index 100%
rename from data/devices/ibm.com/ps2-mouse.xml.in
rename to data/device/ibm.com/ps2-mouse.xml.in
diff --git a/data/oses/ubuntu.com/Makefile.am b/data/device/pcisig.com/Makefile.am
similarity index 100%
rename from data/oses/ubuntu.com/Makefile.am
rename to data/device/pcisig.com/Makefile.am
diff --git a/data/devices/pcisig.com/pci-1000-0012.xml.in b/data/device/pcisig.com/pci-1000-0012.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1000-0012.xml.in
rename to data/device/pcisig.com/pci-1000-0012.xml.in
diff --git a/data/devices/pcisig.com/pci-1013-00b8.xml.in b/data/device/pcisig.com/pci-1013-00b8.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1013-00b8.xml.in
rename to data/device/pcisig.com/pci-1013-00b8.xml.in
diff --git a/data/devices/pcisig.com/pci-1022-2000.xml.in b/data/device/pcisig.com/pci-1022-2000.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1022-2000.xml.in
rename to data/device/pcisig.com/pci-1022-2000.xml.in
diff --git a/data/devices/pcisig.com/pci-10ec-8029.xml.in b/data/device/pcisig.com/pci-10ec-8029.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-10ec-8029.xml.in
rename to data/device/pcisig.com/pci-10ec-8029.xml.in
diff --git a/data/devices/pcisig.com/pci-10ec-8139.xml.in b/data/device/pcisig.com/pci-10ec-8139.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-10ec-8139.xml.in
rename to data/device/pcisig.com/pci-10ec-8139.xml.in
diff --git a/data/devices/pcisig.com/pci-1234-1111.xml.in b/data/device/pcisig.com/pci-1234-1111.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1234-1111.xml.in
rename to data/device/pcisig.com/pci-1234-1111.xml.in
diff --git a/data/devices/pcisig.com/pci-1274-5000.xml.in b/data/device/pcisig.com/pci-1274-5000.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1274-5000.xml.in
rename to data/device/pcisig.com/pci-1274-5000.xml.in
diff --git a/data/devices/pcisig.com/pci-15ad-0710.xml.in b/data/device/pcisig.com/pci-15ad-0710.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-15ad-0710.xml.in
rename to data/device/pcisig.com/pci-15ad-0710.xml.in
diff --git a/data/devices/pcisig.com/pci-1af4-1000.xml.in b/data/device/pcisig.com/pci-1af4-1000.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1af4-1000.xml.in
rename to data/device/pcisig.com/pci-1af4-1000.xml.in
diff --git a/data/devices/pcisig.com/pci-1af4-1001.xml.in b/data/device/pcisig.com/pci-1af4-1001.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1af4-1001.xml.in
rename to data/device/pcisig.com/pci-1af4-1001.xml.in
diff --git a/data/devices/pcisig.com/pci-1af4-1002.xml.in b/data/device/pcisig.com/pci-1af4-1002.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1af4-1002.xml.in
rename to data/device/pcisig.com/pci-1af4-1002.xml.in
diff --git a/data/devices/pcisig.com/pci-1af4-1003.xml.in b/data/device/pcisig.com/pci-1af4-1003.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1af4-1003.xml.in
rename to data/device/pcisig.com/pci-1af4-1003.xml.in
diff --git a/data/devices/pcisig.com/pci-1af4-1009.xml.in b/data/device/pcisig.com/pci-1af4-1009.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1af4-1009.xml.in
rename to data/device/pcisig.com/pci-1af4-1009.xml.in
diff --git a/data/devices/pcisig.com/pci-1b36-0100.xml.in b/data/device/pcisig.com/pci-1b36-0100.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-1b36-0100.xml.in
rename to data/device/pcisig.com/pci-1b36-0100.xml.in
diff --git a/data/devices/pcisig.com/pci-8086-100e.xml.in b/data/device/pcisig.com/pci-8086-100e.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-8086-100e.xml.in
rename to data/device/pcisig.com/pci-8086-100e.xml.in
diff --git a/data/devices/pcisig.com/pci-8086-2415.xml.in b/data/device/pcisig.com/pci-8086-2415.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-8086-2415.xml.in
rename to data/device/pcisig.com/pci-8086-2415.xml.in
diff --git a/data/devices/pcisig.com/pci-8086-25ab.xml.in b/data/device/pcisig.com/pci-8086-25ab.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-8086-25ab.xml.in
rename to data/device/pcisig.com/pci-8086-25ab.xml.in
diff --git a/data/devices/pcisig.com/pci-8086-2668.xml.in b/data/device/pcisig.com/pci-8086-2668.xml.in
similarity index 100%
rename from data/devices/pcisig.com/pci-8086-2668.xml.in
rename to data/device/pcisig.com/pci-8086-2668.xml.in
diff --git a/data/oses/suse.com/Makefile.am b/data/device/usb.org/Makefile.am
similarity index 100%
rename from data/oses/suse.com/Makefile.am
rename to data/device/usb.org/Makefile.am
diff --git a/data/devices/usb.org/usb-80ee-0021.xml.in b/data/device/usb.org/usb-80ee-0021.xml.in
similarity index 100%
rename from data/devices/usb.org/usb-80ee-0021.xml.in
rename to data/device/usb.org/usb-80ee-0021.xml.in
diff --git a/data/oses/sun.com/Makefile.am b/data/device/xen.org/Makefile.am
similarity index 100%
rename from data/oses/sun.com/Makefile.am
rename to data/device/xen.org/Makefile.am
diff --git a/data/devices/xen.org/xen-console.xml.in b/data/device/xen.org/xen-console.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-console.xml.in
rename to data/device/xen.org/xen-console.xml.in
diff --git a/data/devices/xen.org/xen-pci.xml.in b/data/device/xen.org/xen-pci.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-pci.xml.in
rename to data/device/xen.org/xen-pci.xml.in
diff --git a/data/devices/xen.org/xen-vbd.xml.in b/data/device/xen.org/xen-vbd.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-vbd.xml.in
rename to data/device/xen.org/xen-vbd.xml.in
diff --git a/data/devices/xen.org/xen-vfb.xml.in b/data/device/xen.org/xen-vfb.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-vfb.xml.in
rename to data/device/xen.org/xen-vfb.xml.in
diff --git a/data/devices/xen.org/xen-vif.xml.in b/data/device/xen.org/xen-vif.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-vif.xml.in
rename to data/device/xen.org/xen-vif.xml.in
diff --git a/data/devices/xen.org/xen-vkbd.xml.in b/data/device/xen.org/xen-vkbd.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-vkbd.xml.in
rename to data/device/xen.org/xen-vkbd.xml.in
diff --git a/data/devices/xen.org/xen-vscsi.xml.in b/data/device/xen.org/xen-vscsi.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-vscsi.xml.in
rename to data/device/xen.org/xen-vscsi.xml.in
diff --git a/data/devices/xen.org/xen-vtpm.xml.in b/data/device/xen.org/xen-vtpm.xml.in
similarity index 100%
rename from data/devices/xen.org/xen-vtpm.xml.in
rename to data/device/xen.org/xen-vtpm.xml.in
diff --git a/data/install-scripts/Makefile.am b/data/install-script/Makefile.am
similarity index 100%
rename from data/install-scripts/Makefile.am
rename to data/install-script/Makefile.am
diff --git a/data/oses/redhat.com/Makefile.am b/data/install-script/debian.org/Makefile.am
similarity index 100%
rename from data/oses/redhat.com/Makefile.am
rename to data/install-script/debian.org/Makefile.am
diff --git a/data/install-scripts/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in
similarity index 100%
rename from data/install-scripts/debian.org/debian-preseed-desktop.xml.in
rename to data/install-script/debian.org/debian-preseed-desktop.xml.in
diff --git a/data/install-scripts/debian.org/debian-preseed-jeos.xml.in b/data/install-script/debian.org/debian-preseed-jeos.xml.in
similarity index 100%
rename from data/install-scripts/debian.org/debian-preseed-jeos.xml.in
rename to data/install-script/debian.org/debian-preseed-jeos.xml.in
diff --git a/data/oses/oracle.com/Makefile.am b/data/install-script/fedoraproject.org/Makefile.am
similarity index 100%
rename from data/oses/oracle.com/Makefile.am
rename to data/install-script/fedoraproject.org/Makefile.am
diff --git a/data/install-scripts/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
similarity index 100%
rename from data/install-scripts/fedoraproject.org/fedora-kickstart-desktop.xml.in
rename to data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
diff --git a/data/install-scripts/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
similarity index 100%
rename from data/install-scripts/fedoraproject.org/fedora-kickstart-jeos.xml.in
rename to data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
diff --git a/data/oses/opensuse.org/Makefile.am b/data/install-script/microsoft.com/Makefile.am
similarity index 100%
rename from data/oses/opensuse.org/Makefile.am
rename to data/install-script/microsoft.com/Makefile.am
diff --git a/data/install-scripts/microsoft.com/windows-cmd-desktop.xml.in b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
similarity index 100%
rename from data/install-scripts/microsoft.com/windows-cmd-desktop.xml.in
rename to data/install-script/microsoft.com/windows-cmd-desktop.xml.in
diff --git a/data/install-scripts/microsoft.com/windows-reg-desktop.xml.in b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
similarity index 100%
rename from data/install-scripts/microsoft.com/windows-reg-desktop.xml.in
rename to data/install-script/microsoft.com/windows-reg-desktop.xml.in
diff --git a/data/install-scripts/microsoft.com/windows-sif-desktop.xml.in b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
similarity index 100%
rename from data/install-scripts/microsoft.com/windows-sif-desktop.xml.in
rename to data/install-script/microsoft.com/windows-sif-desktop.xml.in
diff --git a/data/install-scripts/microsoft.com/windows-sif-jeos.xml.in b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
similarity index 100%
rename from data/install-scripts/microsoft.com/windows-sif-jeos.xml.in
rename to data/install-script/microsoft.com/windows-sif-jeos.xml.in
diff --git a/data/install-scripts/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
similarity index 100%
rename from data/install-scripts/microsoft.com/windows-unattend-desktop.xml.in
rename to data/install-script/microsoft.com/windows-unattend-desktop.xml.in
diff --git a/data/install-scripts/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
similarity index 100%
rename from data/install-scripts/microsoft.com/windows-unattend-jeos.xml.in
rename to data/install-script/microsoft.com/windows-unattend-jeos.xml.in
diff --git a/data/oses/openbsd.org/Makefile.am b/data/install-script/redhat.com/Makefile.am
similarity index 100%
rename from data/oses/openbsd.org/Makefile.am
rename to data/install-script/redhat.com/Makefile.am
diff --git a/data/install-scripts/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
similarity index 100%
rename from data/install-scripts/redhat.com/rhel-kickstart-desktop.xml.in
rename to data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
diff --git a/data/install-scripts/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
similarity index 100%
rename from data/install-scripts/redhat.com/rhel-kickstart-jeos.xml.in
rename to data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
diff --git a/data/oses/novell.com/Makefile.am b/data/install-script/ubuntu.com/Makefile.am
similarity index 100%
rename from data/oses/novell.com/Makefile.am
rename to data/install-script/ubuntu.com/Makefile.am
diff --git a/data/install-scripts/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
similarity index 100%
rename from data/install-scripts/ubuntu.com/ubuntu-preseed-jeos.xml.in
rename to data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
diff --git a/data/oses/Makefile.am b/data/os/Makefile.am
similarity index 100%
rename from data/oses/Makefile.am
rename to data/os/Makefile.am
diff --git a/data/oses/netbsd.org/Makefile.am b/data/os/altlinux.org/Makefile.am
similarity index 100%
rename from data/oses/netbsd.org/Makefile.am
rename to data/os/altlinux.org/Makefile.am
diff --git a/data/oses/altlinux.org/altlinux-1.0.xml.in b/data/os/altlinux.org/altlinux-1.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-1.0.xml.in
rename to data/os/altlinux.org/altlinux-1.0.xml.in
diff --git a/data/oses/altlinux.org/altlinux-2.0.xml.in b/data/os/altlinux.org/altlinux-2.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-2.0.xml.in
rename to data/os/altlinux.org/altlinux-2.0.xml.in
diff --git a/data/oses/altlinux.org/altlinux-2.2.xml.in b/data/os/altlinux.org/altlinux-2.2.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-2.2.xml.in
rename to data/os/altlinux.org/altlinux-2.2.xml.in
diff --git a/data/oses/altlinux.org/altlinux-2.4.xml.in b/data/os/altlinux.org/altlinux-2.4.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-2.4.xml.in
rename to data/os/altlinux.org/altlinux-2.4.xml.in
diff --git a/data/oses/altlinux.org/altlinux-3.0.xml.in b/data/os/altlinux.org/altlinux-3.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-3.0.xml.in
rename to data/os/altlinux.org/altlinux-3.0.xml.in
diff --git a/data/oses/altlinux.org/altlinux-4.0.xml.in b/data/os/altlinux.org/altlinux-4.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-4.0.xml.in
rename to data/os/altlinux.org/altlinux-4.0.xml.in
diff --git a/data/oses/altlinux.org/altlinux-4.1.xml.in b/data/os/altlinux.org/altlinux-4.1.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-4.1.xml.in
rename to data/os/altlinux.org/altlinux-4.1.xml.in
diff --git a/data/oses/altlinux.org/altlinux-5.0.xml.in b/data/os/altlinux.org/altlinux-5.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-5.0.xml.in
rename to data/os/altlinux.org/altlinux-5.0.xml.in
diff --git a/data/oses/altlinux.org/altlinux-6.0.xml.in b/data/os/altlinux.org/altlinux-6.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-6.0.xml.in
rename to data/os/altlinux.org/altlinux-6.0.xml.in
diff --git a/data/oses/altlinux.org/altlinux-7.0.xml.in b/data/os/altlinux.org/altlinux-7.0.xml.in
similarity index 100%
rename from data/oses/altlinux.org/altlinux-7.0.xml.in
rename to data/os/altlinux.org/altlinux-7.0.xml.in
diff --git a/data/oses/microsoft.com/Makefile.am b/data/os/apple.com/Makefile.am
similarity index 100%
rename from data/oses/microsoft.com/Makefile.am
rename to data/os/apple.com/Makefile.am
diff --git a/data/oses/apple.com/macosx-10.0.xml.in b/data/os/apple.com/macosx-10.0.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.0.xml.in
rename to data/os/apple.com/macosx-10.0.xml.in
diff --git a/data/oses/apple.com/macosx-10.1.xml.in b/data/os/apple.com/macosx-10.1.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.1.xml.in
rename to data/os/apple.com/macosx-10.1.xml.in
diff --git a/data/oses/apple.com/macosx-10.2.xml.in b/data/os/apple.com/macosx-10.2.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.2.xml.in
rename to data/os/apple.com/macosx-10.2.xml.in
diff --git a/data/oses/apple.com/macosx-10.3.xml.in b/data/os/apple.com/macosx-10.3.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.3.xml.in
rename to data/os/apple.com/macosx-10.3.xml.in
diff --git a/data/oses/apple.com/macosx-10.4.xml.in b/data/os/apple.com/macosx-10.4.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.4.xml.in
rename to data/os/apple.com/macosx-10.4.xml.in
diff --git a/data/oses/apple.com/macosx-10.5.xml.in b/data/os/apple.com/macosx-10.5.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.5.xml.in
rename to data/os/apple.com/macosx-10.5.xml.in
diff --git a/data/oses/apple.com/macosx-10.6.xml.in b/data/os/apple.com/macosx-10.6.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.6.xml.in
rename to data/os/apple.com/macosx-10.6.xml.in
diff --git a/data/oses/apple.com/macosx-10.7.xml.in b/data/os/apple.com/macosx-10.7.xml.in
similarity index 100%
rename from data/oses/apple.com/macosx-10.7.xml.in
rename to data/os/apple.com/macosx-10.7.xml.in
diff --git a/data/oses/mandriva.com/Makefile.am b/data/os/centos.org/Makefile.am
similarity index 100%
rename from data/oses/mandriva.com/Makefile.am
rename to data/os/centos.org/Makefile.am
diff --git a/data/oses/centos.org/centos-6.0.xml.in b/data/os/centos.org/centos-6.0.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-6.0.xml.in
rename to data/os/centos.org/centos-6.0.xml.in
diff --git a/data/oses/centos.org/centos-6.1.xml.in b/data/os/centos.org/centos-6.1.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-6.1.xml.in
rename to data/os/centos.org/centos-6.1.xml.in
diff --git a/data/oses/centos.org/centos-6.2.xml.in b/data/os/centos.org/centos-6.2.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-6.2.xml.in
rename to data/os/centos.org/centos-6.2.xml.in
diff --git a/data/oses/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-6.3.xml.in
rename to data/os/centos.org/centos-6.3.xml.in
diff --git a/data/oses/centos.org/centos-6.4.xml.in b/data/os/centos.org/centos-6.4.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-6.4.xml.in
rename to data/os/centos.org/centos-6.4.xml.in
diff --git a/data/oses/centos.org/centos-6.5.xml.in b/data/os/centos.org/centos-6.5.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-6.5.xml.in
rename to data/os/centos.org/centos-6.5.xml.in
diff --git a/data/oses/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
similarity index 100%
rename from data/oses/centos.org/centos-7.0.xml.in
rename to data/os/centos.org/centos-7.0.xml.in
diff --git a/data/oses/mageia.org/Makefile.am b/data/os/debian.org/Makefile.am
similarity index 100%
rename from data/oses/mageia.org/Makefile.am
rename to data/os/debian.org/Makefile.am
diff --git a/data/oses/debian.org/debian-1.1.xml.in b/data/os/debian.org/debian-1.1.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-1.1.xml.in
rename to data/os/debian.org/debian-1.1.xml.in
diff --git a/data/oses/debian.org/debian-1.2.xml.in b/data/os/debian.org/debian-1.2.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-1.2.xml.in
rename to data/os/debian.org/debian-1.2.xml.in
diff --git a/data/oses/debian.org/debian-1.3.xml.in b/data/os/debian.org/debian-1.3.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-1.3.xml.in
rename to data/os/debian.org/debian-1.3.xml.in
diff --git a/data/oses/debian.org/debian-2.0.xml.in b/data/os/debian.org/debian-2.0.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-2.0.xml.in
rename to data/os/debian.org/debian-2.0.xml.in
diff --git a/data/oses/debian.org/debian-2.1.xml.in b/data/os/debian.org/debian-2.1.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-2.1.xml.in
rename to data/os/debian.org/debian-2.1.xml.in
diff --git a/data/oses/debian.org/debian-2.2.xml.in b/data/os/debian.org/debian-2.2.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-2.2.xml.in
rename to data/os/debian.org/debian-2.2.xml.in
diff --git a/data/oses/debian.org/debian-3.1.xml.in b/data/os/debian.org/debian-3.1.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-3.1.xml.in
rename to data/os/debian.org/debian-3.1.xml.in
diff --git a/data/oses/debian.org/debian-3.xml.in b/data/os/debian.org/debian-3.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-3.xml.in
rename to data/os/debian.org/debian-3.xml.in
diff --git a/data/oses/debian.org/debian-4.xml.in b/data/os/debian.org/debian-4.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-4.xml.in
rename to data/os/debian.org/debian-4.xml.in
diff --git a/data/oses/debian.org/debian-5.xml.in b/data/os/debian.org/debian-5.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-5.xml.in
rename to data/os/debian.org/debian-5.xml.in
diff --git a/data/oses/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-6.xml.in
rename to data/os/debian.org/debian-6.xml.in
diff --git a/data/oses/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-7.xml.in
rename to data/os/debian.org/debian-7.xml.in
diff --git a/data/oses/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
similarity index 100%
rename from data/oses/debian.org/debian-8.xml.in
rename to data/os/debian.org/debian-8.xml.in
diff --git a/data/oses/gnome.org/Makefile.am b/data/os/fedoraproject.org/Makefile.am
similarity index 100%
rename from data/oses/gnome.org/Makefile.am
rename to data/os/fedoraproject.org/Makefile.am
diff --git a/data/oses/fedoraproject.org/fedora-1.xml.in b/data/os/fedoraproject.org/fedora-1.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-1.xml.in
rename to data/os/fedoraproject.org/fedora-1.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-10.xml.in b/data/os/fedoraproject.org/fedora-10.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-10.xml.in
rename to data/os/fedoraproject.org/fedora-10.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-11.xml.in b/data/os/fedoraproject.org/fedora-11.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-11.xml.in
rename to data/os/fedoraproject.org/fedora-11.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-12.xml.in b/data/os/fedoraproject.org/fedora-12.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-12.xml.in
rename to data/os/fedoraproject.org/fedora-12.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-13.xml.in b/data/os/fedoraproject.org/fedora-13.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-13.xml.in
rename to data/os/fedoraproject.org/fedora-13.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-14.xml.in
rename to data/os/fedoraproject.org/fedora-14.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-15.xml.in
rename to data/os/fedoraproject.org/fedora-15.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-16.xml.in
rename to data/os/fedoraproject.org/fedora-16.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-17.xml.in
rename to data/os/fedoraproject.org/fedora-17.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-18.xml.in
rename to data/os/fedoraproject.org/fedora-18.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-19.xml.in
rename to data/os/fedoraproject.org/fedora-19.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-2.xml.in b/data/os/fedoraproject.org/fedora-2.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-2.xml.in
rename to data/os/fedoraproject.org/fedora-2.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-20.xml.in
rename to data/os/fedoraproject.org/fedora-20.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-21.xml.in
rename to data/os/fedoraproject.org/fedora-21.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-22.xml.in b/data/os/fedoraproject.org/fedora-22.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-22.xml.in
rename to data/os/fedoraproject.org/fedora-22.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-3.xml.in b/data/os/fedoraproject.org/fedora-3.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-3.xml.in
rename to data/os/fedoraproject.org/fedora-3.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-4.xml.in b/data/os/fedoraproject.org/fedora-4.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-4.xml.in
rename to data/os/fedoraproject.org/fedora-4.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-5.xml.in b/data/os/fedoraproject.org/fedora-5.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-5.xml.in
rename to data/os/fedoraproject.org/fedora-5.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-6.xml.in b/data/os/fedoraproject.org/fedora-6.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-6.xml.in
rename to data/os/fedoraproject.org/fedora-6.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-7.xml.in
rename to data/os/fedoraproject.org/fedora-7.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-8.xml.in
rename to data/os/fedoraproject.org/fedora-8.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-9.xml.in
rename to data/os/fedoraproject.org/fedora-9.xml.in
diff --git a/data/oses/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
similarity index 100%
rename from data/oses/fedoraproject.org/fedora-unknown.xml.in
rename to data/os/fedoraproject.org/fedora-unknown.xml.in
diff --git a/data/oses/freebsd.org/Makefile.am b/data/os/freebsd.org/Makefile.am
similarity index 100%
rename from data/oses/freebsd.org/Makefile.am
rename to data/os/freebsd.org/Makefile.am
diff --git a/data/oses/freebsd.org/freebsd-1.0.xml.in b/data/os/freebsd.org/freebsd-1.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-1.0.xml.in
rename to data/os/freebsd.org/freebsd-1.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-10.0.xml.in b/data/os/freebsd.org/freebsd-10.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-10.0.xml.in
rename to data/os/freebsd.org/freebsd-10.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-10.1.xml.in b/data/os/freebsd.org/freebsd-10.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-10.1.xml.in
rename to data/os/freebsd.org/freebsd-10.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-2.0.5.xml.in b/data/os/freebsd.org/freebsd-2.0.5.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-2.0.5.xml.in
rename to data/os/freebsd.org/freebsd-2.0.5.xml.in
diff --git a/data/oses/freebsd.org/freebsd-2.0.xml.in b/data/os/freebsd.org/freebsd-2.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-2.0.xml.in
rename to data/os/freebsd.org/freebsd-2.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-2.2.8.xml.in b/data/os/freebsd.org/freebsd-2.2.8.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-2.2.8.xml.in
rename to data/os/freebsd.org/freebsd-2.2.8.xml.in
diff --git a/data/oses/freebsd.org/freebsd-2.2.9.xml.in b/data/os/freebsd.org/freebsd-2.2.9.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-2.2.9.xml.in
rename to data/os/freebsd.org/freebsd-2.2.9.xml.in
diff --git a/data/oses/freebsd.org/freebsd-3.0.xml.in b/data/os/freebsd.org/freebsd-3.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-3.0.xml.in
rename to data/os/freebsd.org/freebsd-3.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-3.2.xml.in b/data/os/freebsd.org/freebsd-3.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-3.2.xml.in
rename to data/os/freebsd.org/freebsd-3.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.0.xml.in b/data/os/freebsd.org/freebsd-4.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.0.xml.in
rename to data/os/freebsd.org/freebsd-4.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.1.xml.in b/data/os/freebsd.org/freebsd-4.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.1.xml.in
rename to data/os/freebsd.org/freebsd-4.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.10.xml.in b/data/os/freebsd.org/freebsd-4.10.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.10.xml.in
rename to data/os/freebsd.org/freebsd-4.10.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.11.xml.in b/data/os/freebsd.org/freebsd-4.11.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.11.xml.in
rename to data/os/freebsd.org/freebsd-4.11.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.2.xml.in b/data/os/freebsd.org/freebsd-4.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.2.xml.in
rename to data/os/freebsd.org/freebsd-4.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.3.xml.in b/data/os/freebsd.org/freebsd-4.3.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.3.xml.in
rename to data/os/freebsd.org/freebsd-4.3.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.4.xml.in b/data/os/freebsd.org/freebsd-4.4.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.4.xml.in
rename to data/os/freebsd.org/freebsd-4.4.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.5.xml.in b/data/os/freebsd.org/freebsd-4.5.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.5.xml.in
rename to data/os/freebsd.org/freebsd-4.5.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.6.xml.in b/data/os/freebsd.org/freebsd-4.6.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.6.xml.in
rename to data/os/freebsd.org/freebsd-4.6.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.7.xml.in b/data/os/freebsd.org/freebsd-4.7.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.7.xml.in
rename to data/os/freebsd.org/freebsd-4.7.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.8.xml.in b/data/os/freebsd.org/freebsd-4.8.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.8.xml.in
rename to data/os/freebsd.org/freebsd-4.8.xml.in
diff --git a/data/oses/freebsd.org/freebsd-4.9.xml.in b/data/os/freebsd.org/freebsd-4.9.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-4.9.xml.in
rename to data/os/freebsd.org/freebsd-4.9.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.0.xml.in b/data/os/freebsd.org/freebsd-5.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.0.xml.in
rename to data/os/freebsd.org/freebsd-5.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.1.xml.in b/data/os/freebsd.org/freebsd-5.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.1.xml.in
rename to data/os/freebsd.org/freebsd-5.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.2.1.xml.in b/data/os/freebsd.org/freebsd-5.2.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.2.1.xml.in
rename to data/os/freebsd.org/freebsd-5.2.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.2.xml.in b/data/os/freebsd.org/freebsd-5.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.2.xml.in
rename to data/os/freebsd.org/freebsd-5.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.3.xml.in b/data/os/freebsd.org/freebsd-5.3.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.3.xml.in
rename to data/os/freebsd.org/freebsd-5.3.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.4.xml.in b/data/os/freebsd.org/freebsd-5.4.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.4.xml.in
rename to data/os/freebsd.org/freebsd-5.4.xml.in
diff --git a/data/oses/freebsd.org/freebsd-5.5.xml.in b/data/os/freebsd.org/freebsd-5.5.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-5.5.xml.in
rename to data/os/freebsd.org/freebsd-5.5.xml.in
diff --git a/data/oses/freebsd.org/freebsd-6.0.xml.in b/data/os/freebsd.org/freebsd-6.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-6.0.xml.in
rename to data/os/freebsd.org/freebsd-6.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-6.1.xml.in b/data/os/freebsd.org/freebsd-6.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-6.1.xml.in
rename to data/os/freebsd.org/freebsd-6.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-6.2.xml.in b/data/os/freebsd.org/freebsd-6.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-6.2.xml.in
rename to data/os/freebsd.org/freebsd-6.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-6.3.xml.in b/data/os/freebsd.org/freebsd-6.3.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-6.3.xml.in
rename to data/os/freebsd.org/freebsd-6.3.xml.in
diff --git a/data/oses/freebsd.org/freebsd-6.4.xml.in b/data/os/freebsd.org/freebsd-6.4.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-6.4.xml.in
rename to data/os/freebsd.org/freebsd-6.4.xml.in
diff --git a/data/oses/freebsd.org/freebsd-7.0.xml.in b/data/os/freebsd.org/freebsd-7.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-7.0.xml.in
rename to data/os/freebsd.org/freebsd-7.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-7.1.xml.in b/data/os/freebsd.org/freebsd-7.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-7.1.xml.in
rename to data/os/freebsd.org/freebsd-7.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-7.2.xml.in b/data/os/freebsd.org/freebsd-7.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-7.2.xml.in
rename to data/os/freebsd.org/freebsd-7.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-7.3.xml.in b/data/os/freebsd.org/freebsd-7.3.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-7.3.xml.in
rename to data/os/freebsd.org/freebsd-7.3.xml.in
diff --git a/data/oses/freebsd.org/freebsd-7.4.xml.in b/data/os/freebsd.org/freebsd-7.4.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-7.4.xml.in
rename to data/os/freebsd.org/freebsd-7.4.xml.in
diff --git a/data/oses/freebsd.org/freebsd-8.0.xml.in b/data/os/freebsd.org/freebsd-8.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-8.0.xml.in
rename to data/os/freebsd.org/freebsd-8.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-8.1.xml.in b/data/os/freebsd.org/freebsd-8.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-8.1.xml.in
rename to data/os/freebsd.org/freebsd-8.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-8.2.xml.in b/data/os/freebsd.org/freebsd-8.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-8.2.xml.in
rename to data/os/freebsd.org/freebsd-8.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-8.3.xml.in b/data/os/freebsd.org/freebsd-8.3.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-8.3.xml.in
rename to data/os/freebsd.org/freebsd-8.3.xml.in
diff --git a/data/oses/freebsd.org/freebsd-8.4.xml.in b/data/os/freebsd.org/freebsd-8.4.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-8.4.xml.in
rename to data/os/freebsd.org/freebsd-8.4.xml.in
diff --git a/data/oses/freebsd.org/freebsd-9.0.xml.in b/data/os/freebsd.org/freebsd-9.0.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-9.0.xml.in
rename to data/os/freebsd.org/freebsd-9.0.xml.in
diff --git a/data/oses/freebsd.org/freebsd-9.1.xml.in b/data/os/freebsd.org/freebsd-9.1.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-9.1.xml.in
rename to data/os/freebsd.org/freebsd-9.1.xml.in
diff --git a/data/oses/freebsd.org/freebsd-9.2.xml.in b/data/os/freebsd.org/freebsd-9.2.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-9.2.xml.in
rename to data/os/freebsd.org/freebsd-9.2.xml.in
diff --git a/data/oses/freebsd.org/freebsd-9.3.xml.in b/data/os/freebsd.org/freebsd-9.3.xml.in
similarity index 100%
rename from data/oses/freebsd.org/freebsd-9.3.xml.in
rename to data/os/freebsd.org/freebsd-9.3.xml.in
diff --git a/data/oses/fedoraproject.org/Makefile.am b/data/os/gnome.org/Makefile.am
similarity index 100%
rename from data/oses/fedoraproject.org/Makefile.am
rename to data/os/gnome.org/Makefile.am
diff --git a/data/oses/gnome.org/gnome-3.6.xml.in b/data/os/gnome.org/gnome-3.6.xml.in
similarity index 100%
rename from data/oses/gnome.org/gnome-3.6.xml.in
rename to data/os/gnome.org/gnome-3.6.xml.in
diff --git a/data/oses/gnome.org/gnome-3.8.xml.in b/data/os/gnome.org/gnome-3.8.xml.in
similarity index 100%
rename from data/oses/gnome.org/gnome-3.8.xml.in
rename to data/os/gnome.org/gnome-3.8.xml.in
diff --git a/data/oses/gnome.org/gnome-continuous-3.10.xml.in b/data/os/gnome.org/gnome-continuous-3.10.xml.in
similarity index 100%
rename from data/oses/gnome.org/gnome-continuous-3.10.xml.in
rename to data/os/gnome.org/gnome-continuous-3.10.xml.in
diff --git a/data/oses/gnome.org/gnome-continuous-3.12.xml.in b/data/os/gnome.org/gnome-continuous-3.12.xml.in
similarity index 100%
rename from data/oses/gnome.org/gnome-continuous-3.12.xml.in
rename to data/os/gnome.org/gnome-continuous-3.12.xml.in
diff --git a/data/oses/gnome.org/gnome-continuous-3.14.xml.in b/data/os/gnome.org/gnome-continuous-3.14.xml.in
similarity index 100%
rename from data/oses/gnome.org/gnome-continuous-3.14.xml.in
rename to data/os/gnome.org/gnome-continuous-3.14.xml.in
diff --git a/data/oses/debian.org/Makefile.am b/data/os/mageia.org/Makefile.am
similarity index 100%
rename from data/oses/debian.org/Makefile.am
rename to data/os/mageia.org/Makefile.am
diff --git a/data/oses/mageia.org/mageia-1.xml.in b/data/os/mageia.org/mageia-1.xml.in
similarity index 100%
rename from data/oses/mageia.org/mageia-1.xml.in
rename to data/os/mageia.org/mageia-1.xml.in
diff --git a/data/oses/mageia.org/mageia-2.xml.in b/data/os/mageia.org/mageia-2.xml.in
similarity index 100%
rename from data/oses/mageia.org/mageia-2.xml.in
rename to data/os/mageia.org/mageia-2.xml.in
diff --git a/data/oses/mageia.org/mageia-3.xml.in b/data/os/mageia.org/mageia-3.xml.in
similarity index 100%
rename from data/oses/mageia.org/mageia-3.xml.in
rename to data/os/mageia.org/mageia-3.xml.in
diff --git a/data/oses/centos.org/Makefile.am b/data/os/mandriva.com/Makefile.am
similarity index 100%
rename from data/oses/centos.org/Makefile.am
rename to data/os/mandriva.com/Makefile.am
diff --git a/data/oses/mandriva.com/mandrake-10.0.xml.in b/data/os/mandriva.com/mandrake-10.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-10.0.xml.in
rename to data/os/mandriva.com/mandrake-10.0.xml.in
diff --git a/data/oses/mandriva.com/mandrake-10.1.xml.in b/data/os/mandriva.com/mandrake-10.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-10.1.xml.in
rename to data/os/mandriva.com/mandrake-10.1.xml.in
diff --git a/data/oses/mandriva.com/mandrake-10.2.xml.in b/data/os/mandriva.com/mandrake-10.2.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-10.2.xml.in
rename to data/os/mandriva.com/mandrake-10.2.xml.in
diff --git a/data/oses/mandriva.com/mandrake-5.1.xml.in b/data/os/mandriva.com/mandrake-5.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-5.1.xml.in
rename to data/os/mandriva.com/mandrake-5.1.xml.in
diff --git a/data/oses/mandriva.com/mandrake-5.2.xml.in b/data/os/mandriva.com/mandrake-5.2.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-5.2.xml.in
rename to data/os/mandriva.com/mandrake-5.2.xml.in
diff --git a/data/oses/mandriva.com/mandrake-5.3.xml.in b/data/os/mandriva.com/mandrake-5.3.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-5.3.xml.in
rename to data/os/mandriva.com/mandrake-5.3.xml.in
diff --git a/data/oses/mandriva.com/mandrake-6.0.xml.in b/data/os/mandriva.com/mandrake-6.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-6.0.xml.in
rename to data/os/mandriva.com/mandrake-6.0.xml.in
diff --git a/data/oses/mandriva.com/mandrake-6.1.xml.in b/data/os/mandriva.com/mandrake-6.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-6.1.xml.in
rename to data/os/mandriva.com/mandrake-6.1.xml.in
diff --git a/data/oses/mandriva.com/mandrake-7.0.xml.in b/data/os/mandriva.com/mandrake-7.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-7.0.xml.in
rename to data/os/mandriva.com/mandrake-7.0.xml.in
diff --git a/data/oses/mandriva.com/mandrake-7.1.xml.in b/data/os/mandriva.com/mandrake-7.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-7.1.xml.in
rename to data/os/mandriva.com/mandrake-7.1.xml.in
diff --git a/data/oses/mandriva.com/mandrake-7.2.xml.in b/data/os/mandriva.com/mandrake-7.2.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-7.2.xml.in
rename to data/os/mandriva.com/mandrake-7.2.xml.in
diff --git a/data/oses/mandriva.com/mandrake-8.0.xml.in b/data/os/mandriva.com/mandrake-8.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-8.0.xml.in
rename to data/os/mandriva.com/mandrake-8.0.xml.in
diff --git a/data/oses/mandriva.com/mandrake-8.1.xml.in b/data/os/mandriva.com/mandrake-8.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-8.1.xml.in
rename to data/os/mandriva.com/mandrake-8.1.xml.in
diff --git a/data/oses/mandriva.com/mandrake-8.2.xml.in b/data/os/mandriva.com/mandrake-8.2.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-8.2.xml.in
rename to data/os/mandriva.com/mandrake-8.2.xml.in
diff --git a/data/oses/mandriva.com/mandrake-9.0.xml.in b/data/os/mandriva.com/mandrake-9.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-9.0.xml.in
rename to data/os/mandriva.com/mandrake-9.0.xml.in
diff --git a/data/oses/mandriva.com/mandrake-9.1.xml.in b/data/os/mandriva.com/mandrake-9.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-9.1.xml.in
rename to data/os/mandriva.com/mandrake-9.1.xml.in
diff --git a/data/oses/mandriva.com/mandrake-9.2.xml.in b/data/os/mandriva.com/mandrake-9.2.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandrake-9.2.xml.in
rename to data/os/mandriva.com/mandrake-9.2.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2006.0.xml.in b/data/os/mandriva.com/mandriva-2006.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2006.0.xml.in
rename to data/os/mandriva.com/mandriva-2006.0.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2007.1.xml.in b/data/os/mandriva.com/mandriva-2007.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2007.1.xml.in
rename to data/os/mandriva.com/mandriva-2007.1.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2007.xml.in b/data/os/mandriva.com/mandriva-2007.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2007.xml.in
rename to data/os/mandriva.com/mandriva-2007.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2008.0.xml.in b/data/os/mandriva.com/mandriva-2008.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2008.0.xml.in
rename to data/os/mandriva.com/mandriva-2008.0.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2008.1.xml.in b/data/os/mandriva.com/mandriva-2008.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2008.1.xml.in
rename to data/os/mandriva.com/mandriva-2008.1.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2009.0.xml.in b/data/os/mandriva.com/mandriva-2009.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2009.0.xml.in
rename to data/os/mandriva.com/mandriva-2009.0.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2009.1.xml.in b/data/os/mandriva.com/mandriva-2009.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2009.1.xml.in
rename to data/os/mandriva.com/mandriva-2009.1.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2010.0.xml.in b/data/os/mandriva.com/mandriva-2010.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2010.0.xml.in
rename to data/os/mandriva.com/mandriva-2010.0.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2010.1.xml.in b/data/os/mandriva.com/mandriva-2010.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2010.1.xml.in
rename to data/os/mandriva.com/mandriva-2010.1.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2010.2.xml.in b/data/os/mandriva.com/mandriva-2010.2.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2010.2.xml.in
rename to data/os/mandriva.com/mandriva-2010.2.xml.in
diff --git a/data/oses/mandriva.com/mandriva-2011.xml.in b/data/os/mandriva.com/mandriva-2011.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mandriva-2011.xml.in
rename to data/os/mandriva.com/mandriva-2011.xml.in
diff --git a/data/oses/mandriva.com/mbs-1.0.xml.in b/data/os/mandriva.com/mbs-1.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mbs-1.0.xml.in
rename to data/os/mandriva.com/mbs-1.0.xml.in
diff --git a/data/oses/mandriva.com/mes-5.0.xml.in b/data/os/mandriva.com/mes-5.0.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mes-5.0.xml.in
rename to data/os/mandriva.com/mes-5.0.xml.in
diff --git a/data/oses/mandriva.com/mes-5.1.xml.in b/data/os/mandriva.com/mes-5.1.xml.in
similarity index 100%
rename from data/oses/mandriva.com/mes-5.1.xml.in
rename to data/os/mandriva.com/mes-5.1.xml.in
diff --git a/data/oses/apple.com/Makefile.am b/data/os/microsoft.com/Makefile.am
similarity index 100%
rename from data/oses/apple.com/Makefile.am
rename to data/os/microsoft.com/Makefile.am
diff --git a/data/oses/microsoft.com/msdos-6.22.xml.in b/data/os/microsoft.com/msdos-6.22.xml.in
similarity index 100%
rename from data/oses/microsoft.com/msdos-6.22.xml.in
rename to data/os/microsoft.com/msdos-6.22.xml.in
diff --git a/data/oses/microsoft.com/win-1.0.xml.in b/data/os/microsoft.com/win-1.0.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-1.0.xml.in
rename to data/os/microsoft.com/win-1.0.xml.in
diff --git a/data/oses/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-10.xml.in
rename to data/os/microsoft.com/win-10.xml.in
diff --git a/data/oses/microsoft.com/win-2.0.xml.in b/data/os/microsoft.com/win-2.0.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2.0.xml.in
rename to data/os/microsoft.com/win-2.0.xml.in
diff --git a/data/oses/microsoft.com/win-2.1.xml.in b/data/os/microsoft.com/win-2.1.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2.1.xml.in
rename to data/os/microsoft.com/win-2.1.xml.in
diff --git a/data/oses/microsoft.com/win-2k.xml.in b/data/os/microsoft.com/win-2k.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k.xml.in
rename to data/os/microsoft.com/win-2k.xml.in
diff --git a/data/oses/microsoft.com/win-2k12.xml.in b/data/os/microsoft.com/win-2k12.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k12.xml.in
rename to data/os/microsoft.com/win-2k12.xml.in
diff --git a/data/oses/microsoft.com/win-2k12r2.xml.in b/data/os/microsoft.com/win-2k12r2.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k12r2.xml.in
rename to data/os/microsoft.com/win-2k12r2.xml.in
diff --git a/data/oses/microsoft.com/win-2k3.xml.in b/data/os/microsoft.com/win-2k3.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k3.xml.in
rename to data/os/microsoft.com/win-2k3.xml.in
diff --git a/data/oses/microsoft.com/win-2k3r2.xml.in b/data/os/microsoft.com/win-2k3r2.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k3r2.xml.in
rename to data/os/microsoft.com/win-2k3r2.xml.in
diff --git a/data/oses/microsoft.com/win-2k8.xml.in b/data/os/microsoft.com/win-2k8.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k8.xml.in
rename to data/os/microsoft.com/win-2k8.xml.in
diff --git a/data/oses/microsoft.com/win-2k8r2.xml.in b/data/os/microsoft.com/win-2k8r2.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-2k8r2.xml.in
rename to data/os/microsoft.com/win-2k8r2.xml.in
diff --git a/data/oses/microsoft.com/win-3.1.xml.in b/data/os/microsoft.com/win-3.1.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-3.1.xml.in
rename to data/os/microsoft.com/win-3.1.xml.in
diff --git a/data/oses/microsoft.com/win-7.xml.in b/data/os/microsoft.com/win-7.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-7.xml.in
rename to data/os/microsoft.com/win-7.xml.in
diff --git a/data/oses/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-8.1.xml.in
rename to data/os/microsoft.com/win-8.1.xml.in
diff --git a/data/oses/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-8.xml.in
rename to data/os/microsoft.com/win-8.xml.in
diff --git a/data/oses/microsoft.com/win-95.xml.in b/data/os/microsoft.com/win-95.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-95.xml.in
rename to data/os/microsoft.com/win-95.xml.in
diff --git a/data/oses/microsoft.com/win-98.xml.in b/data/os/microsoft.com/win-98.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-98.xml.in
rename to data/os/microsoft.com/win-98.xml.in
diff --git a/data/oses/microsoft.com/win-me.xml.in b/data/os/microsoft.com/win-me.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-me.xml.in
rename to data/os/microsoft.com/win-me.xml.in
diff --git a/data/oses/microsoft.com/win-vista.xml.in b/data/os/microsoft.com/win-vista.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-vista.xml.in
rename to data/os/microsoft.com/win-vista.xml.in
diff --git a/data/oses/microsoft.com/win-xp.xml.in b/data/os/microsoft.com/win-xp.xml.in
similarity index 100%
rename from data/oses/microsoft.com/win-xp.xml.in
rename to data/os/microsoft.com/win-xp.xml.in
diff --git a/data/oses/microsoft.com/winnt-3.1.xml.in b/data/os/microsoft.com/winnt-3.1.xml.in
similarity index 100%
rename from data/oses/microsoft.com/winnt-3.1.xml.in
rename to data/os/microsoft.com/winnt-3.1.xml.in
diff --git a/data/oses/microsoft.com/winnt-3.5.xml.in b/data/os/microsoft.com/winnt-3.5.xml.in
similarity index 100%
rename from data/oses/microsoft.com/winnt-3.5.xml.in
rename to data/os/microsoft.com/winnt-3.5.xml.in
diff --git a/data/oses/microsoft.com/winnt-3.51.xml.in b/data/os/microsoft.com/winnt-3.51.xml.in
similarity index 100%
rename from data/oses/microsoft.com/winnt-3.51.xml.in
rename to data/os/microsoft.com/winnt-3.51.xml.in
diff --git a/data/oses/microsoft.com/winnt-4.0.xml.in b/data/os/microsoft.com/winnt-4.0.xml.in
similarity index 100%
rename from data/oses/microsoft.com/winnt-4.0.xml.in
rename to data/os/microsoft.com/winnt-4.0.xml.in
diff --git a/data/oses/altlinux.org/Makefile.am b/data/os/netbsd.org/Makefile.am
similarity index 100%
rename from data/oses/altlinux.org/Makefile.am
rename to data/os/netbsd.org/Makefile.am
diff --git a/data/oses/netbsd.org/netbsd-0.8.xml.in b/data/os/netbsd.org/netbsd-0.8.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-0.8.xml.in
rename to data/os/netbsd.org/netbsd-0.8.xml.in
diff --git a/data/oses/netbsd.org/netbsd-0.9.xml.in b/data/os/netbsd.org/netbsd-0.9.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-0.9.xml.in
rename to data/os/netbsd.org/netbsd-0.9.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.0.xml.in b/data/os/netbsd.org/netbsd-1.0.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.0.xml.in
rename to data/os/netbsd.org/netbsd-1.0.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.1.xml.in b/data/os/netbsd.org/netbsd-1.1.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.1.xml.in
rename to data/os/netbsd.org/netbsd-1.1.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.2.xml.in b/data/os/netbsd.org/netbsd-1.2.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.2.xml.in
rename to data/os/netbsd.org/netbsd-1.2.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.3.xml.in b/data/os/netbsd.org/netbsd-1.3.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.3.xml.in
rename to data/os/netbsd.org/netbsd-1.3.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.4.xml.in b/data/os/netbsd.org/netbsd-1.4.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.4.xml.in
rename to data/os/netbsd.org/netbsd-1.4.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.5.xml.in b/data/os/netbsd.org/netbsd-1.5.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.5.xml.in
rename to data/os/netbsd.org/netbsd-1.5.xml.in
diff --git a/data/oses/netbsd.org/netbsd-1.6.xml.in b/data/os/netbsd.org/netbsd-1.6.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-1.6.xml.in
rename to data/os/netbsd.org/netbsd-1.6.xml.in
diff --git a/data/oses/netbsd.org/netbsd-2.0.xml.in b/data/os/netbsd.org/netbsd-2.0.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-2.0.xml.in
rename to data/os/netbsd.org/netbsd-2.0.xml.in
diff --git a/data/oses/netbsd.org/netbsd-3.0.xml.in b/data/os/netbsd.org/netbsd-3.0.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-3.0.xml.in
rename to data/os/netbsd.org/netbsd-3.0.xml.in
diff --git a/data/oses/netbsd.org/netbsd-4.0.xml.in b/data/os/netbsd.org/netbsd-4.0.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-4.0.xml.in
rename to data/os/netbsd.org/netbsd-4.0.xml.in
diff --git a/data/oses/netbsd.org/netbsd-5.0.xml.in b/data/os/netbsd.org/netbsd-5.0.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-5.0.xml.in
rename to data/os/netbsd.org/netbsd-5.0.xml.in
diff --git a/data/oses/netbsd.org/netbsd-5.1.xml.in b/data/os/netbsd.org/netbsd-5.1.xml.in
similarity index 100%
rename from data/oses/netbsd.org/netbsd-5.1.xml.in
rename to data/os/netbsd.org/netbsd-5.1.xml.in
diff --git a/data/install-scripts/ubuntu.com/Makefile.am b/data/os/novell.com/Makefile.am
similarity index 100%
rename from data/install-scripts/ubuntu.com/Makefile.am
rename to data/os/novell.com/Makefile.am
diff --git a/data/oses/novell.com/netware-4.xml.in b/data/os/novell.com/netware-4.xml.in
similarity index 100%
rename from data/oses/novell.com/netware-4.xml.in
rename to data/os/novell.com/netware-4.xml.in
diff --git a/data/oses/novell.com/netware-5.xml.in b/data/os/novell.com/netware-5.xml.in
similarity index 100%
rename from data/oses/novell.com/netware-5.xml.in
rename to data/os/novell.com/netware-5.xml.in
diff --git a/data/oses/novell.com/netware-6.xml.in b/data/os/novell.com/netware-6.xml.in
similarity index 100%
rename from data/oses/novell.com/netware-6.xml.in
rename to data/os/novell.com/netware-6.xml.in
diff --git a/data/install-scripts/redhat.com/Makefile.am b/data/os/openbsd.org/Makefile.am
similarity index 100%
rename from data/install-scripts/redhat.com/Makefile.am
rename to data/os/openbsd.org/Makefile.am
diff --git a/data/oses/openbsd.org/openbsd-4.2.xml.in b/data/os/openbsd.org/openbsd-4.2.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-4.2.xml.in
rename to data/os/openbsd.org/openbsd-4.2.xml.in
diff --git a/data/oses/openbsd.org/openbsd-4.3.xml.in b/data/os/openbsd.org/openbsd-4.3.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-4.3.xml.in
rename to data/os/openbsd.org/openbsd-4.3.xml.in
diff --git a/data/oses/openbsd.org/openbsd-4.4.xml.in b/data/os/openbsd.org/openbsd-4.4.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-4.4.xml.in
rename to data/os/openbsd.org/openbsd-4.4.xml.in
diff --git a/data/oses/openbsd.org/openbsd-4.5.xml.in b/data/os/openbsd.org/openbsd-4.5.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-4.5.xml.in
rename to data/os/openbsd.org/openbsd-4.5.xml.in
diff --git a/data/oses/openbsd.org/openbsd-4.8.xml.in b/data/os/openbsd.org/openbsd-4.8.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-4.8.xml.in
rename to data/os/openbsd.org/openbsd-4.8.xml.in
diff --git a/data/oses/openbsd.org/openbsd-4.9.xml.in b/data/os/openbsd.org/openbsd-4.9.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-4.9.xml.in
rename to data/os/openbsd.org/openbsd-4.9.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.0.xml.in b/data/os/openbsd.org/openbsd-5.0.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.0.xml.in
rename to data/os/openbsd.org/openbsd-5.0.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.1.xml.in b/data/os/openbsd.org/openbsd-5.1.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.1.xml.in
rename to data/os/openbsd.org/openbsd-5.1.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.2.xml.in b/data/os/openbsd.org/openbsd-5.2.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.2.xml.in
rename to data/os/openbsd.org/openbsd-5.2.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.3.xml.in b/data/os/openbsd.org/openbsd-5.3.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.3.xml.in
rename to data/os/openbsd.org/openbsd-5.3.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.4.xml.in b/data/os/openbsd.org/openbsd-5.4.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.4.xml.in
rename to data/os/openbsd.org/openbsd-5.4.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.5.xml.in b/data/os/openbsd.org/openbsd-5.5.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.5.xml.in
rename to data/os/openbsd.org/openbsd-5.5.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.6.xml.in b/data/os/openbsd.org/openbsd-5.6.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.6.xml.in
rename to data/os/openbsd.org/openbsd-5.6.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.7.xml.in b/data/os/openbsd.org/openbsd-5.7.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.7.xml.in
rename to data/os/openbsd.org/openbsd-5.7.xml.in
diff --git a/data/oses/openbsd.org/openbsd-5.8.xml.in b/data/os/openbsd.org/openbsd-5.8.xml.in
similarity index 100%
rename from data/oses/openbsd.org/openbsd-5.8.xml.in
rename to data/os/openbsd.org/openbsd-5.8.xml.in
diff --git a/data/install-scripts/microsoft.com/Makefile.am b/data/os/opensuse.org/Makefile.am
similarity index 100%
rename from data/install-scripts/microsoft.com/Makefile.am
rename to data/os/opensuse.org/Makefile.am
diff --git a/data/oses/opensuse.org/opensuse-10.2.xml.in b/data/os/opensuse.org/opensuse-10.2.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-10.2.xml.in
rename to data/os/opensuse.org/opensuse-10.2.xml.in
diff --git a/data/oses/opensuse.org/opensuse-10.3.xml.in b/data/os/opensuse.org/opensuse-10.3.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-10.3.xml.in
rename to data/os/opensuse.org/opensuse-10.3.xml.in
diff --git a/data/oses/opensuse.org/opensuse-11.0.xml.in b/data/os/opensuse.org/opensuse-11.0.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-11.0.xml.in
rename to data/os/opensuse.org/opensuse-11.0.xml.in
diff --git a/data/oses/opensuse.org/opensuse-11.1.xml.in b/data/os/opensuse.org/opensuse-11.1.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-11.1.xml.in
rename to data/os/opensuse.org/opensuse-11.1.xml.in
diff --git a/data/oses/opensuse.org/opensuse-11.2.xml.in b/data/os/opensuse.org/opensuse-11.2.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-11.2.xml.in
rename to data/os/opensuse.org/opensuse-11.2.xml.in
diff --git a/data/oses/opensuse.org/opensuse-11.3.xml.in b/data/os/opensuse.org/opensuse-11.3.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-11.3.xml.in
rename to data/os/opensuse.org/opensuse-11.3.xml.in
diff --git a/data/oses/opensuse.org/opensuse-11.4.xml.in b/data/os/opensuse.org/opensuse-11.4.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-11.4.xml.in
rename to data/os/opensuse.org/opensuse-11.4.xml.in
diff --git a/data/oses/opensuse.org/opensuse-12.1.xml.in b/data/os/opensuse.org/opensuse-12.1.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-12.1.xml.in
rename to data/os/opensuse.org/opensuse-12.1.xml.in
diff --git a/data/oses/opensuse.org/opensuse-12.2.xml.in b/data/os/opensuse.org/opensuse-12.2.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-12.2.xml.in
rename to data/os/opensuse.org/opensuse-12.2.xml.in
diff --git a/data/oses/opensuse.org/opensuse-12.3.xml.in b/data/os/opensuse.org/opensuse-12.3.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-12.3.xml.in
rename to data/os/opensuse.org/opensuse-12.3.xml.in
diff --git a/data/oses/opensuse.org/opensuse-13.1.xml.in b/data/os/opensuse.org/opensuse-13.1.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-13.1.xml.in
rename to data/os/opensuse.org/opensuse-13.1.xml.in
diff --git a/data/oses/opensuse.org/opensuse-13.2.xml.in b/data/os/opensuse.org/opensuse-13.2.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-13.2.xml.in
rename to data/os/opensuse.org/opensuse-13.2.xml.in
diff --git a/data/oses/opensuse.org/opensuse-factory.xml.in b/data/os/opensuse.org/opensuse-factory.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-factory.xml.in
rename to data/os/opensuse.org/opensuse-factory.xml.in
diff --git a/data/oses/opensuse.org/opensuse-unknown.xml.in b/data/os/opensuse.org/opensuse-unknown.xml.in
similarity index 100%
rename from data/oses/opensuse.org/opensuse-unknown.xml.in
rename to data/os/opensuse.org/opensuse-unknown.xml.in
diff --git a/data/install-scripts/fedoraproject.org/Makefile.am b/data/os/oracle.com/Makefile.am
similarity index 100%
rename from data/install-scripts/fedoraproject.org/Makefile.am
rename to data/os/oracle.com/Makefile.am
diff --git a/data/oses/oracle.com/solaris-11.xml.in b/data/os/oracle.com/solaris-11.xml.in
similarity index 100%
rename from data/oses/oracle.com/solaris-11.xml.in
rename to data/os/oracle.com/solaris-11.xml.in
diff --git a/data/install-scripts/debian.org/Makefile.am b/data/os/redhat.com/Makefile.am
similarity index 100%
rename from data/install-scripts/debian.org/Makefile.am
rename to data/os/redhat.com/Makefile.am
diff --git a/data/oses/redhat.com/rhel-2.1.1.xml.in b/data/os/redhat.com/rhel-2.1.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.1.xml.in
rename to data/os/redhat.com/rhel-2.1.1.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.2.xml.in b/data/os/redhat.com/rhel-2.1.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.2.xml.in
rename to data/os/redhat.com/rhel-2.1.2.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.3.xml.in b/data/os/redhat.com/rhel-2.1.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.3.xml.in
rename to data/os/redhat.com/rhel-2.1.3.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.4.xml.in b/data/os/redhat.com/rhel-2.1.4.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.4.xml.in
rename to data/os/redhat.com/rhel-2.1.4.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.5.xml.in b/data/os/redhat.com/rhel-2.1.5.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.5.xml.in
rename to data/os/redhat.com/rhel-2.1.5.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.6.xml.in b/data/os/redhat.com/rhel-2.1.6.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.6.xml.in
rename to data/os/redhat.com/rhel-2.1.6.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.7.xml.in b/data/os/redhat.com/rhel-2.1.7.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.7.xml.in
rename to data/os/redhat.com/rhel-2.1.7.xml.in
diff --git a/data/oses/redhat.com/rhel-2.1.xml.in b/data/os/redhat.com/rhel-2.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-2.1.xml.in
rename to data/os/redhat.com/rhel-2.1.xml.in
diff --git a/data/oses/redhat.com/rhel-3.1.xml.in b/data/os/redhat.com/rhel-3.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.1.xml.in
rename to data/os/redhat.com/rhel-3.1.xml.in
diff --git a/data/oses/redhat.com/rhel-3.2.xml.in b/data/os/redhat.com/rhel-3.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.2.xml.in
rename to data/os/redhat.com/rhel-3.2.xml.in
diff --git a/data/oses/redhat.com/rhel-3.3.xml.in b/data/os/redhat.com/rhel-3.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.3.xml.in
rename to data/os/redhat.com/rhel-3.3.xml.in
diff --git a/data/oses/redhat.com/rhel-3.4.xml.in b/data/os/redhat.com/rhel-3.4.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.4.xml.in
rename to data/os/redhat.com/rhel-3.4.xml.in
diff --git a/data/oses/redhat.com/rhel-3.5.xml.in b/data/os/redhat.com/rhel-3.5.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.5.xml.in
rename to data/os/redhat.com/rhel-3.5.xml.in
diff --git a/data/oses/redhat.com/rhel-3.6.xml.in b/data/os/redhat.com/rhel-3.6.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.6.xml.in
rename to data/os/redhat.com/rhel-3.6.xml.in
diff --git a/data/oses/redhat.com/rhel-3.7.xml.in b/data/os/redhat.com/rhel-3.7.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.7.xml.in
rename to data/os/redhat.com/rhel-3.7.xml.in
diff --git a/data/oses/redhat.com/rhel-3.8.xml.in b/data/os/redhat.com/rhel-3.8.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.8.xml.in
rename to data/os/redhat.com/rhel-3.8.xml.in
diff --git a/data/oses/redhat.com/rhel-3.9.xml.in b/data/os/redhat.com/rhel-3.9.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.9.xml.in
rename to data/os/redhat.com/rhel-3.9.xml.in
diff --git a/data/oses/redhat.com/rhel-3.xml.in b/data/os/redhat.com/rhel-3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-3.xml.in
rename to data/os/redhat.com/rhel-3.xml.in
diff --git a/data/oses/redhat.com/rhel-4.0.xml.in b/data/os/redhat.com/rhel-4.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.0.xml.in
rename to data/os/redhat.com/rhel-4.0.xml.in
diff --git a/data/oses/redhat.com/rhel-4.1.xml.in b/data/os/redhat.com/rhel-4.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.1.xml.in
rename to data/os/redhat.com/rhel-4.1.xml.in
diff --git a/data/oses/redhat.com/rhel-4.2.xml.in b/data/os/redhat.com/rhel-4.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.2.xml.in
rename to data/os/redhat.com/rhel-4.2.xml.in
diff --git a/data/oses/redhat.com/rhel-4.3.xml.in b/data/os/redhat.com/rhel-4.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.3.xml.in
rename to data/os/redhat.com/rhel-4.3.xml.in
diff --git a/data/oses/redhat.com/rhel-4.4.xml.in b/data/os/redhat.com/rhel-4.4.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.4.xml.in
rename to data/os/redhat.com/rhel-4.4.xml.in
diff --git a/data/oses/redhat.com/rhel-4.5.xml.in b/data/os/redhat.com/rhel-4.5.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.5.xml.in
rename to data/os/redhat.com/rhel-4.5.xml.in
diff --git a/data/oses/redhat.com/rhel-4.6.xml.in b/data/os/redhat.com/rhel-4.6.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.6.xml.in
rename to data/os/redhat.com/rhel-4.6.xml.in
diff --git a/data/oses/redhat.com/rhel-4.7.xml.in b/data/os/redhat.com/rhel-4.7.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.7.xml.in
rename to data/os/redhat.com/rhel-4.7.xml.in
diff --git a/data/oses/redhat.com/rhel-4.8.xml.in b/data/os/redhat.com/rhel-4.8.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.8.xml.in
rename to data/os/redhat.com/rhel-4.8.xml.in
diff --git a/data/oses/redhat.com/rhel-4.9.xml.in b/data/os/redhat.com/rhel-4.9.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-4.9.xml.in
rename to data/os/redhat.com/rhel-4.9.xml.in
diff --git a/data/oses/redhat.com/rhel-5.0.xml.in b/data/os/redhat.com/rhel-5.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.0.xml.in
rename to data/os/redhat.com/rhel-5.0.xml.in
diff --git a/data/oses/redhat.com/rhel-5.1.xml.in b/data/os/redhat.com/rhel-5.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.1.xml.in
rename to data/os/redhat.com/rhel-5.1.xml.in
diff --git a/data/oses/redhat.com/rhel-5.10.xml.in b/data/os/redhat.com/rhel-5.10.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.10.xml.in
rename to data/os/redhat.com/rhel-5.10.xml.in
diff --git a/data/oses/redhat.com/rhel-5.11.xml.in b/data/os/redhat.com/rhel-5.11.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.11.xml.in
rename to data/os/redhat.com/rhel-5.11.xml.in
diff --git a/data/oses/redhat.com/rhel-5.2.xml.in b/data/os/redhat.com/rhel-5.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.2.xml.in
rename to data/os/redhat.com/rhel-5.2.xml.in
diff --git a/data/oses/redhat.com/rhel-5.3.xml.in b/data/os/redhat.com/rhel-5.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.3.xml.in
rename to data/os/redhat.com/rhel-5.3.xml.in
diff --git a/data/oses/redhat.com/rhel-5.4.xml.in b/data/os/redhat.com/rhel-5.4.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.4.xml.in
rename to data/os/redhat.com/rhel-5.4.xml.in
diff --git a/data/oses/redhat.com/rhel-5.5.xml.in b/data/os/redhat.com/rhel-5.5.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.5.xml.in
rename to data/os/redhat.com/rhel-5.5.xml.in
diff --git a/data/oses/redhat.com/rhel-5.6.xml.in b/data/os/redhat.com/rhel-5.6.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.6.xml.in
rename to data/os/redhat.com/rhel-5.6.xml.in
diff --git a/data/oses/redhat.com/rhel-5.7.xml.in b/data/os/redhat.com/rhel-5.7.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.7.xml.in
rename to data/os/redhat.com/rhel-5.7.xml.in
diff --git a/data/oses/redhat.com/rhel-5.8.xml.in b/data/os/redhat.com/rhel-5.8.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.8.xml.in
rename to data/os/redhat.com/rhel-5.8.xml.in
diff --git a/data/oses/redhat.com/rhel-5.9.xml.in b/data/os/redhat.com/rhel-5.9.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-5.9.xml.in
rename to data/os/redhat.com/rhel-5.9.xml.in
diff --git a/data/oses/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.0.xml.in
rename to data/os/redhat.com/rhel-6.0.xml.in
diff --git a/data/oses/redhat.com/rhel-6.1.xml.in b/data/os/redhat.com/rhel-6.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.1.xml.in
rename to data/os/redhat.com/rhel-6.1.xml.in
diff --git a/data/oses/redhat.com/rhel-6.2.xml.in b/data/os/redhat.com/rhel-6.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.2.xml.in
rename to data/os/redhat.com/rhel-6.2.xml.in
diff --git a/data/oses/redhat.com/rhel-6.3.xml.in b/data/os/redhat.com/rhel-6.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.3.xml.in
rename to data/os/redhat.com/rhel-6.3.xml.in
diff --git a/data/oses/redhat.com/rhel-6.4.xml.in b/data/os/redhat.com/rhel-6.4.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.4.xml.in
rename to data/os/redhat.com/rhel-6.4.xml.in
diff --git a/data/oses/redhat.com/rhel-6.5.xml.in b/data/os/redhat.com/rhel-6.5.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.5.xml.in
rename to data/os/redhat.com/rhel-6.5.xml.in
diff --git a/data/oses/redhat.com/rhel-6.6.xml.in b/data/os/redhat.com/rhel-6.6.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-6.6.xml.in
rename to data/os/redhat.com/rhel-6.6.xml.in
diff --git a/data/oses/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-7.0.xml.in
rename to data/os/redhat.com/rhel-7.0.xml.in
diff --git a/data/oses/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-7.1.xml.in
rename to data/os/redhat.com/rhel-7.1.xml.in
diff --git a/data/oses/redhat.com/rhel-atomic-7.0.xml.in b/data/os/redhat.com/rhel-atomic-7.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-atomic-7.0.xml.in
rename to data/os/redhat.com/rhel-atomic-7.0.xml.in
diff --git a/data/oses/redhat.com/rhel-atomic-7.1.xml.in b/data/os/redhat.com/rhel-atomic-7.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhel-atomic-7.1.xml.in
rename to data/os/redhat.com/rhel-atomic-7.1.xml.in
diff --git a/data/oses/redhat.com/rhl-1.0.xml.in b/data/os/redhat.com/rhl-1.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-1.0.xml.in
rename to data/os/redhat.com/rhl-1.0.xml.in
diff --git a/data/oses/redhat.com/rhl-1.1.xml.in b/data/os/redhat.com/rhl-1.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-1.1.xml.in
rename to data/os/redhat.com/rhl-1.1.xml.in
diff --git a/data/oses/redhat.com/rhl-2.0.xml.in b/data/os/redhat.com/rhl-2.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-2.0.xml.in
rename to data/os/redhat.com/rhl-2.0.xml.in
diff --git a/data/oses/redhat.com/rhl-2.1.xml.in b/data/os/redhat.com/rhl-2.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-2.1.xml.in
rename to data/os/redhat.com/rhl-2.1.xml.in
diff --git a/data/oses/redhat.com/rhl-3.0.3.xml.in b/data/os/redhat.com/rhl-3.0.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-3.0.3.xml.in
rename to data/os/redhat.com/rhl-3.0.3.xml.in
diff --git a/data/oses/redhat.com/rhl-4.0.xml.in b/data/os/redhat.com/rhl-4.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-4.0.xml.in
rename to data/os/redhat.com/rhl-4.0.xml.in
diff --git a/data/oses/redhat.com/rhl-4.1.xml.in b/data/os/redhat.com/rhl-4.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-4.1.xml.in
rename to data/os/redhat.com/rhl-4.1.xml.in
diff --git a/data/oses/redhat.com/rhl-4.2.xml.in b/data/os/redhat.com/rhl-4.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-4.2.xml.in
rename to data/os/redhat.com/rhl-4.2.xml.in
diff --git a/data/oses/redhat.com/rhl-5.0.xml.in b/data/os/redhat.com/rhl-5.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-5.0.xml.in
rename to data/os/redhat.com/rhl-5.0.xml.in
diff --git a/data/oses/redhat.com/rhl-5.1.xml.in b/data/os/redhat.com/rhl-5.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-5.1.xml.in
rename to data/os/redhat.com/rhl-5.1.xml.in
diff --git a/data/oses/redhat.com/rhl-5.2.xml.in b/data/os/redhat.com/rhl-5.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-5.2.xml.in
rename to data/os/redhat.com/rhl-5.2.xml.in
diff --git a/data/oses/redhat.com/rhl-6.0.xml.in b/data/os/redhat.com/rhl-6.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-6.0.xml.in
rename to data/os/redhat.com/rhl-6.0.xml.in
diff --git a/data/oses/redhat.com/rhl-6.1.xml.in b/data/os/redhat.com/rhl-6.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-6.1.xml.in
rename to data/os/redhat.com/rhl-6.1.xml.in
diff --git a/data/oses/redhat.com/rhl-6.2.xml.in b/data/os/redhat.com/rhl-6.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-6.2.xml.in
rename to data/os/redhat.com/rhl-6.2.xml.in
diff --git a/data/oses/redhat.com/rhl-7.1.xml.in b/data/os/redhat.com/rhl-7.1.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-7.1.xml.in
rename to data/os/redhat.com/rhl-7.1.xml.in
diff --git a/data/oses/redhat.com/rhl-7.2.xml.in b/data/os/redhat.com/rhl-7.2.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-7.2.xml.in
rename to data/os/redhat.com/rhl-7.2.xml.in
diff --git a/data/oses/redhat.com/rhl-7.3.xml.in b/data/os/redhat.com/rhl-7.3.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-7.3.xml.in
rename to data/os/redhat.com/rhl-7.3.xml.in
diff --git a/data/oses/redhat.com/rhl-7.xml.in b/data/os/redhat.com/rhl-7.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-7.xml.in
rename to data/os/redhat.com/rhl-7.xml.in
diff --git a/data/oses/redhat.com/rhl-8.0.xml.in b/data/os/redhat.com/rhl-8.0.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-8.0.xml.in
rename to data/os/redhat.com/rhl-8.0.xml.in
diff --git a/data/oses/redhat.com/rhl-9.xml.in b/data/os/redhat.com/rhl-9.xml.in
similarity index 100%
rename from data/oses/redhat.com/rhl-9.xml.in
rename to data/os/redhat.com/rhl-9.xml.in
diff --git a/data/devices/xen.org/Makefile.am b/data/os/sun.com/Makefile.am
similarity index 100%
rename from data/devices/xen.org/Makefile.am
rename to data/os/sun.com/Makefile.am
diff --git a/data/oses/sun.com/opensolaris-2009.06.xml.in b/data/os/sun.com/opensolaris-2009.06.xml.in
similarity index 100%
rename from data/oses/sun.com/opensolaris-2009.06.xml.in
rename to data/os/sun.com/opensolaris-2009.06.xml.in
diff --git a/data/oses/sun.com/solaris-10.xml.in b/data/os/sun.com/solaris-10.xml.in
similarity index 100%
rename from data/oses/sun.com/solaris-10.xml.in
rename to data/os/sun.com/solaris-10.xml.in
diff --git a/data/oses/sun.com/solaris-9.xml.in b/data/os/sun.com/solaris-9.xml.in
similarity index 100%
rename from data/oses/sun.com/solaris-9.xml.in
rename to data/os/sun.com/solaris-9.xml.in
diff --git a/data/devices/usb.org/Makefile.am b/data/os/suse.com/Makefile.am
similarity index 100%
rename from data/devices/usb.org/Makefile.am
rename to data/os/suse.com/Makefile.am
diff --git a/data/oses/suse.com/sled-10.xml.in b/data/os/suse.com/sled-10.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-10.xml.in
rename to data/os/suse.com/sled-10.xml.in
diff --git a/data/oses/suse.com/sled-11.1.xml.in b/data/os/suse.com/sled-11.1.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-11.1.xml.in
rename to data/os/suse.com/sled-11.1.xml.in
diff --git a/data/oses/suse.com/sled-11.2.xml.in b/data/os/suse.com/sled-11.2.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-11.2.xml.in
rename to data/os/suse.com/sled-11.2.xml.in
diff --git a/data/oses/suse.com/sled-11.3.xml.in b/data/os/suse.com/sled-11.3.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-11.3.xml.in
rename to data/os/suse.com/sled-11.3.xml.in
diff --git a/data/oses/suse.com/sled-11.4.xml.in b/data/os/suse.com/sled-11.4.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-11.4.xml.in
rename to data/os/suse.com/sled-11.4.xml.in
diff --git a/data/oses/suse.com/sled-11.xml.in b/data/os/suse.com/sled-11.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-11.xml.in
rename to data/os/suse.com/sled-11.xml.in
diff --git a/data/oses/suse.com/sled-12.xml.in b/data/os/suse.com/sled-12.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-12.xml.in
rename to data/os/suse.com/sled-12.xml.in
diff --git a/data/oses/suse.com/sled-9.xml.in b/data/os/suse.com/sled-9.xml.in
similarity index 100%
rename from data/oses/suse.com/sled-9.xml.in
rename to data/os/suse.com/sled-9.xml.in
diff --git a/data/oses/suse.com/sles-10.xml.in b/data/os/suse.com/sles-10.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-10.xml.in
rename to data/os/suse.com/sles-10.xml.in
diff --git a/data/oses/suse.com/sles-11.1.xml.in b/data/os/suse.com/sles-11.1.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-11.1.xml.in
rename to data/os/suse.com/sles-11.1.xml.in
diff --git a/data/oses/suse.com/sles-11.2.xml.in b/data/os/suse.com/sles-11.2.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-11.2.xml.in
rename to data/os/suse.com/sles-11.2.xml.in
diff --git a/data/oses/suse.com/sles-11.3.xml.in b/data/os/suse.com/sles-11.3.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-11.3.xml.in
rename to data/os/suse.com/sles-11.3.xml.in
diff --git a/data/oses/suse.com/sles-11.4.xml.in b/data/os/suse.com/sles-11.4.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-11.4.xml.in
rename to data/os/suse.com/sles-11.4.xml.in
diff --git a/data/oses/suse.com/sles-11.xml.in b/data/os/suse.com/sles-11.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-11.xml.in
rename to data/os/suse.com/sles-11.xml.in
diff --git a/data/oses/suse.com/sles-12.xml.in b/data/os/suse.com/sles-12.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-12.xml.in
rename to data/os/suse.com/sles-12.xml.in
diff --git a/data/oses/suse.com/sles-9.xml.in b/data/os/suse.com/sles-9.xml.in
similarity index 100%
rename from data/oses/suse.com/sles-9.xml.in
rename to data/os/suse.com/sles-9.xml.in
diff --git a/data/devices/pcisig.com/Makefile.am b/data/os/ubuntu.com/Makefile.am
similarity index 100%
rename from data/devices/pcisig.com/Makefile.am
rename to data/os/ubuntu.com/Makefile.am
diff --git a/data/oses/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-10.04.xml.in
rename to data/os/ubuntu.com/ubuntu-10.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-10.10.xml.in b/data/os/ubuntu.com/ubuntu-10.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-10.10.xml.in
rename to data/os/ubuntu.com/ubuntu-10.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-11.04.xml.in
rename to data/os/ubuntu.com/ubuntu-11.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-11.10.xml.in b/data/os/ubuntu.com/ubuntu-11.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-11.10.xml.in
rename to data/os/ubuntu.com/ubuntu-11.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-12.04.xml.in
rename to data/os/ubuntu.com/ubuntu-12.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-12.10.xml.in
rename to data/os/ubuntu.com/ubuntu-12.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-13.04.xml.in
rename to data/os/ubuntu.com/ubuntu-13.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-13.10.xml.in
rename to data/os/ubuntu.com/ubuntu-13.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-14.04.xml.in
rename to data/os/ubuntu.com/ubuntu-14.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-14.10.xml.in
rename to data/os/ubuntu.com/ubuntu-14.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-15.04.xml.in
rename to data/os/ubuntu.com/ubuntu-15.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-15.10.xml.in
rename to data/os/ubuntu.com/ubuntu-15.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-4.10.xml.in b/data/os/ubuntu.com/ubuntu-4.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-4.10.xml.in
rename to data/os/ubuntu.com/ubuntu-4.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-5.04.xml.in b/data/os/ubuntu.com/ubuntu-5.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-5.04.xml.in
rename to data/os/ubuntu.com/ubuntu-5.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-5.10.xml.in b/data/os/ubuntu.com/ubuntu-5.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-5.10.xml.in
rename to data/os/ubuntu.com/ubuntu-5.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-6.06.xml.in
rename to data/os/ubuntu.com/ubuntu-6.06.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-6.10.xml.in b/data/os/ubuntu.com/ubuntu-6.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-6.10.xml.in
rename to data/os/ubuntu.com/ubuntu-6.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-7.04.xml.in b/data/os/ubuntu.com/ubuntu-7.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-7.04.xml.in
rename to data/os/ubuntu.com/ubuntu-7.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-7.10.xml.in b/data/os/ubuntu.com/ubuntu-7.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-7.10.xml.in
rename to data/os/ubuntu.com/ubuntu-7.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-8.04.xml.in
rename to data/os/ubuntu.com/ubuntu-8.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-8.10.xml.in b/data/os/ubuntu.com/ubuntu-8.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-8.10.xml.in
rename to data/os/ubuntu.com/ubuntu-8.10.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-9.04.xml.in
rename to data/os/ubuntu.com/ubuntu-9.04.xml.in
diff --git a/data/oses/ubuntu.com/ubuntu-9.10.xml.in b/data/os/ubuntu.com/ubuntu-9.10.xml.in
similarity index 100%
rename from data/oses/ubuntu.com/ubuntu-9.10.xml.in
rename to data/os/ubuntu.com/ubuntu-9.10.xml.in
diff --git a/data/platforms/Makefile.am b/data/platform/Makefile.am
similarity index 100%
rename from data/platforms/Makefile.am
rename to data/platform/Makefile.am
diff --git a/data/devices/ibm.com/Makefile.am b/data/platform/linux-kvm.org/Makefile.am
similarity index 100%
rename from data/devices/ibm.com/Makefile.am
rename to data/platform/linux-kvm.org/Makefile.am
diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
similarity index 100%
rename from data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in
rename to data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
similarity index 100%
rename from data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in
rename to data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
similarity index 100%
rename from data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in
rename to data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in
similarity index 100%
rename from data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in
rename to data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in
diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in
similarity index 100%
rename from data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in
rename to data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in
diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in
similarity index 100%
rename from data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in
rename to data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in
diff --git a/data/devices/ibasetechnologies.net/Makefile.am b/data/platform/qemu.org/Makefile.am
similarity index 100%
rename from data/devices/ibasetechnologies.net/Makefile.am
rename to data/platform/qemu.org/Makefile.am
diff --git a/data/platforms/qemu.org/qemu-1.0.1.xml.in b/data/platform/qemu.org/qemu-1.0.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.0.1.xml.in
rename to data/platform/qemu.org/qemu-1.0.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.0.xml.in b/data/platform/qemu.org/qemu-1.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.0.xml.in
rename to data/platform/qemu.org/qemu-1.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.1.1-1.xml.in b/data/platform/qemu.org/qemu-1.1.1-1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.1.1-1.xml.in
rename to data/platform/qemu.org/qemu-1.1.1-1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.1.1.xml.in b/data/platform/qemu.org/qemu-1.1.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.1.1.xml.in
rename to data/platform/qemu.org/qemu-1.1.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.1.2.xml.in b/data/platform/qemu.org/qemu-1.1.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.1.2.xml.in
rename to data/platform/qemu.org/qemu-1.1.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.1.xml.in b/data/platform/qemu.org/qemu-1.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.1.xml.in
rename to data/platform/qemu.org/qemu-1.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.2.0.xml.in b/data/platform/qemu.org/qemu-1.2.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.2.0.xml.in
rename to data/platform/qemu.org/qemu-1.2.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.2.1.xml.in b/data/platform/qemu.org/qemu-1.2.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.2.1.xml.in
rename to data/platform/qemu.org/qemu-1.2.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.2.2.xml.in b/data/platform/qemu.org/qemu-1.2.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.2.2.xml.in
rename to data/platform/qemu.org/qemu-1.2.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.3.0.xml.in b/data/platform/qemu.org/qemu-1.3.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.3.0.xml.in
rename to data/platform/qemu.org/qemu-1.3.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.3.1.xml.in b/data/platform/qemu.org/qemu-1.3.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.3.1.xml.in
rename to data/platform/qemu.org/qemu-1.3.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.4.0.xml.in b/data/platform/qemu.org/qemu-1.4.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.4.0.xml.in
rename to data/platform/qemu.org/qemu-1.4.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.4.1.xml.in b/data/platform/qemu.org/qemu-1.4.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.4.1.xml.in
rename to data/platform/qemu.org/qemu-1.4.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.4.2.xml.in b/data/platform/qemu.org/qemu-1.4.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.4.2.xml.in
rename to data/platform/qemu.org/qemu-1.4.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.5.0.xml.in b/data/platform/qemu.org/qemu-1.5.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.5.0.xml.in
rename to data/platform/qemu.org/qemu-1.5.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.5.1.xml.in b/data/platform/qemu.org/qemu-1.5.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.5.1.xml.in
rename to data/platform/qemu.org/qemu-1.5.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.5.2.xml.in b/data/platform/qemu.org/qemu-1.5.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.5.2.xml.in
rename to data/platform/qemu.org/qemu-1.5.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.5.3.xml.in b/data/platform/qemu.org/qemu-1.5.3.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.5.3.xml.in
rename to data/platform/qemu.org/qemu-1.5.3.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.6.0.xml.in b/data/platform/qemu.org/qemu-1.6.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.6.0.xml.in
rename to data/platform/qemu.org/qemu-1.6.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.6.1.xml.in b/data/platform/qemu.org/qemu-1.6.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.6.1.xml.in
rename to data/platform/qemu.org/qemu-1.6.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.6.2.xml.in b/data/platform/qemu.org/qemu-1.6.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.6.2.xml.in
rename to data/platform/qemu.org/qemu-1.6.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.7.0.xml.in b/data/platform/qemu.org/qemu-1.7.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.7.0.xml.in
rename to data/platform/qemu.org/qemu-1.7.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.7.1.xml.in b/data/platform/qemu.org/qemu-1.7.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.7.1.xml.in
rename to data/platform/qemu.org/qemu-1.7.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-1.7.2.xml.in b/data/platform/qemu.org/qemu-1.7.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-1.7.2.xml.in
rename to data/platform/qemu.org/qemu-1.7.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.0.0.xml.in b/data/platform/qemu.org/qemu-2.0.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.0.0.xml.in
rename to data/platform/qemu.org/qemu-2.0.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.0.1.xml.in b/data/platform/qemu.org/qemu-2.0.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.0.1.xml.in
rename to data/platform/qemu.org/qemu-2.0.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.0.2.xml.in b/data/platform/qemu.org/qemu-2.0.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.0.2.xml.in
rename to data/platform/qemu.org/qemu-2.0.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.1.0.xml.in b/data/platform/qemu.org/qemu-2.1.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.1.0.xml.in
rename to data/platform/qemu.org/qemu-2.1.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.1.1.xml.in b/data/platform/qemu.org/qemu-2.1.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.1.1.xml.in
rename to data/platform/qemu.org/qemu-2.1.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.1.2.xml.in b/data/platform/qemu.org/qemu-2.1.2.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.1.2.xml.in
rename to data/platform/qemu.org/qemu-2.1.2.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.1.3.xml.in b/data/platform/qemu.org/qemu-2.1.3.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.1.3.xml.in
rename to data/platform/qemu.org/qemu-2.1.3.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.2.0.xml.in b/data/platform/qemu.org/qemu-2.2.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.2.0.xml.in
rename to data/platform/qemu.org/qemu-2.2.0.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.2.1.xml.in b/data/platform/qemu.org/qemu-2.2.1.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.2.1.xml.in
rename to data/platform/qemu.org/qemu-2.2.1.xml.in
diff --git a/data/platforms/qemu.org/qemu-2.3.0.xml.in b/data/platform/qemu.org/qemu-2.3.0.xml.in
similarity index 100%
rename from data/platforms/qemu.org/qemu-2.3.0.xml.in
rename to data/platform/qemu.org/qemu-2.3.0.xml.in
diff --git a/data/datamaps/x.org/Makefile.am b/data/platform/redhat.com/Makefile.am
similarity index 100%
rename from data/datamaps/x.org/Makefile.am
rename to data/platform/redhat.com/Makefile.am
diff --git a/data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in b/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in
rename to data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
similarity index 100%
rename from data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in
rename to data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
diff --git a/data/datamaps/microsoft.com/Makefile.am b/data/platform/xen.org/Makefile.am
similarity index 100%
rename from data/datamaps/microsoft.com/Makefile.am
rename to data/platform/xen.org/Makefile.am
diff --git a/data/platforms/xen.org/xen-3.0.2.xml.in b/data/platform/xen.org/xen-3.0.2.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.0.2.xml.in
rename to data/platform/xen.org/xen-3.0.2.xml.in
diff --git a/data/platforms/xen.org/xen-3.0.3.xml.in b/data/platform/xen.org/xen-3.0.3.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.0.3.xml.in
rename to data/platform/xen.org/xen-3.0.3.xml.in
diff --git a/data/platforms/xen.org/xen-3.0.4.xml.in b/data/platform/xen.org/xen-3.0.4.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.0.4.xml.in
rename to data/platform/xen.org/xen-3.0.4.xml.in
diff --git a/data/platforms/xen.org/xen-3.1.0.xml.in b/data/platform/xen.org/xen-3.1.0.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.1.0.xml.in
rename to data/platform/xen.org/xen-3.1.0.xml.in
diff --git a/data/platforms/xen.org/xen-3.1.3.xml.in b/data/platform/xen.org/xen-3.1.3.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.1.3.xml.in
rename to data/platform/xen.org/xen-3.1.3.xml.in
diff --git a/data/platforms/xen.org/xen-3.1.4.xml.in b/data/platform/xen.org/xen-3.1.4.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.1.4.xml.in
rename to data/platform/xen.org/xen-3.1.4.xml.in
diff --git a/data/platforms/xen.org/xen-3.2.0.xml.in b/data/platform/xen.org/xen-3.2.0.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.2.0.xml.in
rename to data/platform/xen.org/xen-3.2.0.xml.in
diff --git a/data/platforms/xen.org/xen-3.2.1.xml.in b/data/platform/xen.org/xen-3.2.1.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.2.1.xml.in
rename to data/platform/xen.org/xen-3.2.1.xml.in
diff --git a/data/platforms/xen.org/xen-3.2.2.xml.in b/data/platform/xen.org/xen-3.2.2.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.2.2.xml.in
rename to data/platform/xen.org/xen-3.2.2.xml.in
diff --git a/data/platforms/xen.org/xen-3.2.3.xml.in b/data/platform/xen.org/xen-3.2.3.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.2.3.xml.in
rename to data/platform/xen.org/xen-3.2.3.xml.in
diff --git a/data/platforms/xen.org/xen-3.3.0.xml.in b/data/platform/xen.org/xen-3.3.0.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.3.0.xml.in
rename to data/platform/xen.org/xen-3.3.0.xml.in
diff --git a/data/platforms/xen.org/xen-3.3.1.xml.in b/data/platform/xen.org/xen-3.3.1.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.3.1.xml.in
rename to data/platform/xen.org/xen-3.3.1.xml.in
diff --git a/data/platforms/xen.org/xen-3.3.2.xml.in b/data/platform/xen.org/xen-3.3.2.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.3.2.xml.in
rename to data/platform/xen.org/xen-3.3.2.xml.in
diff --git a/data/platforms/xen.org/xen-3.4.0.xml.in b/data/platform/xen.org/xen-3.4.0.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.4.0.xml.in
rename to data/platform/xen.org/xen-3.4.0.xml.in
diff --git a/data/platforms/xen.org/xen-3.4.1.xml.in b/data/platform/xen.org/xen-3.4.1.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.4.1.xml.in
rename to data/platform/xen.org/xen-3.4.1.xml.in
diff --git a/data/platforms/xen.org/xen-3.4.2.xml.in b/data/platform/xen.org/xen-3.4.2.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.4.2.xml.in
rename to data/platform/xen.org/xen-3.4.2.xml.in
diff --git a/data/platforms/xen.org/xen-3.4.3.xml.in b/data/platform/xen.org/xen-3.4.3.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-3.4.3.xml.in
rename to data/platform/xen.org/xen-3.4.3.xml.in
diff --git a/data/platforms/xen.org/xen-4.0.0.xml.in b/data/platform/xen.org/xen-4.0.0.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-4.0.0.xml.in
rename to data/platform/xen.org/xen-4.0.0.xml.in
diff --git a/data/platforms/xen.org/xen-4.0.1.xml.in b/data/platform/xen.org/xen-4.0.1.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-4.0.1.xml.in
rename to data/platform/xen.org/xen-4.0.1.xml.in
diff --git a/data/platforms/xen.org/xen-4.1.0.xml.in b/data/platform/xen.org/xen-4.1.0.xml.in
similarity index 100%
rename from data/platforms/xen.org/xen-4.1.0.xml.in
rename to data/platform/xen.org/xen-4.1.0.xml.in
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index c9f7e2c..8ef688a 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -109,11 +109,11 @@ rm -fr %{buildroot}
%dir %{_datadir}/libosinfo/schemas/
%{_datadir}/libosinfo/db/usb.ids
%{_datadir}/libosinfo/db/pci.ids
-%{_datadir}/libosinfo/db/datamaps
-%{_datadir}/libosinfo/db/devices
-%{_datadir}/libosinfo/db/oses
-%{_datadir}/libosinfo/db/platforms
-%{_datadir}/libosinfo/db/install-scripts
+%{_datadir}/libosinfo/db/datamap
+%{_datadir}/libosinfo/db/device
+%{_datadir}/libosinfo/db/os
+%{_datadir}/libosinfo/db/platform
+%{_datadir}/libosinfo/db/install-script
%{_datadir}/libosinfo/schemas/libosinfo.rng
%{_mandir}/man1/osinfo-db-validate.1*
%{_mandir}/man1/osinfo-detect.1*
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index a678c3f..2529471 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -105,11 +105,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%dir %{mingw32_datadir}/libosinfo/schemas
%{mingw32_datadir}/libosinfo/db/usb.ids
%{mingw32_datadir}/libosinfo/db/pci.ids
-%{mingw32_datadir}/libosinfo/db/datamaps
-%{mingw32_datadir}/libosinfo/db/devices
-%{mingw32_datadir}/libosinfo/db/oses
-%{mingw32_datadir}/libosinfo/db/platforms
-%{mingw32_datadir}/libosinfo/db/install-scripts
+%{mingw32_datadir}/libosinfo/db/datamap
+%{mingw32_datadir}/libosinfo/db/device
+%{mingw32_datadir}/libosinfo/db/os
+%{mingw32_datadir}/libosinfo/db/platform
+%{mingw32_datadir}/libosinfo/db/install-script
%{mingw32_datadir}/libosinfo/schemas/libosinfo.rng
%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
@@ -130,11 +130,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%dir %{mingw64_datadir}/libosinfo/schemas
%{mingw64_datadir}/libosinfo/db/usb.ids
%{mingw64_datadir}/libosinfo/db/pci.ids
-%{mingw64_datadir}/libosinfo/db/datamaps
-%{mingw64_datadir}/libosinfo/db/devices
-%{mingw64_datadir}/libosinfo/db/oses
-%{mingw64_datadir}/libosinfo/db/platforms
-%{mingw64_datadir}/libosinfo/db/install-scripts
+%{mingw64_datadir}/libosinfo/db/datamap
+%{mingw64_datadir}/libosinfo/db/device
+%{mingw64_datadir}/libosinfo/db/os
+%{mingw64_datadir}/libosinfo/db/platform
+%{mingw64_datadir}/libosinfo/db/install-script
%{mingw64_datadir}/libosinfo/schemas/libosinfo.rng
%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
diff --git a/po/POTFILES.in b/po/POTFILES.in
index da70e2b..f5d40c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,406 +1,406 @@
-data/oses/altlinux.org/altlinux-1.0.xml.in
-data/oses/altlinux.org/altlinux-2.0.xml.in
-data/oses/altlinux.org/altlinux-2.2.xml.in
-data/oses/altlinux.org/altlinux-2.4.xml.in
-data/oses/altlinux.org/altlinux-3.0.xml.in
-data/oses/altlinux.org/altlinux-4.0.xml.in
-data/oses/altlinux.org/altlinux-4.1.xml.in
-data/oses/altlinux.org/altlinux-5.0.xml.in
-data/oses/altlinux.org/altlinux-6.0.xml.in
-data/oses/altlinux.org/altlinux-7.0.xml.in
-data/oses/apple.com/macosx-10.0.xml.in
-data/oses/apple.com/macosx-10.1.xml.in
-data/oses/apple.com/macosx-10.2.xml.in
-data/oses/apple.com/macosx-10.3.xml.in
-data/oses/apple.com/macosx-10.4.xml.in
-data/oses/apple.com/macosx-10.5.xml.in
-data/oses/apple.com/macosx-10.6.xml.in
-data/oses/apple.com/macosx-10.7.xml.in
-data/oses/centos.org/centos-6.0.xml.in
-data/oses/centos.org/centos-6.1.xml.in
-data/oses/centos.org/centos-6.2.xml.in
-data/oses/centos.org/centos-6.3.xml.in
-data/oses/centos.org/centos-6.4.xml.in
-data/oses/centos.org/centos-6.5.xml.in
-data/oses/centos.org/centos-7.0.xml.in
-data/oses/debian.org/debian-1.1.xml.in
-data/oses/debian.org/debian-1.2.xml.in
-data/oses/debian.org/debian-1.3.xml.in
-data/oses/debian.org/debian-2.0.xml.in
-data/oses/debian.org/debian-2.1.xml.in
-data/oses/debian.org/debian-2.2.xml.in
-data/oses/debian.org/debian-3.1.xml.in
-data/oses/debian.org/debian-3.xml.in
-data/oses/debian.org/debian-4.xml.in
-data/oses/debian.org/debian-5.xml.in
-data/oses/debian.org/debian-6.xml.in
-data/oses/debian.org/debian-7.xml.in
-data/oses/debian.org/debian-8.xml.in
-data/oses/fedoraproject.org/fedora-1.xml.in
-data/oses/fedoraproject.org/fedora-2.xml.in
-data/oses/fedoraproject.org/fedora-3.xml.in
-data/oses/fedoraproject.org/fedora-4.xml.in
-data/oses/fedoraproject.org/fedora-5.xml.in
-data/oses/fedoraproject.org/fedora-6.xml.in
-data/oses/fedoraproject.org/fedora-7.xml.in
-data/oses/fedoraproject.org/fedora-8.xml.in
-data/oses/fedoraproject.org/fedora-9.xml.in
-data/oses/fedoraproject.org/fedora-10.xml.in
-data/oses/fedoraproject.org/fedora-11.xml.in
-data/oses/fedoraproject.org/fedora-12.xml.in
-data/oses/fedoraproject.org/fedora-13.xml.in
-data/oses/fedoraproject.org/fedora-14.xml.in
-data/oses/fedoraproject.org/fedora-15.xml.in
-data/oses/fedoraproject.org/fedora-16.xml.in
-data/oses/fedoraproject.org/fedora-17.xml.in
-data/oses/fedoraproject.org/fedora-18.xml.in
-data/oses/fedoraproject.org/fedora-19.xml.in
-data/oses/fedoraproject.org/fedora-20.xml.in
-data/oses/fedoraproject.org/fedora-21.xml.in
-data/oses/fedoraproject.org/fedora-22.xml.in
-data/oses/fedoraproject.org/fedora-unknown.xml.in
-data/oses/freebsd.org/freebsd-1.0.xml.in
-data/oses/freebsd.org/freebsd-2.0.5.xml.in
-data/oses/freebsd.org/freebsd-2.0.xml.in
-data/oses/freebsd.org/freebsd-2.2.8.xml.in
-data/oses/freebsd.org/freebsd-2.2.9.xml.in
-data/oses/freebsd.org/freebsd-3.0.xml.in
-data/oses/freebsd.org/freebsd-3.2.xml.in
-data/oses/freebsd.org/freebsd-4.0.xml.in
-data/oses/freebsd.org/freebsd-4.10.xml.in
-data/oses/freebsd.org/freebsd-4.11.xml.in
-data/oses/freebsd.org/freebsd-4.1.xml.in
-data/oses/freebsd.org/freebsd-4.2.xml.in
-data/oses/freebsd.org/freebsd-4.3.xml.in
-data/oses/freebsd.org/freebsd-4.4.xml.in
-data/oses/freebsd.org/freebsd-4.5.xml.in
-data/oses/freebsd.org/freebsd-4.6.xml.in
-data/oses/freebsd.org/freebsd-4.7.xml.in
-data/oses/freebsd.org/freebsd-4.8.xml.in
-data/oses/freebsd.org/freebsd-4.9.xml.in
-data/oses/freebsd.org/freebsd-5.0.xml.in
-data/oses/freebsd.org/freebsd-5.1.xml.in
-data/oses/freebsd.org/freebsd-5.2.1.xml.in
-data/oses/freebsd.org/freebsd-5.2.xml.in
-data/oses/freebsd.org/freebsd-5.3.xml.in
-data/oses/freebsd.org/freebsd-5.4.xml.in
-data/oses/freebsd.org/freebsd-5.5.xml.in
-data/oses/freebsd.org/freebsd-6.0.xml.in
-data/oses/freebsd.org/freebsd-6.1.xml.in
-data/oses/freebsd.org/freebsd-6.2.xml.in
-data/oses/freebsd.org/freebsd-6.3.xml.in
-data/oses/freebsd.org/freebsd-6.4.xml.in
-data/oses/freebsd.org/freebsd-7.0.xml.in
-data/oses/freebsd.org/freebsd-7.1.xml.in
-data/oses/freebsd.org/freebsd-7.2.xml.in
-data/oses/freebsd.org/freebsd-7.3.xml.in
-data/oses/freebsd.org/freebsd-7.4.xml.in
-data/oses/freebsd.org/freebsd-8.0.xml.in
-data/oses/freebsd.org/freebsd-8.1.xml.in
-data/oses/freebsd.org/freebsd-8.2.xml.in
-data/oses/freebsd.org/freebsd-8.3.xml.in
-data/oses/freebsd.org/freebsd-8.4.xml.in
-data/oses/freebsd.org/freebsd-9.0.xml.in
-data/oses/freebsd.org/freebsd-9.1.xml.in
-data/oses/freebsd.org/freebsd-9.2.xml.in
-data/oses/freebsd.org/freebsd-9.3.xml.in
-data/oses/freebsd.org/freebsd-10.0.xml.in
-data/oses/freebsd.org/freebsd-10.1.xml.in
-data/oses/gnome.org/gnome-3.6.xml.in
-data/oses/gnome.org/gnome-3.8.xml.in
-data/oses/gnome.org/gnome-continuous-3.10.xml.in
-data/oses/gnome.org/gnome-continuous-3.12.xml.in
-data/oses/gnome.org/gnome-continuous-3.14.xml.in
-data/oses/mageia.org/mageia-1.xml.in
-data/oses/mageia.org/mageia-2.xml.in
-data/oses/mageia.org/mageia-3.xml.in
-data/oses/mandriva.com/mandrake-5.1.xml.in
-data/oses/mandriva.com/mandrake-5.2.xml.in
-data/oses/mandriva.com/mandrake-5.3.xml.in
-data/oses/mandriva.com/mandrake-6.0.xml.in
-data/oses/mandriva.com/mandrake-6.1.xml.in
-data/oses/mandriva.com/mandrake-7.0.xml.in
-data/oses/mandriva.com/mandrake-7.1.xml.in
-data/oses/mandriva.com/mandrake-7.2.xml.in
-data/oses/mandriva.com/mandrake-8.0.xml.in
-data/oses/mandriva.com/mandrake-8.1.xml.in
-data/oses/mandriva.com/mandrake-8.2.xml.in
-data/oses/mandriva.com/mandrake-9.0.xml.in
-data/oses/mandriva.com/mandrake-9.1.xml.in
-data/oses/mandriva.com/mandrake-9.2.xml.in
-data/oses/mandriva.com/mandrake-10.0.xml.in
-data/oses/mandriva.com/mandrake-10.1.xml.in
-data/oses/mandriva.com/mandrake-10.2.xml.in
-data/oses/mandriva.com/mandriva-2006.0.xml.in
-data/oses/mandriva.com/mandriva-2007.1.xml.in
-data/oses/mandriva.com/mandriva-2007.xml.in
-data/oses/mandriva.com/mandriva-2008.0.xml.in
-data/oses/mandriva.com/mandriva-2008.1.xml.in
-data/oses/mandriva.com/mandriva-2009.0.xml.in
-data/oses/mandriva.com/mandriva-2009.1.xml.in
-data/oses/mandriva.com/mandriva-2010.0.xml.in
-data/oses/mandriva.com/mandriva-2010.1.xml.in
-data/oses/mandriva.com/mandriva-2010.2.xml.in
-data/oses/mandriva.com/mandriva-2011.xml.in
-data/oses/mandriva.com/mbs-1.0.xml.in
-data/oses/mandriva.com/mes-5.0.xml.in
-data/oses/mandriva.com/mes-5.1.xml.in
-data/oses/microsoft.com/msdos-6.22.xml.in
-data/oses/microsoft.com/win-1.0.xml.in
-data/oses/microsoft.com/win-10.xml.in
-data/oses/microsoft.com/win-2.0.xml.in
-data/oses/microsoft.com/win-2.1.xml.in
-data/oses/microsoft.com/win-2k12r2.xml.in
-data/oses/microsoft.com/win-2k12.xml.in
-data/oses/microsoft.com/win-2k3r2.xml.in
-data/oses/microsoft.com/win-2k3.xml.in
-data/oses/microsoft.com/win-2k8r2.xml.in
-data/oses/microsoft.com/win-2k8.xml.in
-data/oses/microsoft.com/win-2k.xml.in
-data/oses/microsoft.com/win-3.1.xml.in
-data/oses/microsoft.com/win-7.xml.in
-data/oses/microsoft.com/win-8.1.xml.in
-data/oses/microsoft.com/win-8.xml.in
-data/oses/microsoft.com/win-95.xml.in
-data/oses/microsoft.com/win-98.xml.in
-data/oses/microsoft.com/win-me.xml.in
-data/oses/microsoft.com/winnt-3.1.xml.in
-data/oses/microsoft.com/winnt-3.51.xml.in
-data/oses/microsoft.com/winnt-3.5.xml.in
-data/oses/microsoft.com/winnt-4.0.xml.in
-data/oses/microsoft.com/win-vista.xml.in
-data/oses/microsoft.com/win-xp.xml.in
-data/oses/netbsd.org/netbsd-0.8.xml.in
-data/oses/netbsd.org/netbsd-0.9.xml.in
-data/oses/netbsd.org/netbsd-1.0.xml.in
-data/oses/netbsd.org/netbsd-1.1.xml.in
-data/oses/netbsd.org/netbsd-1.2.xml.in
-data/oses/netbsd.org/netbsd-1.3.xml.in
-data/oses/netbsd.org/netbsd-1.4.xml.in
-data/oses/netbsd.org/netbsd-1.5.xml.in
-data/oses/netbsd.org/netbsd-1.6.xml.in
-data/oses/netbsd.org/netbsd-2.0.xml.in
-data/oses/netbsd.org/netbsd-3.0.xml.in
-data/oses/netbsd.org/netbsd-4.0.xml.in
-data/oses/netbsd.org/netbsd-5.0.xml.in
-data/oses/netbsd.org/netbsd-5.1.xml.in
-data/oses/novell.com/netware-4.xml.in
-data/oses/novell.com/netware-5.xml.in
-data/oses/novell.com/netware-6.xml.in
-data/oses/openbsd.org/openbsd-4.2.xml.in
-data/oses/openbsd.org/openbsd-4.3.xml.in
-data/oses/openbsd.org/openbsd-4.4.xml.in
-data/oses/openbsd.org/openbsd-4.5.xml.in
-data/oses/openbsd.org/openbsd-4.8.xml.in
-data/oses/openbsd.org/openbsd-4.9.xml.in
-data/oses/openbsd.org/openbsd-5.0.xml.in
-data/oses/openbsd.org/openbsd-5.1.xml.in
-data/oses/openbsd.org/openbsd-5.2.xml.in
-data/oses/openbsd.org/openbsd-5.3.xml.in
-data/oses/openbsd.org/openbsd-5.4.xml.in
-data/oses/openbsd.org/openbsd-5.5.xml.in
-data/oses/openbsd.org/openbsd-5.6.xml.in
-data/oses/openbsd.org/openbsd-5.7.xml.in
-data/oses/openbsd.org/openbsd-5.8.xml.in
-data/oses/opensuse.org/opensuse-10.2.xml.in
-data/oses/opensuse.org/opensuse-10.3.xml.in
-data/oses/opensuse.org/opensuse-11.0.xml.in
-data/oses/opensuse.org/opensuse-11.1.xml.in
-data/oses/opensuse.org/opensuse-11.2.xml.in
-data/oses/opensuse.org/opensuse-11.3.xml.in
-data/oses/opensuse.org/opensuse-11.4.xml.in
-data/oses/opensuse.org/opensuse-12.1.xml.in
-data/oses/opensuse.org/opensuse-12.2.xml.in
-data/oses/opensuse.org/opensuse-12.3.xml.in
-data/oses/opensuse.org/opensuse-13.1.xml.in
-data/oses/opensuse.org/opensuse-13.2.xml.in
-data/oses/opensuse.org/opensuse-factory.xml.in
-data/oses/opensuse.org/opensuse-unknown.xml.in
-data/oses/oracle.com/solaris-11.xml.in
-data/oses/redhat.com/rhel-2.1.1.xml.in
-data/oses/redhat.com/rhel-2.1.2.xml.in
-data/oses/redhat.com/rhel-2.1.3.xml.in
-data/oses/redhat.com/rhel-2.1.4.xml.in
-data/oses/redhat.com/rhel-2.1.5.xml.in
-data/oses/redhat.com/rhel-2.1.6.xml.in
-data/oses/redhat.com/rhel-2.1.7.xml.in
-data/oses/redhat.com/rhel-2.1.xml.in
-data/oses/redhat.com/rhel-3.1.xml.in
-data/oses/redhat.com/rhel-3.2.xml.in
-data/oses/redhat.com/rhel-3.3.xml.in
-data/oses/redhat.com/rhel-3.4.xml.in
-data/oses/redhat.com/rhel-3.5.xml.in
-data/oses/redhat.com/rhel-3.6.xml.in
-data/oses/redhat.com/rhel-3.7.xml.in
-data/oses/redhat.com/rhel-3.8.xml.in
-data/oses/redhat.com/rhel-3.9.xml.in
-data/oses/redhat.com/rhel-3.xml.in
-data/oses/redhat.com/rhel-4.0.xml.in
-data/oses/redhat.com/rhel-4.1.xml.in
-data/oses/redhat.com/rhel-4.2.xml.in
-data/oses/redhat.com/rhel-4.3.xml.in
-data/oses/redhat.com/rhel-4.4.xml.in
-data/oses/redhat.com/rhel-4.5.xml.in
-data/oses/redhat.com/rhel-4.6.xml.in
-data/oses/redhat.com/rhel-4.7.xml.in
-data/oses/redhat.com/rhel-4.8.xml.in
-data/oses/redhat.com/rhel-4.9.xml.in
-data/oses/redhat.com/rhel-5.0.xml.in
-data/oses/redhat.com/rhel-5.10.xml.in
-data/oses/redhat.com/rhel-5.11.xml.in
-data/oses/redhat.com/rhel-5.1.xml.in
-data/oses/redhat.com/rhel-5.2.xml.in
-data/oses/redhat.com/rhel-5.3.xml.in
-data/oses/redhat.com/rhel-5.4.xml.in
-data/oses/redhat.com/rhel-5.5.xml.in
-data/oses/redhat.com/rhel-5.6.xml.in
-data/oses/redhat.com/rhel-5.7.xml.in
-data/oses/redhat.com/rhel-5.8.xml.in
-data/oses/redhat.com/rhel-5.9.xml.in
-data/oses/redhat.com/rhel-6.0.xml.in
-data/oses/redhat.com/rhel-6.1.xml.in
-data/oses/redhat.com/rhel-6.2.xml.in
-data/oses/redhat.com/rhel-6.3.xml.in
-data/oses/redhat.com/rhel-6.4.xml.in
-data/oses/redhat.com/rhel-6.5.xml.in
-data/oses/redhat.com/rhel-6.6.xml.in
-data/oses/redhat.com/rhel-7.0.xml.in
-data/oses/redhat.com/rhel-7.1.xml.in
-data/oses/redhat.com/rhel-atomic-7.0.xml.in
-data/oses/redhat.com/rhel-atomic-7.1.xml.in
-data/oses/redhat.com/rhl-1.0.xml.in
-data/oses/redhat.com/rhl-1.1.xml.in
-data/oses/redhat.com/rhl-2.0.xml.in
-data/oses/redhat.com/rhl-2.1.xml.in
-data/oses/redhat.com/rhl-3.0.3.xml.in
-data/oses/redhat.com/rhl-4.0.xml.in
-data/oses/redhat.com/rhl-4.1.xml.in
-data/oses/redhat.com/rhl-4.2.xml.in
-data/oses/redhat.com/rhl-5.0.xml.in
-data/oses/redhat.com/rhl-5.1.xml.in
-data/oses/redhat.com/rhl-5.2.xml.in
-data/oses/redhat.com/rhl-6.0.xml.in
-data/oses/redhat.com/rhl-6.1.xml.in
-data/oses/redhat.com/rhl-6.2.xml.in
-data/oses/redhat.com/rhl-7.1.xml.in
-data/oses/redhat.com/rhl-7.2.xml.in
-data/oses/redhat.com/rhl-7.3.xml.in
-data/oses/redhat.com/rhl-7.xml.in
-data/oses/redhat.com/rhl-8.0.xml.in
-data/oses/redhat.com/rhl-9.xml.in
-data/oses/sun.com/opensolaris-2009.06.xml.in
-data/oses/sun.com/solaris-9.xml.in
-data/oses/sun.com/solaris-10.xml.in
-data/oses/suse.com/sled-9.xml.in
-data/oses/suse.com/sled-10.xml.in
-data/oses/suse.com/sled-11.1.xml.in
-data/oses/suse.com/sled-11.2.xml.in
-data/oses/suse.com/sled-11.3.xml.in
-data/oses/suse.com/sled-11.4.xml.in
-data/oses/suse.com/sled-11.xml.in
-data/oses/suse.com/sled-12.xml.in
-data/oses/suse.com/sles-9.xml.in
-data/oses/suse.com/sles-10.xml.in
-data/oses/suse.com/sles-11.1.xml.in
-data/oses/suse.com/sles-11.2.xml.in
-data/oses/suse.com/sles-11.3.xml.in
-data/oses/suse.com/sles-11.4.xml.in
-data/oses/suse.com/sles-11.xml.in
-data/oses/suse.com/sles-12.xml.in
-data/oses/ubuntu.com/ubuntu-4.10.xml.in
-data/oses/ubuntu.com/ubuntu-5.04.xml.in
-data/oses/ubuntu.com/ubuntu-5.10.xml.in
-data/oses/ubuntu.com/ubuntu-6.06.xml.in
-data/oses/ubuntu.com/ubuntu-6.10.xml.in
-data/oses/ubuntu.com/ubuntu-7.04.xml.in
-data/oses/ubuntu.com/ubuntu-7.10.xml.in
-data/oses/ubuntu.com/ubuntu-8.04.xml.in
-data/oses/ubuntu.com/ubuntu-8.10.xml.in
-data/oses/ubuntu.com/ubuntu-9.04.xml.in
-data/oses/ubuntu.com/ubuntu-9.10.xml.in
-data/oses/ubuntu.com/ubuntu-10.04.xml.in
-data/oses/ubuntu.com/ubuntu-10.10.xml.in
-data/oses/ubuntu.com/ubuntu-11.04.xml.in
-data/oses/ubuntu.com/ubuntu-11.10.xml.in
-data/oses/ubuntu.com/ubuntu-12.04.xml.in
-data/oses/ubuntu.com/ubuntu-12.10.xml.in
-data/oses/ubuntu.com/ubuntu-13.04.xml.in
-data/oses/ubuntu.com/ubuntu-13.10.xml.in
-data/oses/ubuntu.com/ubuntu-14.04.xml.in
-data/oses/ubuntu.com/ubuntu-14.10.xml.in
-data/oses/ubuntu.com/ubuntu-15.04.xml.in
-data/oses/ubuntu.com/ubuntu-15.10.xml.in
-data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in
-data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in
-data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in
-data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in
-data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in
-data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in
-data/platforms/qemu.org/qemu-1.0.1.xml.in
-data/platforms/qemu.org/qemu-1.0.xml.in
-data/platforms/qemu.org/qemu-1.1.1-1.xml.in
-data/platforms/qemu.org/qemu-1.1.1.xml.in
-data/platforms/qemu.org/qemu-1.1.2.xml.in
-data/platforms/qemu.org/qemu-1.1.xml.in
-data/platforms/qemu.org/qemu-1.2.0.xml.in
-data/platforms/qemu.org/qemu-1.2.1.xml.in
-data/platforms/qemu.org/qemu-1.2.2.xml.in
-data/platforms/qemu.org/qemu-1.3.0.xml.in
-data/platforms/qemu.org/qemu-1.3.1.xml.in
-data/platforms/qemu.org/qemu-1.4.0.xml.in
-data/platforms/qemu.org/qemu-1.4.1.xml.in
-data/platforms/qemu.org/qemu-1.4.2.xml.in
-data/platforms/qemu.org/qemu-1.5.0.xml.in
-data/platforms/qemu.org/qemu-1.5.1.xml.in
-data/platforms/qemu.org/qemu-1.5.2.xml.in
-data/platforms/qemu.org/qemu-1.5.3.xml.in
-data/platforms/qemu.org/qemu-1.6.0.xml.in
-data/platforms/qemu.org/qemu-1.6.1.xml.in
-data/platforms/qemu.org/qemu-1.6.2.xml.in
-data/platforms/qemu.org/qemu-1.7.0.xml.in
-data/platforms/qemu.org/qemu-1.7.1.xml.in
-data/platforms/qemu.org/qemu-1.7.2.xml.in
-data/platforms/qemu.org/qemu-2.0.0.xml.in
-data/platforms/qemu.org/qemu-2.0.1.xml.in
-data/platforms/qemu.org/qemu-2.0.2.xml.in
-data/platforms/qemu.org/qemu-2.1.0.xml.in
-data/platforms/qemu.org/qemu-2.1.1.xml.in
-data/platforms/qemu.org/qemu-2.1.2.xml.in
-data/platforms/qemu.org/qemu-2.1.3.xml.in
-data/platforms/qemu.org/qemu-2.2.0.xml.in
-data/platforms/qemu.org/qemu-2.2.1.xml.in
-data/platforms/qemu.org/qemu-2.3.0.xml.in
-data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in
-data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in
-data/platforms/xen.org/xen-3.0.2.xml.in
-data/platforms/xen.org/xen-3.0.3.xml.in
-data/platforms/xen.org/xen-3.0.4.xml.in
-data/platforms/xen.org/xen-3.1.0.xml.in
-data/platforms/xen.org/xen-3.1.3.xml.in
-data/platforms/xen.org/xen-3.1.4.xml.in
-data/platforms/xen.org/xen-3.2.0.xml.in
-data/platforms/xen.org/xen-3.2.1.xml.in
-data/platforms/xen.org/xen-3.2.2.xml.in
-data/platforms/xen.org/xen-3.2.3.xml.in
-data/platforms/xen.org/xen-3.3.0.xml.in
-data/platforms/xen.org/xen-3.3.1.xml.in
-data/platforms/xen.org/xen-3.3.2.xml.in
-data/platforms/xen.org/xen-3.4.0.xml.in
-data/platforms/xen.org/xen-3.4.1.xml.in
-data/platforms/xen.org/xen-3.4.2.xml.in
-data/platforms/xen.org/xen-3.4.3.xml.in
-data/platforms/xen.org/xen-4.0.0.xml.in
-data/platforms/xen.org/xen-4.0.1.xml.in
-data/platforms/xen.org/xen-4.1.0.xml.in
-data/devices/ibm.com/ps2-keyboard.xml.in
-data/devices/ibm.com/ps2-mouse.xml.in
-data/devices/pcisig.com/pci-1234-1111.xml.in
+data/os/altlinux.org/altlinux-1.0.xml.in
+data/os/altlinux.org/altlinux-2.0.xml.in
+data/os/altlinux.org/altlinux-2.2.xml.in
+data/os/altlinux.org/altlinux-2.4.xml.in
+data/os/altlinux.org/altlinux-3.0.xml.in
+data/os/altlinux.org/altlinux-4.0.xml.in
+data/os/altlinux.org/altlinux-4.1.xml.in
+data/os/altlinux.org/altlinux-5.0.xml.in
+data/os/altlinux.org/altlinux-6.0.xml.in
+data/os/altlinux.org/altlinux-7.0.xml.in
+data/os/apple.com/macosx-10.0.xml.in
+data/os/apple.com/macosx-10.1.xml.in
+data/os/apple.com/macosx-10.2.xml.in
+data/os/apple.com/macosx-10.3.xml.in
+data/os/apple.com/macosx-10.4.xml.in
+data/os/apple.com/macosx-10.5.xml.in
+data/os/apple.com/macosx-10.6.xml.in
+data/os/apple.com/macosx-10.7.xml.in
+data/os/centos.org/centos-6.0.xml.in
+data/os/centos.org/centos-6.1.xml.in
+data/os/centos.org/centos-6.2.xml.in
+data/os/centos.org/centos-6.3.xml.in
+data/os/centos.org/centos-6.4.xml.in
+data/os/centos.org/centos-6.5.xml.in
+data/os/centos.org/centos-7.0.xml.in
+data/os/debian.org/debian-1.1.xml.in
+data/os/debian.org/debian-1.2.xml.in
+data/os/debian.org/debian-1.3.xml.in
+data/os/debian.org/debian-2.0.xml.in
+data/os/debian.org/debian-2.1.xml.in
+data/os/debian.org/debian-2.2.xml.in
+data/os/debian.org/debian-3.1.xml.in
+data/os/debian.org/debian-3.xml.in
+data/os/debian.org/debian-4.xml.in
+data/os/debian.org/debian-5.xml.in
+data/os/debian.org/debian-6.xml.in
+data/os/debian.org/debian-7.xml.in
+data/os/debian.org/debian-8.xml.in
+data/os/fedoraproject.org/fedora-1.xml.in
+data/os/fedoraproject.org/fedora-2.xml.in
+data/os/fedoraproject.org/fedora-3.xml.in
+data/os/fedoraproject.org/fedora-4.xml.in
+data/os/fedoraproject.org/fedora-5.xml.in
+data/os/fedoraproject.org/fedora-6.xml.in
+data/os/fedoraproject.org/fedora-7.xml.in
+data/os/fedoraproject.org/fedora-8.xml.in
+data/os/fedoraproject.org/fedora-9.xml.in
+data/os/fedoraproject.org/fedora-10.xml.in
+data/os/fedoraproject.org/fedora-11.xml.in
+data/os/fedoraproject.org/fedora-12.xml.in
+data/os/fedoraproject.org/fedora-13.xml.in
+data/os/fedoraproject.org/fedora-14.xml.in
+data/os/fedoraproject.org/fedora-15.xml.in
+data/os/fedoraproject.org/fedora-16.xml.in
+data/os/fedoraproject.org/fedora-17.xml.in
+data/os/fedoraproject.org/fedora-18.xml.in
+data/os/fedoraproject.org/fedora-19.xml.in
+data/os/fedoraproject.org/fedora-20.xml.in
+data/os/fedoraproject.org/fedora-21.xml.in
+data/os/fedoraproject.org/fedora-22.xml.in
+data/os/fedoraproject.org/fedora-unknown.xml.in
+data/os/freebsd.org/freebsd-1.0.xml.in
+data/os/freebsd.org/freebsd-2.0.5.xml.in
+data/os/freebsd.org/freebsd-2.0.xml.in
+data/os/freebsd.org/freebsd-2.2.8.xml.in
+data/os/freebsd.org/freebsd-2.2.9.xml.in
+data/os/freebsd.org/freebsd-3.0.xml.in
+data/os/freebsd.org/freebsd-3.2.xml.in
+data/os/freebsd.org/freebsd-4.0.xml.in
+data/os/freebsd.org/freebsd-4.10.xml.in
+data/os/freebsd.org/freebsd-4.11.xml.in
+data/os/freebsd.org/freebsd-4.1.xml.in
+data/os/freebsd.org/freebsd-4.2.xml.in
+data/os/freebsd.org/freebsd-4.3.xml.in
+data/os/freebsd.org/freebsd-4.4.xml.in
+data/os/freebsd.org/freebsd-4.5.xml.in
+data/os/freebsd.org/freebsd-4.6.xml.in
+data/os/freebsd.org/freebsd-4.7.xml.in
+data/os/freebsd.org/freebsd-4.8.xml.in
+data/os/freebsd.org/freebsd-4.9.xml.in
+data/os/freebsd.org/freebsd-5.0.xml.in
+data/os/freebsd.org/freebsd-5.1.xml.in
+data/os/freebsd.org/freebsd-5.2.1.xml.in
+data/os/freebsd.org/freebsd-5.2.xml.in
+data/os/freebsd.org/freebsd-5.3.xml.in
+data/os/freebsd.org/freebsd-5.4.xml.in
+data/os/freebsd.org/freebsd-5.5.xml.in
+data/os/freebsd.org/freebsd-6.0.xml.in
+data/os/freebsd.org/freebsd-6.1.xml.in
+data/os/freebsd.org/freebsd-6.2.xml.in
+data/os/freebsd.org/freebsd-6.3.xml.in
+data/os/freebsd.org/freebsd-6.4.xml.in
+data/os/freebsd.org/freebsd-7.0.xml.in
+data/os/freebsd.org/freebsd-7.1.xml.in
+data/os/freebsd.org/freebsd-7.2.xml.in
+data/os/freebsd.org/freebsd-7.3.xml.in
+data/os/freebsd.org/freebsd-7.4.xml.in
+data/os/freebsd.org/freebsd-8.0.xml.in
+data/os/freebsd.org/freebsd-8.1.xml.in
+data/os/freebsd.org/freebsd-8.2.xml.in
+data/os/freebsd.org/freebsd-8.3.xml.in
+data/os/freebsd.org/freebsd-8.4.xml.in
+data/os/freebsd.org/freebsd-9.0.xml.in
+data/os/freebsd.org/freebsd-9.1.xml.in
+data/os/freebsd.org/freebsd-9.2.xml.in
+data/os/freebsd.org/freebsd-9.3.xml.in
+data/os/freebsd.org/freebsd-10.0.xml.in
+data/os/freebsd.org/freebsd-10.1.xml.in
+data/os/gnome.org/gnome-3.6.xml.in
+data/os/gnome.org/gnome-3.8.xml.in
+data/os/gnome.org/gnome-continuous-3.10.xml.in
+data/os/gnome.org/gnome-continuous-3.12.xml.in
+data/os/gnome.org/gnome-continuous-3.14.xml.in
+data/os/mageia.org/mageia-1.xml.in
+data/os/mageia.org/mageia-2.xml.in
+data/os/mageia.org/mageia-3.xml.in
+data/os/mandriva.com/mandrake-5.1.xml.in
+data/os/mandriva.com/mandrake-5.2.xml.in
+data/os/mandriva.com/mandrake-5.3.xml.in
+data/os/mandriva.com/mandrake-6.0.xml.in
+data/os/mandriva.com/mandrake-6.1.xml.in
+data/os/mandriva.com/mandrake-7.0.xml.in
+data/os/mandriva.com/mandrake-7.1.xml.in
+data/os/mandriva.com/mandrake-7.2.xml.in
+data/os/mandriva.com/mandrake-8.0.xml.in
+data/os/mandriva.com/mandrake-8.1.xml.in
+data/os/mandriva.com/mandrake-8.2.xml.in
+data/os/mandriva.com/mandrake-9.0.xml.in
+data/os/mandriva.com/mandrake-9.1.xml.in
+data/os/mandriva.com/mandrake-9.2.xml.in
+data/os/mandriva.com/mandrake-10.0.xml.in
+data/os/mandriva.com/mandrake-10.1.xml.in
+data/os/mandriva.com/mandrake-10.2.xml.in
+data/os/mandriva.com/mandriva-2006.0.xml.in
+data/os/mandriva.com/mandriva-2007.1.xml.in
+data/os/mandriva.com/mandriva-2007.xml.in
+data/os/mandriva.com/mandriva-2008.0.xml.in
+data/os/mandriva.com/mandriva-2008.1.xml.in
+data/os/mandriva.com/mandriva-2009.0.xml.in
+data/os/mandriva.com/mandriva-2009.1.xml.in
+data/os/mandriva.com/mandriva-2010.0.xml.in
+data/os/mandriva.com/mandriva-2010.1.xml.in
+data/os/mandriva.com/mandriva-2010.2.xml.in
+data/os/mandriva.com/mandriva-2011.xml.in
+data/os/mandriva.com/mbs-1.0.xml.in
+data/os/mandriva.com/mes-5.0.xml.in
+data/os/mandriva.com/mes-5.1.xml.in
+data/os/microsoft.com/msdos-6.22.xml.in
+data/os/microsoft.com/win-1.0.xml.in
+data/os/microsoft.com/win-10.xml.in
+data/os/microsoft.com/win-2.0.xml.in
+data/os/microsoft.com/win-2.1.xml.in
+data/os/microsoft.com/win-2k12r2.xml.in
+data/os/microsoft.com/win-2k12.xml.in
+data/os/microsoft.com/win-2k3r2.xml.in
+data/os/microsoft.com/win-2k3.xml.in
+data/os/microsoft.com/win-2k8r2.xml.in
+data/os/microsoft.com/win-2k8.xml.in
+data/os/microsoft.com/win-2k.xml.in
+data/os/microsoft.com/win-3.1.xml.in
+data/os/microsoft.com/win-7.xml.in
+data/os/microsoft.com/win-8.1.xml.in
+data/os/microsoft.com/win-8.xml.in
+data/os/microsoft.com/win-95.xml.in
+data/os/microsoft.com/win-98.xml.in
+data/os/microsoft.com/win-me.xml.in
+data/os/microsoft.com/winnt-3.1.xml.in
+data/os/microsoft.com/winnt-3.51.xml.in
+data/os/microsoft.com/winnt-3.5.xml.in
+data/os/microsoft.com/winnt-4.0.xml.in
+data/os/microsoft.com/win-vista.xml.in
+data/os/microsoft.com/win-xp.xml.in
+data/os/netbsd.org/netbsd-0.8.xml.in
+data/os/netbsd.org/netbsd-0.9.xml.in
+data/os/netbsd.org/netbsd-1.0.xml.in
+data/os/netbsd.org/netbsd-1.1.xml.in
+data/os/netbsd.org/netbsd-1.2.xml.in
+data/os/netbsd.org/netbsd-1.3.xml.in
+data/os/netbsd.org/netbsd-1.4.xml.in
+data/os/netbsd.org/netbsd-1.5.xml.in
+data/os/netbsd.org/netbsd-1.6.xml.in
+data/os/netbsd.org/netbsd-2.0.xml.in
+data/os/netbsd.org/netbsd-3.0.xml.in
+data/os/netbsd.org/netbsd-4.0.xml.in
+data/os/netbsd.org/netbsd-5.0.xml.in
+data/os/netbsd.org/netbsd-5.1.xml.in
+data/os/novell.com/netware-4.xml.in
+data/os/novell.com/netware-5.xml.in
+data/os/novell.com/netware-6.xml.in
+data/os/openbsd.org/openbsd-4.2.xml.in
+data/os/openbsd.org/openbsd-4.3.xml.in
+data/os/openbsd.org/openbsd-4.4.xml.in
+data/os/openbsd.org/openbsd-4.5.xml.in
+data/os/openbsd.org/openbsd-4.8.xml.in
+data/os/openbsd.org/openbsd-4.9.xml.in
+data/os/openbsd.org/openbsd-5.0.xml.in
+data/os/openbsd.org/openbsd-5.1.xml.in
+data/os/openbsd.org/openbsd-5.2.xml.in
+data/os/openbsd.org/openbsd-5.3.xml.in
+data/os/openbsd.org/openbsd-5.4.xml.in
+data/os/openbsd.org/openbsd-5.5.xml.in
+data/os/openbsd.org/openbsd-5.6.xml.in
+data/os/openbsd.org/openbsd-5.7.xml.in
+data/os/openbsd.org/openbsd-5.8.xml.in
+data/os/opensuse.org/opensuse-10.2.xml.in
+data/os/opensuse.org/opensuse-10.3.xml.in
+data/os/opensuse.org/opensuse-11.0.xml.in
+data/os/opensuse.org/opensuse-11.1.xml.in
+data/os/opensuse.org/opensuse-11.2.xml.in
+data/os/opensuse.org/opensuse-11.3.xml.in
+data/os/opensuse.org/opensuse-11.4.xml.in
+data/os/opensuse.org/opensuse-12.1.xml.in
+data/os/opensuse.org/opensuse-12.2.xml.in
+data/os/opensuse.org/opensuse-12.3.xml.in
+data/os/opensuse.org/opensuse-13.1.xml.in
+data/os/opensuse.org/opensuse-13.2.xml.in
+data/os/opensuse.org/opensuse-factory.xml.in
+data/os/opensuse.org/opensuse-unknown.xml.in
+data/os/oracle.com/solaris-11.xml.in
+data/os/redhat.com/rhel-2.1.1.xml.in
+data/os/redhat.com/rhel-2.1.2.xml.in
+data/os/redhat.com/rhel-2.1.3.xml.in
+data/os/redhat.com/rhel-2.1.4.xml.in
+data/os/redhat.com/rhel-2.1.5.xml.in
+data/os/redhat.com/rhel-2.1.6.xml.in
+data/os/redhat.com/rhel-2.1.7.xml.in
+data/os/redhat.com/rhel-2.1.xml.in
+data/os/redhat.com/rhel-3.1.xml.in
+data/os/redhat.com/rhel-3.2.xml.in
+data/os/redhat.com/rhel-3.3.xml.in
+data/os/redhat.com/rhel-3.4.xml.in
+data/os/redhat.com/rhel-3.5.xml.in
+data/os/redhat.com/rhel-3.6.xml.in
+data/os/redhat.com/rhel-3.7.xml.in
+data/os/redhat.com/rhel-3.8.xml.in
+data/os/redhat.com/rhel-3.9.xml.in
+data/os/redhat.com/rhel-3.xml.in
+data/os/redhat.com/rhel-4.0.xml.in
+data/os/redhat.com/rhel-4.1.xml.in
+data/os/redhat.com/rhel-4.2.xml.in
+data/os/redhat.com/rhel-4.3.xml.in
+data/os/redhat.com/rhel-4.4.xml.in
+data/os/redhat.com/rhel-4.5.xml.in
+data/os/redhat.com/rhel-4.6.xml.in
+data/os/redhat.com/rhel-4.7.xml.in
+data/os/redhat.com/rhel-4.8.xml.in
+data/os/redhat.com/rhel-4.9.xml.in
+data/os/redhat.com/rhel-5.0.xml.in
+data/os/redhat.com/rhel-5.10.xml.in
+data/os/redhat.com/rhel-5.11.xml.in
+data/os/redhat.com/rhel-5.1.xml.in
+data/os/redhat.com/rhel-5.2.xml.in
+data/os/redhat.com/rhel-5.3.xml.in
+data/os/redhat.com/rhel-5.4.xml.in
+data/os/redhat.com/rhel-5.5.xml.in
+data/os/redhat.com/rhel-5.6.xml.in
+data/os/redhat.com/rhel-5.7.xml.in
+data/os/redhat.com/rhel-5.8.xml.in
+data/os/redhat.com/rhel-5.9.xml.in
+data/os/redhat.com/rhel-6.0.xml.in
+data/os/redhat.com/rhel-6.1.xml.in
+data/os/redhat.com/rhel-6.2.xml.in
+data/os/redhat.com/rhel-6.3.xml.in
+data/os/redhat.com/rhel-6.4.xml.in
+data/os/redhat.com/rhel-6.5.xml.in
+data/os/redhat.com/rhel-6.6.xml.in
+data/os/redhat.com/rhel-7.0.xml.in
+data/os/redhat.com/rhel-7.1.xml.in
+data/os/redhat.com/rhel-atomic-7.0.xml.in
+data/os/redhat.com/rhel-atomic-7.1.xml.in
+data/os/redhat.com/rhl-1.0.xml.in
+data/os/redhat.com/rhl-1.1.xml.in
+data/os/redhat.com/rhl-2.0.xml.in
+data/os/redhat.com/rhl-2.1.xml.in
+data/os/redhat.com/rhl-3.0.3.xml.in
+data/os/redhat.com/rhl-4.0.xml.in
+data/os/redhat.com/rhl-4.1.xml.in
+data/os/redhat.com/rhl-4.2.xml.in
+data/os/redhat.com/rhl-5.0.xml.in
+data/os/redhat.com/rhl-5.1.xml.in
+data/os/redhat.com/rhl-5.2.xml.in
+data/os/redhat.com/rhl-6.0.xml.in
+data/os/redhat.com/rhl-6.1.xml.in
+data/os/redhat.com/rhl-6.2.xml.in
+data/os/redhat.com/rhl-7.1.xml.in
+data/os/redhat.com/rhl-7.2.xml.in
+data/os/redhat.com/rhl-7.3.xml.in
+data/os/redhat.com/rhl-7.xml.in
+data/os/redhat.com/rhl-8.0.xml.in
+data/os/redhat.com/rhl-9.xml.in
+data/os/sun.com/opensolaris-2009.06.xml.in
+data/os/sun.com/solaris-9.xml.in
+data/os/sun.com/solaris-10.xml.in
+data/os/suse.com/sled-9.xml.in
+data/os/suse.com/sled-10.xml.in
+data/os/suse.com/sled-11.1.xml.in
+data/os/suse.com/sled-11.2.xml.in
+data/os/suse.com/sled-11.3.xml.in
+data/os/suse.com/sled-11.4.xml.in
+data/os/suse.com/sled-11.xml.in
+data/os/suse.com/sled-12.xml.in
+data/os/suse.com/sles-9.xml.in
+data/os/suse.com/sles-10.xml.in
+data/os/suse.com/sles-11.1.xml.in
+data/os/suse.com/sles-11.2.xml.in
+data/os/suse.com/sles-11.3.xml.in
+data/os/suse.com/sles-11.4.xml.in
+data/os/suse.com/sles-11.xml.in
+data/os/suse.com/sles-12.xml.in
+data/os/ubuntu.com/ubuntu-4.10.xml.in
+data/os/ubuntu.com/ubuntu-5.04.xml.in
+data/os/ubuntu.com/ubuntu-5.10.xml.in
+data/os/ubuntu.com/ubuntu-6.06.xml.in
+data/os/ubuntu.com/ubuntu-6.10.xml.in
+data/os/ubuntu.com/ubuntu-7.04.xml.in
+data/os/ubuntu.com/ubuntu-7.10.xml.in
+data/os/ubuntu.com/ubuntu-8.04.xml.in
+data/os/ubuntu.com/ubuntu-8.10.xml.in
+data/os/ubuntu.com/ubuntu-9.04.xml.in
+data/os/ubuntu.com/ubuntu-9.10.xml.in
+data/os/ubuntu.com/ubuntu-10.04.xml.in
+data/os/ubuntu.com/ubuntu-10.10.xml.in
+data/os/ubuntu.com/ubuntu-11.04.xml.in
+data/os/ubuntu.com/ubuntu-11.10.xml.in
+data/os/ubuntu.com/ubuntu-12.04.xml.in
+data/os/ubuntu.com/ubuntu-12.10.xml.in
+data/os/ubuntu.com/ubuntu-13.04.xml.in
+data/os/ubuntu.com/ubuntu-13.10.xml.in
+data/os/ubuntu.com/ubuntu-14.04.xml.in
+data/os/ubuntu.com/ubuntu-14.10.xml.in
+data/os/ubuntu.com/ubuntu-15.04.xml.in
+data/os/ubuntu.com/ubuntu-15.10.xml.in
+data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
+data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
+data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
+data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in
+data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in
+data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in
+data/platform/qemu.org/qemu-1.0.1.xml.in
+data/platform/qemu.org/qemu-1.0.xml.in
+data/platform/qemu.org/qemu-1.1.1-1.xml.in
+data/platform/qemu.org/qemu-1.1.1.xml.in
+data/platform/qemu.org/qemu-1.1.2.xml.in
+data/platform/qemu.org/qemu-1.1.xml.in
+data/platform/qemu.org/qemu-1.2.0.xml.in
+data/platform/qemu.org/qemu-1.2.1.xml.in
+data/platform/qemu.org/qemu-1.2.2.xml.in
+data/platform/qemu.org/qemu-1.3.0.xml.in
+data/platform/qemu.org/qemu-1.3.1.xml.in
+data/platform/qemu.org/qemu-1.4.0.xml.in
+data/platform/qemu.org/qemu-1.4.1.xml.in
+data/platform/qemu.org/qemu-1.4.2.xml.in
+data/platform/qemu.org/qemu-1.5.0.xml.in
+data/platform/qemu.org/qemu-1.5.1.xml.in
+data/platform/qemu.org/qemu-1.5.2.xml.in
+data/platform/qemu.org/qemu-1.5.3.xml.in
+data/platform/qemu.org/qemu-1.6.0.xml.in
+data/platform/qemu.org/qemu-1.6.1.xml.in
+data/platform/qemu.org/qemu-1.6.2.xml.in
+data/platform/qemu.org/qemu-1.7.0.xml.in
+data/platform/qemu.org/qemu-1.7.1.xml.in
+data/platform/qemu.org/qemu-1.7.2.xml.in
+data/platform/qemu.org/qemu-2.0.0.xml.in
+data/platform/qemu.org/qemu-2.0.1.xml.in
+data/platform/qemu.org/qemu-2.0.2.xml.in
+data/platform/qemu.org/qemu-2.1.0.xml.in
+data/platform/qemu.org/qemu-2.1.1.xml.in
+data/platform/qemu.org/qemu-2.1.2.xml.in
+data/platform/qemu.org/qemu-2.1.3.xml.in
+data/platform/qemu.org/qemu-2.2.0.xml.in
+data/platform/qemu.org/qemu-2.2.1.xml.in
+data/platform/qemu.org/qemu-2.3.0.xml.in
+data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
+data/platform/xen.org/xen-3.0.2.xml.in
+data/platform/xen.org/xen-3.0.3.xml.in
+data/platform/xen.org/xen-3.0.4.xml.in
+data/platform/xen.org/xen-3.1.0.xml.in
+data/platform/xen.org/xen-3.1.3.xml.in
+data/platform/xen.org/xen-3.1.4.xml.in
+data/platform/xen.org/xen-3.2.0.xml.in
+data/platform/xen.org/xen-3.2.1.xml.in
+data/platform/xen.org/xen-3.2.2.xml.in
+data/platform/xen.org/xen-3.2.3.xml.in
+data/platform/xen.org/xen-3.3.0.xml.in
+data/platform/xen.org/xen-3.3.1.xml.in
+data/platform/xen.org/xen-3.3.2.xml.in
+data/platform/xen.org/xen-3.4.0.xml.in
+data/platform/xen.org/xen-3.4.1.xml.in
+data/platform/xen.org/xen-3.4.2.xml.in
+data/platform/xen.org/xen-3.4.3.xml.in
+data/platform/xen.org/xen-4.0.0.xml.in
+data/platform/xen.org/xen-4.0.1.xml.in
+data/platform/xen.org/xen-4.1.0.xml.in
+data/device/ibm.com/ps2-keyboard.xml.in
+data/device/ibm.com/ps2-mouse.xml.in
+data/device/pcisig.com/pci-1234-1111.xml.in
osinfo/osinfo_avatar_format.c
osinfo/osinfo_deployment.c
osinfo/osinfo_devicelink.c
diff --git a/test/test-xml-validate b/test/test-xml-validate
index e3cb1a0..4f46a02 100755
--- a/test/test-xml-validate
+++ b/test/test-xml-validate
@@ -42,7 +42,7 @@ exit $ret
: ${srcdir=.}
. $srcdir/test-lib.sh
-DIRS="datamaps oses platforms devices install-scripts"
+DIRS="datamap os platform device install-script"
SCHEMA="libosinfo.rng"
check_schema "$DIRS" "$SCHEMA"
--
2.4.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
