Updated for "Windows 10 Anniversary Update" (Version 1607)

84 files changed, 712 insertions, 2178 deletions

diff --git a/general/toaster/toastDrv/Package/package.VcxProj b/general/toaster/toastDrv/Package/package.VcxProj
index df14540a..43181207 100644
--- a/general/toaster/toastDrv/Package/package.VcxProj
+++ b/general/toaster/toastDrv/Package/package.VcxProj
@@ -19,35 +19,32 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\classinstaller\tostrcls.vcxproj">
-      <Project>{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\kmdf\bus\dynamic\dynambus.vcxproj">
-      <Project>{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}</Project>
+      <Project>{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\bus\static\StatBus.vcxproj">
-      <Project>{965C0E80-0715-4376-A138-48D08EFDDC09}</Project>
+      <Project>{6C6E0C23-5B37-4BBB-8909-435078D49364}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\filter\generic\filter.vcxproj">
-      <Project>{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}</Project>
+      <Project>{B39F6628-73BA-4AC3-863A-EA20892F1EFD}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\filter\sideband\filter.vcxproj">
-      <Project>{5094C704-35B0-4A25-AD30-570C49BCAE82}</Project>
+      <Project>{1A40DA6D-B948-43A7-864C-962517EE0A1D}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\func\featured\wdffeatured.vcxproj">
-      <Project>{CA0E203E-4C96-466F-BF19-24F42DFC0C89}</Project>
+      <Project>{C0049CDD-7551-4681-9E30-EFE32868F651}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\func\simple\wdfsimple.vcxproj">
-      <Project>{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}</Project>
+      <Project>{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\toastmon\wdftoastmon.vcxproj">
-      <Project>{A5E50982-981B-40B9-BEE6-1E15581FE947}</Project>
+      <Project>{D15FD911-F2DA-4644-8142-6D22756AD287}</Project>
     </ProjectReference>
     <ProjectReference Include="..\umdf\func\WUDFToaster.vcxproj">
-      <Project>{B439C142-C570-44A6-B13C-43F70AE05A69}</Project>
+      <Project>{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}</Project>
     </ProjectReference>
     <ProjectReference Include="..\umdf\Toastmon\WUDFToastMon.vcxproj">
-      <Project>{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}</Project>
+      <Project>{F575419D-099B-4DA0-B80C-88D766DD7542}</Project>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="PropertySheets">
@@ -59,8 +56,8 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D72A34B9-86A5-4801-B7E3-256CF1F382AD}</ProjectGuid>
-    <SampleGuid>{DC08D3F2-EDC5-409B-800B-8F8AC3703227}</SampleGuid>
+    <ProjectGuid>{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}</ProjectGuid>
+    <SampleGuid>{198A87DB-8A25-471F-971B-7F131503ADBA}</SampleGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/general/toaster/toastDrv/Package/package.VcxProj.Filters b/general/toaster/toastDrv/Package/package.VcxProj.Filters
index 6ac14cf2..f2732c36 100644
--- a/general/toaster/toastDrv/Package/package.VcxProj.Filters
+++ b/general/toaster/toastDrv/Package/package.VcxProj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{326C9B70-6DC4-4EA3-92EB-476DC4DBD40B}</UniqueIdentifier>
+      <UniqueIdentifier>{E3FF1186-A45E-4F9A-A4CE-A201588AABBB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{24CE830C-B385-46E4-83A3-B26A795BF457}</UniqueIdentifier>
+      <UniqueIdentifier>{3D734124-81A9-453D-9D3B-8CCB518874BA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{695BFD83-FE23-4414-BBAC-E44BB2BBAE00}</UniqueIdentifier>
+      <UniqueIdentifier>{CF3D354B-7827-4425-AFE0-BB3C638CAA1D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8A6D9B6E-0F3C-448E-948B-DCA1A5066C25}</UniqueIdentifier>
+      <UniqueIdentifier>{FFF9B3CB-B591-4F59-BDE7-F9F033C56A73}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/general/toaster/toastDrv/classinstaller/classInst.c b/general/toaster/toastDrv/classinstaller/classInst.c
deleted file mode 100644
index 9aa3294a..00000000
--- a/general/toaster/toastDrv/classinstaller/classInst.c
+++ /dev/null
@@ -1,513 +0,0 @@
-//+---------------------------------------------------------------------------
-//
-//  Copyright (c) Microsoft Corporation.  All rights reserved.
-//
-//  THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
-//  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-//  IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
-//  PURPOSE.
-//
-//  File:       ClassINST.C
-//
-//  Contents:   class-installer for toaster.
-//
-//  Notes:      This is a sample class installer. Class installer is not required 
-//              for every class of device. I have included here to provide 
-//              an icon for the toaster class and to demonstrate how one
-//              can provide a customer property sheet in the device manager
-//              in response to DIF_ADDPROPERTYPAGE_ADVANCED. 
-//              The property sheet has a check box. If you enable the box
-//              and press OK, it will restart the device. This is required
-//              if the user changes the device properties, and it needs to
-//              be restarted to apply the new attributes.
-//              For a complete description of ClassInstallers, please see the 
-//              Microsoft Windows 2000 DDK Documentation.
-//
-//  
-//  Revision: Added property page - Nov 14, 2000
-//  
-//
-//----------------------------------------------------------------------------
-
-//
-// Annotation to indicate to prefast that this is nondriver user-mode code.
-//
-#include <DriverSpecs.h>
-__user_code  
-
-#include <windows.h>
-#include <strsafe.h>
-#include <setupapi.h>
-#include <stdio.h>
-#include "resource.h"
-#include <dontuse.h>
-//+---------------------------------------------------------------------------
-//
-// WARNING! 
-//
-// Installer must not generate any popup to the user.
-//    It should provide appropriate defaults.
-//
-//  OutputDebugString should be fine...
-//
-#if DBG
-#define DbgOut(Text) OutputDebugString(TEXT("ClassInstaller: " Text "\n"))
-#else
-#define DbgOut(Text) 
-#endif 
-
-typedef struct _TOASTER_PROP_PARAMS
-{
-
-   HDEVINFO                     DeviceInfoSet;
-   PSP_DEVINFO_DATA             DeviceInfoData;
-   BOOL                         Restart;
-   
-} TOASTER_PROP_PARAMS, *PTOASTER_PROP_PARAMS;
-
-
-INT_PTR
-PropPageDlgProc(_In_ HWND   hDlg,
-               _In_ UINT   uMessage,
-               _In_ WPARAM wParam,
-               _In_ LPARAM lParam);
-
-UINT
-CALLBACK
-PropPageDlgCallback(HWND hwnd,
-                    UINT uMsg,
-                    LPPROPSHEETPAGE ppsp);
-DWORD
-PropPageProvider(
-    _In_  HDEVINFO            DeviceInfoSet,
-    _In_  PSP_DEVINFO_DATA    DeviceInfoData OPTIONAL
-);
-
-BOOL
-OnNotify(
-    HWND    ParentHwnd,
-    LPNMHDR NmHdr,
-    PTOASTER_PROP_PARAMS Params
-    );
-    
-HMODULE ModuleInstance;
-
-BOOL WINAPI 
-DllMain(
-    HINSTANCE DllInstance,
-    DWORD Reason,
-    PVOID Reserved
-    )
-{
-
-    UNREFERENCED_PARAMETER( Reserved );
-
-    switch(Reason) {
-
-        case DLL_PROCESS_ATTACH: {
-
-            ModuleInstance = DllInstance;
-            DisableThreadLibraryCalls(DllInstance);
-            InitCommonControls();
-            break;
-        }
-
-        case DLL_PROCESS_DETACH: {
-            ModuleInstance = NULL;
-            break;
-        }
-
-        default: {
-            break;
-        }
-    }
-
-    return TRUE;
-}
-
-DWORD CALLBACK
-ToasterClassInstaller(
-    _In_  DI_FUNCTION         InstallFunction,
-    _In_  HDEVINFO            DeviceInfoSet,
-    _In_  PSP_DEVINFO_DATA    DeviceInfoData OPTIONAL
-    )
-/*++
-
-Routine Description: 
-
-    Responds to Class-installer messages
-    .  
-Arguments:
-
-     InstallFunction   [in] 
-     DeviceInfoSet     [in]
-     DeviceInfoData    [in]
-
-Return Value:
-
-Returns:    NO_ERROR, ERROR_DI_POSTPROCESSING_REQUIRED, or an error code.
-
---*/
-{
-    switch (InstallFunction)
-    {
-        case DIF_INSTALLDEVICE: 
-            //
-            // Sent twice: once before installing the device and once
-            // after installing device, if you have returned 
-            // ERROR_DI_POSTPROCESSING_REQUIRED during the first pass.
-            //
-            DbgOut("DIF_INSTALLDEVICE");
-            break;
-            
-        case DIF_ADDPROPERTYPAGE_ADVANCED:
-            //
-            // Sent when you check the properties of the device in the
-            // device manager.
-            //
-            DbgOut("DIF_ADDPROPERTYPAGE_ADVANCED");
-            return PropPageProvider(DeviceInfoSet, DeviceInfoData);           
-            
-        case DIF_POWERMESSAGEWAKE:
-            //
-            // Sent when you check the power management tab 
-            //
-            DbgOut("DIF_POWERMESSAGEWAKE");
-            break;
-
-        case DIF_PROPERTYCHANGE:
-            //
-            // Sent when you change the property of the device using
-            // SetupDiSetDeviceInstallParams. (Enable/Disable/Restart)
-            //
-            DbgOut("DIF_PROPERTYCHANGE");
-            break;
-        case DIF_REMOVE: 
-             //
-             // Sent when you uninstall the device.
-             //
-             DbgOut("DIF_REMOVE");
-             break;
-             
-        case DIF_NEWDEVICEWIZARD_FINISHINSTALL:
-            //
-            // Sent near the end of installation to allow 
-            // an installer to supply wizard page(s) to the user.
-            // These wizard pages are different from the device manager
-            // property sheet.There are popped only once during install.
-            //
-            DbgOut("DIF_NEWDEVICEWIZARD_FINISHINSTALL");
-            break;
-            
-        case DIF_SELECTDEVICE:
-            DbgOut("DIF_SELECTDEVICE");
-            break;
-        case DIF_DESTROYPRIVATEDATA:
-            //
-            // Sent when Setup destroys a device information set 
-            // or an SP_DEVINFO_DATA element, or when Setup discards 
-            // its list of co-installers and class installer for a device
-            //
-            DbgOut("DIF_DESTROYPRIVATEDATA");
-            break;
-        case DIF_INSTALLDEVICEFILES:
-            DbgOut("DIF_INSTALLDEVICEFILES");
-            break;
-        case DIF_ALLOW_INSTALL:
-            //
-            // Sent to confirm whether the installer wants to allow
-            // the installation of device.
-            //
-            DbgOut("DIF_ALLOW_INSTALL");
-            break;
-        case DIF_SELECTBESTCOMPATDRV:
-            DbgOut("DIF_SELECTBESTCOMPATDRV");
-            break;
-
-        case DIF_INSTALLINTERFACES:
-            DbgOut("DIF_INSTALLINTERFACES");
-            break;
-        case DIF_REGISTER_COINSTALLERS:
-            DbgOut("DIF_REGISTER_COINSTALLERS");
-            break;
-        default:
-            DbgOut("DIF_???");
-            break;
-    }   
-    return ERROR_DI_DO_DEFAULT;    
-}
-
-DWORD
-PropPageProvider(
-    _In_  HDEVINFO            DeviceInfoSet,
-    _In_  PSP_DEVINFO_DATA    DeviceInfoData OPTIONAL
-)
-
-/*++
-
-Routine Description: 
-
-    Entry-point for adding additional device manager property
-    sheet pages.  
-Arguments:
-
-Return Value:
-
-Returns:    NO_ERROR, ERROR_DI_DO_DEFAULT, or an error code.
-
---*/
-{
-    HPROPSHEETPAGE  pageHandle;
-    PROPSHEETPAGE   page;
-    PTOASTER_PROP_PARAMS      params = NULL;
-    SP_ADDPROPERTYPAGE_DATA AddPropertyPageData = {0};
-
-    //
-    // DeviceInfoSet is NULL if setup is requesting property pages for
-    // the device setup class. We don't want to do anything in this 
-    // case.
-    //
-    if (DeviceInfoData==NULL) {
-        return ERROR_DI_DO_DEFAULT;
-    }
-
-    AddPropertyPageData.ClassInstallHeader.cbSize = 
-         sizeof(SP_CLASSINSTALL_HEADER);
-
-    //
-    // Get the current class install parameters for the device
-    //
-
-    if (SetupDiGetClassInstallParams(DeviceInfoSet, DeviceInfoData,
-         (PSP_CLASSINSTALL_HEADER)&AddPropertyPageData,
-         sizeof(SP_ADDPROPERTYPAGE_DATA), NULL )) 
-    {
-
-        //
-        // Ensure that the maximum number of dynamic pages for the 
-        // device has not yet been met
-        //
-        if(AddPropertyPageData.NumDynamicPages >= MAX_INSTALLWIZARD_DYNAPAGES){
-            return NO_ERROR;
-        }
-        params = HeapAlloc(GetProcessHeap(), 0, sizeof(TOASTER_PROP_PARAMS));
-        if (params)
-        {
-            //
-            // Save DeviceInfoSet and DeviceInfoData
-            //
-            params->DeviceInfoSet     = DeviceInfoSet;
-            params->DeviceInfoData    = DeviceInfoData;
-            params->Restart           = FALSE;
-            
-            //
-            // Create custom property sheet page
-            //
-            memset(&page, 0, sizeof(PROPSHEETPAGE));
-
-            page.dwSize = sizeof(PROPSHEETPAGE);
-            page.dwFlags = PSP_USECALLBACK;
-            page.hInstance = ModuleInstance;
-            page.pszTemplate = MAKEINTRESOURCE(DLG_TOASTER_PORTSETTINGS);
-            page.pfnDlgProc = (DLGPROC) PropPageDlgProc;
-            page.pfnCallback = PropPageDlgCallback;
-
-            page.lParam = (LPARAM) params;
-
-            pageHandle = CreatePropertySheetPage(&page);
-            if(!pageHandle)
-            {
-                HeapFree(GetProcessHeap(), 0, params);
-                return NO_ERROR;
-            }
-
-            //
-            // Add the new page to the list of dynamic property 
-            // sheets
-            //
-            AddPropertyPageData.DynamicPages[
-                AddPropertyPageData.NumDynamicPages++]=pageHandle;
-
-            SetupDiSetClassInstallParams(DeviceInfoSet,
-                        DeviceInfoData,
-                        (PSP_CLASSINSTALL_HEADER)&AddPropertyPageData,
-                        sizeof(SP_ADDPROPERTYPAGE_DATA));
-        }
-    }
-    return NO_ERROR;
-} 
-
-INT_PTR
-PropPageDlgProc(_In_ HWND   hDlg,
-                   _In_ UINT   uMessage,
-                   _In_ WPARAM wParam,
-                   _In_ LPARAM lParam)
-/*++
-
-Routine Description: PropPageDlgProc
-
-    The windows control function for the custom property page window
-
-Arguments:
-
-    hDlg, uMessage, wParam, lParam: standard windows DlgProc parameters
-
-Return Value:
-
-    BOOL: FALSE if function fails, TRUE if function passes
-
---*/
-{
-    PTOASTER_PROP_PARAMS params;
-
-    UNREFERENCED_PARAMETER( wParam );
-
-    params = (PTOASTER_PROP_PARAMS) GetWindowLongPtr(hDlg, DWLP_USER);
-
-    switch(uMessage) {
-    case WM_COMMAND:
-        break;
-
-    case WM_CONTEXTMENU:
-        break;
-
-    case WM_HELP:
-        break;
-
-    case WM_INITDIALOG:
-
-        //
-        // on WM_INITDIALOG call, lParam points to the property
-        // sheet page.
-        //
-        // The lParam field in the property sheet page struct is set by the
-        // caller. This was set when we created the property sheet.
-        // Save this in the user window long so that we can access it on later 
-        // on later messages.
-        //
-
-        params = (PTOASTER_PROP_PARAMS) ((LPPROPSHEETPAGE)lParam)->lParam;
-        SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR) params);
-        break;
-
-
-    case WM_NOTIFY:
-        OnNotify(hDlg, (NMHDR *)lParam, params);
-        break;
-
-    default: 
-        return FALSE;
-    }
-
-    return TRUE;
-} 
-
-
-UINT
-CALLBACK
-PropPageDlgCallback(HWND hwnd,
-                   UINT uMsg,
-                   LPPROPSHEETPAGE ppsp)
-{
-    PTOASTER_PROP_PARAMS params;
-
-    UNREFERENCED_PARAMETER( hwnd );
-
-    switch (uMsg) {
-
-    case PSPCB_CREATE:
-        //
-        // Called when the property sheet is first displayed
-        //
-        return TRUE;    // return TRUE to continue with creation of page
-
-    case PSPCB_RELEASE:
-        //
-        // Called when property page is destroyed, even if the page 
-        // was never displayed. This is the correct way to release data.
-        //
-        params = (PTOASTER_PROP_PARAMS) ppsp->lParam;
-        LocalFree(params);
-        return 0;       // return value ignored
-    default:
-        break;
-    }
-
-    return TRUE;
-}
-
-
-BOOL
-OnNotify(
-    HWND    ParentHwnd,
-    LPNMHDR NmHdr,
-    PTOASTER_PROP_PARAMS Params
-    )
-{
-    SP_DEVINSTALL_PARAMS spDevInstall = {0};
-    TCHAR                friendlyName[LINE_LEN] ={0};
-    size_t  charCount;
-    BOOL    fSuccess;
-
-    switch (NmHdr->code) {
-    case PSN_APPLY:
-        //
-        // Sent when the user clicks on Apply OR OK !!
-        //
-
-        GetDlgItemText(ParentHwnd, IDC_FRIENDLYNAME, friendlyName,
-                                        LINE_LEN-1 );
-        friendlyName[LINE_LEN-1] = UNICODE_NULL;
-        if(friendlyName[0]) {
-
-            if (FAILED(StringCchLength(friendlyName,
-                         STRSAFE_MAX_CCH,
-                         &charCount))) {
-                DbgOut("StringCchLength failed!");                   
-                break;
-            }
-            fSuccess = SetupDiSetDeviceRegistryProperty(Params->DeviceInfoSet, 
-                         Params->DeviceInfoData,
-                         SPDRP_FRIENDLYNAME,
-                         (BYTE *)friendlyName,
-                         (DWORD)((charCount + 1) * sizeof(TCHAR))
-                         );
-            if(!fSuccess) {
-                DbgOut("SetupDiSetDeviceRegistryProperty failed!");                   
-                break;
-            }
-
-            //
-            // Inform setup about property change so that it can
-            // restart the device.
-            //
-
-            spDevInstall.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-     
-            if (Params && SetupDiGetDeviceInstallParams(Params->DeviceInfoSet,
-                                              Params->DeviceInfoData,
-                                              &spDevInstall)) {
-                //
-                // If your device requires a reboot to restart, you can
-                // specify that by setting DI_NEEDREBOOT as shown below
-                //
-                // if(NeedReboot) {
-                //    spDevInstall.Flags |= DI_PROPERTIES_CHANGE | DI_NEEDREBOOT;
-                // }
-                //
-                spDevInstall.FlagsEx |= DI_FLAGSEX_PROPCHANGE_PENDING;
-                
-                SetupDiSetDeviceInstallParams(Params->DeviceInfoSet,
-                                              Params->DeviceInfoData,
-                                              &spDevInstall);
-            }
-        
-        }
-        return TRUE;
-
-    default:
-        return FALSE;
-    }
-    return FALSE;   
-} 
-
diff --git a/general/toaster/toastDrv/classinstaller/classinst.rc b/general/toaster/toastDrv/classinstaller/classinst.rc
deleted file mode 100644
index 7320e436..00000000
--- a/general/toaster/toastDrv/classinstaller/classinst.rc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*++
-
-Copyright (c) Microsoft Corporation.  All rights reserved.
-
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
-    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
-    PURPOSE.
-
-Module Name:
-
-    classinst.rc
-
-Abstract:
-
-    Resource Script for Toaster Class Installer Sample
-
-Environment:
-
-    user mode only
-
-Revision History:
-
---*/
-
-
-#include "resource.h"
-#include <windows.h>
-#include <ntverp.h>
-
-#define VER_FILETYPE    VFT_APP
-#define VER_FILESUBTYPE VFT2_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "Class-Installer DLL for Toaster Sample"
-#define VER_INTERNALNAME_STR        "TostrCls.dll"
-#define VER_ORIGINALFILENAME_STR    "TostrCls.dll"
-
-#include <common.ver>
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLG_TOASTER_PORTSETTINGS DIALOGEX 0, 0, 257, 215
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Custom Property Page"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "You can change the friendly name of the device with the following edit box. If you give a name and click OK, it will cause the device to restart.",
-                    IDC_STATIC,43,24,171,27,WS_BORDER,WS_EX_STATICEDGE
-    EDITTEXT        IDC_FRIENDLYNAME,97,78,118,14,ES_AUTOHSCROLL
-    LTEXT           "FriendlyName",204,46,81,46,10
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-IDI_CLASS_ICON  ICON    DISCARDABLE     "TOASTER.ICO"
-
-
diff --git a/general/toaster/toastDrv/classinstaller/resource.h b/general/toaster/toastDrv/classinstaller/resource.h
deleted file mode 100644
index e8331ee0..00000000
--- a/general/toaster/toastDrv/classinstaller/resource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*++
-
-Copyright (c) 1999-2000  Microsoft Corporation
-
-Module Name:
-
-    Resource.h
-
-Abstract:
-
-    Resource def.
-
-Environment:
-
-    user mode only
-
-Notes:
-
-  THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
-  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
-  PURPOSE.
-
-  Copyright (c) 1999-2000 Microsoft Corporation.  All Rights Reserved.
-
-
-Revision History:
-
---*/
-
-#define IDI_CLASS_ICON                       100
-
-#define DLG_TOASTER_PORTSETTINGS             200
-
-#define IDC_STATIC                           202
-
-#define IDC_FRIENDLYNAME                     203
-
diff --git a/general/toaster/toastDrv/classinstaller/toaster.ico b/general/toaster/toastDrv/classinstaller/toaster.ico
deleted file mode 100644
index 77ad2081..00000000
--- a/general/toaster/toastDrv/classinstaller/toaster.ico
+++ /dev/null
diff --git a/general/toaster/toastDrv/classinstaller/tostrcls.def b/general/toaster/toastDrv/classinstaller/tostrcls.def
deleted file mode 100644
index 877e3aff..00000000
--- a/general/toaster/toastDrv/classinstaller/tostrcls.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY  TOSTRCLS
-
-EXPORTS   
-   ToasterClassInstaller
-   
diff --git a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj b/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj
deleted file mode 100644
index a3a6891d..00000000
--- a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <SupportsPackaging>false</SupportsPackaging>
-    <RequiresPackageProject>true</RequiresPackageProject>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{EB79C9FC-7142-4AC9-BF03-D873407A31DE}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="classinst.c" />
-    <ResourceCompile Include="classinst.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
-    <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
-    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
-    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj.Filters b/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj.Filters
deleted file mode 100644
index 841ba6f6..00000000
--- a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj.Filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{DFE60A11-D228-4BF1-B20A-708606E63695}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{692DFF5B-CE0A-4047-8EC8-27394EDFB2B6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{20E0445D-854A-4108-AAF5-8DF38235343B}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="classinst.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="tostrcls.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="classinst.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/general/toaster/toastDrv/coinstaller/coinst.c b/general/toaster/toastDrv/coinstaller/coinst.c
deleted file mode 100644
index a78223c5..00000000
--- a/general/toaster/toastDrv/coinstaller/coinst.c
+++ /dev/null
@@ -1,343 +0,0 @@
-// 45678901234567890123456789012345678901234567890123456789012345678901234567890
-//+---------------------------------------------------------------------------
-//
-//  Microsoft Windows
-//  Copyright (C) Microsoft Corporation, 1999.
-//
-//  File:       COINST.C
-//
-//  Contents:   co-installer hook.
-//
-//  Notes:      For a complete description of CoInstallers, please see the
-//                 Microsoft Windows 2000 DDK Documentation
-//
-//
-// Revision History:
-//              Added FriendlyName interface
-//
-//              Modified to create a friendlyname in the first callback to
-//              to install device rather than in post-processing.
-//                  - July 28, 2000
-//
-//----------------------------------------------------------------------------
-
-//
-// Annotation to indicate to prefast that this is nondriver user-mode code.
-//
-#include <DriverSpecs.h>
-__user_code  
-
-#include <windows.h>
-#include <setupapi.h>
-#include <stdio.h>
-#include <strsafe.h>
-
-//+---------------------------------------------------------------------------
-//
-// WARNING!
-//
-// A Coinstaller must not generate any popup to the user.
-//     it should provide appropriate defaults.
-//
-//  OutputDebugString should be fine...
-//
-#if DBG
-#define DbgOut(Text) OutputDebugString(TEXT("CoInstaller: " Text "\n"))
-#else
-#define DbgOut(Text)
-#endif
-
-//+---------------------------------------------------------------------------
-//
-//  Function:   MyOpenInfFile
-//
-//  Purpose:    Will open the handle to the INF file being installed
-//
-//  Arguments:
-//      DeviceInfoSet     [in]
-//      DeviceInfoData    [in]
-//      ErrorLine         [out] // Optional, See SetupOpenInfFile
-//
-//  Returns:    HINF Handle of INF file
-//
-HINF MyOpenInfFile (
-                    _In_      HDEVINFO          DeviceInfoSet,
-                    _In_      PSP_DEVINFO_DATA  DeviceInfoData,
-                    _Out_opt_ PUINT             ErrorLine
-                    )
-{
-    SP_DRVINFO_DATA DriverInfoData;
-    SP_DRVINFO_DETAIL_DATA DriverInfoDetailData;
-    DWORD Status;
-    HINF FileHandle;
-
-    if (NULL != ErrorLine)
-    {
-        *ErrorLine = 0;
-    }
-
-    DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA);
-    if (!SetupDiGetSelectedDriver( DeviceInfoSet,
-        DeviceInfoData,
-        &DriverInfoData))
-    {
-        DbgOut("Fail: SetupDiGetSelectedDriver");
-        return INVALID_HANDLE_VALUE;
-    }
-
-    DriverInfoDetailData.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
-    if (!SetupDiGetDriverInfoDetail(DeviceInfoSet,
-        DeviceInfoData,
-        &DriverInfoData,
-        &DriverInfoDetailData,
-        sizeof(SP_DRVINFO_DETAIL_DATA),
-        NULL))
-    {
-        if ((Status = GetLastError()) == ERROR_INSUFFICIENT_BUFFER)
-        {
-            // We don't need the extended information.  Ignore.
-        }
-        else
-        {
-            DbgOut("Fail: SetupDiGetDriverInfoDetail");
-            return INVALID_HANDLE_VALUE;
-        }
-    }
-
-    if (INVALID_HANDLE_VALUE == (FileHandle = SetupOpenInfFile(
-        DriverInfoDetailData.InfFileName,
-        NULL,
-        INF_STYLE_WIN4,
-        ErrorLine)))
-    {
-        DbgOut("Fail: SetupOpenInfFile");
-    }
-    return FileHandle;
-}
-
-//+---------------------------------------------------------------------------
-//
-//  Function:   ToasterCoInstaller
-//
-//  Purpose:    Responds to co-installer messages
-//
-//  Arguments:
-//      InstallFunction   [in]
-//      DeviceInfoSet     [in]
-//      DeviceInfoData    [in]
-//      Context           [inout]
-//
-//  Returns:    NO_ERROR, ERROR_DI_POSTPROCESSING_REQUIRED, or an error code.
-//
-DWORD CALLBACK
-ToasterCoInstaller (
-               _In_     DI_FUNCTION               InstallFunction,
-               _In_     HDEVINFO                  DeviceInfoSet,
-               _In_     PSP_DEVINFO_DATA          DeviceInfoData,  OPTIONAL
-               _Inout_ PCOINSTALLER_CONTEXT_DATA Context
-               )
-{
-    switch (InstallFunction)
-    {
-    case DIF_INSTALLDEVICE:
-        if(!Context->PostProcessing)
-        {
-            TCHAR       FriendlyName[MAX_PATH];
-            BOOL        fSuccess=FALSE;
-            DWORD       dwRegType, UINumber;
-            size_t      len;
-
-            DbgOut("DIF_INSTALLDEVICE");
-
-            //
-            // We wil create here a friendly name for this device
-            // based on it's serial number.
-            // The bus driver returns the serial No. in the UINumber.
-            // field of the device capabiliities structure.
-            // So let us get that first .
-            //
-            fSuccess =
-            SetupDiGetDeviceRegistryProperty(DeviceInfoSet,
-                                             DeviceInfoData,
-                                             SPDRP_UI_NUMBER,
-                                             &dwRegType,
-                                             (BYTE*) &UINumber,
-                                             sizeof(UINumber),
-                                             NULL);
-            if (fSuccess)
-            {
-                //
-                // Cook a FriendlyName and add it to the registry
-                //
-                if (SUCCEEDED(StringCbPrintf(FriendlyName,
-                               sizeof(FriendlyName),
-                               TEXT("ToasterDevice%02u"),
-                               UINumber))) {
-
-                    if (SUCCEEDED(StringCbLength(FriendlyName,
-                                    sizeof(FriendlyName),
-                                    &len))) {
-                        fSuccess = SetupDiSetDeviceRegistryProperty(DeviceInfoSet,
-                                     DeviceInfoData,
-                                     SPDRP_FRIENDLYNAME,
-                                     (BYTE *)FriendlyName,
-                                     (DWORD)len
-                                     );
-                        if(!fSuccess) {
-                            DbgOut("SetupDiSetDeviceRegistryProperty failed!");
-                        }
-                    }
-                    
-                }
-
-            }
-
-            // You can use PrivateData to pass Data needed for PostProcessing
-            // Context->PrivateData = Something;
-
-            return ERROR_DI_POSTPROCESSING_REQUIRED; //Set for PostProcessing
-        }
-        else // post processing
-        {
-            INFCONTEXT  InfContext;
-            HINF        InfFile;
-
-            //
-            // Sample code to show how you can process a custom section
-            // in your INF file.
-            //
-            DbgOut("DIF_INSTALLDEVICE PostProcessing");
-
-            if (INVALID_HANDLE_VALUE == (InfFile =
-                MyOpenInfFile(DeviceInfoSet,DeviceInfoData,NULL)))
-            {
-                return GetLastError();
-            }
-
-            if (SetupFindFirstLine(InfFile, // InfHandle
-                TEXT("MySection"),
-                TEXT("MySpecialFlag"),
-                &InfContext))
-            {
-                DbgOut("DIF_INSTALLDEVICE MySpecicalFlag, Do something here!");
-
-            }
-
-        }
-        break;
-
-    case DIF_REMOVE:
-        DbgOut("DIF_REMOVE");
-        break;
-
-    case DIF_SELECTDEVICE:
-        DbgOut("DIF_SELECTDEVICE");
-        break;
-    case DIF_ASSIGNRESOURCES:
-        DbgOut("DIF_ASSIGNRESOURCES");
-        break;
-    case DIF_PROPERTIES:
-        DbgOut("DIF_PROPERTIES");
-        break;
-    case DIF_FIRSTTIMESETUP:
-        DbgOut("DIF_FIRSTTIMESETUP");
-        break;
-    case DIF_FOUNDDEVICE:
-        DbgOut("DIF_FOUNDDEVICE");
-        break;
-    case DIF_SELECTCLASSDRIVERS:
-        DbgOut("DIF_SELECTCLASSDRIVERS");
-        break;
-    case DIF_VALIDATECLASSDRIVERS:
-        DbgOut("DIF_VALIDATECLASSDRIVERS");
-        break;
-    case DIF_INSTALLCLASSDRIVERS:
-        DbgOut("DIF_INSTALLCLASSDRIVERS");
-        break;
-    case DIF_CALCDISKSPACE:
-        DbgOut("DIF_CALCDISKSPACE");
-        break;
-    case DIF_DESTROYPRIVATEDATA:
-        DbgOut("DIF_DESTROYPRIVATEDATA");
-        break;
-    case DIF_VALIDATEDRIVER:
-        DbgOut("DIF_VALIDATEDRIVER");
-        break;
-    case DIF_MOVEDEVICE:
-        DbgOut("DIF_MOVEDEVICE");
-        break;
-    case DIF_DETECT:
-        DbgOut("DIF_DETECT");
-        break;
-    case DIF_INSTALLWIZARD:
-        DbgOut("DIF_INSTALLWIZARD");
-        break;
-    case DIF_DESTROYWIZARDDATA:
-        DbgOut("DIF_DESTROYWIZARDDATA");
-        break;
-    case DIF_PROPERTYCHANGE:
-        DbgOut("DIF_PROPERTYCHANGE");
-        break;
-    case DIF_ENABLECLASS:
-        DbgOut("DIF_ENABLECLASS");
-        break;
-    case DIF_DETECTVERIFY:
-        DbgOut("DIF_DETECTVERIFY");
-        break;
-    case DIF_INSTALLDEVICEFILES:
-        DbgOut("DIF_INSTALLDEVICEFILES");
-        break;
-    case DIF_ALLOW_INSTALL:
-        DbgOut("DIF_ALLOW_INSTALL");
-        break;
-    case DIF_SELECTBESTCOMPATDRV:
-        DbgOut("DIF_SELECTBESTCOMPATDRV");
-        break;
-    case DIF_REGISTERDEVICE:
-        DbgOut("DIF_REGISTERDEVICE");
-        break;
-    case DIF_NEWDEVICEWIZARD_PRESELECT:
-        DbgOut("DIF_NEWDEVICEWIZARD_PRESELECT");
-        break;
-    case DIF_NEWDEVICEWIZARD_SELECT:
-        DbgOut("DIF_NEWDEVICEWIZARD_SELECT");
-        break;
-    case DIF_NEWDEVICEWIZARD_PREANALYZE:
-        DbgOut("DIF_NEWDEVICEWIZARD_PREANALYZE");
-        break;
-    case DIF_NEWDEVICEWIZARD_POSTANALYZE:
-        DbgOut("DIF_NEWDEVICEWIZARD_POSTANALYZE");
-        break;
-    case DIF_NEWDEVICEWIZARD_FINISHINSTALL:
-        DbgOut("DIF_NEWDEVICEWIZARD_FINISHINSTALL");
-        break;
-    case DIF_INSTALLINTERFACES:
-        DbgOut("DIF_INSTALLINTERFACES");
-        break;
-    case DIF_DETECTCANCEL:
-        DbgOut("DIF_DETECTCANCEL");
-        break;
-    case DIF_REGISTER_COINSTALLERS:
-        DbgOut("DIF_REGISTER_COINSTALLERS");
-        break;
-    case DIF_ADDPROPERTYPAGE_ADVANCED:
-        DbgOut("DIF_ADDPROPERTYPAGE_ADVANCED");
-        break;
-    case DIF_ADDPROPERTYPAGE_BASIC:
-        DbgOut("DIF_ADDPROPERTYPAGE_BASIC");
-        break;
-    case DIF_TROUBLESHOOTER:
-        DbgOut("DIF_TROUBLESHOOTER");
-        break;
-    case DIF_POWERMESSAGEWAKE:
-        DbgOut("DIF_POWERMESSAGEWAKE");
-        break;
-    default:
-        DbgOut("?????");
-        break;
-    }
-
-    return NO_ERROR;
-}
-
-
diff --git a/general/toaster/toastDrv/coinstaller/tostrco1.def b/general/toaster/toastDrv/coinstaller/tostrco1.def
deleted file mode 100644
index 8927a887..00000000
--- a/general/toaster/toastDrv/coinstaller/tostrco1.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY  TOSTRCO1
-
-EXPORTS   
-   ToasterCoInstaller 
-
-   
diff --git a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj b/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj
deleted file mode 100644
index efbef488..00000000
--- a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2C2FDE7E-AF76-431C-B346-457A23F65F6D}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="coinst.c" />
-  </ItemGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
-    <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
-    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
-    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj.Filters b/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj.Filters
deleted file mode 100644
index a9cd7e88..00000000
--- a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj.Filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{DA0ECA8C-145B-4D3A-8C0F-7DADEEABEE7C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{19EA12EE-E368-463D-B066-44D1E82DD776}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{E5E47602-89BD-4D0E-93C1-4EA3331105AA}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="coinst.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="tostrco1.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/general/toaster/toastDrv/exe/enum/Enum.vcxproj b/general/toaster/toastDrv/exe/enum/Enum.vcxproj
index 175e7897..7059deb7 100644
--- a/general/toaster/toastDrv/exe/enum/Enum.vcxproj
+++ b/general/toaster/toastDrv/exe/enum/Enum.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}</ProjectGuid>
+    <ProjectGuid>{91E7C695-3307-4596-90E1-065AFB4D2643}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9C22B158-73CF-4D66-B85C-4E4AE9DB0AC4}</SampleGuid>
+    <SampleGuid>{AC84F877-CAB8-44D9-9199-028B400504FA}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,17 +89,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -108,17 +108,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -127,17 +127,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -146,17 +146,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
diff --git a/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters b/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters
index dbbc99c6..fff7bcd3 100644
--- a/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{4DF85533-7B9E-4C98-8769-7C6420BCE72E}</UniqueIdentifier>
+      <UniqueIdentifier>{0478CA74-6E89-40CC-BA37-7A2FBC70982B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{871CA74F-21C6-45DD-888C-CA8EA3F48965}</UniqueIdentifier>
+      <UniqueIdentifier>{418A5D3D-5225-4430-AD6C-DBCDB8B00D57}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{5B1A9C9F-B7FB-4466-9E15-80E147D55C1A}</UniqueIdentifier>
+      <UniqueIdentifier>{F170FC27-1BFE-4060-A548-BD9A219A502C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/exe/notify/notify.vcxproj b/general/toaster/toastDrv/exe/notify/notify.vcxproj
index ded7bd0b..99a5f790 100644
--- a/general/toaster/toastDrv/exe/notify/notify.vcxproj
+++ b/general/toaster/toastDrv/exe/notify/notify.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}</ProjectGuid>
+    <ProjectGuid>{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{C26150C1-ABE5-4264-BD23-6449114CA46C}</SampleGuid>
+    <SampleGuid>{B9D000EC-83CC-4167-802E-8438A8FF51E4}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,15 +89,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -105,15 +105,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -121,15 +121,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -137,15 +137,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters b/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters
index 1ba140e2..6590341f 100644
--- a/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D1EC8595-68A9-4660-8CDA-5C17574C450B}</UniqueIdentifier>
+      <UniqueIdentifier>{DBCA469B-548D-4437-BF5A-97DCEBE3D840}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{75CBFBEA-4EA9-4872-8030-99429611E8A1}</UniqueIdentifier>
+      <UniqueIdentifier>{DE8C6977-FC68-4C69-8630-4694C3622D6C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{1F8FFCF9-E0C1-4EBE-8C4E-76C812637E15}</UniqueIdentifier>
+      <UniqueIdentifier>{BF9BD5C8-F576-4DB4-BB8E-2AED59380E60}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/exe/toast/toast.vcxproj b/general/toaster/toastDrv/exe/toast/toast.vcxproj
index d06a207d..af82acfe 100644
--- a/general/toaster/toastDrv/exe/toast/toast.vcxproj
+++ b/general/toaster/toastDrv/exe/toast/toast.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}</ProjectGuid>
+    <ProjectGuid>{8FA35EEE-04BE-438A-AD20-A8E849C9A107}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9B71A258-9AC3-4501-B5D5-03FD83F9F40A}</SampleGuid>
+    <SampleGuid>{E86474CB-C1C2-4A18-8715-FC4AC163A6D2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,15 +89,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -105,15 +105,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -121,15 +121,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -137,15 +137,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters b/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters
index a8533f0b..961ea2ff 100644
--- a/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{8C1E3DAE-53E3-457C-98F3-FB405BC9A120}</UniqueIdentifier>
+      <UniqueIdentifier>{C5935659-AF96-4A26-9828-7135F79A7107}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C2C50665-6AB2-4502-B4A2-29496B9935F0}</UniqueIdentifier>
+      <UniqueIdentifier>{4542E5F6-7451-43E0-8EFF-A7AC183A23B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{D0127FBE-76C6-4B7C-91D7-DC444B6B223D}</UniqueIdentifier>
+      <UniqueIdentifier>{29D0DA0A-77D3-48A1-87F5-15578B07F740}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj
index a1ab7caf..1de90b0b 100644
--- a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj
+++ b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9FF1CCE5-AD65-444C-97C1-179619AA2479}</ProjectGuid>
+    <ProjectGuid>{869C08D1-A32F-49C7-9831-2ADB52F241B6}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{519C06B4-3DEE-4917-9D48-4EA2905EF515}</SampleGuid>
+    <SampleGuid>{FCD66B78-4C9B-4619-8C39-EFB1AE426386}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters
index d9b9e30b..512407d1 100644
--- a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{779E4F7E-89F5-41F9-92C2-C9E8B7060B92}</UniqueIdentifier>
+      <UniqueIdentifier>{7244DA1C-4F60-44A8-940A-AD55012199D1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{BFEAC96B-E61B-4729-B62C-A7F52A16E99C}</UniqueIdentifier>
+      <UniqueIdentifier>{8B1421F5-129C-46B6-905E-C0516D654622}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{D5FE79F8-F00F-4D49-B219-CB749AD7DD7A}</UniqueIdentifier>
+      <UniqueIdentifier>{C72A10B1-2A49-4A34-8061-ED8EABF77E9A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/inc/driver.h b/general/toaster/toastDrv/inc/driver.h
index 8e7ade01..8e7ade01 100644
--- a/general/toaster/toastDrv/kmdf/inc/driver.h
+++ b/general/toaster/toastDrv/inc/driver.h
diff --git a/general/toaster/toastDrv/kmdf/inc/public.h b/general/toaster/toastDrv/inc/public.h
index 0628f95f..0628f95f 100644
--- a/general/toaster/toastDrv/kmdf/inc/public.h
+++ b/general/toaster/toastDrv/inc/public.h
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c b/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c
index 5c908770..d7d2cf54 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c
@@ -83,7 +83,7 @@ Return Value:
     }
 
     dst->HardwareIds = (PWCHAR) ExAllocatePoolWithTag(
-        NonPagedPool,
+        NonPagedPoolNx,
         safeMultResult,
         BUS_TAG);
 
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
index e45f4329..9f7634b1 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj
index 042c93ef..659d356e 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}</ProjectGuid>
+    <ProjectGuid>{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{168C515B-E0DC-4CCE-AB5D-4B3FE501CC58}</SampleGuid>
+    <SampleGuid>{DD9AA820-3B18-435A-88BD-1574156D5E12}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -108,15 +108,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -124,15 +124,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -140,15 +140,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -156,15 +156,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters
index 46ffc89f..081dc9b3 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{F47FA196-0B9F-4630-A6DC-87B41000BC35}</UniqueIdentifier>
+      <UniqueIdentifier>{AC53A94A-C5A4-40B4-8A66-32832F92CC2F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{62AF8524-CB5B-468E-9398-455D5E9DC688}</UniqueIdentifier>
+      <UniqueIdentifier>{55B97607-1E61-45FF-91CB-B2B5A201C882}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{812EE7F2-C44C-4C50-AC55-CE56B09EF7AC}</UniqueIdentifier>
+      <UniqueIdentifier>{D0EAD36D-F4E0-4E66-9393-160608E23A85}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{00095F3E-A751-4C8E-9052-D3E64DF88F1E}</UniqueIdentifier>
+      <UniqueIdentifier>{847FA4FE-DFFD-4B58-860A-38A570C5CFD6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\dynambus.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="busenum.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj
index b78e8a0c..9b7b3374 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj
+++ b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{965C0E80-0715-4376-A138-48D08EFDDC09}</ProjectGuid>
+    <ProjectGuid>{6C6E0C23-5B37-4BBB-8909-435078D49364}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{23FA1088-5777-47FF-8254-EFD0B687928E}</SampleGuid>
+    <SampleGuid>{112DC6FF-C92C-45C5-B5E1-85C2129D81D3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -108,15 +108,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -124,15 +124,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -140,15 +140,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -156,15 +156,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters
index f4363bf0..9668a27e 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{86D36061-8E62-43AE-9677-EF29528CAAE9}</UniqueIdentifier>
+      <UniqueIdentifier>{C4C78574-F3CF-412F-BF41-26EEFB651EC3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{67A8D587-DF81-4D99-B5F5-A02788E04594}</UniqueIdentifier>
+      <UniqueIdentifier>{7B3EF77E-8DE8-4D96-A0CF-4356B08F046D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{5EB6269C-B636-406C-A13C-A22C2CF8D4DA}</UniqueIdentifier>
+      <UniqueIdentifier>{101CDAA2-6E2D-47AD-AB91-F9FF064131AF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{26ED96D4-93DD-490C-84FF-7B474E8AE395}</UniqueIdentifier>
+      <UniqueIdentifier>{4B642090-F96B-49A0-B433-97692B1A5EF5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\statbus.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="busenum.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
index 9e8cb03a..0725d2bb 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
+++ b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
diff --git a/general/toaster/toastDrv/kmdf/filter/filter.inx b/general/toaster/toastDrv/kmdf/filter/filter.inx
index db58c43d..d579ff7e 100644
--- a/general/toaster/toastDrv/kmdf/filter/filter.inx
+++ b/general/toaster/toastDrv/kmdf/filter/filter.inx
diff --git a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj
index e59da4b8..e2bbd3c4 100644
--- a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj
+++ b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}</ProjectGuid>
+    <ProjectGuid>{B39F6628-73BA-4AC3-863A-EA20892F1EFD}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{319B1451-754B-4F6E-9EBC-FDF268C22624}</SampleGuid>
+    <SampleGuid>{92082E8D-0D74-485B-9578-34DB3ED3F74D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -100,7 +100,7 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -108,17 +108,17 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -126,17 +126,17 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -144,17 +144,17 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -162,10 +162,10 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters
index d5f0682e..7c92ccef 100644
--- a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{57623C7D-A559-470E-82F1-5855F3D3E968}</UniqueIdentifier>
+      <UniqueIdentifier>{E3242171-0D71-4EAC-94E0-E3B9FC647C16}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1425FE66-5130-4EBE-BC59-706EFFACDBAC}</UniqueIdentifier>
+      <UniqueIdentifier>{D593E254-6A82-4D73-A34E-CD7D019FB577}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{557E8DA6-D010-47FD-A26B-A6BC0D90716E}</UniqueIdentifier>
+      <UniqueIdentifier>{5240632B-924D-4233-AE9C-CE317927559C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{BD774D78-091B-4F17-86D1-EDA291D0D2F4}</UniqueIdentifier>
+      <UniqueIdentifier>{B6CEB15F-684F-4D1C-A9C3-400B108BC28E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\filter.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj
index bf299111..1d3bc662 100644
--- a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj
+++ b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5094C704-35B0-4A25-AD30-570C49BCAE82}</ProjectGuid>
+    <ProjectGuid>{1A40DA6D-B948-43A7-864C-962517EE0A1D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{45B5BA9D-00B6-4AC4-BAC8-C9458CEE7190}</SampleGuid>
+    <SampleGuid>{433785F9-277E-45B7-97C7-7BD4D705B18D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,17 +101,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
@@ -122,17 +122,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
@@ -143,17 +143,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
@@ -164,17 +164,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters
index f78f59e4..24a2d237 100644
--- a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{CDD79DAB-0B3B-443A-9490-7EC7FA5C9B21}</UniqueIdentifier>
+      <UniqueIdentifier>{1252FA89-6F4A-4F02-B1C1-2ADE5DF160E5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{DC29ED4D-9D57-4982-AD99-B5099AA50460}</UniqueIdentifier>
+      <UniqueIdentifier>{563927D3-D3A9-467F-9FEB-9BBAFA7874AA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{EA8061CA-59F3-441F-8AD7-74F675F1B50F}</UniqueIdentifier>
+      <UniqueIdentifier>{2C21B45C-F0E7-4E75-8D5A-8ED0EB3E1009}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3EAB2CF5-86A8-4A52-839A-15A3878E8426}</UniqueIdentifier>
+      <UniqueIdentifier>{C33F22A9-B917-461D-802A-BACBF53ACFDF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\filter.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
index 6a256f2c..32916e7e 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj
index 468b7716..6120ade6 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CA0E203E-4C96-466F-BF19-24F42DFC0C89}</ProjectGuid>
+    <ProjectGuid>{C0049CDD-7551-4681-9E30-EFE32868F651}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2EBCE232-7DA0-4C77-9EEA-8DE675F4ADC7}</SampleGuid>
+    <SampleGuid>{64BB8707-3DD7-40D5-A874-E33251334995}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -113,17 +113,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -132,17 +132,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -151,17 +151,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -170,17 +170,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters
index c37a360d..9fd3e21f 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{5AEF704A-4799-414D-BC85-F523B601FF9D}</UniqueIdentifier>
+      <UniqueIdentifier>{77F46A21-812D-47F4-8CDA-8667B9516A0D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{8688F2E4-3E07-4E21-947E-9A0917D3799F}</UniqueIdentifier>
+      <UniqueIdentifier>{DB601389-B92E-40DF-919C-4DB72E7E890A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{D979FABA-F85A-4E60-8402-9E1603B7F223}</UniqueIdentifier>
+      <UniqueIdentifier>{9043E19F-FA3C-4876-B616-FE80F6FFFA40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{91E1B29C-05DE-4125-9FB5-C19173D157DD}</UniqueIdentifier>
+      <UniqueIdentifier>{AA6801CD-B2C4-47AD-8ADE-357A97AE98EB}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdffeatured.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="toaster.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wmi.c b/general/toaster/toastDrv/kmdf/func/featured/wmi.c
index 2dc8775f..e7c76a23 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wmi.c
+++ b/general/toaster/toastDrv/kmdf/func/featured/wmi.c
@@ -62,7 +62,7 @@ ToasterHelperFunction3(
     );
 
 
-#define ToasterDeviceInformation_SIZE FIELD_OFFSET(ToasterDeviceInformation, VariableData)
+#define ToasterDeviceInformation_SIZE UFIELD_OFFSET(ToasterDeviceInformation, VariableData)
 
 WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(ToasterDeviceInformation, ToasterWmiGetData)
 WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(ToasterControl, ToasterWmiGetControlData)
@@ -356,7 +356,7 @@ EvtWmiInstanceStdDeviceDataSetInstance(
 {
     PAGED_CODE();
 
-    if (InBufferSize < (ULONG)ToasterDeviceInformation_SIZE) {
+    if (InBufferSize < ToasterDeviceInformation_SIZE) {
         return STATUS_BUFFER_TOO_SMALL;
     }
 
@@ -444,9 +444,9 @@ ToasterFireArrivalEvent(
     size = wnodeSize + wnodeInstanceNameSize + wnodeDataBlockSize;
 
     //
-    // Allocate memory for the WNODE from NonPagedPool
+    // Allocate memory for the WNODE from NonPagedPoolNx
     //
-    wnode = ExAllocatePoolWithTag(NonPagedPool, size, TOASTER_POOL_TAG);
+    wnode = ExAllocatePoolWithTag(NonPagedPoolNx, size, TOASTER_POOL_TAG);
 
     if (NULL != wnode) {
         RtlZeroMemory(wnode, size);
@@ -580,14 +580,14 @@ Return Value:
     //
     status = WdfDeviceAllocAndQueryProperty(Device,
                                             DevicePropertyFriendlyName,
-                                            NonPagedPool,
+                                            NonPagedPoolNx,
                                             WDF_NO_OBJECT_ATTRIBUTES,
                                             DeviceName);
 
     if (!NT_SUCCESS(status) && status != STATUS_INSUFFICIENT_RESOURCES) {
         status = WdfDeviceAllocAndQueryProperty(Device,
                                                 DevicePropertyDeviceDescription,
-                                                NonPagedPool,
+                                                NonPagedPoolNx,
                                                 WDF_NO_OBJECT_ATTRIBUTES,
                                                 DeviceName);
 
diff --git a/general/toaster/toastDrv/kmdf/func/shared/toaster.h b/general/toaster/toastDrv/kmdf/func/shared/toaster.h
index 4dde5c42..fc847d2d 100644
--- a/general/toaster/toastDrv/kmdf/func/shared/toaster.h
+++ b/general/toaster/toastDrv/kmdf/func/shared/toaster.h
@@ -28,8 +28,8 @@ Environment:
 
 #include "wmilib.h"
 #include <initguid.h>
-#include "..\inc\driver.h"
-#include "..\inc\public.h"
+#include "driver.h"
+#include "public.h"
 
 // For Featured driver only
 #ifdef TOASTER_FUNC_FEATURED
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
index 9d07ff93..ad55da36 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj
index 92186701..4656138e 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}</ProjectGuid>
+    <ProjectGuid>{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{B609B6B5-97C5-4918-AD38-A4E7EE1B43BD}</SampleGuid>
+    <SampleGuid>{91DBD0B6-6FC1-4A3E-8110-FD832091F89B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,54 +98,54 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters
index cadde112..0631732e 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{63D238C3-D6F1-4A4D-8E9A-CD96C3EF19BA}</UniqueIdentifier>
+      <UniqueIdentifier>{AA78EAA0-EB89-4DFF-B704-8117A1B43E0E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D146F406-1C35-4F03-8623-AD0E44BDE5C0}</UniqueIdentifier>
+      <UniqueIdentifier>{2B9D7536-B3AC-490E-8995-C8E764CE42FF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{17782FC8-CA51-4C10-8D28-E9EA73162C1A}</UniqueIdentifier>
+      <UniqueIdentifier>{A72C4B5C-5EEA-4605-ADEA-C5258878B301}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8DF8F970-514A-42CA-BEB9-7B0BBD19E87E}</UniqueIdentifier>
+      <UniqueIdentifier>{F1462C26-D17A-4F77-A706-BDD04B29EAE8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdfsimple.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toaster.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/toastmon/toastmon.c b/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
index e06c523b..82b2e5d3 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
+++ b/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
@@ -851,7 +851,7 @@ Return Value:
     attributes.ParentObject = request;
     status = WdfMemoryCreate(
                         &attributes,
-                        NonPagedPool,
+                        NonPagedPoolNx,
                         DRIVER_TAG,
                         READ_BUF_SIZE,
                         &memory,
@@ -931,7 +931,7 @@ Return Value:
     attributes.ParentObject = request;
     status = WdfMemoryCreate(
                         &attributes,
-                        NonPagedPool,
+                        NonPagedPoolNx,
                         DRIVER_TAG,
                         WRITE_BUF_SIZE,
                         &memory,
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
index 214e2273..cfee1b11 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj
index b6981f74..a31e31c7 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A5E50982-981B-40B9-BEE6-1E15581FE947}</ProjectGuid>
+    <ProjectGuid>{D15FD911-F2DA-4644-8142-6D22756AD287}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9CAC55A2-7E42-4350-840F-0EE864DEC954}</SampleGuid>
+    <SampleGuid>{0C425406-1D19-4B02-8130-808A2679E773}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,15 +101,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,15 +117,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -133,15 +133,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -149,15 +149,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters
index 2f2921ed..1dc2e071 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{734E963A-2784-4259-A850-7B527681AB96}</UniqueIdentifier>
+      <UniqueIdentifier>{5F3B1BF3-8AA1-4260-A45B-EC21831E877B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1C35D44B-4EF9-4C91-A466-1C08A009F227}</UniqueIdentifier>
+      <UniqueIdentifier>{43739221-90B9-4A1F-9CAD-F06ADD55B435}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{8588E893-BBAD-441F-A814-9664F0BBEF97}</UniqueIdentifier>
+      <UniqueIdentifier>{5D93FF77-9BB3-41AF-9463-36BEC1612A7B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{9C5C6D96-ABDC-4238-9471-4DD2FF83DC29}</UniqueIdentifier>
+      <UniqueIdentifier>{54979279-ACEC-4A61-9D03-A14A147693FF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdftoastmon.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toastmon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wmi.c b/general/toaster/toastDrv/kmdf/toastmon/wmi.c
index eb2ef2a3..b3cdcb88 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wmi.c
+++ b/general/toaster/toastDrv/kmdf/toastmon/wmi.c
@@ -188,14 +188,14 @@ Return Value:
     //
     status = WdfIoTargetAllocAndQueryTargetProperty(Target,
                                                     DevicePropertyFriendlyName,
-                                                    NonPagedPool,
+                                                    NonPagedPoolNx,
                                                     WDF_NO_OBJECT_ATTRIBUTES,
                                                     TargetName);
 
     if (!NT_SUCCESS(status) && status != STATUS_INSUFFICIENT_RESOURCES) {
         status = WdfIoTargetAllocAndQueryTargetProperty(Target,
                                                         DevicePropertyDeviceDescription,
-                                                        NonPagedPool,
+                                                        NonPagedPoolNx,
                                                         WDF_NO_OBJECT_ATTRIBUTES,
                                                         TargetName);
 
diff --git a/general/toaster/toastDrv/toaster.sln b/general/toaster/toastDrv/toaster.sln
index cffb0f49..0d1c2e6c 100644
--- a/general/toaster/toastDrv/toaster.sln
+++ b/general/toaster/toastDrv/toaster.sln
@@ -3,81 +3,73 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{ADC63E58-1F2E-4A3A-A760-779FD9EAD00E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{F8CFBC14-78B5-4B7D-B9B5-648E3389C70C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Classinstaller", "Classinstaller", "{2C550FE4-29CD-40A8-836D-313696A3442B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wmi", "Wmi", "{C1205C19-4601-4DF6-A222-91CC30C12284}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Coinstaller", "Coinstaller", "{470F597C-0DBC-44AC-B69B-594ACB7B1ED0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{B1177A9B-61C5-4747-B40A-9F36D83CE9A0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wmi", "Wmi", "{F39421E1-95F5-4DEE-A78F-B522BE05FEB0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{26B8AB05-2BE2-4266-AB19-BA912C0ACFA1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{29C3C959-4CBC-4D9D-B660-2135BF00CC55}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{D2F3C374-F164-4E08-A5FE-F902972C57F9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{9C9637D5-A764-49F0-AF7D-C7F123CEB343}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{742BA5B5-A2DA-463A-A85E-9A12DE605FA6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{0293B300-378A-4D97-B93C-0690C8BC8019}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{581503D0-FE38-435F-B12A-FAAA2AE22359}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{F1085E78-8F4D-4044-B58E-BDA9E7E35A0F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{57D2095B-0A01-4F4C-A5D8-50F40DC155D0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{0BFA46E4-075E-475A-B73E-6FAB41B71B68}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{ECBD2F30-C9DF-4B13-83C2-45BDFD988518}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{929B678F-2875-4DEE-AA34-2C255D4B84EA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{7466998A-6403-4EBB-9328-656ECFD3F594}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{AC2EC9A6-11CC-4F9C-BBA6-2E78FFFF5C84}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{4B422EE1-0A80-4048-81BF-0005A2D67381}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sideband", "Sideband", "{BACE2A27-C593-43C6-B058-1D0A6A5D63B5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{A6681C1E-BA3B-4DD1-A641-DA27776A0319}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{5C1F160D-DF15-4215-AAC1-59BDF70D2C38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sideband", "Sideband", "{B2431307-5557-4D2E-AB33-F38E7D8680A4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{9577224D-E994-4E6E-BE11-FF456B8A4D46}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{A457C9CB-C02C-4835-8B4F-D3C03956C246}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Static", "Static", "{A69FDC71-8327-494A-9840-CF684E74965C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{F956DAF1-330C-458A-B659-A30D5CE74374}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{320825A6-82C4-42DE-91A3-EE5994B74EC3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Static", "Static", "{0A0AA60F-8EAD-4BC1-AB00-315A13174032}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamic", "Dynamic", "{4A994F2B-05BD-4CED-9157-45B29777740D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{C1623324-F98A-40DF-B5BD-A1D4465653C5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{16ECEF20-C217-4477-8C88-E8A231CC23B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamic", "Dynamic", "{E2B2526B-3B31-4309-A22A-1236F16CB840}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umdf", "Umdf", "{82276D55-C8B4-4C84-98FE-83F10C898FA0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{85556EF1-3D39-442F-BB0A-B3B5D6DE7352}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{9BEE50D5-9D78-4CA3-A535-75904B21C448}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umdf", "Umdf", "{B9DF6659-83A8-42FF-80CD-A03012E07CCE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{BF917E30-8925-4467-A1BF-CBD9E0AC7D12}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WmiToast", "exe\wmi\WmiToast.vcxproj", "{869C08D1-A32F-49C7-9831-2ADB52F241B6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{D72A34B9-86A5-4801-B7E3-256CF1F382AD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{816AC9A5-B371-4041-880C-A6B630DBCCE9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrcls", "classinstaller\tostrcls.vcxproj", "{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco1", "coinstaller\tostrco1.vcxproj", "{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{B26E87C6-12CE-4E03-A002-A2BF12B34986}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WmiToast", "exe\wmi\WmiToast.vcxproj", "{9FF1CCE5-AD65-444C-97C1-179619AA2479}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdftoastmon", "kmdf\toastmon\wdftoastmon.vcxproj", "{D15FD911-F2DA-4644-8142-6D22756AD287}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimple", "kmdf\func\simple\wdfsimple.vcxproj", "{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeatured", "kmdf\func\featured\wdffeatured.vcxproj", "{C0049CDD-7551-4681-9E30-EFE32868F651}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\sideband\filter.vcxproj", "{1A40DA6D-B948-43A7-864C-962517EE0A1D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdftoastmon", "kmdf\toastmon\wdftoastmon.vcxproj", "{A5E50982-981B-40B9-BEE6-1E15581FE947}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\generic\filter.vcxproj", "{B39F6628-73BA-4AC3-863A-EA20892F1EFD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimple", "kmdf\func\simple\wdfsimple.vcxproj", "{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatBus", "kmdf\bus\static\StatBus.vcxproj", "{6C6E0C23-5B37-4BBB-8909-435078D49364}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeatured", "kmdf\func\featured\wdffeatured.vcxproj", "{CA0E203E-4C96-466F-BF19-24F42DFC0C89}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynambus", "kmdf\bus\dynamic\dynambus.vcxproj", "{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\sideband\filter.vcxproj", "{5094C704-35B0-4A25-AD30-570C49BCAE82}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToastMon", "umdf\Toastmon\WUDFToastMon.vcxproj", "{F575419D-099B-4DA0-B80C-88D766DD7542}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\generic\filter.vcxproj", "{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatBus", "kmdf\bus\static\StatBus.vcxproj", "{965C0E80-0715-4376-A138-48D08EFDDC09}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynambus", "kmdf\bus\dynamic\dynambus.vcxproj", "{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToastMon", "umdf\Toastmon\WUDFToastMon.vcxproj", "{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToaster", "umdf\func\WUDFToaster.vcxproj", "{B439C142-C570-44A6-B13C-43F70AE05A69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToaster", "umdf\func\WUDFToaster.vcxproj", "{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -87,170 +79,152 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|Win32.Build.0 = Debug|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|Win32.ActiveCfg = Release|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|Win32.Build.0 = Release|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|x64.ActiveCfg = Debug|x64
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|x64.Build.0 = Debug|x64
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|x64.ActiveCfg = Release|x64
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|x64.Build.0 = Release|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|Win32.Build.0 = Debug|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|Win32.ActiveCfg = Release|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|Win32.Build.0 = Release|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|x64.ActiveCfg = Debug|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|x64.Build.0 = Debug|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|x64.ActiveCfg = Release|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|x64.Build.0 = Release|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|Win32.Build.0 = Debug|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|Win32.ActiveCfg = Release|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|Win32.Build.0 = Release|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|x64.ActiveCfg = Debug|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|x64.Build.0 = Debug|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|x64.ActiveCfg = Release|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|x64.Build.0 = Release|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|Win32.Build.0 = Debug|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|Win32.ActiveCfg = Release|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|Win32.Build.0 = Release|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|x64.ActiveCfg = Debug|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|x64.Build.0 = Debug|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|x64.ActiveCfg = Release|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|x64.Build.0 = Release|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|Win32.Build.0 = Debug|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|Win32.ActiveCfg = Release|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|Win32.Build.0 = Release|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|x64.ActiveCfg = Debug|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|x64.Build.0 = Debug|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|x64.ActiveCfg = Release|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|x64.Build.0 = Release|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|Win32.Build.0 = Debug|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|Win32.ActiveCfg = Release|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|Win32.Build.0 = Release|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|x64.ActiveCfg = Debug|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|x64.Build.0 = Debug|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|x64.ActiveCfg = Release|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|x64.Build.0 = Release|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|Win32.Build.0 = Debug|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|Win32.ActiveCfg = Release|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|Win32.Build.0 = Release|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|x64.ActiveCfg = Debug|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|x64.Build.0 = Debug|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|x64.ActiveCfg = Release|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|x64.Build.0 = Release|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|Win32.Build.0 = Debug|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|Win32.ActiveCfg = Release|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|Win32.Build.0 = Release|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|x64.ActiveCfg = Debug|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|x64.Build.0 = Debug|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|x64.ActiveCfg = Release|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|x64.Build.0 = Release|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|Win32.Build.0 = Debug|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|Win32.ActiveCfg = Release|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|Win32.Build.0 = Release|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|x64.ActiveCfg = Debug|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|x64.Build.0 = Debug|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|x64.ActiveCfg = Release|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|x64.Build.0 = Release|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|Win32.Build.0 = Debug|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|Win32.ActiveCfg = Release|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|Win32.Build.0 = Release|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|x64.ActiveCfg = Debug|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|x64.Build.0 = Debug|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|x64.ActiveCfg = Release|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|x64.Build.0 = Release|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|Win32.Build.0 = Debug|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|Win32.ActiveCfg = Release|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|Win32.Build.0 = Release|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|x64.ActiveCfg = Debug|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|x64.Build.0 = Debug|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|x64.ActiveCfg = Release|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|x64.Build.0 = Release|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|Win32.Build.0 = Debug|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|Win32.ActiveCfg = Release|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|Win32.Build.0 = Release|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|x64.ActiveCfg = Debug|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|x64.Build.0 = Debug|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|x64.ActiveCfg = Release|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|x64.Build.0 = Release|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|Win32.ActiveCfg = Debug|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|Win32.Build.0 = Debug|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|Win32.ActiveCfg = Release|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|Win32.Build.0 = Release|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|x64.ActiveCfg = Debug|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|x64.Build.0 = Debug|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|x64.ActiveCfg = Release|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|x64.Build.0 = Release|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|Win32.Build.0 = Debug|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|Win32.ActiveCfg = Release|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|Win32.Build.0 = Release|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|x64.ActiveCfg = Debug|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|x64.Build.0 = Debug|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|x64.ActiveCfg = Release|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|x64.Build.0 = Release|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|Win32.Build.0 = Debug|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|Win32.ActiveCfg = Release|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|Win32.Build.0 = Release|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|x64.ActiveCfg = Debug|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|x64.Build.0 = Debug|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|x64.ActiveCfg = Release|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|x64.Build.0 = Release|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|Win32.Build.0 = Debug|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|Win32.ActiveCfg = Release|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|Win32.Build.0 = Release|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|x64.ActiveCfg = Debug|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|x64.Build.0 = Debug|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|x64.ActiveCfg = Release|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|x64.Build.0 = Release|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|Win32.Build.0 = Debug|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|Win32.ActiveCfg = Release|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|Win32.Build.0 = Release|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|x64.ActiveCfg = Debug|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|x64.Build.0 = Debug|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|x64.ActiveCfg = Release|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|x64.Build.0 = Release|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|Win32.Build.0 = Debug|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|Win32.ActiveCfg = Release|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|Win32.Build.0 = Release|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|x64.ActiveCfg = Debug|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|x64.Build.0 = Debug|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|x64.ActiveCfg = Release|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|x64.Build.0 = Release|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|Win32.Build.0 = Debug|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|Win32.ActiveCfg = Release|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|Win32.Build.0 = Release|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|x64.ActiveCfg = Debug|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|x64.Build.0 = Debug|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|x64.ActiveCfg = Release|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|x64.Build.0 = Release|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|Win32.Build.0 = Debug|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|Win32.ActiveCfg = Release|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|Win32.Build.0 = Release|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|x64.ActiveCfg = Debug|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|x64.Build.0 = Debug|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|x64.ActiveCfg = Release|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|x64.Build.0 = Release|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|Win32.Build.0 = Debug|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|Win32.ActiveCfg = Release|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|Win32.Build.0 = Release|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|x64.ActiveCfg = Debug|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|x64.Build.0 = Debug|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|x64.ActiveCfg = Release|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|x64.Build.0 = Release|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|Win32.Build.0 = Debug|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|Win32.ActiveCfg = Release|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|Win32.Build.0 = Release|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|x64.ActiveCfg = Debug|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|x64.Build.0 = Debug|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|x64.ActiveCfg = Release|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|x64.Build.0 = Release|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|Win32.Build.0 = Debug|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|Win32.ActiveCfg = Release|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|Win32.Build.0 = Release|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|x64.ActiveCfg = Debug|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|x64.Build.0 = Debug|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|x64.ActiveCfg = Release|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|x64.Build.0 = Release|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|Win32.Build.0 = Debug|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|Win32.ActiveCfg = Release|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|Win32.Build.0 = Release|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|x64.ActiveCfg = Debug|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|x64.Build.0 = Debug|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|x64.ActiveCfg = Release|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|x64.Build.0 = Release|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|Win32.Build.0 = Debug|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|Win32.ActiveCfg = Release|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|Win32.Build.0 = Release|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|x64.ActiveCfg = Debug|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|x64.Build.0 = Debug|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|x64.ActiveCfg = Release|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|x64.Build.0 = Release|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|Win32.Build.0 = Debug|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|Win32.ActiveCfg = Release|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|Win32.Build.0 = Release|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|x64.ActiveCfg = Debug|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|x64.Build.0 = Debug|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|x64.ActiveCfg = Release|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|x64.Build.0 = Release|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|Win32.Build.0 = Debug|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|Win32.ActiveCfg = Release|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|Win32.Build.0 = Release|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|x64.ActiveCfg = Debug|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|x64.Build.0 = Debug|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|x64.ActiveCfg = Release|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|x64.Build.0 = Release|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|Win32.Build.0 = Debug|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|Win32.ActiveCfg = Release|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|Win32.Build.0 = Release|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|x64.ActiveCfg = Debug|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|x64.Build.0 = Debug|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|x64.ActiveCfg = Release|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|x64.Build.0 = Release|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|Win32.Build.0 = Debug|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|Win32.ActiveCfg = Release|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|Win32.Build.0 = Release|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|x64.ActiveCfg = Debug|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|x64.Build.0 = Debug|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|x64.ActiveCfg = Release|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|x64.Build.0 = Release|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|Win32.Build.0 = Debug|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|Win32.ActiveCfg = Release|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|Win32.Build.0 = Release|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|x64.ActiveCfg = Debug|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|x64.Build.0 = Debug|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|x64.ActiveCfg = Release|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD} = {ADC63E58-1F2E-4A3A-A760-779FD9EAD00E}
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC} = {2C550FE4-29CD-40A8-836D-313696A3442B}
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF} = {470F597C-0DBC-44AC-B69B-594ACB7B1ED0}
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479} = {F39421E1-95F5-4DEE-A78F-B522BE05FEB0}
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD} = {9C9637D5-A764-49F0-AF7D-C7F123CEB343}
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E} = {0293B300-378A-4D97-B93C-0690C8BC8019}
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37} = {F1085E78-8F4D-4044-B58E-BDA9E7E35A0F}
-		{A5E50982-981B-40B9-BEE6-1E15581FE947} = {0BFA46E4-075E-475A-B73E-6FAB41B71B68}
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759} = {AC2EC9A6-11CC-4F9C-BBA6-2E78FFFF5C84}
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89} = {A6681C1E-BA3B-4DD1-A641-DA27776A0319}
-		{5094C704-35B0-4A25-AD30-570C49BCAE82} = {B2431307-5557-4D2E-AB33-F38E7D8680A4}
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207} = {F956DAF1-330C-458A-B659-A30D5CE74374}
-		{965C0E80-0715-4376-A138-48D08EFDDC09} = {0A0AA60F-8EAD-4BC1-AB00-315A13174032}
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8} = {E2B2526B-3B31-4309-A22A-1236F16CB840}
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7} = {85556EF1-3D39-442F-BB0A-B3B5D6DE7352}
-		{B439C142-C570-44A6-B13C-43F70AE05A69} = {BF917E30-8925-4467-A1BF-CBD9E0AC7D12}
-		{F39421E1-95F5-4DEE-A78F-B522BE05FEB0} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{9C9637D5-A764-49F0-AF7D-C7F123CEB343} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{0293B300-378A-4D97-B93C-0690C8BC8019} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{F1085E78-8F4D-4044-B58E-BDA9E7E35A0F} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{0BFA46E4-075E-475A-B73E-6FAB41B71B68} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{AC2EC9A6-11CC-4F9C-BBA6-2E78FFFF5C84} = {1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2}
-		{1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{A6681C1E-BA3B-4DD1-A641-DA27776A0319} = {1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2}
-		{B2431307-5557-4D2E-AB33-F38E7D8680A4} = {A457C9CB-C02C-4835-8B4F-D3C03956C246}
-		{A457C9CB-C02C-4835-8B4F-D3C03956C246} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{F956DAF1-330C-458A-B659-A30D5CE74374} = {A457C9CB-C02C-4835-8B4F-D3C03956C246}
-		{0A0AA60F-8EAD-4BC1-AB00-315A13174032} = {C1623324-F98A-40DF-B5BD-A1D4465653C5}
-		{C1623324-F98A-40DF-B5BD-A1D4465653C5} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{E2B2526B-3B31-4309-A22A-1236F16CB840} = {C1623324-F98A-40DF-B5BD-A1D4465653C5}
-		{85556EF1-3D39-442F-BB0A-B3B5D6DE7352} = {B9DF6659-83A8-42FF-80CD-A03012E07CCE}
-		{BF917E30-8925-4467-A1BF-CBD9E0AC7D12} = {B9DF6659-83A8-42FF-80CD-A03012E07CCE}
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F} = {F8CFBC14-78B5-4B7D-B9B5-648E3389C70C}
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6} = {C1205C19-4601-4DF6-A222-91CC30C12284}
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9} = {26B8AB05-2BE2-4266-AB19-BA912C0ACFA1}
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6} = {D2F3C374-F164-4E08-A5FE-F902972C57F9}
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986} = {742BA5B5-A2DA-463A-A85E-9A12DE605FA6}
+		{D15FD911-F2DA-4644-8142-6D22756AD287} = {581503D0-FE38-435F-B12A-FAAA2AE22359}
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795} = {ECBD2F30-C9DF-4B13-83C2-45BDFD988518}
+		{C0049CDD-7551-4681-9E30-EFE32868F651} = {4B422EE1-0A80-4048-81BF-0005A2D67381}
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D} = {BACE2A27-C593-43C6-B058-1D0A6A5D63B5}
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD} = {9577224D-E994-4E6E-BE11-FF456B8A4D46}
+		{6C6E0C23-5B37-4BBB-8909-435078D49364} = {A69FDC71-8327-494A-9840-CF684E74965C}
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03} = {4A994F2B-05BD-4CED-9157-45B29777740D}
+		{F575419D-099B-4DA0-B80C-88D766DD7542} = {16ECEF20-C217-4477-8C88-E8A231CC23B8}
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F} = {9BEE50D5-9D78-4CA3-A535-75904B21C448}
+		{C1205C19-4601-4DF6-A222-91CC30C12284} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{26B8AB05-2BE2-4266-AB19-BA912C0ACFA1} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{D2F3C374-F164-4E08-A5FE-F902972C57F9} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{742BA5B5-A2DA-463A-A85E-9A12DE605FA6} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{581503D0-FE38-435F-B12A-FAAA2AE22359} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{ECBD2F30-C9DF-4B13-83C2-45BDFD988518} = {7466998A-6403-4EBB-9328-656ECFD3F594}
+		{7466998A-6403-4EBB-9328-656ECFD3F594} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{4B422EE1-0A80-4048-81BF-0005A2D67381} = {7466998A-6403-4EBB-9328-656ECFD3F594}
+		{BACE2A27-C593-43C6-B058-1D0A6A5D63B5} = {5C1F160D-DF15-4215-AAC1-59BDF70D2C38}
+		{5C1F160D-DF15-4215-AAC1-59BDF70D2C38} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{9577224D-E994-4E6E-BE11-FF456B8A4D46} = {5C1F160D-DF15-4215-AAC1-59BDF70D2C38}
+		{A69FDC71-8327-494A-9840-CF684E74965C} = {320825A6-82C4-42DE-91A3-EE5994B74EC3}
+		{320825A6-82C4-42DE-91A3-EE5994B74EC3} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{4A994F2B-05BD-4CED-9157-45B29777740D} = {320825A6-82C4-42DE-91A3-EE5994B74EC3}
+		{16ECEF20-C217-4477-8C88-E8A231CC23B8} = {82276D55-C8B4-4C84-98FE-83F10C898FA0}
+		{9BEE50D5-9D78-4CA3-A535-75904B21C448} = {82276D55-C8B4-4C84-98FE-83F10C898FA0}
 	EndGlobalSection
 EndGlobal
diff --git a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx
index 24067461..eba3c794 100644
--- a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx
+++ b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx
diff --git a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj
index 7055b671..8dce7fd4 100644
--- a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj
+++ b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}</ProjectGuid>
+    <ProjectGuid>{F575419D-099B-4DA0-B80C-88D766DD7542}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{6713742F-8981-4BDD-8232-744F6ACE78A0}</SampleGuid>
+    <SampleGuid>{439EDE87-12DD-4F6D-8C22-A8AC9DAEF4B2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters
index ba04cdae..890e83d6 100644
--- a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters
+++ b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{C958237F-A7DD-499B-8D1E-59D0ED81A78A}</UniqueIdentifier>
+      <UniqueIdentifier>{FDA736D6-A855-4CED-9C9E-B6FF707C26E1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{6167785E-EAD2-49EE-9D85-0DCE3CDCA899}</UniqueIdentifier>
+      <UniqueIdentifier>{03AC1F65-1B83-4D8E-9D06-DF35B5085EA7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{A3079E54-E051-4EDD-8669-23098CEF4A4F}</UniqueIdentifier>
+      <UniqueIdentifier>{E8FFB961-9B2B-4A4A-8F75-5F933AF32C60}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{EB7A1810-4971-4585-938E-98F65782861E}</UniqueIdentifier>
+      <UniqueIdentifier>{C6C8B61F-CD41-4ACB-AC13-2E7A02CC94A0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="WUDFToastMon.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="ToastMon.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/toaster/toastDrv/umdf/func/WUDFToaster.inx b/general/toaster/toastDrv/umdf/func/WUDFToaster.inx
index 7c65bd09..9874becf 100644
--- a/general/toaster/toastDrv/umdf/func/WUDFToaster.inx
+++ b/general/toaster/toastDrv/umdf/func/WUDFToaster.inx
diff --git a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj
index 26aa3b69..e45ee69c 100644
--- a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj
+++ b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B439C142-C570-44A6-B13C-43F70AE05A69}</ProjectGuid>
+    <ProjectGuid>{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{71A982A9-366B-42AD-AEFD-F60AAD4820F2}</SampleGuid>
+    <SampleGuid>{8FD6D25D-F593-45DB-AF96-6F358E01587B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -234,15 +234,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
@@ -251,15 +251,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
@@ -268,15 +268,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
@@ -285,15 +285,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters
index 46ae82b5..b64202cf 100644
--- a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters
+++ b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{170A06AF-2C82-4ACA-A945-09EC764D4AD0}</UniqueIdentifier>
+      <UniqueIdentifier>{9ACEB224-90E2-40F2-838C-9F279873D314}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{9D2AA52F-CCFD-4741-8446-4BC64BE329AB}</UniqueIdentifier>
+      <UniqueIdentifier>{150AE92E-5F8C-4B90-B7BE-352ECA0434CD}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{298C639B-301D-4144-BD66-7074B07ED001}</UniqueIdentifier>
+      <UniqueIdentifier>{BBE5A5E9-E1F7-47E7-91B7-111A3D0BAE2A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{2BF2C9E3-92D6-43CA-B2A3-98DF1231AABC}</UniqueIdentifier>
+      <UniqueIdentifier>{CCF62242-AF1C-424F-942F-E11D79A0EF79}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -48,11 +48,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="WUDFToaster.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="WUDFToaster.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/toaster/toastpkg/README.md b/general/toaster/toastpkg/README.md
index 7a5b7855..326d40a9 100644
--- a/general/toaster/toastpkg/README.md
+++ b/general/toaster/toastpkg/README.md
@@ -1,21 +1,134 @@
-Toaster Package Sample
-======================
+Toaster Sample Driver
+=====================
+The Toaster collection is an iterative series of samples that demonstrate fundamental aspects of Windows driver development for both Kernel-Mode Driver Framework (KMDF) and User-Mode Driver Framework (UMDF) version 1.
 
-The Toastpkg sample simulates hardware-first and software-first installation of the toaster sample driver.
+All the samples work with a hypothetical toaster bus, over which toaster devices can be connected to a PC.
 
-The Toaster Installation Package comprises driver projects (.vcxproj files) that are contained in the toastpkg.sln solution file (in general/toaster/toastpkg).
+The Toaster sample collection comprises driver projects (.vcxproj files) that are contained in the toaster.sln solution file (in general\\toaster\\toastdrv).
 
-This document discusses the different approaches that end users take when adding new hardware to their computer, and describes an approach that addresses these scenarios in a consistent, robust manner. It also outlines the mechanisms provided to facilitate additional vendor requirements such as the installation of value-added software.
+Related technologies
+--------------------
+[Windows Driver Frameworks](http://msdn.microsoft.com/en-us/library/windows/hardware/ff557565)
 
-**Introduction**
+For detailed descriptions and code walkthroughs of each project, see [Sample Toaster Driver Programming Tour](http://msdn.microsoft.com/en-us/library/windows/hardware/dn569312). To learn how to build and run the samples, read on.
 
-The installation of software to support an instance of a given device (known as "device installation" or "driver installation") is done in a device-centric fashion in Windows operating systems. A device INF that matches up with one of the device's hardware or compatible IDs is used to identify the required driver file(s), registry modifications, etc., that are needed to make the device fully operational. This INF, along with the files copied thereby and a catalog that contains the digital signatures of the INF and these other files, constitute what is known as a "driver package".
 
-Because device installation is done for a specific instance of a device, the "natural" method of adding devices to a computer running a Plug and Play operating system is by plugging in the device first, letting Plug and Play find the device and automatically initiate an installation for that device. The device installation may then proceed using a driver package supplied with the OS, or a "3rd-party" driver package (supplied via CD-ROM, the Internet, or some other distribution mechanism). When the device installation is initiated by the addition of hardware, this is termed a "hardware-first" device installation.
+Run the sample
+--------------
+The computer where you install the driver is called the *target computer* or the *test computer*. Typically this is a separate computer from where you develop and build the driver package. The computer where you develop and build the driver is called the *host computer*.
 
-Users may, however, take an alternate approach to adding hardware to their computer. In this scenario, they first run a setup program (perhaps launched as an autorun application when the vendor-supplied CD-ROM is inserted). This setup program may perform installation activities, and then prompt the user to insert their hardware. Upon the hardware's insertion, the vendor-supplied driver package (which was "pre-installed" by the setup program) is then found by Plug and Play, and the installation proceeds as in the hardware-first scenario. When the device installation is initiated by running a setup program, this is termed a "software-first" device installation. This approach to adding new hardware is just as valid as the hardware-first scenario, and some vendors may even instruct their users (via documentation that ships with the hardware) that this is the preferred method.
+The process of moving the driver package to the target computer and installing the driver is called *deploying the driver*. You can deploy components of the Toaster Sample automatically or manually. Here, we install the wdfsimple driver on the target computer.
 
-Vendors must support the hardware-first scenario (by providing a driver package that may be supplied to the "Found New Hardware" wizard with no "pre-configuration" performed by a setup program or other mechanism). Vendors may optionally support the software-first scenario as well, but the actual installation of the device instance is done by Plug and Play upon the device's arrival, as described above.
+### Specifying which projects to deploy
 
-Vendors may also wish to perform additional activities as part of the device installation. For example, the vendor may want to allow the user to optionally install one or more applications that ship with the device (e.g., a scanner that ships with an image processing application). Such software is termed "value-added software". Value-added software is distinct from the files that comprise the driver package because, unlike the core driver files, the device does not require value-added software to function properly. In the previous example of a scanner, for instance, perhaps the user already has an image processing application that they prefer. The user should be given the option of whether or not they want to install any value-added software. Additional activities (such as allowing the user to select value-added software offerings) may be accomplished by using a vendor-supplied device-specific co-installer.
+Before doing this, you should back up your package.vcxproj file, located in your sample directory, for example C:\\Toaster\\C++\\Package.
+
+1.  In the Properties for the package project, navigate to **Common Properties \> References**.
+2.  Remove all references except WdfSimple. (Use the **Remove Reference** button at the bottom.)
+
+### Automatic deployment (root enumerated)
+
+Before you automatically deploy a driver, you must provision the target computer. For instructions, see [Configuring a Computer for Driver Deployment, Testing, and Debugging](http://msdn.microsoft.com/en-us/library/windows/hardware/).
+
+1.  On the host computer, in Visual Studio, in Solution Explorer, right click the **package** project (within the package folder), and choose **Properties**. Navigate to **Configuration Properties \> Driver Install \> Deployment**.
+2.  Check **Enable deployment**, and check **Remove previous driver versions before deployment**. For **Target Computer Name**, use the drop down to select the name of a target computer that you provisioned previously. Select **Hardware ID Driver Update**, and enter **{b85b7c50-6a01-11d2-b841-00c04fad5171}\\MsToaster** for the hardware ID. (You can find this value in the WdfSimple.inx file.) Click **Apply** and **OK**.
+3.  Because this solution contains many projects, you may find it easier to remove some of them before you build and deploy a driver package. To do so, right click **package** (lower case), and choose **Properties**. Navigate to **Common Properties-\>References** and click **Remove Reference** to remove projects you don't want. (You can add them back later by using **Add New Reference**.) Click **OK**.
+4.  On the **Build** menu, choose **Build Solution** or **Rebuild Solution** (if you removed references).
+5.  If you removed references and deployment does not succeed, try deleting the contents of the c:\\DriverTest\\Drivers folder on the target machine, and then retry deployment.
+
+### Manual deployment (root enumerated)
+
+Before you manually deploy a driver, you must turn on test signing and install a certificate on the target computer. You also need to copy the [DevCon](http://msdn.microsoft.com/en-us/library/windows/hardware/ff544707) tool to the target computer. For instructions, see [Preparing a Computer for Manual Driver Deployment](http://msdn.microsoft.com/en-us/library/windows/hardware/dn265571).
+
+1.  Copy all of the files in your driver package to a folder on the target computer (for example, c:\\WdfSimplePackage).
+2.  On the target computer, open a Command Prompt window as Administrator. Navigate to your driver package folder, and enter the following command:
+
+    **devcon install WdfSimple.inf {b85b7c50-6a01-11d2-b841-00c04fad5171}\\MsToaster**
+
+### View the root enumerated driver in Device Manager
+
+On the target computer, in a Command Prompt window, enter **devmgmt** to open Device Manager. In Device Manager, on the **View** menu, choose **Devices by type**. In the device tree, locate **Microsoft WDF Simple Toaster (No Class Installer)**.
+
+In Device Manager, on the **View** menu, choose **Devices by connection**. Locate **Microsoft WDF Simple Toaster (No Class Installer)** as a child of the root node of the device tree.
+
+Build the sample using MSBuild
+------------------------------
+
+As an alternative to building the Toaster sample in Visual Studio, you can build it in a Visual Studio Command Prompt window. In Visual Studio, on the **Tools** menu, choose **Visual Studio Command Prompt**. In the Visual Studio Command Prompt window, navigate to the folder that has the solution file, Toaster.sln. Use the MSBuild command to build the solution. Here are some examples:
+
+**msbuild /p:configuration="Debug" /p:platform="x64" Toaster.sln**
+
+**msbuild /p:configuration="Release" /p:platform="Win32" Toaster.sln**
+
+For more information about using MSBuild to build a driver package, see [Building a Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff554644).
+
+UMDF Toaster File Manifest
+--------------------------
+#### WUDFToaster.idl
+Component Interface file
+
+#### WUDFToaster.cpp
+DLL Support code - provides the DLL's entry point as well as the DllGetClassObject export.
+
+#### WUDFToaster.def
+This file lists the functions that the driver DLL exports.
+
+#### stdafx.h
+This is the main header file for the sample driver.
+
+#### driver.cpp & driver.h
+Definition and implementation of the IDriverEntry callbacks in CDriver class.
+
+#### device.cpp & device.h
+Definition and implementation of various interfaces and their callbacks in CDevice class. Add your PnP and Power interfaces specific for your hardware.
+
+#### queue.cpp & queue.h
+Definition and implementation of the base queue callback class (CQueue). IQueueCallbackDevicekIoControl, IQueueCallbackRead and IQueueCallBackWrite callbacks are implemented to handle I/O control requests.
+
+#### WUDFToaster.rc
+This file defines resource information for the WUDF Toaster sample driver.
+
+#### WUDFToaster.inf
+Sample INF for installing the sample WUDF Toaster driver under the Toaster class of devices.
+
+#### WUDFtoaster.ctl, internal.h
+This file lists the WPP trace control GUID(s) for the sample driver. This file can be used with the tracelog command's -guid flag to enable the collection of these trace events within an established trace session.
+These GUIDs must remain in sync with the trace control guids defined in internal.h.
+
+Toastmon File Manifest
+----------------------
+#### comsup.cpp & comsup.h
+Boilerplate COM Support code - specifically base classes which provide implementations for the standard COM interfaces IUnknown and IClassFactory which are used throughout the sample.
+The implementation of IClassFactory is designed to create instances of the CMyDriver class. If you should change the name of your base driver class, you would also need to modify this file.
+
+#### dllsup.cpp
+Boilerplate DLL Support code - provides the DLL's entry point as well as the single required export (DllGetClassObject).
+These depend on comsup.cpp to perform the necessary class creation.
+
+#### exports.def
+This file lists the functions that the driver DLL exports.
+
+#### makefile
+This file redirects to the real makefile, which is shared by all the driver components of the Windows Driver Kit.
+
+#### internal.h
+This is the main header file for the ToastMon driver
+
+#### driver.cpp & driver.h
+Definition and implementation of the driver callback class for the ToastMon sample.
+
+#### device.cpp & device.h
+Definition and implementation of the device callback class for the ToastMon sample. This is mostly boilerplate, but also registers for RemoteInterface Arrival notifications. When a RemoteInterface arrival callback occurs, it calls CreateRemoteInterface and creates a CMyRemoteTarget callback object to handle I/O on that RemoteInterface.
+
+#### RemoteTarget.cpp & RemoteTarget.h
+Definition and implementation of the remote target callback class for the ToastMon sample.
+
+#### list.h
+Doubly-linked-list code
+
+#### ToastMon.rc
+This file defines resource information for the ToastMon sample driver.
+
+#### UMDFToastMon.inf
+Sample INF for installing the Skeleton driver to control a root enumerated device with a hardware ID of UMDFSamples\\ToastMon
 
diff --git a/general/toaster/toastpkg/toastapp/toastapp.vcxproj b/general/toaster/toastpkg/toastapp/toastapp.vcxproj
index 772c2744..99f5d3ed 100644
--- a/general/toaster/toastpkg/toastapp/toastapp.vcxproj
+++ b/general/toaster/toastpkg/toastapp/toastapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BE9B424-9C7C-495D-BECD-A04867DB2802}</ProjectGuid>
+    <ProjectGuid>{DA341425-3029-4DFD-8024-6910371ACEF5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{00FF9348-781D-4F7C-B665-3C46FF4F4DBE}</SampleGuid>
+    <SampleGuid>{11D55790-49C6-4517-A55C-ECAAB33AC1E9}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters b/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
index 21f9ddec..3d3a9ae7 100644
--- a/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{67DF9821-5DF2-4390-8645-AA3893DBEB53}</UniqueIdentifier>
+      <UniqueIdentifier>{EC7E6C8A-C706-422C-AD10-91E347D35360}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7FB050B7-6DF1-4D3D-BE1C-B6D7D27C122B}</UniqueIdentifier>
+      <UniqueIdentifier>{0137E48B-AEC4-4FAF-BC20-ADB802C90BD2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{08ED54F9-B7BC-42BA-B064-47CA51C6FE48}</UniqueIdentifier>
+      <UniqueIdentifier>{C2DFE14E-5F5A-4CE1-8FEF-B6E479EE9088}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastpkg/toastcd/tostx86.cat b/general/toaster/toastpkg/toastcd/tostx86.cat
index b16db9e9..e8b604b5 100644
--- a/general/toaster/toastpkg/toastcd/tostx86.cat
+++ b/general/toaster/toastpkg/toastcd/tostx86.cat
diff --git a/general/toaster/toastpkg/toastcd/tstamd64.cat b/general/toaster/toastpkg/toastcd/tstamd64.cat
index 637df4db..cd1a8eb6 100644
--- a/general/toaster/toastpkg/toastcd/tstamd64.cat
+++ b/general/toaster/toastpkg/toastcd/tstamd64.cat
diff --git a/general/toaster/toastpkg/toastco/tostrco2.vcxproj b/general/toaster/toastpkg/toastco/tostrco2.vcxproj
index afaed3ff..acaa1a74 100644
--- a/general/toaster/toastpkg/toastco/tostrco2.vcxproj
+++ b/general/toaster/toastpkg/toastco/tostrco2.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2603EF56-C013-4A84-897A-76EA07FDBB27}</ProjectGuid>
+    <ProjectGuid>{7C8F71F5-C429-4DFF-957E-00B9E82E2882}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{94575B57-4141-4421-94D8-C4826C2077AF}</SampleGuid>
+    <SampleGuid>{3EE5DFE9-31C3-48A4-BAB4-DF9CD0FFE1BC}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters b/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
index f176be76..7a8dd21a 100644
--- a/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{1EC35066-5352-4C66-AB55-7064A1D2710A}</UniqueIdentifier>
+      <UniqueIdentifier>{0E160D93-81ED-43A4-BE15-4BCB9047831E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{461AEF17-4B21-4416-983F-205E529241F9}</UniqueIdentifier>
+      <UniqueIdentifier>{EBF03CB3-5F56-4F34-A0E5-B350D5686B99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{D2257EDC-D839-4646-836B-75D16A94E4F0}</UniqueIdentifier>
+      <UniqueIdentifier>{E8916D68-529D-40C2-8127-D69423218770}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastpkg/toastpkg.sln b/general/toaster/toastpkg/toastpkg.sln
index dd1e999c..870855c3 100644
--- a/general/toaster/toastpkg/toastpkg.sln
+++ b/general/toaster/toastpkg/toastpkg.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastapp", "Toastapp", "{8638CA9F-2C57-4198-A01B-002B6A1226B2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastapp", "Toastapp", "{552BDD2C-737F-4EB1-884C-BDFC2370EC4A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastco", "Toastco", "{9B6AB1AE-E802-4AF9-B72B-D2262CFF65AD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastco", "Toastco", "{F661D16C-5F0B-4FE2-AAEC-97D786C17D54}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastva", "Toastva", "{80ACC4C0-C750-4914-9A4F-D36076590E22}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastva", "Toastva", "{9326D33D-A5B7-443B-91D0-A65AE33394DB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastapp", "toastapp\toastapp.vcxproj", "{4BE9B424-9C7C-495D-BECD-A04867DB2802}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastapp", "toastapp\toastapp.vcxproj", "{DA341425-3029-4DFD-8024-6910371ACEF5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco2", "toastco\tostrco2.vcxproj", "{2603EF56-C013-4A84-897A-76EA07FDBB27}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco2", "toastco\tostrco2.vcxproj", "{7C8F71F5-C429-4DFF-957E-00B9E82E2882}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastva", "toastva\toastva.vcxproj", "{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastva", "toastva\toastva.vcxproj", "{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2603EF56-C013-4A84-897A-76EA07FDBB27} = {2603EF56-C013-4A84-897A-76EA07FDBB27}
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882} = {7C8F71F5-C429-4DFF-957E-00B9E82E2882}
 	EndProjectSection
 EndProject
 Global
@@ -26,37 +26,37 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|Win32.Build.0 = Debug|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|Win32.ActiveCfg = Release|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|Win32.Build.0 = Release|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|x64.ActiveCfg = Debug|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|x64.Build.0 = Debug|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|x64.ActiveCfg = Release|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|x64.Build.0 = Release|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|Win32.Build.0 = Debug|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|Win32.ActiveCfg = Release|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|Win32.Build.0 = Release|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|x64.ActiveCfg = Debug|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|x64.Build.0 = Debug|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|x64.ActiveCfg = Release|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|x64.Build.0 = Release|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|Win32.Build.0 = Debug|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|Win32.ActiveCfg = Release|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|Win32.Build.0 = Release|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|x64.ActiveCfg = Debug|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|x64.Build.0 = Debug|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|x64.ActiveCfg = Release|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|x64.Build.0 = Release|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|Win32.Build.0 = Debug|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|Win32.ActiveCfg = Release|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|Win32.Build.0 = Release|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|x64.ActiveCfg = Debug|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|x64.Build.0 = Debug|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|x64.ActiveCfg = Release|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|x64.Build.0 = Release|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|Win32.Build.0 = Debug|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|Win32.ActiveCfg = Release|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|Win32.Build.0 = Release|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|x64.ActiveCfg = Debug|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|x64.Build.0 = Debug|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|x64.ActiveCfg = Release|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|x64.Build.0 = Release|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|Win32.Build.0 = Release|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|x64.ActiveCfg = Debug|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|x64.Build.0 = Debug|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|x64.ActiveCfg = Release|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802} = {8638CA9F-2C57-4198-A01B-002B6A1226B2}
-		{2603EF56-C013-4A84-897A-76EA07FDBB27} = {9B6AB1AE-E802-4AF9-B72B-D2262CFF65AD}
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421} = {80ACC4C0-C750-4914-9A4F-D36076590E22}
+		{DA341425-3029-4DFD-8024-6910371ACEF5} = {552BDD2C-737F-4EB1-884C-BDFC2370EC4A}
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882} = {F661D16C-5F0B-4FE2-AAEC-97D786C17D54}
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5} = {9326D33D-A5B7-443B-91D0-A65AE33394DB}
 	EndGlobalSection
 EndGlobal
diff --git a/general/toaster/toastpkg/toastva/toastva.vcxproj b/general/toaster/toastpkg/toastva/toastva.vcxproj
index 55a4cfb6..92591cdd 100644
--- a/general/toaster/toastpkg/toastva/toastva.vcxproj
+++ b/general/toaster/toastpkg/toastva/toastva.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}</ProjectGuid>
+    <ProjectGuid>{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{43F6E849-808D-47F0-9F7A-4D173795892D}</SampleGuid>
+    <SampleGuid>{02BCF403-1E72-4F88-9267-FBFB771C8A94}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters b/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
index af5a1160..20306006 100644
--- a/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{69A8D8BA-92F5-4CB0-A45E-6F00B9831369}</UniqueIdentifier>
+      <UniqueIdentifier>{4127F338-E099-419C-A8F1-58489A04992A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{37B69B6B-8428-4579-9C66-618C8E6B9003}</UniqueIdentifier>
+      <UniqueIdentifier>{66FC923F-DCC6-4587-98AE-5C092542A0EA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{9F8FFEAF-405F-44A2-BAE8-E44AC9BDF69D}</UniqueIdentifier>
+      <UniqueIdentifier>{EA13A6E0-448B-4674-AFA8-79C6B8269AD5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/Package/package.VcxProj b/general/toaster/umdf2/Package/package.VcxProj
index 0b9bc62d..19a45a22 100644
--- a/general/toaster/umdf2/Package/package.VcxProj
+++ b/general/toaster/umdf2/Package/package.VcxProj
@@ -20,10 +20,10 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\filter\generic\filterum.vcxproj">
-      <Project>{322F1E83-402B-49F0-B206-FD44F046091F}</Project>
+      <Project>{3CC42473-D121-41F4-AE26-1F2F0AC65E82}</Project>
     </ProjectReference>
     <ProjectReference Include="..\func\simple\wdfsimpleum.vcxproj">
-      <Project>{2FB86AE0-CD30-4E4E-93D1-306A8982263C}</Project>
+      <Project>{31C45025-FDA4-4CB5-B55E-81F934382654}</Project>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="PropertySheets">
@@ -35,8 +35,8 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}</ProjectGuid>
-    <SampleGuid>{1DF2195C-0F0C-4679-8995-133027CE291F}</SampleGuid>
+    <ProjectGuid>{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}</ProjectGuid>
+    <SampleGuid>{B552060C-CC51-4961-8C6E-74C455A65757}</SampleGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/general/toaster/umdf2/Package/package.VcxProj.Filters b/general/toaster/umdf2/Package/package.VcxProj.Filters
index 1761b725..6d56f080 100644
--- a/general/toaster/umdf2/Package/package.VcxProj.Filters
+++ b/general/toaster/umdf2/Package/package.VcxProj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D2DAB9A9-5425-40C2-87AA-D9786B3E42F5}</UniqueIdentifier>
+      <UniqueIdentifier>{0B198A0D-D6A7-4D7C-B773-41969DAE5343}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7D7C232A-C3B7-4775-B0F1-9EF3256E4A00}</UniqueIdentifier>
+      <UniqueIdentifier>{DA189D30-1E24-422A-B856-F4FE19A4C936}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{BF9AF006-025D-4D97-8CC6-848B3618B69C}</UniqueIdentifier>
+      <UniqueIdentifier>{B99B6F74-A017-4AEA-B846-B757A4258320}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{E1B01869-FAF8-4E60-93B6-1DEA6295B589}</UniqueIdentifier>
+      <UniqueIdentifier>{F4FF09EC-A122-471B-B493-44267FF160BA}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/general/toaster/umdf2/exe/enum/Enum.vcxproj b/general/toaster/umdf2/exe/enum/Enum.vcxproj
index 55524214..7059deb7 100644
--- a/general/toaster/umdf2/exe/enum/Enum.vcxproj
+++ b/general/toaster/umdf2/exe/enum/Enum.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{12CC02AE-DC1B-4B19-966F-9F324828D94D}</ProjectGuid>
+    <ProjectGuid>{91E7C695-3307-4596-90E1-065AFB4D2643}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{EAE54135-6F6A-4694-B2BE-8EF7AD38CFDE}</SampleGuid>
+    <SampleGuid>{AC84F877-CAB8-44D9-9199-028B400504FA}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters b/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters
index 952d8156..fff7bcd3 100644
--- a/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters
+++ b/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{58733B34-2D37-4533-A53B-61D148D97CC2}</UniqueIdentifier>
+      <UniqueIdentifier>{0478CA74-6E89-40CC-BA37-7A2FBC70982B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{4C9923EA-9B5C-4DD4-BF2F-EBAA7B6815C0}</UniqueIdentifier>
+      <UniqueIdentifier>{418A5D3D-5225-4430-AD6C-DBCDB8B00D57}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{A563728A-CB57-4506-BEC0-BA328E4BC76C}</UniqueIdentifier>
+      <UniqueIdentifier>{F170FC27-1BFE-4060-A548-BD9A219A502C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/exe/notify/notify.vcxproj b/general/toaster/umdf2/exe/notify/notify.vcxproj
index ecee4086..99a5f790 100644
--- a/general/toaster/umdf2/exe/notify/notify.vcxproj
+++ b/general/toaster/umdf2/exe/notify/notify.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}</ProjectGuid>
+    <ProjectGuid>{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{0CE9F05C-A3F4-4E23-9057-DB90E8DB24F1}</SampleGuid>
+    <SampleGuid>{B9D000EC-83CC-4167-802E-8438A8FF51E4}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters b/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters
index ec0b3c28..6590341f 100644
--- a/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters
+++ b/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{6B905269-3A91-4F64-9E49-E5A9BA33D6F2}</UniqueIdentifier>
+      <UniqueIdentifier>{DBCA469B-548D-4437-BF5A-97DCEBE3D840}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A9BEAF80-2298-41A9-A7CF-3315D06823C1}</UniqueIdentifier>
+      <UniqueIdentifier>{DE8C6977-FC68-4C69-8630-4694C3622D6C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{E8D961C9-3289-486E-87E7-A27F36334C88}</UniqueIdentifier>
+      <UniqueIdentifier>{BF9BD5C8-F576-4DB4-BB8E-2AED59380E60}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/exe/toast/toast.vcxproj b/general/toaster/umdf2/exe/toast/toast.vcxproj
index 8eb09f0b..af82acfe 100644
--- a/general/toaster/umdf2/exe/toast/toast.vcxproj
+++ b/general/toaster/umdf2/exe/toast/toast.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{73C36066-9CDD-4D33-AACB-4A1B54083FC9}</ProjectGuid>
+    <ProjectGuid>{8FA35EEE-04BE-438A-AD20-A8E849C9A107}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7EA1DD91-8456-47F7-BDE0-4F27F5EA522F}</SampleGuid>
+    <SampleGuid>{E86474CB-C1C2-4A18-8715-FC4AC163A6D2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters b/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters
index 6705206b..961ea2ff 100644
--- a/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters
+++ b/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{CBE9C966-D1FD-4F05-95F6-AF6BD7E02A4D}</UniqueIdentifier>
+      <UniqueIdentifier>{C5935659-AF96-4A26-9828-7135F79A7107}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{75AE28AC-313C-498E-9FD3-86F7E7849E1E}</UniqueIdentifier>
+      <UniqueIdentifier>{4542E5F6-7451-43E0-8EFF-A7AC183A23B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{9C3CDC3D-85F9-430D-9FCB-A2769D5699F4}</UniqueIdentifier>
+      <UniqueIdentifier>{29D0DA0A-77D3-48A1-87F5-15578B07F740}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx
index 431550a0..6686b2fb 100644
--- a/general/toaster/umdf2/filter/generic/filterum.inx
+++ b/general/toaster/umdf2/filter/generic/filterum.inx
diff --git a/general/toaster/umdf2/filter/generic/filterum.vcxproj b/general/toaster/umdf2/filter/generic/filterum.vcxproj
index 0f32ed2d..84dd508e 100644
--- a/general/toaster/umdf2/filter/generic/filterum.vcxproj
+++ b/general/toaster/umdf2/filter/generic/filterum.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{322F1E83-402B-49F0-B206-FD44F046091F}</ProjectGuid>
+    <ProjectGuid>{3CC42473-D121-41F4-AE26-1F2F0AC65E82}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{27CAA789-59E6-4CE6-A3C4-1E32A3B836B7}</SampleGuid>
+    <SampleGuid>{1A4A32BA-1596-4F52-BC48-B85A6D8D5D12}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,7 +101,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -110,11 +109,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -122,7 +119,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -131,11 +127,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,7 +137,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -152,11 +145,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -164,7 +155,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -173,11 +163,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters b/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters
index fbc2255e..4170887d 100644
--- a/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters
+++ b/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D2172684-87C0-4852-875A-0CA8BD491BD7}</UniqueIdentifier>
+      <UniqueIdentifier>{B98D4FD9-00A8-4964-AE34-6AF1F833564B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{4613B345-34B0-4251-93CF-3414D7B1C840}</UniqueIdentifier>
+      <UniqueIdentifier>{30413FCB-C550-4E4B-85F0-F39789145A19}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{9BB65910-D35E-42C5-BF39-F62B4D9F973B}</UniqueIdentifier>
+      <UniqueIdentifier>{D54A0D65-9B62-45F4-8B43-F92BC9FF355C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3FF9C7B5-8269-4401-8BB5-225709D52804}</UniqueIdentifier>
+      <UniqueIdentifier>{71F51C61-8117-4556-90E5-DE06697F59D6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\filterum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
index b6c650ff..067ca605 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.inx
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
index e580d540..65b00def 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}</ProjectGuid>
+    <ProjectGuid>{FCF21B34-353D-4F85-9EA0-C29978C12DBF}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{70A815C1-5D9C-419C-8379-F61A04BA3DD1}</SampleGuid>
+    <SampleGuid>{E74D4F4D-7209-4A02-BD2C-3BB528618D2E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
index bdfdc4f9..7a394e09 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{4C00BD29-A08C-48FF-9326-65CB99A38B85}</UniqueIdentifier>
+      <UniqueIdentifier>{B8C9DC5B-7C98-4A49-93F3-E3442CBF75A5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{588F07FC-8AC0-4132-B7D8-A2C7C589CBA1}</UniqueIdentifier>
+      <UniqueIdentifier>{14D2CA4B-89D1-4EBA-9189-6488CD5FA53B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{F07FF097-C35A-47EB-A0F6-1B7AF7677990}</UniqueIdentifier>
+      <UniqueIdentifier>{9E64748C-D7C7-4161-9D23-8F53507ECDDA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{AEBC341B-92EB-4BFD-980F-F69DD9AEC99C}</UniqueIdentifier>
+      <UniqueIdentifier>{13A3B2C6-C1C7-4A41-8F08-27011CD7C327}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdffeaturedum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="power.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/func/shared/toaster.h b/general/toaster/umdf2/func/shared/toaster.h
index 006166e7..87ddcd54 100644
--- a/general/toaster/umdf2/func/shared/toaster.h
+++ b/general/toaster/umdf2/func/shared/toaster.h
@@ -28,8 +28,8 @@ Environment:
 #include <wudfwdm.h>
 #include <wdf.h>
 #include <initguid.h>
-#include "..\inc\driver.h"
-#include "..\inc\public.h"
+#include "driver.h"
+#include "public.h"
 
 #define TOASTER_POOL_TAG (ULONG) 'saoT'
 
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
index 0cd117e2..18576c76 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.inx
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
index f947f97e..6ed5cc6b 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2FB86AE0-CD30-4E4E-93D1-306A8982263C}</ProjectGuid>
+    <ProjectGuid>{31C45025-FDA4-4CB5-B55E-81F934382654}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{DDC9A998-E2C4-47F7-AB33-D0F4C54E1A07}</SampleGuid>
+    <SampleGuid>{7D92DB42-741A-42C9-87E5-E9EC492CCC0D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -102,17 +102,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -121,17 +118,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -140,17 +134,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -159,17 +150,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
index fb8738bb..1fbc9c7b 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{DC7382CC-718D-4177-8EBD-6A3AAA546FA2}</UniqueIdentifier>
+      <UniqueIdentifier>{1A3802F5-383A-403F-B84E-5CC40D20B8B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{0B35AC27-FBA9-482C-AB2D-A0B9A44DFBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{68D48BB7-AE50-491B-9EBF-C9DADA0FC35F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{648AB4A2-DE81-48B3-9E36-5A767F698567}</UniqueIdentifier>
+      <UniqueIdentifier>{E8112111-3C61-4671-83B0-B97F62F8CAEA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{73524C9E-B6C0-4702-B212-55BDE5F61FFB}</UniqueIdentifier>
+      <UniqueIdentifier>{22FDD2D2-7FE2-4575-9FDB-91166ED98B18}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdfsimpleum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toaster.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/umdf2toaster.sln b/general/toaster/umdf2/umdf2toaster.sln
index e47cbb9c..0b476358 100644
--- a/general/toaster/umdf2/umdf2toaster.sln
+++ b/general/toaster/umdf2/umdf2toaster.sln
@@ -3,39 +3,39 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{ED63C611-D43D-42E8-A083-AB082C31A0DF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{44837D96-E34C-4A65-9AD1-AA84279876DC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{3055CBF7-B33A-4DED-BFB5-19DE53027CF2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{FA4A8867-88BE-4EAB-B31F-ADBBD9FEF845}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{06CC3519-A442-4DC8-93B5-3320863FB409}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{04EDF890-486C-4B66-8360-CA172D2ED6A8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{48DB3120-7565-4863-8C99-C0DE5FD2DC11}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{E15B3554-BFCE-4C53-A132-DBF669D01584}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{B0E9361C-6773-4E78-870D-10887BBE6D40}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{1A6F0878-1D3D-4301-A5B7-5D5E03DC4DD8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{CE2CDD3A-ED87-475C-BE33-4ED4C288884D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{12113395-BEDC-46E3-A87C-62455B650D4C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{38DD140E-6B82-43DA-8269-FF850206DAD6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{2798D90E-2976-4C76-8843-0F467D4B98E5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{8A73614A-6351-42D3-A518-9C6B504D9E55}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{FF4B4265-D9F5-4071-9683-A6A94350994F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{E7B355DF-2054-45A0-BF14-B78D6E61DDF1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{A3B700C5-0F77-4926-ADBA-520CE882A8F1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{8CADBFA7-5C4A-46FA-9171-10827B7BB3F9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{CA73AC30-5711-4A0E-B0D2-59E79C79ECEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{73C36066-9CDD-4D33-AACB-4A1B54083FC9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{8FA35EEE-04BE-438A-AD20-A8E849C9A107}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{12CC02AE-DC1B-4B19-966F-9F324828D94D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{91E7C695-3307-4596-90E1-065AFB4D2643}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimpleum", "func\simple\wdfsimpleum.vcxproj", "{2FB86AE0-CD30-4E4E-93D1-306A8982263C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimpleum", "func\simple\wdfsimpleum.vcxproj", "{31C45025-FDA4-4CB5-B55E-81F934382654}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeaturedum", "func\featured\wdffeaturedum.vcxproj", "{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeaturedum", "func\featured\wdffeaturedum.vcxproj", "{FCF21B34-353D-4F85-9EA0-C29978C12DBF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filterum", "filter\generic\filterum.vcxproj", "{322F1E83-402B-49F0-B206-FD44F046091F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filterum", "filter\generic\filterum.vcxproj", "{3CC42473-D121-41F4-AE26-1F2F0AC65E82}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,79 +45,79 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|Win32.Build.0 = Debug|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|Win32.ActiveCfg = Release|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|Win32.Build.0 = Release|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|x64.ActiveCfg = Debug|x64
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|x64.Build.0 = Debug|x64
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|x64.ActiveCfg = Release|x64
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|x64.Build.0 = Release|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|Win32.Build.0 = Debug|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|Win32.ActiveCfg = Release|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|Win32.Build.0 = Release|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|x64.ActiveCfg = Debug|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|x64.Build.0 = Debug|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|x64.ActiveCfg = Release|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|x64.Build.0 = Release|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|Win32.Build.0 = Debug|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|Win32.ActiveCfg = Release|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|Win32.Build.0 = Release|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|x64.ActiveCfg = Debug|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|x64.Build.0 = Debug|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|x64.ActiveCfg = Release|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|x64.Build.0 = Release|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|Win32.Build.0 = Debug|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|Win32.ActiveCfg = Release|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|Win32.Build.0 = Release|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|x64.ActiveCfg = Debug|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|x64.Build.0 = Debug|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|x64.ActiveCfg = Release|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|x64.Build.0 = Release|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|Win32.Build.0 = Debug|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|Win32.ActiveCfg = Release|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|Win32.Build.0 = Release|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|x64.ActiveCfg = Debug|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|x64.Build.0 = Debug|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|x64.ActiveCfg = Release|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|x64.Build.0 = Release|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|Win32.Build.0 = Debug|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|Win32.ActiveCfg = Release|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|Win32.Build.0 = Release|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|x64.ActiveCfg = Debug|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|x64.Build.0 = Debug|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|x64.ActiveCfg = Release|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|x64.Build.0 = Release|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|Win32.Build.0 = Debug|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|Win32.ActiveCfg = Release|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|Win32.Build.0 = Release|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|x64.ActiveCfg = Debug|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|x64.Build.0 = Debug|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|x64.ActiveCfg = Release|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|x64.Build.0 = Release|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|Win32.Build.0 = Debug|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|Win32.ActiveCfg = Release|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|Win32.Build.0 = Release|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|x64.ActiveCfg = Debug|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|x64.Build.0 = Debug|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|x64.ActiveCfg = Release|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|x64.Build.0 = Release|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|Win32.Build.0 = Debug|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|Win32.ActiveCfg = Release|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|Win32.Build.0 = Release|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|x64.ActiveCfg = Debug|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|x64.Build.0 = Debug|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|x64.ActiveCfg = Release|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|x64.Build.0 = Release|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|Win32.Build.0 = Debug|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|Win32.ActiveCfg = Release|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|Win32.Build.0 = Release|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|x64.ActiveCfg = Debug|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|x64.Build.0 = Debug|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|x64.ActiveCfg = Release|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|x64.Build.0 = Release|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|Win32.Build.0 = Debug|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|Win32.ActiveCfg = Release|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|Win32.Build.0 = Release|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|x64.ActiveCfg = Debug|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|x64.Build.0 = Debug|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|x64.ActiveCfg = Release|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|x64.Build.0 = Release|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|Win32.ActiveCfg = Debug|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|Win32.Build.0 = Debug|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|Win32.ActiveCfg = Release|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|Win32.Build.0 = Release|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|x64.ActiveCfg = Debug|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|x64.Build.0 = Debug|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|x64.ActiveCfg = Release|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|x64.Build.0 = Release|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|Win32.Build.0 = Debug|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|Win32.ActiveCfg = Release|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|Win32.Build.0 = Release|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|x64.ActiveCfg = Debug|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|x64.Build.0 = Debug|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|x64.ActiveCfg = Release|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|x64.Build.0 = Release|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|Win32.Build.0 = Debug|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|Win32.ActiveCfg = Release|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|Win32.Build.0 = Release|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|x64.ActiveCfg = Debug|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|x64.Build.0 = Debug|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|x64.ActiveCfg = Release|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76} = {ED63C611-D43D-42E8-A083-AB082C31A0DF}
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248} = {3055CBF7-B33A-4DED-BFB5-19DE53027CF2}
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9} = {48DB3120-7565-4863-8C99-C0DE5FD2DC11}
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D} = {B0E9361C-6773-4E78-870D-10887BBE6D40}
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C} = {CE2CDD3A-ED87-475C-BE33-4ED4C288884D}
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5} = {8A73614A-6351-42D3-A518-9C6B504D9E55}
-		{322F1E83-402B-49F0-B206-FD44F046091F} = {E7B355DF-2054-45A0-BF14-B78D6E61DDF1}
-		{3055CBF7-B33A-4DED-BFB5-19DE53027CF2} = {06CC3519-A442-4DC8-93B5-3320863FB409}
-		{48DB3120-7565-4863-8C99-C0DE5FD2DC11} = {06CC3519-A442-4DC8-93B5-3320863FB409}
-		{B0E9361C-6773-4E78-870D-10887BBE6D40} = {06CC3519-A442-4DC8-93B5-3320863FB409}
-		{CE2CDD3A-ED87-475C-BE33-4ED4C288884D} = {38DD140E-6B82-43DA-8269-FF850206DAD6}
-		{8A73614A-6351-42D3-A518-9C6B504D9E55} = {38DD140E-6B82-43DA-8269-FF850206DAD6}
-		{E7B355DF-2054-45A0-BF14-B78D6E61DDF1} = {8CADBFA7-5C4A-46FA-9171-10827B7BB3F9}
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD} = {44837D96-E34C-4A65-9AD1-AA84279876DC}
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB} = {FA4A8867-88BE-4EAB-B31F-ADBBD9FEF845}
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107} = {E15B3554-BFCE-4C53-A132-DBF669D01584}
+		{91E7C695-3307-4596-90E1-065AFB4D2643} = {1A6F0878-1D3D-4301-A5B7-5D5E03DC4DD8}
+		{31C45025-FDA4-4CB5-B55E-81F934382654} = {12113395-BEDC-46E3-A87C-62455B650D4C}
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF} = {FF4B4265-D9F5-4071-9683-A6A94350994F}
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82} = {A3B700C5-0F77-4926-ADBA-520CE882A8F1}
+		{FA4A8867-88BE-4EAB-B31F-ADBBD9FEF845} = {04EDF890-486C-4B66-8360-CA172D2ED6A8}
+		{E15B3554-BFCE-4C53-A132-DBF669D01584} = {04EDF890-486C-4B66-8360-CA172D2ED6A8}
+		{1A6F0878-1D3D-4301-A5B7-5D5E03DC4DD8} = {04EDF890-486C-4B66-8360-CA172D2ED6A8}
+		{12113395-BEDC-46E3-A87C-62455B650D4C} = {2798D90E-2976-4C76-8843-0F467D4B98E5}
+		{FF4B4265-D9F5-4071-9683-A6A94350994F} = {2798D90E-2976-4C76-8843-0F467D4B98E5}
+		{A3B700C5-0F77-4926-ADBA-520CE882A8F1} = {CA73AC30-5711-4A0E-B0D2-59E79C79ECEA}
 	EndGlobalSection
 EndGlobal