diff --git a/.gitignore b/.gitignore
index f804316..e819a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -357,4 +357,7 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
+/disk1/ViGEmBus_x64.cab
+/setup.inf
+/setup.rpt
diff --git a/ViGEmBus_x64.ddf b/ViGEmBus_x64.ddf
index 082412e..d8a55d9 100644
--- a/ViGEmBus_x64.ddf
+++ b/ViGEmBus_x64.ddf
@@ -1,3 +1,4 @@
+; ViGEmBus cab file for attestation submission
 .OPTION EXPLICIT
 .Set CabinetFileCountThreshold=0
 .Set FolderFileCountThreshold=0
@@ -8,14 +9,11 @@
 .Set CompressionType=MSZIP
 .Set Cabinet=on
 .Set Compress=on
-.Set CabinetNameTemplate=ViGEmBus.cab
-.Set DestinationDir=ViGEmBus
-.\artifacts\ViGEmBus.inf
-.Set DestinationDir=ViGEmBus\x64
-.\artifacts\x64\ViGEmBus.sys
-.\artifacts\x64\ViGEmBus.pdb
-.\artifacts\x64\WdfCoinstaller01009.dll
-.Set DestinationDir=ViGEmBus\x86
-.\artifacts\x86\ViGEmBus.sys
-.\artifacts\x86\ViGEmBus.pdb
-.\artifacts\x86\WdfCoinstaller01009.dll
\ No newline at end of file
+; x64
+.Set CabinetNameTemplate=ViGEmBus_x64.cab
+.Set DestinationDir=ViGEmBus_x64
+LICENSE
+bin\x64\ViGEmBus.pdb
+bin\x64\ViGEmBus\ViGEmBus.inf
+bin\x64\ViGEmBus\ViGEmBus.sys
+bin\x64\ViGEmBus\WdfCoinstaller01009.dll
\ No newline at end of file
diff --git a/ViGEmBus_x86.ddf b/ViGEmBus_x86.ddf
index 082412e..b24406a 100644
--- a/ViGEmBus_x86.ddf
+++ b/ViGEmBus_x86.ddf
@@ -1,3 +1,4 @@
+; ViGEmBus cab file for attestation submission
 .OPTION EXPLICIT
 .Set CabinetFileCountThreshold=0
 .Set FolderFileCountThreshold=0
@@ -8,14 +9,11 @@
 .Set CompressionType=MSZIP
 .Set Cabinet=on
 .Set Compress=on
-.Set CabinetNameTemplate=ViGEmBus.cab
-.Set DestinationDir=ViGEmBus
-.\artifacts\ViGEmBus.inf
-.Set DestinationDir=ViGEmBus\x64
-.\artifacts\x64\ViGEmBus.sys
-.\artifacts\x64\ViGEmBus.pdb
-.\artifacts\x64\WdfCoinstaller01009.dll
-.Set DestinationDir=ViGEmBus\x86
-.\artifacts\x86\ViGEmBus.sys
-.\artifacts\x86\ViGEmBus.pdb
-.\artifacts\x86\WdfCoinstaller01009.dll
\ No newline at end of file
+; x86
+.Set CabinetNameTemplate=ViGEmBus_x86.cab
+.Set DestinationDir=ViGEmBus_x86
+LICENSE
+bin\x86\ViGEmBus.pdb
+bin\x86\ViGEmBus\ViGEmBus.inf
+bin\x86\ViGEmBus\ViGEmBus.sys
+bin\x86\ViGEmBus\WdfCoinstaller01009.dll
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index b819d82..c1e4496 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,12 +14,13 @@ before_build:
 build:
   project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln
 after_build:
-#- cmd: makecab.exe /f ViGEmBus.ddf
+- cmd: makecab.exe /f ViGEmBus_%PLATFORM%.ddf
 artifacts:
 - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.inf'
 - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.sys'
 - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.dll'
 - path: 'bin**\*.pdb'
+- path: 'disk1\*.cab'
 deploy:
 - provider: Environment
   name: BUILDBOT
diff --git a/sys/RCa08996 b/sys/RCa08996
deleted file mode 100644
index e1da2b4..0000000
Binary files a/sys/RCa08996 and /dev/null differ
diff --git a/sys/ViGEmBus.inf b/sys/ViGEmBus.inf
index 14494ea..1785ddc 100644
--- a/sys/ViGEmBus.inf
+++ b/sys/ViGEmBus.inf
@@ -35,13 +35,8 @@ DriverVer= ;
 DefaultDestDir = 12
 ViGEmBus_Device_CoInstaller_CopyFiles = 11
 
-; ================= Class section =====================
-
-[SourceDisksNames.amd64]
-1 = %DiskName%,,,"\x64"
-
-[SourceDisksNames.x86]
-1 = %DiskName%,,,"\x86"
+[SourceDisksNames]
+1 = %DiskName%,,,
 
 [SourceDisksFiles]
 ViGEmBus.sys = 1,,
diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj
index bd58440..7a6d373 100644
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -179,7 +179,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <Inf Include="ViGEmBus.inf" />
-    <Inf Include="ViGEmBus_SingleArch.inf" />
   </ItemGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
diff --git a/sys/ViGEmBus.vcxproj.filters b/sys/ViGEmBus.vcxproj.filters
index 66f8fd6..2016129 100644
--- a/sys/ViGEmBus.vcxproj.filters
+++ b/sys/ViGEmBus.vcxproj.filters
@@ -31,9 +31,6 @@
     <Inf Include="ViGEmBus.inf">
       <Filter>Driver Files</Filter>
     </Inf>
-    <Inf Include="ViGEmBus_SingleArch.inf">
-      <Filter>Driver Files</Filter>
-    </Inf>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="busenum.h">
diff --git a/sys/ViGEmBus_SingleArch.inf b/sys/ViGEmBus_SingleArch.inf
deleted file mode 100644
index 1785ddc..0000000
--- a/sys/ViGEmBus_SingleArch.inf
+++ /dev/null
@@ -1,100 +0,0 @@
-; Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-; 
-; MIT License
-; 
-; Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
-; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
-; of this software and associated documentation files (the "Software"), to deal
-; in the Software without restriction, including without limitation the rights
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be included in all
-; copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
-
-
-[Version]
-Signature="$WINDOWS NT$"
-Class=System
-ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
-Provider=%ManufacturerName%
-CatalogFile=ViGEmBus.cat
-DriverVer= ;
-
-[DestinationDirs]
-DefaultDestDir = 12
-ViGEmBus_Device_CoInstaller_CopyFiles = 11
-
-[SourceDisksNames]
-1 = %DiskName%,,,
-
-[SourceDisksFiles]
-ViGEmBus.sys = 1,,
-WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1
-
-;*****************************************
-; Install Section
-;*****************************************
-
-[Manufacturer]
-%ManufacturerName%=Standard,NTamd64,NTx86
-
-[Standard.NTamd64]
-%ViGEmBus.DeviceDesc%=ViGEmBus_Device, Nefarius\ViGEmBus\Gen1
-
-[Standard.NTx86]
-%ViGEmBus.DeviceDesc%=ViGEmBus_Device, Nefarius\ViGEmBus\Gen1
-
-[ViGEmBus_Device.NT]
-CopyFiles=Drivers_Dir
-
-[Drivers_Dir]
-ViGEmBus.sys
-
-;-------------- Service installation
-[ViGEmBus_Device.NT.Services]
-AddService = ViGEmBus,%SPSVCINST_ASSOCSERVICE%, ViGEmBus_Service_Inst
-
-; -------------- ViGEmBus driver install sections
-[ViGEmBus_Service_Inst]
-DisplayName    = %ViGEmBus.SVCDESC%
-ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 3               ; SERVICE_DEMAND_START
-ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\ViGEmBus.sys
-
-;
-;--- ViGEmBus_Device Coinstaller installation ------
-;
-
-[ViGEmBus_Device.NT.CoInstallers]
-AddReg=ViGEmBus_Device_CoInstaller_AddReg
-CopyFiles=ViGEmBus_Device_CoInstaller_CopyFiles
-
-[ViGEmBus_Device_CoInstaller_AddReg]
-HKR,,CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
-
-[ViGEmBus_Device_CoInstaller_CopyFiles]
-WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll
-
-[ViGEmBus_Device.NT.Wdf]
-KmdfService =  ViGEmBus, ViGEmBus_wdfsect
-[ViGEmBus_wdfsect]
-KmdfLibraryVersion = $KMDFVERSION$
-
-[Strings]
-SPSVCINST_ASSOCSERVICE= 0x00000002
-ManufacturerName="Nefarius Software Solutions e.U."
-DiskName = "ViGEmBus Installation Disk"
-ViGEmBus.DeviceDesc = "Virtual Gamepad Emulation Bus"
-ViGEmBus.SVCDESC = "Virtual Gamepad Emulation Service"