diff --git a/os/microsoft.com/win-10.d/post-installable-drivers.xml b/os/microsoft.com/win-10.d/post-installable-drivers.xml
deleted file mode 100644
index 7d12f00..0000000
--- a/os/microsoft.com/win-10.d/post-installable-drivers.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/10">
-    <short-id>win10</short-id>
-    <name>Microsoft Windows 10</name>
-    <name xml:lang="uk">Microsoft Windows 10</name>
-    <name xml:lang="tr">Microsoft Windows 10</name>
-    <name xml:lang="pt_BR">Microsoft Windows 10</name>
-    <name xml:lang="pl">Microsoft Windows 10</name>
-    <name xml:lang="it">Microsoft Windows 10</name>
-    <name xml:lang="id">Microsoft Windows 10</name>
-    <name xml:lang="fr">Microsoft Windows 10</name>
-    <name xml:lang="es">Microsoft Windows 10</name>
-    <name xml:lang="ca">Microsoft Windows 10</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-10.d/pre-installable-drivers.xml b/os/microsoft.com/win-10.d/pre-installable-drivers.xml
deleted file mode 100644
index d494bd9..0000000
--- a/os/microsoft.com/win-10.d/pre-installable-drivers.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/10">
-    <short-id>win10</short-id>
-    <name>Microsoft Windows 10</name>
-    <name xml:lang="uk">Microsoft Windows 10</name>
-    <name xml:lang="tr">Microsoft Windows 10</name>
-    <name xml:lang="pt_BR">Microsoft Windows 10</name>
-    <name xml:lang="pl">Microsoft Windows 10</name>
-    <name xml:lang="it">Microsoft Windows 10</name>
-    <name xml:lang="id">Microsoft Windows 10</name>
-    <name xml:lang="fr">Microsoft Windows 10</name>
-    <name xml:lang="es">Microsoft Windows 10</name>
-    <name xml:lang="ca">Microsoft Windows 10</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w10/x86" pre-installable="true" signed="false">
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemufwcfg.cat</file>
-      <file>qemufwcfg.inf</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxldod.cat</file>
-      <file>qxldod.inf</file>
-      <file>qxldod.sys</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w10/amd64" pre-installable="true" signed="false">
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemufwcfg.cat</file>
-      <file>qemufwcfg.inf</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxldod.cat</file>
-      <file>qxldod.inf</file>
-      <file>qxldod.sys</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-7.d/post-installable-drivers.xml b/os/microsoft.com/win-7.d/post-installable-drivers.xml
deleted file mode 100644
index ca6985c..0000000
--- a/os/microsoft.com/win-7.d/post-installable-drivers.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/7">
-    <short-id>win7</short-id>
-    <name>Microsoft Windows 7</name>
-    <name xml:lang="uk">Microsoft Windows 7</name>
-    <name xml:lang="tr">Microsoft Windows 7</name>
-    <name xml:lang="pt_BR">Microsoft Windows 7</name>
-    <name xml:lang="pl">Microsoft Windows 7</name>
-    <name xml:lang="ja">Microsoft Windows 7</name>
-    <name xml:lang="it">Microsoft Windows 7</name>
-    <name xml:lang="id">Microsoft Windows 7</name>
-    <name xml:lang="fr">Microsoft Windows 7</name>
-    <name xml:lang="es">Microsoft Windows 7</name>
-    <name xml:lang="de">Microsoft Windows 7</name>
-    <name xml:lang="ca">Microsoft Windows 7</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-7.d/pre-installable-drivers.xml b/os/microsoft.com/win-7.d/pre-installable-drivers.xml
deleted file mode 100644
index e02306c..0000000
--- a/os/microsoft.com/win-7.d/pre-installable-drivers.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/7">
-    <short-id>win7</short-id>
-    <name>Microsoft Windows 7</name>
-    <name xml:lang="uk">Microsoft Windows 7</name>
-    <name xml:lang="tr">Microsoft Windows 7</name>
-    <name xml:lang="pt_BR">Microsoft Windows 7</name>
-    <name xml:lang="pl">Microsoft Windows 7</name>
-    <name xml:lang="ja">Microsoft Windows 7</name>
-    <name xml:lang="it">Microsoft Windows 7</name>
-    <name xml:lang="id">Microsoft Windows 7</name>
-    <name xml:lang="fr">Microsoft Windows 7</name>
-    <name xml:lang="es">Microsoft Windows 7</name>
-    <name xml:lang="de">Microsoft Windows 7</name>
-    <name xml:lang="ca">Microsoft Windows 7</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w7/x86" pre-installable="true" signed="false">
-      <file>WdfCoInstaller01009.dll</file>
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxl.cat</file>
-      <file>qxl.inf</file>
-      <file>qxl.sys</file>
-      <file>qxldd.dll</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w7/amd64" pre-installable="true" signed="false">
-      <file>WdfCoInstaller01009.dll</file>
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxl.cat</file>
-      <file>qxl.inf</file>
-      <file>qxl.sys</file>
-      <file>qxldd.dll</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-8.1.d/post-installable-drivers.xml b/os/microsoft.com/win-8.1.d/post-installable-drivers.xml
deleted file mode 100644
index 3b022d2..0000000
--- a/os/microsoft.com/win-8.1.d/post-installable-drivers.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/8.1">
-    <short-id>win8.1</short-id>
-    <name>Microsoft Windows 8.1</name>
-    <name xml:lang="uk">Microsoft Windows 8.1</name>
-    <name xml:lang="tr">Microsoft Windows 8.1</name>
-    <name xml:lang="pt_BR">Microsoft Windows 8.1</name>
-    <name xml:lang="pl">Microsoft Windows 8.1</name>
-    <name xml:lang="it">Microsoft Windows 8.1</name>
-    <name xml:lang="id">Microsoft Windows 8.1</name>
-    <name xml:lang="fr">Microsoft Windows 8.1</name>
-    <name xml:lang="es">Microsoft Windows 8.1</name>
-    <name xml:lang="ca">Microsoft Windows 8.1</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-8.1.d/pre-installable-drivers.xml b/os/microsoft.com/win-8.1.d/pre-installable-drivers.xml
deleted file mode 100644
index 7b2075d..0000000
--- a/os/microsoft.com/win-8.1.d/pre-installable-drivers.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/8.1">
-    <short-id>win8.1</short-id>
-    <name>Microsoft Windows 8.1</name>
-    <name xml:lang="uk">Microsoft Windows 8.1</name>
-    <name xml:lang="tr">Microsoft Windows 8.1</name>
-    <name xml:lang="pt_BR">Microsoft Windows 8.1</name>
-    <name xml:lang="pl">Microsoft Windows 8.1</name>
-    <name xml:lang="it">Microsoft Windows 8.1</name>
-    <name xml:lang="id">Microsoft Windows 8.1</name>
-    <name xml:lang="fr">Microsoft Windows 8.1</name>
-    <name xml:lang="es">Microsoft Windows 8.1</name>
-    <name xml:lang="ca">Microsoft Windows 8.1</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w8.1/x86" pre-installable="true" signed="false">
-      <file>WdfCoInstaller01011.dll</file>
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxldod.cat</file>
-      <file>qxldod.inf</file>
-      <file>qxldod.sys</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w8.1/amd64" pre-installable="true" signed="false">
-      <file>WdfCoInstaller01011.dll</file>
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxldod.cat</file>
-      <file>qxldod.inf</file>
-      <file>qxldod.sys</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-8.d/post-installable-drivers.xml b/os/microsoft.com/win-8.d/post-installable-drivers.xml
deleted file mode 100644
index 34f14cc..0000000
--- a/os/microsoft.com/win-8.d/post-installable-drivers.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/8">
-    <short-id>win8</short-id>
-    <name>Microsoft Windows 8</name>
-    <name xml:lang="uk">Microsoft Windows 8</name>
-    <name xml:lang="tr">Microsoft Windows 8</name>
-    <name xml:lang="pt_BR">Microsoft Windows 8</name>
-    <name xml:lang="pl">Microsoft Windows 8</name>
-    <name xml:lang="ja">Microsoft Windows 8</name>
-    <name xml:lang="it">Microsoft Windows 8</name>
-    <name xml:lang="id">Microsoft Windows 8</name>
-    <name xml:lang="fr">Microsoft Windows 8</name>
-    <name xml:lang="es">Microsoft Windows 8</name>
-    <name xml:lang="de">Microsoft Windows 8</name>
-    <name xml:lang="ca">Microsoft Windows 8</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/postinst/spice-guest-tools/0.141" signed="false">
-      <file>spice-guest-tools-0.141.exe</file>
-      <file>spice-guest-tools-0.141.cmd</file>
-      <file>qxl-0.141.cer</file>
-      <file>virtio-0.141.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-8.d/pre-installable-drivers.xml b/os/microsoft.com/win-8.d/pre-installable-drivers.xml
deleted file mode 100644
index 9b8be59..0000000
--- a/os/microsoft.com/win-8.d/pre-installable-drivers.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/8">
-    <short-id>win8</short-id>
-    <name>Microsoft Windows 8</name>
-    <name xml:lang="uk">Microsoft Windows 8</name>
-    <name xml:lang="tr">Microsoft Windows 8</name>
-    <name xml:lang="pt_BR">Microsoft Windows 8</name>
-    <name xml:lang="pl">Microsoft Windows 8</name>
-    <name xml:lang="ja">Microsoft Windows 8</name>
-    <name xml:lang="it">Microsoft Windows 8</name>
-    <name xml:lang="id">Microsoft Windows 8</name>
-    <name xml:lang="fr">Microsoft Windows 8</name>
-    <name xml:lang="es">Microsoft Windows 8</name>
-    <name xml:lang="de">Microsoft Windows 8</name>
-    <name xml:lang="ca">Microsoft Windows 8</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w8/x86" pre-installable="true" signed="false">
-      <file>WdfCoInstaller01011.dll</file>
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxldod.cat</file>
-      <file>qxldod.inf</file>
-      <file>qxldod.sys</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-    <driver arch="x86_64" location="https://fedorapeople.org/groups/virt/unattended/drivers/preinst/virtio-win/0.1.171/w8/amd64" pre-installable="true" signed="false">
-      <file>WdfCoInstaller01011.dll</file>
-      <file>balloon.cat</file>
-      <file>balloon.inf</file>
-      <file>balloon.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <!-- virtio1.0-balloon -->
-      <file>netkvm.cat</file>
-      <file>netkvm.inf</file>
-      <file>netkvm.sys</file>
-      <file>netkvmco.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <!-- virtio1.0-net -->
-      <file>pvpanic.cat</file>
-      <file>pvpanic.inf</file>
-      <file>pvpanic.sys</file>
-      <file>qemupciserial.cat</file>
-      <file>qemupciserial.inf</file>
-      <file>qxldod.cat</file>
-      <file>qxldod.inf</file>
-      <file>qxldod.sys</file>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-      <file>viohidkmdf.sys</file>
-      <file>vioinput.cat</file>
-      <file>vioinput.inf</file>
-      <file>vioinput.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <!-- virtio1.0-input -->
-      <file>viorng.cat</file>
-      <file>viorng.inf</file>
-      <file>viorng.sys</file>
-      <file>viorngci.dll</file>
-      <file>viorngum.dll</file>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <!-- virtio-rng -->
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <!-- virtio1.0-rng -->
-      <file>vioscsi.cat</file>
-      <file>vioscsi.inf</file>
-      <file>vioscsi.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <!-- virtio-scsi -->
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <!-- virtio1.0-scsi -->
-      <file>vioser.cat</file>
-      <file>vioser.inf</file>
-      <file>vioser.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <!-- virtio1.0-console -->
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <!-- virtio1.0-block-->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-xp.d/post-installable-drivers.xml b/os/microsoft.com/win-xp.d/post-installable-drivers.xml
deleted file mode 100644
index 6ae4d8d..0000000
--- a/os/microsoft.com/win-xp.d/post-installable-drivers.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/xp">
-    <short-id>winxp</short-id>
-    <name>Microsoft Windows XP</name>
-    <name xml:lang="uk">Microsoft Windows XP</name>
-    <name xml:lang="tr">Microsoft Windows XP</name>
-    <name xml:lang="pt_BR">Microsoft Windows XP</name>
-    <name xml:lang="pl">Microsoft Windows XP</name>
-    <name xml:lang="ja">Microsoft Windows XP</name>
-    <name xml:lang="it">Microsoft Windows XP</name>
-    <name xml:lang="id">Microsoft Windows XP</name>
-    <name xml:lang="fr">Microsoft Windows XP</name>
-    <name xml:lang="es">Microsoft Windows XP</name>
-    <name xml:lang="de">Microsoft Windows XP</name>
-    <name xml:lang="ca">Microsoft Windows XP</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-    </driver>
-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- qxl -->
-    </driver>
-  </os>
-</libosinfo>
diff --git a/os/microsoft.com/win-xp.d/pre-installable-drivers.xml b/os/microsoft.com/win-xp.d/pre-installable-drivers.xml
deleted file mode 100644
index d3c51b3..0000000
--- a/os/microsoft.com/win-xp.d/pre-installable-drivers.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<libosinfo version="0.0.1">
-  <!-- Licensed under the GNU General Public License version 2 or later.
-     See http://www.gnu.org/licenses/ for a copy of the license text -->
-  <os id="http://microsoft.com/win/xp">
-    <short-id>winxp</short-id>
-    <name>Microsoft Windows XP</name>
-    <name xml:lang="uk">Microsoft Windows XP</name>
-    <name xml:lang="tr">Microsoft Windows XP</name>
-    <name xml:lang="pt_BR">Microsoft Windows XP</name>
-    <name xml:lang="pl">Microsoft Windows XP</name>
-    <name xml:lang="ja">Microsoft Windows XP</name>
-    <name xml:lang="it">Microsoft Windows XP</name>
-    <name xml:lang="id">Microsoft Windows XP</name>
-    <name xml:lang="fr">Microsoft Windows XP</name>
-    <name xml:lang="es">Microsoft Windows XP</name>
-    <name xml:lang="de">Microsoft Windows XP</name>
-    <name xml:lang="ca">Microsoft Windows XP</name>
-    <vendor>Microsoft Corporation</vendor>
-    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-    <vendor xml:lang="it">Microsoft Corporation</vendor>
-    <vendor xml:lang="id">Microsoft Corporation</vendor>
-    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-    <vendor xml:lang="es">Microsoft Corporation</vendor>
-    <vendor xml:lang="de">Microsoft Corporation</vendor>
-    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86" pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <!-- For now we require this for pre-installation but we should probably generate this too -->
-      <file>txtsetup.oem</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-    </driver>
-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64" pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <!-- For now we require this for pre-installation but we should probably generate this too -->
-      <file>txtsetup.oem</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-block -->
-    </driver>
-  </os>
-</libosinfo>