diff --git a/README.md b/README.md
new file mode 100644
index 0000000..47b1e32
--- /dev/null
+++ b/README.md
@@ -0,0 +1,28 @@
+# LibUsbDotNet
+[![Build status](https://ci.appveyor.com/api/projects/status/5fe0th33i60h24bw?svg=true)](https://ci.appveyor.com/project/qmfrederik/libusbdotnet)
+
+> __NOTE__ This repository contains a fork of LibUsbDotNet; the original repository is located on [SourceForge](https://sourceforge.net/p/libusbdotnet/).
+> This repository adds some minor bug fixes and support for .NET Core.
+
+[LibUsbDotNet](http://sourceforge.net/projects/libusbdotnet) is a .NET C# USB library for WinUsb, libusb-win32, and Linux libusb v1.x developers. 
+All basic USB device functionality can be performed through common device classes allowing you to write OS and driver independent code.
+
+* LibUsbDotNet versions 2.2.4 and above support the Libusb-1.0 driver.
+* LibUsbDotNet 2.1.0 and above supports the genuine [libusb-win32](http://sourceforge.net/projects/libusb-win32) driver package. However, 
+  access to basic device information via the windows registry is not available. See the [LegacyUsbRegistry](http://libusbdotnet.sourceforge.net/V2/html/9b8a7337-0d0c-c3e6-6f56-d47f1a3e5856.htm)
+  class for more information.
+
+## Features
+* Full support for WinUSB. All WinUSB interfaces are treated as separate devices; each interface can be used by a different application.
+* Extended kernel level support for libusb-win32.
+* Supports Unix-like operating systems using Mono .NET and libusb-1.0.
+* Common device classes allow for a single code base to support multiple drivers and platforms.
+* Includes a Usb InfWizard utility (Windows only) for generating usb installation packages, removing devices, and installing drivers.
+* Device discovery using any or all of the folowing criteria:
+  * VendorID
+  * ProductID
+  * Revision Code
+  * Serial Number
+  * Device Interface GUID
+
+Source package includes many small example applications.
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..10f27fa
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,9 @@
+build_script:
+  - msbuild stage\LibUsbDotNet.sln /p:Configuration=Release /p:Platform="Any CPU" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - dotnet restore stage\LibUsbDotNet\project.json
+  - dotnet build stage\LibUsbDotNet\project.json
+  - dotnet pack stage\LibUsbDotNet\project.json --version-suffix r%APPVEYOR_BUILD_VERSION%
+
+on_success:
+  - ps: Push-AppVeyorArtifact stage\LibUsbDotNet\bin\Debug\CoreCompat.LibUsbDotNet.2.2.8-r$($env:APPVEYOR_BUILD_VERSION).nupkg
+  - ps: Push-AppVeyorArtifact stage\LibUsbDotNet\bin\Debug\CoreCompat.LibUsbDotNet.2.2.8-r$($env:APPVEYOR_BUILD_VERSION).symbols.nupkg
\ No newline at end of file
diff --git a/stage/Benchmark/Benchmark.csproj b/stage/Benchmark/Benchmark.csproj
index 421dfee..4df3088 100644
--- a/stage/Benchmark/Benchmark.csproj
+++ b/stage/Benchmark/Benchmark.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,11 +12,12 @@
     <AssemblyName>Benchmark</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ApplicationIcon>UsbIco.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -82,14 +83,20 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Compile Include="StopWatch.cs" />
@@ -99,8 +106,8 @@
     <Content Include="UsbIco.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/stage/Benchmark/Properties/Resources.Designer.cs b/stage/Benchmark/Properties/Resources.Designer.cs
index 0e91936..4b91143 100644
--- a/stage/Benchmark/Properties/Resources.Designer.cs
+++ b/stage/Benchmark/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace Benchmark.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/stage/Benchmark/Properties/Settings.Designer.cs b/stage/Benchmark/Properties/Settings.Designer.cs
index 6d08f61..3a59ff9 100644
--- a/stage/Benchmark/Properties/Settings.Designer.cs
+++ b/stage/Benchmark/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Benchmark.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/stage/BenchmarkCon/BenchmarkCon.csproj b/stage/BenchmarkCon/BenchmarkCon.csproj
index 5a6c9a2..65276a8 100644
--- a/stage/BenchmarkCon/BenchmarkCon.csproj
+++ b/stage/BenchmarkCon/BenchmarkCon.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +10,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LibUsbDotNet</RootNamespace>
     <AssemblyName>BenchmarkCon</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
     <ApplicationIcon>UsbDos.ico</ApplicationIcon>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -60,13 +64,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
-      <Name>LibUsbDotNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="BenchmarkHelp.txt" />
@@ -76,6 +76,12 @@
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
+      <Name>LibUsbDotNet</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -84,10 +90,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <PropertyGroup>
-    <PostBuildEvent>SET  USE_ILMERGE=1
-IF NOT DEFINED USE_ILMERGE GOTO DONE
-ilmerge /out:"$(TargetDir)Bm$(TargetExt)" "$(TargetPath)" "$(TargetDir)LibUsbDotNet.dll"
-:DONE</PostBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/stage/Examples/Device.Notification/Device.Notification.csproj b/stage/Examples/Device.Notification/Device.Notification.csproj
index 3d445c5..0405173 100644
--- a/stage/Examples/Device.Notification/Device.Notification.csproj
+++ b/stage/Examples/Device.Notification/Device.Notification.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Device.Notification</RootNamespace>
     <AssemblyName>Device.Notification</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,11 +61,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/stage/Examples/Read.Isochronous/Read.Isochronous.csproj b/stage/Examples/Read.Isochronous/Read.Isochronous.csproj
index 22da68e..2e3f669 100644
--- a/stage/Examples/Read.Isochronous/Read.Isochronous.csproj
+++ b/stage/Examples/Read.Isochronous/Read.Isochronous.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Read.Isochronous</RootNamespace>
     <AssemblyName>Read.Isochronous</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,8 +62,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/stage/Examples/Read.Only/Read.Only.csproj b/stage/Examples/Read.Only/Read.Only.csproj
index bcf82b1..d94d6bb 100644
--- a/stage/Examples/Read.Only/Read.Only.csproj
+++ b/stage/Examples/Read.Only/Read.Only.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Read.Only</RootNamespace>
     <AssemblyName>Read.Only</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,8 +60,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/stage/Examples/Read.Write.Async/Read.Write.Async.csproj b/stage/Examples/Read.Write.Async/Read.Write.Async.csproj
index bb8ddbb..ebe6e66 100644
--- a/stage/Examples/Read.Write.Async/Read.Write.Async.csproj
+++ b/stage/Examples/Read.Write.Async/Read.Write.Async.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Read.Write.Async</RootNamespace>
     <AssemblyName>Read.Write.Async</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,10 +60,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Device.Notification\Device.Notification.csproj">
+      <Project>{a893cfaa-fcdf-4055-a8d4-435cde59445f}</Project>
+      <Name>Device.Notification</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/stage/Examples/Read.Write.Event/Read.Write.Event.csproj b/stage/Examples/Read.Write.Event/Read.Write.Event.csproj
index 189a705..2deb71f 100644
--- a/stage/Examples/Read.Write.Event/Read.Write.Event.csproj
+++ b/stage/Examples/Read.Write.Event/Read.Write.Event.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Examples</RootNamespace>
     <AssemblyName>Read.Write.Event</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,18 +56,22 @@
     <Compile Include="ReadWriteEventDriven.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
-      <Name>LibUsbDotNet</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
+      <Name>LibUsbDotNet</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Device.Notification\Device.Notification.csproj">
+      <Project>{a893cfaa-fcdf-4055-a8d4-435cde59445f}</Project>
+      <Name>Device.Notification</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/stage/Examples/Read.Write/Read.Write.csproj b/stage/Examples/Read.Write/Read.Write.csproj
index 042aa8f..9f993b3 100644
--- a/stage/Examples/Read.Write/Read.Write.csproj
+++ b/stage/Examples/Read.Write/Read.Write.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Examples</RootNamespace>
     <AssemblyName>Read.Write</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,13 +62,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
-      <Name>LibUsbDotNet</Name>
-    </ProjectReference>
+    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
+      <Name>LibUsbDotNet</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/stage/Examples/Show.Info/Show.Info.csproj b/stage/Examples/Show.Info/Show.Info.csproj
index d28821c..1083270 100644
--- a/stage/Examples/Show.Info/Show.Info.csproj
+++ b/stage/Examples/Show.Info/Show.Info.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <ProjectGuid>{F7069C5F-8327-471A-9C13-9764C11E3A56}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,13 +7,17 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Examples</RootNamespace>
     <AssemblyName>Show.Info</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\travis\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -67,12 +71,16 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
-      <Name>LibUsbDotNet</Name>
-    </ProjectReference>
+    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <ProjectReference Include="..\..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
+      <Name>LibUsbDotNet</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Device.Notification\Device.Notification.csproj">
+      <Project>{a893cfaa-fcdf-4055-a8d4-435cde59445f}</Project>
+      <Name>Device.Notification</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/stage/InfWizard/InfWizard.csproj b/stage/InfWizard/InfWizard.csproj
index a25dfab..97243a4 100644
--- a/stage/InfWizard/InfWizard.csproj
+++ b/stage/InfWizard/InfWizard.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,12 +12,13 @@
     <AssemblyName>InfWizard</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <ApplicationIcon>InfWizard.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,8 +63,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\LibWinUsb\Internal\UsbRegex\NamedGroup.cs" />
-    <Compile Include="..\LibWinUsb\Internal\UsbRegex\RegHardwareID.cs" />
+    <Compile Include="..\LibUsbDotNet\Internal\UsbRegex\NamedGroup.cs" />
+    <Compile Include="..\LibUsbDotNet\Internal\UsbRegex\RegHardwareID.cs" />
     <Compile Include="DriverResource\DriverResManager.cs" />
     <Compile Include="DriverResource\DriverResource.cs" />
     <Compile Include="DriverResource\DriverResourceDownload.cs" />
@@ -74,7 +75,7 @@
     <Compile Include="DynamicProps\DynamicPropWrapper.cs" />
     <Compile Include="DynamicProps\DynamicTypeDescriptor.cs" />
     <Compile Include="FolderBrowserUITypeEditor.cs" />
-    <Compile Include="Properties\Settings1.Designer.cs">
+    <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
@@ -191,7 +192,7 @@
     <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <None Include="app.config" />
     <None Include="Resources\InfoImage.gif" />
@@ -210,6 +211,12 @@
     <Content Include="Wizard\Wizard.bmp" />
     <Content Include="Wizard\wizBigOnlineFolder.gif" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
+      <Name>LibUsbDotNet</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/stage/InfWizard/Properties/Settings1.Designer.cs b/stage/InfWizard/Properties/Settings.Designer.cs
similarity index 96%
rename from stage/InfWizard/Properties/Settings1.Designer.cs
rename to stage/InfWizard/Properties/Settings.Designer.cs
index fd2323a..ef0fc87 100644
--- a/stage/InfWizard/Properties/Settings1.Designer.cs
+++ b/stage/InfWizard/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace InfWizard.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/stage/InfWizard/resInfWizard.Designer.cs b/stage/InfWizard/resInfWizard.Designer.cs
index a658205..0015354 100644
--- a/stage/InfWizard/resInfWizard.Designer.cs
+++ b/stage/InfWizard/resInfWizard.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace InfWizard {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class resInfWizard {
@@ -60,6 +60,9 @@ internal resInfWizard() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap CloseFolderImage {
             get {
                 object obj = ResourceManager.GetObject("CloseFolderImage", resourceCulture);
@@ -76,6 +79,9 @@ internal static string DRIVERRESOURCE_NOTFOUND {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap InfoImage {
             get {
                 object obj = ResourceManager.GetObject("InfoImage", resourceCulture);
@@ -137,6 +143,9 @@ internal static string INSTALLDRIVER_WINDOWSSERVICE_TEXT {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap LeftArrowImage {
             get {
                 object obj = ResourceManager.GetObject("LeftArrowImage", resourceCulture);
@@ -144,6 +153,9 @@ internal static System.Drawing.Bitmap LeftArrowImage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap LudnImage {
             get {
                 object obj = ResourceManager.GetObject("LudnImage", resourceCulture);
@@ -151,6 +163,9 @@ internal static System.Drawing.Bitmap LudnImage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap OpenFolderImage {
             get {
                 object obj = ResourceManager.GetObject("OpenFolderImage", resourceCulture);
@@ -158,6 +173,9 @@ internal static System.Drawing.Bitmap OpenFolderImage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap RefreshImage {
             get {
                 object obj = ResourceManager.GetObject("RefreshImage", resourceCulture);
@@ -174,6 +192,9 @@ internal static string REMOVE_DEVICE_WARNING {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap RightArrowImage {
             get {
                 object obj = ResourceManager.GetObject("RightArrowImage", resourceCulture);
@@ -181,6 +202,9 @@ internal static System.Drawing.Bitmap RightArrowImage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap SaveImage {
             get {
                 object obj = ResourceManager.GetObject("SaveImage", resourceCulture);
@@ -217,6 +241,9 @@ internal static string SETUP_PACKAGE_README_HTM {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap StopImage {
             get {
                 object obj = ResourceManager.GetObject("StopImage", resourceCulture);
@@ -224,6 +251,9 @@ internal static System.Drawing.Bitmap StopImage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap YieldImage {
             get {
                 object obj = ResourceManager.GetObject("YieldImage", resourceCulture);
diff --git a/stage/LibUsbDotNet.sln b/stage/LibUsbDotNet.sln
index 5664178..17866e3 100644
--- a/stage/LibUsbDotNet.sln
+++ b/stage/LibUsbDotNet.sln
@@ -1,18 +1,18 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{5E024A6D-DD45-421A-BF51-73DBA0A27E53}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Bulk", "Test_Bulk\Test_Bulk.csproj", "{2AA77B1D-5F6B-4206-954C-ED8D6E7DEA1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmark", "Benchmark\Benchmark.csproj", "{A379842D-C4E3-41E1-BE82-4041293AC225}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibUsbDotNet", "LibWinUsb\LibUsbDotNet.csproj", "{0A78F6FF-5586-4052-8104-E23FF83A7CE1}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_DeviceNotify", "Test_DeviceNotify\Test_DeviceNotify.csproj", "{7E081E3A-C557-4303-93EB-FFE2DA8DAB68}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Info", "Test_Info\Test_Info.csproj", "{3EFEDA92-CAE3-4585-A519-439ACD58468A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{5E024A6D-DD45-421A-BF51-73DBA0A27E53}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Read.Write", "Examples\Read.Write\Read.Write.csproj", "{4030AC2F-4073-4F33-A529-6AF5B5D99B45}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Read.Write.Event", "Examples\Read.Write.Event\Read.Write.Event.csproj", "{CCDBE804-2312-444D-B7E7-C63FF1469795}"
@@ -31,6 +31,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkCon", "BenchmarkCo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Read.Isochronous", "Examples\Read.Isochronous\Read.Isochronous.csproj", "{4581EC5B-EB14-4B1A-A85B-9D3B1087DBBE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibUsbDotNet", "LibUsbDotNet\LibUsbDotNet.csproj", "{0A78F6FF-5586-4052-8104-E23FF83A7CE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,14 +57,6 @@ Global
 		{A379842D-C4E3-41E1-BE82-4041293AC225}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A379842D-C4E3-41E1-BE82-4041293AC225}.Release|x86.ActiveCfg = Release|x86
 		{A379842D-C4E3-41E1-BE82-4041293AC225}.Release|x86.Build.0 = Release|x86
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|x86.ActiveCfg = Debug|x86
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|x86.Build.0 = Debug|x86
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|x86.ActiveCfg = Release|x86
-		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|x86.Build.0 = Release|x86
 		{7E081E3A-C557-4303-93EB-FFE2DA8DAB68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E081E3A-C557-4303-93EB-FFE2DA8DAB68}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E081E3A-C557-4303-93EB-FFE2DA8DAB68}.Debug|x86.ActiveCfg = Debug|x86
@@ -151,6 +145,14 @@ Global
 		{4581EC5B-EB14-4B1A-A85B-9D3B1087DBBE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4581EC5B-EB14-4B1A-A85B-9D3B1087DBBE}.Release|x86.ActiveCfg = Release|x86
 		{4581EC5B-EB14-4B1A-A85B-9D3B1087DBBE}.Release|x86.Build.0 = Release|x86
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|x86.ActiveCfg = Debug|x86
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Debug|x86.Build.0 = Debug|x86
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|x86.ActiveCfg = Release|x86
+		{0A78F6FF-5586-4052-8104-E23FF83A7CE1}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/stage/LibWinUsb/Descriptors/ClassCodeType.cs b/stage/LibUsbDotNet/Descriptors/ClassCodeType.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/ClassCodeType.cs
rename to stage/LibUsbDotNet/Descriptors/ClassCodeType.cs
diff --git a/stage/LibWinUsb/Descriptors/DescriptorType.cs b/stage/LibUsbDotNet/Descriptors/DescriptorType.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/DescriptorType.cs
rename to stage/LibUsbDotNet/Descriptors/DescriptorType.cs
diff --git a/stage/LibWinUsb/Descriptors/LangStringDescriptor.cs b/stage/LibUsbDotNet/Descriptors/LangStringDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/LangStringDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/LangStringDescriptor.cs
diff --git a/stage/LibWinUsb/Descriptors/StringDescriptor.cs b/stage/LibUsbDotNet/Descriptors/StringDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/StringDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/StringDescriptor.cs
diff --git a/stage/LibWinUsb/Descriptors/UsbConfigDescriptor.cs b/stage/LibUsbDotNet/Descriptors/UsbConfigDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/UsbConfigDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/UsbConfigDescriptor.cs
diff --git a/stage/LibWinUsb/Descriptors/UsbDescriptor.cs b/stage/LibUsbDotNet/Descriptors/UsbDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/UsbDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/UsbDescriptor.cs
diff --git a/stage/LibWinUsb/Descriptors/UsbDeviceDescriptor.cs b/stage/LibUsbDotNet/Descriptors/UsbDeviceDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/UsbDeviceDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/UsbDeviceDescriptor.cs
diff --git a/stage/LibWinUsb/Descriptors/UsbEndpointDescriptor.cs b/stage/LibUsbDotNet/Descriptors/UsbEndpointDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/UsbEndpointDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/UsbEndpointDescriptor.cs
diff --git a/stage/LibWinUsb/Descriptors/UsbInterfaceDescriptor.cs b/stage/LibUsbDotNet/Descriptors/UsbInterfaceDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/Descriptors/UsbInterfaceDescriptor.cs
rename to stage/LibUsbDotNet/Descriptors/UsbInterfaceDescriptor.cs
diff --git a/stage/LibWinUsb/DeviceNotify/DeviceNotifier.cs b/stage/LibUsbDotNet/DeviceNotify/DeviceNotifier.cs
similarity index 95%
rename from stage/LibWinUsb/DeviceNotify/DeviceNotifier.cs
rename to stage/LibUsbDotNet/DeviceNotify/DeviceNotifier.cs
index 37991c9..a907637 100644
--- a/stage/LibWinUsb/DeviceNotify/DeviceNotifier.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/DeviceNotifier.cs
@@ -19,6 +19,7 @@
 // visit www.gnu.org.
 // 
 // 
+#if !NETSTANDARD1_5
 using LibUsbDotNet.DeviceNotify.Linux;
 
 namespace LibUsbDotNet.DeviceNotify
@@ -45,4 +46,5 @@ public static IDeviceNotifier OpenDeviceNotifier()
             }
         }
     }
-}
\ No newline at end of file
+}
+#endif
diff --git a/stage/LibWinUsb/DeviceNotify/DeviceNotifyEventArgs.cs b/stage/LibUsbDotNet/DeviceNotify/DeviceNotifyEventArgs.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/DeviceNotifyEventArgs.cs
rename to stage/LibUsbDotNet/DeviceNotify/DeviceNotifyEventArgs.cs
diff --git a/stage/LibWinUsb/DeviceNotify/DeviceType.cs b/stage/LibUsbDotNet/DeviceNotify/DeviceType.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/DeviceType.cs
rename to stage/LibUsbDotNet/DeviceNotify/DeviceType.cs
diff --git a/stage/LibWinUsb/DeviceNotify/EventType.cs b/stage/LibUsbDotNet/DeviceNotify/EventType.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/EventType.cs
rename to stage/LibUsbDotNet/DeviceNotify/EventType.cs
diff --git a/stage/LibWinUsb/DeviceNotify/IDeviceNotifier.cs b/stage/LibUsbDotNet/DeviceNotify/IDeviceNotifier.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/IDeviceNotifier.cs
rename to stage/LibUsbDotNet/DeviceNotify/IDeviceNotifier.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Info/IPortNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Info/IPortNotifyInfo.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Info/IPortNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Info/IPortNotifyInfo.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Info/IUsbDeviceNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Info/IUsbDeviceNotifyInfo.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Info/IUsbDeviceNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Info/IUsbDeviceNotifyInfo.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Info/IVolumeNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Info/IVolumeNotifyInfo.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Info/IVolumeNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Info/IVolumeNotifyInfo.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Info/PortNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Info/PortNotifyInfo.cs
similarity index 95%
rename from stage/LibWinUsb/DeviceNotify/Info/PortNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Info/PortNotifyInfo.cs
index d7662fb..dd2b62c 100644
--- a/stage/LibWinUsb/DeviceNotify/Info/PortNotifyInfo.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/Info/PortNotifyInfo.cs
@@ -36,7 +36,7 @@ internal PortNotifyInfo(IntPtr lParam)
         {
             Marshal.PtrToStructure(lParam, mBaseHdr);
             IntPtr pName = new IntPtr(lParam.ToInt64() + Marshal.OffsetOf(typeof (DevBroadcastPort), "mNameHolder").ToInt64());
-            mName = Marshal.PtrToStringAuto(pName);
+            mName = Marshal.PtrToStringUni(pName);
         }
 
         #region IPortNotifyInfo Members
diff --git a/stage/LibWinUsb/DeviceNotify/Info/UsbDeviceNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Info/UsbDeviceNotifyInfo.cs
similarity index 96%
rename from stage/LibWinUsb/DeviceNotify/Info/UsbDeviceNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Info/UsbDeviceNotifyInfo.cs
index 37dc1c4..24926eb 100644
--- a/stage/LibWinUsb/DeviceNotify/Info/UsbDeviceNotifyInfo.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/Info/UsbDeviceNotifyInfo.cs
@@ -39,7 +39,7 @@ internal UsbDeviceNotifyInfo(IntPtr lParam)
         {
             Marshal.PtrToStructure(lParam, mBaseHdr);
             IntPtr pName = new IntPtr(lParam.ToInt64() + Marshal.OffsetOf(typeof (DevBroadcastDeviceinterface), "mNameHolder").ToInt64());
-            mName = Marshal.PtrToStringAuto(pName);
+            mName = Marshal.PtrToStringUni(pName);
         }
 
         #region IUsbDeviceNotifyInfo Members
diff --git a/stage/LibWinUsb/DeviceNotify/Info/VolumeNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Info/VolumeNotifyInfo.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Info/VolumeNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Info/VolumeNotifyInfo.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastDeviceinterface.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastDeviceinterface.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastDeviceinterface.cs
rename to stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastDeviceinterface.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastHdr.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastHdr.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastHdr.cs
rename to stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastHdr.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastPort.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastPort.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastPort.cs
rename to stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastPort.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastVolume.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastVolume.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Internal/DevBroadcastVolume.cs
rename to stage/LibUsbDotNet/DeviceNotify/Internal/DevBroadcastVolume.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Internal/DevNotifyNativeWindow.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/DevNotifyNativeWindow.cs
similarity index 95%
rename from stage/LibWinUsb/DeviceNotify/Internal/DevNotifyNativeWindow.cs
rename to stage/LibUsbDotNet/DeviceNotify/Internal/DevNotifyNativeWindow.cs
index 03a6d99..8745349 100644
--- a/stage/LibWinUsb/DeviceNotify/Internal/DevNotifyNativeWindow.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/Internal/DevNotifyNativeWindow.cs
@@ -19,6 +19,7 @@
 // visit www.gnu.org.
 // 
 // 
+#if !NETSTANDARD1_5
 using System;
 using System.Windows.Forms;
 
@@ -76,4 +77,5 @@ protected override void WndProc(ref Message m)
 
         #endregion
     }
-}
\ No newline at end of file
+}
+#endif
diff --git a/stage/LibUsbDotNet/DeviceNotify/Internal/SafeHandleZeroOrMinusOneIsInvalid.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/SafeHandleZeroOrMinusOneIsInvalid.cs
new file mode 100644
index 0000000..4d41f8b
--- /dev/null
+++ b/stage/LibUsbDotNet/DeviceNotify/Internal/SafeHandleZeroOrMinusOneIsInvalid.cs
@@ -0,0 +1,25 @@
+#if NETSTANDARD1_5
+using System;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace LibUsbDotNet.DeviceNotify.Internal
+{
+    [SecurityCritical]
+    internal abstract class SafeHandleZeroOrMinusOneIsInvalid : SafeHandle
+    {
+        protected SafeHandleZeroOrMinusOneIsInvalid(bool ownsHandle) : base(IntPtr.Zero, ownsHandle)
+        {
+        }
+
+        public override bool IsInvalid
+        {
+            [SecurityCritical]
+            get 
+            {
+                return handle == IntPtr.Zero || handle == new IntPtr(-1); 
+            }
+        }
+    }
+}
+#endif
diff --git a/stage/LibWinUsb/DeviceNotify/Internal/SafeNotifyHandle.cs b/stage/LibUsbDotNet/DeviceNotify/Internal/SafeNotifyHandle.cs
similarity index 95%
rename from stage/LibWinUsb/DeviceNotify/Internal/SafeNotifyHandle.cs
rename to stage/LibUsbDotNet/DeviceNotify/Internal/SafeNotifyHandle.cs
index 5960eaa..92eb661 100644
--- a/stage/LibWinUsb/DeviceNotify/Internal/SafeNotifyHandle.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/Internal/SafeNotifyHandle.cs
@@ -19,6 +19,7 @@
 // visit www.gnu.org.
 // 
 // 
+#if !NETSTANDARD1_5
 using System;
 using Microsoft.Win32.SafeHandles;
 
@@ -42,4 +43,5 @@ protected override bool ReleaseHandle()
             return true;
         }
     }
-}
\ No newline at end of file
+}
+#endif
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDevItem.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDevItem.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDevItem.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDevItem.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDevItemList.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDevItemList.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDevItemList.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDevItemList.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.DevMonitor.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.DevMonitor.cs
similarity index 93%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.DevMonitor.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.DevMonitor.cs
index bbdab1f..cf93104 100644
--- a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.DevMonitor.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.DevMonitor.cs
@@ -74,10 +74,13 @@ private static bool ReadFileDescriptor(string fullPath, out byte[] deviceDescrip
         {
             try
             {
-                FileStream f = File.Open(fullPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                deviceDescriptorBytes = new byte[UsbDeviceDescriptor.Size];
-                int iRead = f.Read(deviceDescriptorBytes, 0, UsbDeviceDescriptor.Size);
-                f.Close();
+                int iRead = 0;
+
+                using (FileStream f = File.Open(fullPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                {
+                    deviceDescriptorBytes = new byte[UsbDeviceDescriptor.Size];
+                    iRead = f.Read(deviceDescriptorBytes, 0, UsbDeviceDescriptor.Size);
+                }
 
                 return iRead == UsbDeviceDescriptor.Size;
             }
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.DeviceListPolling.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.DeviceListPolling.cs
similarity index 85%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.DeviceListPolling.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.DeviceListPolling.cs
index 212a1bb..dd77d56 100644
--- a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.DeviceListPolling.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.DeviceListPolling.cs
@@ -20,7 +20,7 @@
 // 
 // 
 using System;
-using System.Timers;
+using System.Threading;
 using LibUsbDotNet.LudnMonoLibUsb;
 using MonoLibUsb.Profile;
 
@@ -45,19 +45,17 @@ private void StartDeviceListPolling()
                 MonoUsbDevice.RefreshProfileList();
 
                 MonoUsbDevice.ProfileList.AddRemoveEvent += OnAddRemoveEvent;
-                mDeviceListPollTimer = new Timer(PollingInterval);
-                mDeviceListPollTimer.Elapsed += PollTimer_Elapsed;
-                mDeviceListPollTimer.Start();
+                mDeviceListPollTimer = new Timer(PollTimer_Elapsed, null, PollingInterval, PollingInterval);
             }
         }
 
-        private void PollTimer_Elapsed(object sender, ElapsedEventArgs e)
+        private void PollTimer_Elapsed(object state)
         {
             lock (PollTimerLock)
             {
-                mDeviceListPollTimer.Stop();
+                mDeviceListPollTimer.Change(-1, -1);
                 MonoUsbDevice.RefreshProfileList();
-                mDeviceListPollTimer.Start();
+                mDeviceListPollTimer.Change(PollingInterval, PollingInterval);
             }
         }
 
@@ -66,8 +64,7 @@ private void StopDeviceListPolling()
             lock (PollTimerLock)
             {
                 if (mDeviceListPollTimer == null) return;
-                mDeviceListPollTimer.Stop();
-                mDeviceListPollTimer.Elapsed -= PollTimer_Elapsed;
+                mDeviceListPollTimer.Change(Timeout.Infinite, Timeout.Infinite);
                 mDeviceListPollTimer.Dispose();
                 MonoUsbDevice.ProfileList.AddRemoveEvent -= OnAddRemoveEvent;
                 mDeviceListPollTimer = null;
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifier.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifier.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifierMode.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifierMode.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifierMode.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifierMode.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifyEventArgs.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifyEventArgs.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxDeviceNotifyEventArgs.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxDeviceNotifyEventArgs.cs
diff --git a/stage/LibWinUsb/DeviceNotify/Linux/LinuxUsbDeviceNotifyInfo.cs b/stage/LibUsbDotNet/DeviceNotify/Linux/LinuxUsbDeviceNotifyInfo.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/Linux/LinuxUsbDeviceNotifyInfo.cs
rename to stage/LibUsbDotNet/DeviceNotify/Linux/LinuxUsbDeviceNotifyInfo.cs
diff --git a/stage/LibWinUsb/DeviceNotify/WindowsDeviceNotifier.cs b/stage/LibUsbDotNet/DeviceNotify/WindowsDeviceNotifier.cs
similarity index 97%
rename from stage/LibWinUsb/DeviceNotify/WindowsDeviceNotifier.cs
rename to stage/LibUsbDotNet/DeviceNotify/WindowsDeviceNotifier.cs
index 716c7a1..67ae294 100644
--- a/stage/LibWinUsb/DeviceNotify/WindowsDeviceNotifier.cs
+++ b/stage/LibUsbDotNet/DeviceNotify/WindowsDeviceNotifier.cs
@@ -19,6 +19,7 @@
 // visit www.gnu.org.
 // 
 // 
+#if !NETSTANDARD1_5
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -143,4 +144,5 @@ private void OnHandleChange(IntPtr newWindowHandle)
             Debug.Print("RegisterDeviceInterface:" + bSuccess);
         }
     }
-}
\ No newline at end of file
+}
+#endif
diff --git a/stage/LibWinUsb/DeviceNotify/WindowsDeviceNotifyEventArgs.cs b/stage/LibUsbDotNet/DeviceNotify/WindowsDeviceNotifyEventArgs.cs
similarity index 100%
rename from stage/LibWinUsb/DeviceNotify/WindowsDeviceNotifyEventArgs.cs
rename to stage/LibUsbDotNet/DeviceNotify/WindowsDeviceNotifyEventArgs.cs
diff --git a/stage/LibWinUsb/IUsbDevice.cs b/stage/LibUsbDotNet/IUsbDevice.cs
similarity index 100%
rename from stage/LibWinUsb/IUsbDevice.cs
rename to stage/LibUsbDotNet/IUsbDevice.cs
diff --git a/stage/LibWinUsb/IUsbInterface.cs b/stage/LibUsbDotNet/IUsbInterface.cs
similarity index 100%
rename from stage/LibWinUsb/IUsbInterface.cs
rename to stage/LibUsbDotNet/IUsbInterface.cs
diff --git a/stage/LibWinUsb/Info/UsbBaseInfo.cs b/stage/LibUsbDotNet/Info/UsbBaseInfo.cs
similarity index 100%
rename from stage/LibWinUsb/Info/UsbBaseInfo.cs
rename to stage/LibUsbDotNet/Info/UsbBaseInfo.cs
diff --git a/stage/LibWinUsb/Info/UsbConfigInfo.cs b/stage/LibUsbDotNet/Info/UsbConfigInfo.cs
similarity index 100%
rename from stage/LibWinUsb/Info/UsbConfigInfo.cs
rename to stage/LibUsbDotNet/Info/UsbConfigInfo.cs
diff --git a/stage/LibWinUsb/Info/UsbDeviceInfo.cs b/stage/LibUsbDotNet/Info/UsbDeviceInfo.cs
similarity index 96%
rename from stage/LibWinUsb/Info/UsbDeviceInfo.cs
rename to stage/LibUsbDotNet/Info/UsbDeviceInfo.cs
index 173b5ef..ff00e05 100644
--- a/stage/LibWinUsb/Info/UsbDeviceInfo.cs
+++ b/stage/LibUsbDotNet/Info/UsbDeviceInfo.cs
@@ -87,10 +87,11 @@ public short CurrentCultureLangID
             {
                 if (mCurrentCultureLangID == NO_LANG)
                 {
-                    short currentCultureLangID = (short) CultureInfo.CurrentCulture.LCID;
                     short[] deviceLangIDs;
                     if (mUsbDevice.GetLangIDs(out deviceLangIDs))
                     {
+#if !NETSTANDARD1_5
+                        short currentCultureLangID = (short) CultureInfo.CurrentCulture.LCID;
                         foreach (short deviceLangID in deviceLangIDs)
                         {
                             if (deviceLangID == currentCultureLangID)
@@ -99,7 +100,9 @@ public short CurrentCultureLangID
                                 return mCurrentCultureLangID;
                             }
                         }
+#endif
                     }
+
                     mCurrentCultureLangID = deviceLangIDs.Length > 0 ? deviceLangIDs[0] : (short) 0;
                 }
                 return mCurrentCultureLangID;
diff --git a/stage/LibWinUsb/Info/UsbEndpointInfo.cs b/stage/LibUsbDotNet/Info/UsbEndpointInfo.cs
similarity index 100%
rename from stage/LibWinUsb/Info/UsbEndpointInfo.cs
rename to stage/LibUsbDotNet/Info/UsbEndpointInfo.cs
diff --git a/stage/LibWinUsb/Info/UsbInterfaceInfo.cs b/stage/LibUsbDotNet/Info/UsbInterfaceInfo.cs
similarity index 100%
rename from stage/LibWinUsb/Info/UsbInterfaceInfo.cs
rename to stage/LibUsbDotNet/Info/UsbInterfaceInfo.cs
diff --git a/stage/LibWinUsb/Internal/Kernel32.cs b/stage/LibUsbDotNet/Internal/Kernel32.cs
similarity index 96%
rename from stage/LibWinUsb/Internal/Kernel32.cs
rename to stage/LibUsbDotNet/Internal/Kernel32.cs
index 10ef296..ac9e730 100644
--- a/stage/LibWinUsb/Internal/Kernel32.cs
+++ b/stage/LibUsbDotNet/Internal/Kernel32.cs
@@ -30,13 +30,15 @@
 
 namespace LibUsbDotNet.Internal
 {
+#if !NETSTANDARD1_5
     [SuppressUnmanagedCodeSecurity]
+#endif
     internal static class Kernel32
     {
         private const int FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000;
         private static readonly StringBuilder m_sbSysMsg = new StringBuilder(1024);
 
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         public static extern SafeFileHandle CreateFile(string fileName,
                                                        [MarshalAs(UnmanagedType.U4)] NativeFileAccess fileAccess,
                                                        [MarshalAs(UnmanagedType.U4)] NativeFileShare fileShare,
@@ -45,7 +47,7 @@ public static extern SafeFileHandle CreateFile(string fileName,
                                                        NativeFileFlag flags,
                                                        IntPtr template);
 
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         private static extern int FormatMessage(int dwFlags,
                                                 IntPtr lpSource,
                                                 int dwMessageId,
@@ -65,7 +67,11 @@ public static string FormatSystemMessage(int dwMessageId)
                 int ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
                                         IntPtr.Zero,
                                         dwMessageId,
+#if !NETSTANDARD1_5
                                         CultureInfo.CurrentCulture.LCID,
+#else
+                                        0,
+#endif
                                         m_sbSysMsg,
                                         m_sbSysMsg.Capacity - 1,
                                         IntPtr.Zero);
@@ -75,7 +81,7 @@ public static string FormatSystemMessage(int dwMessageId)
             }
         }
 
-        #region DeviceIoControl
+#region DeviceIoControl
 
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Ansi)]
         public static extern bool DeviceIoControl(SafeHandle hDevice,
@@ -117,7 +123,7 @@ public static extern bool DeviceIoControlAsObject(SafeHandle hDevice,
                                                           ref int pBytesReturned,
                                                           IntPtr Overlapped);
 
-        #endregion
+#endregion
     }
 
     [Flags]
diff --git a/stage/LibWinUsb/Internal/OverlappedTransferContext.cs b/stage/LibUsbDotNet/Internal/OverlappedTransferContext.cs
similarity index 88%
rename from stage/LibWinUsb/Internal/OverlappedTransferContext.cs
rename to stage/LibUsbDotNet/Internal/OverlappedTransferContext.cs
index 9c2fe8f..1784f66 100644
--- a/stage/LibWinUsb/Internal/OverlappedTransferContext.cs
+++ b/stage/LibUsbDotNet/Internal/OverlappedTransferContext.cs
@@ -43,12 +43,12 @@ public override ErrorCode Submit()
             int iTransferred;
             ErrorCode eReturn = ErrorCode.Success;
 
-            if (mTransferCancelEvent.WaitOne(0, false)) return ErrorCode.IoCancelled;
-            if (!mTransferCompleteEvent.WaitOne(0, UsbConstants.EXIT_CONTEXT)) return ErrorCode.ResourceBusy;
+            if (mTransferCancelEvent.WaitOne(0)) return ErrorCode.IoCancelled;
+            if (!mTransferCompleteEvent.WaitOne(0)) return ErrorCode.ResourceBusy;
 
             mHasWaitBeenCalled = false;
             mTransferCompleteEvent.Reset();
-            Overlapped.Init(mTransferCompleteEvent.SafeWaitHandle.DangerousGetHandle());
+            Overlapped.Init(mTransferCompleteEvent.GetSafeWaitHandle().DangerousGetHandle());
 
             int ret = EndpointBase.PipeTransferSubmit(NextBufPtr,
                                                       RequestCount,
@@ -72,7 +72,7 @@ public override ErrorCode Wait(out int transferredCount, bool cancel)
             transferredCount = 0;
             bool bSuccess;
             // Temporarily release the transfer lock while we wait for something to happen.
-            int iWait = WaitHandle.WaitAny(new WaitHandle[] { mTransferCompleteEvent, mTransferCancelEvent }, mTimeout, UsbConstants.EXIT_CONTEXT);
+            int iWait = WaitHandle.WaitAny(new WaitHandle[] { mTransferCompleteEvent, mTransferCancelEvent }, mTimeout);
             if (iWait == WaitHandle.WaitTimeout && !cancel)
             {
                 return ErrorCode.IoTimedOut;
@@ -82,7 +82,7 @@ public override ErrorCode Wait(out int transferredCount, bool cancel)
             if (iWait != 0)
             {
                 bSuccess = EndpointBase.mUsbApi.AbortPipe(EndpointBase.Handle, EndpointBase.EpNum);
-                bool bTransferComplete = mTransferCompleteEvent.WaitOne(100, UsbConstants.EXIT_CONTEXT);
+                bool bTransferComplete = mTransferCompleteEvent.WaitOne(100);
                 mTransferCompleteEvent.Set();
                 if (!bSuccess || !bTransferComplete)
                 {
diff --git a/stage/LibUsbDotNet/Internal/RegistryKeyPermissionCheck.cs b/stage/LibUsbDotNet/Internal/RegistryKeyPermissionCheck.cs
new file mode 100644
index 0000000..0d2fa5a
--- /dev/null
+++ b/stage/LibUsbDotNet/Internal/RegistryKeyPermissionCheck.cs
@@ -0,0 +1,11 @@
+#if NETSTANDARD1_5
+namespace LibUsbDotNet.Internal
+{
+    internal enum RegistryKeyPermissionCheck
+    {
+        Default = 0,
+        ReadSubTree = 1,
+        ReadWriteSubTree = 2
+    }
+}
+#endif
diff --git a/stage/LibWinUsb/Internal/SafeOverlapped.cs b/stage/LibUsbDotNet/Internal/SafeOverlapped.cs
similarity index 100%
rename from stage/LibWinUsb/Internal/SafeOverlapped.cs
rename to stage/LibUsbDotNet/Internal/SafeOverlapped.cs
diff --git a/stage/LibUsbDotNet/Internal/SetupApi.cs b/stage/LibUsbDotNet/Internal/SetupApi.cs
new file mode 100644
index 0000000..fbf8a72
--- /dev/null
+++ b/stage/LibUsbDotNet/Internal/SetupApi.cs
@@ -0,0 +1,670 @@
+// Copyright © 2006-2010 Travis Robinson. All rights reserved.
+// 
+// website: http://sourceforge.net/projects/libusbdotnet
+// e-mail:  libusbdotnet@gmail.com
+// 
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2 of the License, or 
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful, but 
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+// 
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. or 
+// visit www.gnu.org.
+// 
+// 
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using LibUsbDotNet.Main;
+using LibUsbDotNet.WinUsb;
+using Microsoft.Win32;
+
+// ReSharper disable InconsistentNaming
+// ReSharper disable ClassNeverInstantiated.Local
+// ReSharper disable UnusedMember.Local
+// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
+// ReSharper disable UnusedParameter.Local
+
+namespace LibUsbDotNet.Internal
+{
+    internal class SetupApi
+    {
+        #region Delegates
+
+        public delegate bool ClassEnumeratorDelegate(
+            IntPtr DeviceInfoSet, int deviceIndex, ref SP_DEVINFO_DATA DeviceInfoData, object classEnumeratorCallbackParam1);
+
+        #endregion
+
+        #region Enumerations
+
+        #region CR enum
+
+        public enum CR
+        {
+            SUCCESS = (0x00000000),
+            DEFAULT = (0x00000001),
+            OUT_OF_MEMORY = (0x00000002),
+            INVALID_POINTER = (0x00000003),
+            INVALID_FLAG = (0x00000004),
+            INVALID_DEVNODE = (0x00000005),
+            INVALID_DEVINST = INVALID_DEVNODE,
+            INVALID_RES_DES = (0x00000006),
+            INVALID_LOG_CONF = (0x00000007),
+            INVALID_ARBITRATOR = (0x00000008),
+            INVALID_NODELIST = (0x00000009),
+            DEVNODE_HAS_REQS = (0x0000000A),
+            DEVINST_HAS_REQS = DEVNODE_HAS_REQS,
+            INVALID_RESOURCEID = (0x0000000B),
+            DLVXD_NOT_FOUND = (0x0000000C), // WIN 95 ONLY
+            NO_SUCH_DEVNODE = (0x0000000D),
+            NO_SUCH_DEVINST = NO_SUCH_DEVNODE,
+            NO_MORE_LOG_CONF = (0x0000000E),
+            NO_MORE_RES_DES = (0x0000000F),
+            ALREADY_SUCH_DEVNODE = (0x00000010),
+            ALREADY_SUCH_DEVINST = ALREADY_SUCH_DEVNODE,
+            INVALID_RANGE_LIST = (0x00000011),
+            INVALID_RANGE = (0x00000012),
+            FAILURE = (0x00000013),
+            NO_SUCH_LOGICAL_DEV = (0x00000014),
+            CREATE_BLOCKED = (0x00000015),
+            NOT_SYSTEM_VM = (0x00000016), // WIN 95 ONLY
+            REMOVE_VETOED = (0x00000017),
+            APM_VETOED = (0x00000018),
+            INVALID_LOAD_TYPE = (0x00000019),
+            BUFFER_SMALL = (0x0000001A),
+            NO_ARBITRATOR = (0x0000001B),
+            NO_REGISTRY_HANDLE = (0x0000001C),
+            REGISTRY_ERROR = (0x0000001D),
+            INVALID_DEVICE_ID = (0x0000001E),
+            INVALID_DATA = (0x0000001F),
+            INVALID_API = (0x00000020),
+            DEVLOADER_NOT_READY = (0x00000021),
+            NEED_RESTART = (0x00000022),
+            NO_MORE_HW_PROFILES = (0x00000023),
+            DEVICE_NOT_THERE = (0x00000024),
+            NO_SUCH_VALUE = (0x00000025),
+            WRONG_TYPE = (0x00000026),
+            INVALID_PRIORITY = (0x00000027),
+            NOT_DISABLEABLE = (0x00000028),
+            FREE_RESOURCES = (0x00000029),
+            QUERY_VETOED = (0x0000002A),
+            CANT_SHARE_IRQ = (0x0000002B),
+            NO_DEPENDENT = (0x0000002C),
+            SAME_RESOURCES = (0x0000002D),
+            NO_SUCH_REGISTRY_KEY = (0x0000002E),
+            INVALID_MACHINENAME = (0x0000002F), // NT ONLY
+            REMOTE_COMM_FAILURE = (0x00000030), // NT ONLY
+            MACHINE_UNAVAILABLE = (0x00000031), // NT ONLY
+            NO_CM_SERVICES = (0x00000032), // NT ONLY
+            ACCESS_DENIED = (0x00000033), // NT ONLY
+            CALL_NOT_IMPLEMENTED = (0x00000034),
+            INVALID_PROPERTY = (0x00000035),
+            DEVICE_INTERFACE_ACTIVE = (0x00000036),
+            NO_SUCH_DEVICE_INTERFACE = (0x00000037),
+            INVALID_REFERENCE_STRING = (0x00000038),
+            INVALID_CONFLICT_LIST = (0x00000039),
+            INVALID_INDEX = (0x0000003A),
+            INVALID_STRUCTURE_SIZE = (0x0000003B),
+            NUM_CR_RESULTS = (0x0000003C)
+        }
+
+        #endregion
+
+        #region DeviceInterfaceDataFlags enum
+
+        public enum DeviceInterfaceDataFlags : uint
+        {
+            Active = 0x00000001,
+            Default = 0x00000002,
+            Removed = 0x00000004
+        }
+
+        #endregion
+
+        #region DICFG enum
+
+        [Flags]
+        public enum DICFG
+        {
+            /// <summary>
+            /// Return only the device that is associated with the system default device interface, if one is set, for the specified device interface classes. 
+            ///  only valid with <see cref="DEVICEINTERFACE"/>.
+            /// </summary>
+            DEFAULT = 0x00000001,
+            /// <summary>
+            /// Return only devices that are currently present in a system. 
+            /// </summary>
+            PRESENT = 0x00000002,
+            /// <summary>
+            /// Return a list of installed devices for all device setup classes or all device interface classes. 
+            /// </summary>
+            ALLCLASSES = 0x00000004,
+            /// <summary>
+            /// Return only devices that are a part of the current hardware profile. 
+            /// </summary>
+            PROFILE = 0x00000008,
+            /// <summary>
+            /// Return devices that support device interfaces for the specified device interface classes. 
+            /// </summary>
+            DEVICEINTERFACE = 0x00000010,
+        }
+
+        #endregion
+
+        #region DICUSTOMDEVPROP enum
+
+        public enum DICUSTOMDEVPROP
+        {
+            NONE = 0,
+            MERGE_MULTISZ = 0x00000001,
+        }
+
+        #endregion
+
+        [Flags]
+        public enum DevKeyType
+        {
+            DEV = 0x00000001,         // Open/Create/Delete device key
+            DRV = 0x00000002,         // Open/Create/Delete driver key
+            BOTH = 0x00000004,         // Delete both driver and Device key
+
+        }
+        #endregion
+
+        private const string STRUCT_END_MARK = "STRUCT_END_MARK";
+
+        public static readonly Guid GUID_DEVINTERFACE_USB_DEVICE = new Guid("f18a0e88-c30c-11d0-8815-00a0c906bed8");
+        
+        public static bool Is64Bit
+        {
+            get { return (IntPtr.Size == 8); }
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dnDevInst">Caller-supplied device instance handle that is bound to the local machine.</param>
+        /// <param name="Buffer">Address of a buffer to receive a device instance ID string. The required buffer size can be obtained by calling CM_Get_Device_ID_Size, then incrementing the received value to allow room for the string's terminating NULL. </param>
+        /// <param name="BufferLen">Caller-supplied length, in characters, of the buffer specified by Buffer. </param>
+        /// <param name="ulFlags">Not used. set to 0.</param>
+        /// <returns>If the operation succeeds, the function returns CR_SUCCESS. Otherwise, it returns one of the CR_-prefixed error codes defined in cfgmgr32.h.</returns>
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode)]
+        public static extern CR CM_Get_Device_ID(IntPtr dnDevInst, IntPtr Buffer, int BufferLen, int ulFlags);
+
+
+        /// <summary>
+        /// The CM_Get_Parent function obtains a device instance handle to the parent node of a specified device node, in the local machine's device tree.
+        /// </summary>
+        /// <param name="pdnDevInst">Caller-supplied pointer to the device instance handle to the parent node that this function retrieves. The retrieved handle is bound to the local machine.</param>
+        /// <param name="dnDevInst">Caller-supplied device instance handle that is bound to the local machine. </param>
+        /// <param name="ulFlags">Not used. set to 0.</param>
+        /// <returns>If the operation succeeds, the function returns CR_SUCCESS. Otherwise, it returns one of the CR_-prefixed error codes defined in cfgmgr32.h.</returns>
+        [DllImport("setupapi.dll")]
+        public static extern CR CM_Get_Parent(out IntPtr pdnDevInst, IntPtr dnDevInst, int ulFlags);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode /*, SetLastError = true*/)]
+        public static extern bool SetupDiDestroyDeviceInfoList(IntPtr hDevInfo);
+
+        [DllImport("setupapi.dll", SetLastError = true)]
+        public static extern bool SetupDiEnumDeviceInfo(IntPtr DeviceInfoSet, int MemberIndex, ref SP_DEVINFO_DATA DeviceInfoData);
+
+        /// <summary>
+        /// The SetupDiEnumDeviceInterfaces function enumerates the device interfaces that are contained in a device information set. 
+        /// </summary>
+        /// <param name="hDevInfo">A pointer to a device information set that contains the device interfaces for which to return information. This handle is typically returned by SetupDiGetClassDevs. </param>
+        /// <param name="devInfo">A pointer to an SP_DEVINFO_DATA structure that specifies a device information element in DeviceInfoSet. This parameter is optional and can be NULL. If this parameter is specified, SetupDiEnumDeviceInterfaces constrains the enumeration to the interfaces that are supported by the specified device. If this parameter is NULL, repeated calls to SetupDiEnumDeviceInterfaces return information about the interfaces that are associated with all the device information elements in DeviceInfoSet. This pointer is typically returned by SetupDiEnumDeviceInfo. </param>
+        /// <param name="interfaceClassGuid">A pointer to a GUID that specifies the device interface class for the requested interface. </param>
+        /// <param name="memberIndex">A zero-based index into the list of interfaces in the device information set. The caller should call this function first with MemberIndex set to zero to obtain the first interface. Then, repeatedly increment MemberIndex and retrieve an interface until this function fails and GetLastError returns ERROR_NO_MORE_ITEMS.  If DeviceInfoData specifies a particular device, the MemberIndex is relative to only the interfaces exposed by that device.</param>
+        /// <param name="deviceInterfaceData">A pointer to a caller-allocated buffer that contains, on successful return, a completed SP_DEVICE_INTERFACE_DATA structure that identifies an interface that meets the search parameters. The caller must set DeviceInterfaceData.cbSize to sizeof(SP_DEVICE_INTERFACE_DATA) before calling this function. </param>
+        /// <returns></returns>
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern Boolean SetupDiEnumDeviceInterfaces(IntPtr hDevInfo,
+                                                                 ref SP_DEVINFO_DATA devInfo,
+                                                                 ref Guid interfaceClassGuid,
+                                                                 int memberIndex,
+                                                                 ref SP_DEVICE_INTERFACE_DATA deviceInterfaceData);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern Boolean SetupDiEnumDeviceInterfaces(IntPtr hDevInfo,
+                                                                 [MarshalAs(UnmanagedType.AsAny)] object devInfo,
+                                                                 ref Guid interfaceClassGuid,
+                                                                 int memberIndex,
+                                                                 ref SP_DEVICE_INTERFACE_DATA deviceInterfaceData);
+
+        /// <summary>
+        /// The SetupDiGetClassDevs function returns a handle to a device information set that contains requested device information elements for a local machine. 
+        /// </summary>
+        /// <param name="ClassGuid">A pointer to the GUID for a device setup class or a device interface class. This pointer is optional and can be NULL. For more information about how to set ClassGuid, see the following Comments section. </param>
+        /// <param name="Enumerator">A pointer to a NULL-terminated string that supplies the name of a Plug and Play (PnP) enumerator or a PnP device instance identifier. This pointer is optional and can be NULL. For more information about how to set the Enumerator value, see the following Comments section. </param>
+        /// <param name="hwndParent">A handle of the top-level window to be used for a user interface that is associated with installing a device instance in the device information set. This handle is optional and can be NULL. </param>
+        /// <param name="Flags">A variable of type DWORD that specifies control options that filter the device information elements that are added to the device information set. This parameter can be a bitwise OR of zero or more of the following flags.</param>
+        /// <returns></returns>
+        [DllImport("setupapi.dll", CharSet = CharSet.Ansi, EntryPoint = "SetupDiGetClassDevsA")]
+        public static extern IntPtr SetupDiGetClassDevs(ref Guid ClassGuid,
+                                                        [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
+                                                        IntPtr hwndParent,
+                                                        DICFG Flags);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Ansi, EntryPoint = "SetupDiGetClassDevsA")]
+        public static extern IntPtr SetupDiGetClassDevs(ref Guid ClassGuid, int Enumerator, IntPtr hwndParent, DICFG Flags);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Ansi, EntryPoint = "SetupDiGetClassDevsA")]
+        public static extern IntPtr SetupDiGetClassDevs(int ClassGuid, string Enumerator, IntPtr hwndParent, DICFG Flags);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern bool SetupDiGetCustomDeviceProperty(IntPtr DeviceInfoSet,
+                                                                 ref SP_DEVINFO_DATA DeviceInfoData,
+                                                                 string CustomPropertyName,
+                                                                 DICUSTOMDEVPROP Flags,
+                                                                 out RegistryValueKind PropertyRegDataType,
+                                                                 Byte[] PropertyBuffer,
+                                                                 int PropertyBufferSize,
+                                                                 out int RequiredSize);
+
+        /// <summary>
+        /// The SetupDiGetDeviceInstanceId function retrieves the device instance ID that is associated with a device information element.
+        /// </summary>
+        /// <param name="DeviceInfoSet">A handle to the device information set that contains the device information element that represents the device for which to retrieve a device instance ID. </param>
+        /// <param name="DeviceInfoData">A pointer to an SP_DEVINFO_DATA structure that specifies the device information element in DeviceInfoSet. </param>
+        /// <param name="DeviceInstanceId">A pointer to the character buffer that will receive the NULL-terminated device instance ID for the specified device information element. For information about device instance IDs, see Device Identification Strings.</param>
+        /// <param name="DeviceInstanceIdSize">The size, in characters, of the DeviceInstanceId buffer. </param>
+        /// <param name="RequiredSize">A pointer to the variable that receives the number of characters required to store the device instance ID.</param>
+        /// <returns>The function returns TRUE if it is successful. Otherwise, it returns FALSE and the logged error can be retrieved with a call to GetLastError.</returns>
+        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Ansi, EntryPoint = "SetupDiGetDeviceInstanceIdA")]
+        public static extern bool SetupDiGetDeviceInstanceId(IntPtr DeviceInfoSet,
+                                                             ref SP_DEVINFO_DATA DeviceInfoData,
+                                                             StringBuilder DeviceInstanceId,
+                                                             int DeviceInstanceIdSize,
+                                                             out int RequiredSize);
+
+        [DllImport(@"setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern Boolean SetupDiGetDeviceInterfaceDetail(IntPtr hDevInfo,
+                                                                     ref SP_DEVICE_INTERFACE_DATA deviceInterfaceData,
+                                                                     DEVICE_INTERFACE_DETAIL_HANDLE deviceInterfaceDetailData,
+                                                                     int deviceInterfaceDetailDataSize,
+                                                                     out int requiredSize,
+                                                                     [MarshalAs(UnmanagedType.AsAny)] object deviceInfoData);
+        [DllImport(@"setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern Boolean SetupDiGetDeviceInterfaceDetail(IntPtr hDevInfo,
+                                                                     ref SP_DEVICE_INTERFACE_DATA deviceInterfaceData,
+                                                                     DEVICE_INTERFACE_DETAIL_HANDLE deviceInterfaceDetailData,
+                                                                     int deviceInterfaceDetailDataSize,
+                                                                     out int requiredSize,
+                                                                     ref SP_DEVINFO_DATA deviceInfoData);
+        
+        
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode)]
+        public static extern bool SetupDiGetDeviceInterfacePropertyKeys(IntPtr DeviceInfoSet,
+                                                                        ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
+                                                                        byte[] propKeyBuffer,
+                                                                        int propKeyBufferElements,
+                                                                        out int RequiredPropertyKeyCount,
+                                                                        int Flags);
+
+        /// <summary>
+        /// The SetupDiGetDeviceRegistryProperty function retrieves the specified device property.
+        /// This handle is typically returned by the SetupDiGetClassDevs or SetupDiGetClassDevsEx function.
+        /// </summary>
+        /// <param Name="DeviceInfoSet">Handle to the device information set that contains the interface and its underlying device.</param>
+        /// <param Name="DeviceInfoData">Pointer to an SP_DEVINFO_DATA structure that defines the device instance.</param>
+        /// <param Name="Property">Device property to be retrieved. SEE MSDN</param>
+        /// <param Name="PropertyRegDataType">Pointer to a variable that receives the registry data Type. This parameter can be NULL.</param>
+        /// <param Name="PropertyBuffer">Pointer to a buffer that receives the requested device property.</param>
+        /// <param Name="PropertyBufferSize">Size of the buffer, in bytes.</param>
+        /// <param Name="RequiredSize">Pointer to a variable that receives the required buffer size, in bytes. This parameter can be NULL.</param>
+        /// <returns>If the function succeeds, the return value is nonzero.</returns>
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet,
+                                                                   ref SP_DEVINFO_DATA DeviceInfoData,
+                                                                   SPDRP Property,
+                                                                   out RegistryValueKind PropertyRegDataType,
+                                                                   byte[] PropertyBuffer,
+                                                                   int PropertyBufferSize,
+                                                                   out int RequiredSize);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode)]
+        public static extern CR CM_Get_Device_ID(uint dnDevInst, StringBuilder Buffer, int BufferLen, int ulFlags);
+
+        [DllImport("Setupapi", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern IntPtr SetupDiOpenDevRegKey(IntPtr hDeviceInfoSet, ref SP_DEVINFO_DATA deviceInfoData, int scope, int hwProfile, DevKeyType keyType, RegistryKeyPermissionCheck samDesired);
+
+        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern int RegEnumValue(IntPtr hKey, int index, StringBuilder lpValueName, ref int lpcValueName, IntPtr lpReserved, out RegistryValueKind lpType, byte[] data, ref int dataLength);
+
+        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern int RegEnumValue(IntPtr hKey, int index, StringBuilder lpValueName, ref int lpcValueName, IntPtr lpReserved, out RegistryValueKind lpType, StringBuilder data, ref int dataLength);
+
+        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern int RegCloseKey(IntPtr hKey);
+
+        public static bool EnumClassDevs(string enumerator,
+                                         DICFG flags,
+                                         ClassEnumeratorDelegate classEnumeratorCallback,
+                                         object classEnumeratorCallbackParam1)
+        {
+            SP_DEVINFO_DATA dev_info_data = SP_DEVINFO_DATA.Empty;
+
+            int dev_index = 0;
+
+            IntPtr dev_info = SetupDiGetClassDevs(0, enumerator, IntPtr.Zero, flags);
+
+            if (dev_info == IntPtr.Zero || dev_info.ToInt64() == -1) return false;
+            bool bSuccess = false;
+            while (SetupDiEnumDeviceInfo(dev_info, dev_index, ref dev_info_data))
+            {
+                if (classEnumeratorCallback(dev_info, dev_index, ref dev_info_data, classEnumeratorCallbackParam1))
+                {
+                    bSuccess = true;
+                    break;
+                }
+
+                dev_index++;
+            }
+
+            SetupDiDestroyDeviceInfoList(dev_info);
+
+            return bSuccess;
+        }
+
+        public static void getSPDRPProperties(IntPtr deviceInfoSet, ref SP_DEVINFO_DATA deviceInfoData, Dictionary<string, object> deviceProperties)
+        {
+            byte[] propBuffer = new byte[1024];
+            Dictionary<string, int> allProps = Helper.GetEnumData(typeof(SPDRP));
+            foreach (KeyValuePair<string, int> prop in allProps)
+            {
+                object oValue = String.Empty;
+                int iReturnBytes;
+                RegistryValueKind regPropType;
+                bool bSuccess = SetupDiGetDeviceRegistryProperty(deviceInfoSet,
+                                                                 ref deviceInfoData,
+                                                                 (SPDRP)prop.Value,
+                                                                 out regPropType,
+                                                                 propBuffer,
+                                                                 propBuffer.Length,
+                                                                 out iReturnBytes);
+                if (bSuccess)
+                {
+                    switch ((SPDRP)prop.Value)
+                    {
+                        case SPDRP.PhysicalDeviceObjectName:
+                        case SPDRP.LocationInformation:
+                        case SPDRP.Class:
+                        case SPDRP.Mfg:
+                        case SPDRP.DeviceDesc:
+                        case SPDRP.Driver:
+                        case SPDRP.EnumeratorName:
+                        case SPDRP.FriendlyName:
+                        case SPDRP.ClassGuid:
+                            oValue = UsbRegistry.GetAsString(propBuffer, iReturnBytes);
+                            break;
+                        case SPDRP.HardwareId:
+                        case SPDRP.CompatibleIds:
+                        case SPDRP.LocationPaths:
+                            oValue = UsbRegistry.GetAsStringArray(propBuffer, iReturnBytes);
+                            break;
+                        case SPDRP.BusNumber:
+                        case SPDRP.InstallState:
+                        case SPDRP.LegacyBusType:
+                        case SPDRP.RemovalPolicy:
+                        case SPDRP.UiNumber:
+                        case SPDRP.Address:
+                            oValue = UsbRegistry.GetAsStringInt32(propBuffer, iReturnBytes);
+                            break;
+                        case SPDRP.BusTypeGuid:
+                            oValue = UsbRegistry.GetAsGuid(propBuffer, iReturnBytes);
+                            break;
+                    }
+                }
+                else
+                    oValue = String.Empty;
+
+                deviceProperties.Add(prop.Key, oValue);
+            }
+        }
+
+        public static bool SetupDiGetDeviceInterfaceDetailLength(IntPtr hDevInfo,
+                                                                 ref SP_DEVICE_INTERFACE_DATA deviceInterfaceData,
+                                                                 out int requiredLength)
+        {
+            DEVICE_INTERFACE_DETAIL_HANDLE tmp = new DEVICE_INTERFACE_DETAIL_HANDLE();
+            return SetupDiGetDeviceInterfaceDetail(hDevInfo, ref deviceInterfaceData, tmp, 0, out requiredLength, null);
+        }
+
+        public static bool SetupDiGetDeviceRegistryProperty(out byte[] regBytes,
+                                                            IntPtr DeviceInfoSet,
+                                                            ref SP_DEVINFO_DATA DeviceInfoData,
+                                                            SPDRP Property)
+        {
+            regBytes = null;
+            byte[] tmp = new byte[1024];
+            int iReqSize;
+            RegistryValueKind regValueType;
+            if (!SetupDiGetDeviceRegistryProperty(DeviceInfoSet, ref DeviceInfoData, Property, out regValueType, tmp, tmp.Length, out iReqSize))
+            {
+                UsbError.Error(ErrorCode.Win32Error, Marshal.GetLastWin32Error(), "SetupDiGetDeviceRegistryProperty", typeof(SetupApi));
+                return false;
+            }
+            regBytes = new byte[iReqSize];
+            Array.Copy(tmp, regBytes, regBytes.Length);
+            return true;
+        }
+
+        public static bool SetupDiGetDeviceRegistryProperty(out string regSZ, IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property)
+        {
+            regSZ = null;
+            byte[] tmp;
+            if (SetupDiGetDeviceRegistryProperty(out tmp, DeviceInfoSet, ref DeviceInfoData, Property))
+            {
+                regSZ = Encoding.Unicode.GetString(tmp).TrimEnd(new char[] {'\0'});
+                return true;
+            }
+            return false;
+        }
+
+        public static bool SetupDiGetDeviceRegistryProperty(out string[] regMultiSZ,
+                                                            IntPtr DeviceInfoSet,
+                                                            ref SP_DEVINFO_DATA DeviceInfoData,
+                                                            SPDRP Property)
+        {
+            regMultiSZ = null;
+            string tmp;
+            if (SetupDiGetDeviceRegistryProperty(out tmp, DeviceInfoSet, ref DeviceInfoData, Property))
+            {
+                regMultiSZ = tmp.Split(new char[] {'\0'}, StringSplitOptions.RemoveEmptyEntries);
+                return true;
+            }
+            return false;
+        }
+
+        private static bool cbHasDeviceInterfaceGUID(IntPtr DeviceInfoSet,
+                                                     int deviceIndex,
+                                                     ref SP_DEVINFO_DATA DeviceInfoData,
+                                                     object devInterfaceGuid)
+        {
+            RegistryValueKind propertyType;
+            byte[] propBuffer = new byte[256];
+            int requiredSize;
+            bool bSuccess = SetupDiGetCustomDeviceProperty(DeviceInfoSet,
+                                                           ref DeviceInfoData,
+                                                           "DeviceInterfaceGuids",
+                                                           DICUSTOMDEVPROP.NONE,
+                                                           out propertyType,
+                                                           propBuffer,
+                                                           propBuffer.Length,
+                                                           out requiredSize);
+            if (bSuccess)
+            {
+                Guid devGuid = (Guid) devInterfaceGuid;
+                string[] stemp = Encoding.Unicode.GetString(propBuffer, 0, requiredSize).Split(new char[] {'\0'},
+                                                                                               StringSplitOptions.RemoveEmptyEntries);
+                Guid findGuid = new Guid(stemp[0]);
+                return (devGuid == findGuid);
+            }
+            return false;
+        }
+
+        #region Nested Types
+
+        #region Nested type: DEVICE_INTERFACE_DETAIL_HANDLE
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct DEVICE_INTERFACE_DETAIL_HANDLE
+        {
+            private IntPtr mPtr;
+
+            internal DEVICE_INTERFACE_DETAIL_HANDLE(IntPtr ptrInit) { mPtr = ptrInit; }
+        }
+
+        #endregion
+
+        #region Nested type: DeviceInterfaceDetailHelper
+
+        public class DeviceInterfaceDetailHelper
+        {
+            public static readonly int SIZE = Is64Bit ? 8 : 6;
+            private IntPtr mpDevicePath;
+            private IntPtr mpStructure;
+
+            public DeviceInterfaceDetailHelper(int maximumLength)
+            {
+                mpStructure = Marshal.AllocHGlobal(maximumLength);
+                mpDevicePath = new IntPtr(mpStructure.ToInt64() + Marshal.SizeOf(typeof (int)));
+            }
+
+            public DEVICE_INTERFACE_DETAIL_HANDLE Handle
+            {
+                get
+                {
+                    Marshal.WriteInt32(mpStructure, SIZE);
+                    return new DEVICE_INTERFACE_DETAIL_HANDLE(mpStructure);
+                }
+            }
+
+            public string DevicePath
+            {
+                get { return Marshal.PtrToStringUni(mpDevicePath); }
+            }
+
+
+            public void Free()
+            {
+                if (mpStructure != IntPtr.Zero)
+                    Marshal.FreeHGlobal(mpStructure);
+
+                mpDevicePath = IntPtr.Zero;
+                mpStructure = IntPtr.Zero;
+            }
+
+
+            ~DeviceInterfaceDetailHelper() { Free(); }
+        }
+
+        #endregion
+
+        #region Nested type: MaxStructSizes
+
+        private class MaxStructSizes
+        {
+            public const int SP_DEVINFO_DATA = 40;
+        }
+
+        #endregion
+
+        #region Nested type: SP_DEVICE_INTERFACE_DATA
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SP_DEVICE_INTERFACE_DATA
+        {
+            public static readonly SP_DEVICE_INTERFACE_DATA Empty = new SP_DEVICE_INTERFACE_DATA(Marshal.SizeOf(typeof (SP_DEVICE_INTERFACE_DATA)));
+
+            public UInt32 cbSize;
+            public Guid interfaceClassGuid;
+            public UInt32 flags;
+            private UIntPtr reserved;
+
+            private SP_DEVICE_INTERFACE_DATA(int size)
+            {
+                cbSize = (uint) size;
+                reserved = UIntPtr.Zero;
+                flags = 0;
+                interfaceClassGuid = Guid.Empty;
+            }
+        }
+
+        #endregion
+
+        //[StructLayout(LayoutKind.Sequential, Pack = 1)]
+        //public struct SP_DEVICE_INTERFACE_DATA
+        //{
+        //    public static readonly SP_DEVICE_INTERFACE_DATA Empty = new SP_DEVICE_INTERFACE_DATA(GetSetupApiSize(typeof (SP_DEVICE_INTERFACE_DATA)));
+
+        //    public readonly uint cbSize;
+        //    public Guid interfaceClassGuid;
+        //    public DeviceInterfaceDataFlags flags;
+        //    private IntPtr reserved;
+
+        //    private SP_DEVICE_INTERFACE_DATA(int size)
+        //    {
+        //        reserved = new IntPtr();
+        //        flags = 0;
+        //        interfaceClassGuid = Guid.Empty;
+        //        cbSize = size;
+        //    }
+        //}
+
+        #region Nested type: SP_DEVINFO_DATA
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SP_DEVINFO_DATA
+        {
+            public static readonly SP_DEVINFO_DATA Empty = new SP_DEVINFO_DATA(Marshal.SizeOf(typeof (SP_DEVINFO_DATA)));
+
+            public UInt32 cbSize;
+            public Guid ClassGuid;
+            public UInt32 DevInst;
+            public IntPtr Reserved;
+
+            private SP_DEVINFO_DATA(int size)
+            {
+                cbSize = (uint) size;
+                ClassGuid = Guid.Empty;
+                DevInst = 0;
+                Reserved = IntPtr.Zero;
+            }
+        }
+
+        #endregion
+
+        //[StructLayout(LayoutKind.Sequential, Pack = IntPtr.Size==8?8:1, Size = MaxStructSizes.SP_DEVINFO_DATA)]
+        //public struct SP_DEVINFO_DATA
+        //{
+        //    public static readonly SP_DEVINFO_DATA Empty = new SP_DEVINFO_DATA(Marshal.SizeOf(typeof(SP_DEVINFO_DATA)));
+
+        //    public readonly int cbSize;
+        //    public Guid ClassGuid;
+        //    public IntPtr DevInst;
+        //    public IntPtr Reserved;
+        //    private SP_DEVINFO_DATA(int size)
+        //    {
+        //        cbSize = size;
+        //        ClassGuid = Guid.Empty;
+        //        DevInst = IntPtr.Zero;
+        //        Reserved = IntPtr.Zero;
+
+        //        STRUCT_END_MARK = 0;
+        //    }
+        //}
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/stage/LibWinUsb/Internal/TransferContextBase.cs b/stage/LibUsbDotNet/Internal/TransferContextBase.cs
similarity index 92%
rename from stage/LibWinUsb/Internal/TransferContextBase.cs
rename to stage/LibUsbDotNet/Internal/TransferContextBase.cs
index e5156fc..cd901b8 100644
--- a/stage/LibWinUsb/Internal/TransferContextBase.cs
+++ b/stage/LibUsbDotNet/Internal/TransferContextBase.cs
@@ -71,22 +71,22 @@ protected IntPtr NextBufPtr
 
         public bool IsCancelled
         {
-            get { return mTransferCancelEvent.WaitOne(0, UsbConstants.EXIT_CONTEXT); }
+            get { return mTransferCancelEvent.WaitOne(0); }
         }
 
         public bool IsComplete
         {
-            get { return mTransferCompleteEvent.WaitOne(0, UsbConstants.EXIT_CONTEXT); }
+            get { return mTransferCompleteEvent.WaitOne(0); }
         }
 
         public SafeWaitHandle CancelWaitHandle
         {
-            get { return mTransferCancelEvent.SafeWaitHandle; }
+            get { return mTransferCancelEvent.GetSafeWaitHandle(); }
         }
 
         public SafeWaitHandle CompleteWaitHandle
         {
-            get { return mTransferCompleteEvent.SafeWaitHandle; }
+            get { return mTransferCompleteEvent.GetSafeWaitHandle(); }
         }
 
         #region IDisposable Members
diff --git a/stage/LibWinUsb/Internal/UsbApiBase.cs b/stage/LibUsbDotNet/Internal/UsbApiBase.cs
similarity index 100%
rename from stage/LibWinUsb/Internal/UsbApiBase.cs
rename to stage/LibUsbDotNet/Internal/UsbApiBase.cs
diff --git a/stage/LibWinUsb/Internal/UsbRegex/BaseRegSymbolicName.cs b/stage/LibUsbDotNet/Internal/UsbRegex/BaseRegSymbolicName.cs
similarity index 100%
rename from stage/LibWinUsb/Internal/UsbRegex/BaseRegSymbolicName.cs
rename to stage/LibUsbDotNet/Internal/UsbRegex/BaseRegSymbolicName.cs
diff --git a/stage/LibWinUsb/Internal/UsbRegex/NamedGroup.cs b/stage/LibUsbDotNet/Internal/UsbRegex/NamedGroup.cs
similarity index 100%
rename from stage/LibWinUsb/Internal/UsbRegex/NamedGroup.cs
rename to stage/LibUsbDotNet/Internal/UsbRegex/NamedGroup.cs
diff --git a/stage/LibWinUsb/Internal/UsbRegex/RegHardwareID.cs b/stage/LibUsbDotNet/Internal/UsbRegex/RegHardwareID.cs
similarity index 100%
rename from stage/LibWinUsb/Internal/UsbRegex/RegHardwareID.cs
rename to stage/LibUsbDotNet/Internal/UsbRegex/RegHardwareID.cs
diff --git a/stage/LibWinUsb/Internal/UsbRegex/RegSymbolicName.cs b/stage/LibUsbDotNet/Internal/UsbRegex/RegSymbolicName.cs
similarity index 100%
rename from stage/LibWinUsb/Internal/UsbRegex/RegSymbolicName.cs
rename to stage/LibUsbDotNet/Internal/UsbRegex/RegSymbolicName.cs
diff --git a/stage/LibWinUsb/LibUsb/Internal/LibUsbAPI.cs b/stage/LibUsbDotNet/LibUsb/Internal/LibUsbAPI.cs
similarity index 100%
rename from stage/LibWinUsb/LibUsb/Internal/LibUsbAPI.cs
rename to stage/LibUsbDotNet/LibUsb/Internal/LibUsbAPI.cs
diff --git a/stage/LibWinUsb/LibUsb/Internal/LibUsbDriverIO.cs b/stage/LibUsbDotNet/LibUsb/Internal/LibUsbDriverIO.cs
similarity index 90%
rename from stage/LibWinUsb/LibUsb/Internal/LibUsbDriverIO.cs
rename to stage/LibUsbDotNet/LibUsb/Internal/LibUsbDriverIO.cs
index a4de0a4..2d1440a 100644
--- a/stage/LibWinUsb/LibUsb/Internal/LibUsbDriverIO.cs
+++ b/stage/LibUsbDotNet/LibUsb/Internal/LibUsbDriverIO.cs
@@ -67,7 +67,7 @@ internal static bool UsbIOSync(SafeHandle dev, int code, Object inBuffer, int in
         {
             SafeOverlapped deviceIoOverlapped = new SafeOverlapped();
             ManualResetEvent hEvent = new ManualResetEvent(false);
-            deviceIoOverlapped.Init(hEvent.SafeWaitHandle.DangerousGetHandle());
+            deviceIoOverlapped.Init(hEvent.GetSafeWaitHandle().DangerousGetHandle());
             ret = 0;
 
             if (!Kernel32.DeviceIoControlAsObject(dev, code, inBuffer, inSize, outBuffer, outSize, ref ret, deviceIoOverlapped.GlobalOverlapped))
@@ -82,18 +82,29 @@ internal static bool UsbIOSync(SafeHandle dev, int code, Object inBuffer, int in
                         if (code == LibUsbIoCtl.GET_CUSTOM_REG_PROPERTY) break;
                         UsbError.Error(ErrorCode.Win32Error, iError, String.Format("DeviceIoControl code {0:X8} failed:{1}", code, Kernel32.FormatSystemMessage(iError)), typeof(LibUsbDriverIO));
                     } while (false);
-
+#if !NETSTANDARD1_5
                     hEvent.Close();
+#else
+                    hEvent.Dispose();
+#endif
                     return false;
                 }
             }
             if (Kernel32.GetOverlappedResult(dev, deviceIoOverlapped.GlobalOverlapped, out ret, true))
             {
+#if !NETSTANDARD1_5
                 hEvent.Close();
+#else
+                hEvent.Dispose();
+#endif
                 return true;
             }
             UsbError.Error(ErrorCode.Win32Error, Marshal.GetLastWin32Error(), "GetOverlappedResult failed.\nIoCtlCode:" + code, typeof(LibUsbDriverIO));
+#if !NETSTANDARD1_5
             hEvent.Close();
+#else
+            hEvent.Dispose();
+#endif
             return false;
         }
     }
diff --git a/stage/LibWinUsb/LibUsb/Internal/LibUsbDriverIO_IOControlMessage.cs b/stage/LibUsbDotNet/LibUsb/Internal/LibUsbDriverIO_IOControlMessage.cs
similarity index 100%
rename from stage/LibWinUsb/LibUsb/Internal/LibUsbDriverIO_IOControlMessage.cs
rename to stage/LibUsbDotNet/LibUsb/Internal/LibUsbDriverIO_IOControlMessage.cs
diff --git a/stage/LibWinUsb/LibUsb/Internal/LibUsbIoCtl.cs b/stage/LibUsbDotNet/LibUsb/Internal/LibUsbIoCtl.cs
similarity index 100%
rename from stage/LibWinUsb/LibUsb/Internal/LibUsbIoCtl.cs
rename to stage/LibUsbDotNet/LibUsb/Internal/LibUsbIoCtl.cs
diff --git a/stage/LibWinUsb/LibUsb/Internal/LibUsbRequest.cs b/stage/LibUsbDotNet/LibUsb/Internal/LibUsbRequest.cs
similarity index 100%
rename from stage/LibWinUsb/LibUsb/Internal/LibUsbRequest.cs
rename to stage/LibUsbDotNet/LibUsb/Internal/LibUsbRequest.cs
diff --git a/stage/LibWinUsb/LibUsb/LibUsbDevice.cs b/stage/LibUsbDotNet/LibUsb/LibUsbDevice.cs
similarity index 97%
rename from stage/LibWinUsb/LibUsb/LibUsbDevice.cs
rename to stage/LibUsbDotNet/LibUsb/LibUsbDevice.cs
index fa329e5..0cdd7af 100644
--- a/stage/LibWinUsb/LibUsb/LibUsbDevice.cs
+++ b/stage/LibUsbDotNet/LibUsb/LibUsbDevice.cs
@@ -152,7 +152,7 @@ public override bool Close()
             {
                 ReleaseAllInterfaces();
                 ActiveEndpoints.Clear();
-                mUsbHandle.Close();
+                mUsbHandle.Dispose();
             }
             return true;
         }
diff --git a/stage/LibWinUsb/LibUsb/LibUsbDeviceRegistryKeyRequest.cs b/stage/LibUsbDotNet/LibUsb/LibUsbDeviceRegistryKeyRequest.cs
similarity index 100%
rename from stage/LibWinUsb/LibUsb/LibUsbDeviceRegistryKeyRequest.cs
rename to stage/LibUsbDotNet/LibUsb/LibUsbDeviceRegistryKeyRequest.cs
diff --git a/stage/LibWinUsb/LibUsb/LibUsbKernelType.cs b/stage/LibUsbDotNet/LibUsb/LibUsbKernelType.cs
similarity index 100%
rename from stage/LibWinUsb/LibUsb/LibUsbKernelType.cs
rename to stage/LibUsbDotNet/LibUsb/LibUsbKernelType.cs
diff --git a/stage/LibWinUsb/LibUsb/LibUsbRegistry.cs b/stage/LibUsbDotNet/LibUsb/LibUsbRegistry.cs
similarity index 97%
rename from stage/LibWinUsb/LibUsb/LibUsbRegistry.cs
rename to stage/LibUsbDotNet/LibUsb/LibUsbRegistry.cs
index 1c1f61a..fc61619 100644
--- a/stage/LibWinUsb/LibUsb/LibUsbRegistry.cs
+++ b/stage/LibUsbDotNet/LibUsb/LibUsbRegistry.cs
@@ -156,10 +156,10 @@ public static List<LibUsbRegistry> DeviceList
                         }
                         catch (Exception ex)
                         {
-                            Debug.Print(ex.Message);
+                            Debug.WriteLine(ex.Message);
                         }
                     }
-                    if (deviceHandle != null && !deviceHandle.IsClosed) deviceHandle.Close();
+                    if (deviceHandle != null && !deviceHandle.IsClosed) deviceHandle.Dispose();
                 }
 
                 return deviceList;
diff --git a/stage/LibWinUsb/LibUsbDotNet.csproj b/stage/LibUsbDotNet/LibUsbDotNet.csproj
similarity index 95%
rename from stage/LibWinUsb/LibUsbDotNet.csproj
rename to stage/LibUsbDotNet/LibUsbDotNet.csproj
index 17d34a2..662e37e 100644
--- a/stage/LibWinUsb/LibUsbDotNet.csproj
+++ b/stage/LibUsbDotNet/LibUsbDotNet.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,12 +12,13 @@
     <AssemblyName>LibUsbDotNet</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>LibUsbDotNet.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -96,6 +97,7 @@
     <Compile Include="DeviceNotify\Info\VolumeNotifyInfo.cs" />
     <Compile Include="DeviceNotify\Internal\DevNotifyNativeWindow.cs" />
     <Compile Include="DeviceNotify\Internal\DevBroadcastDeviceinterface.cs" />
+    <Compile Include="DeviceNotify\Internal\SafeHandleZeroOrMinusOneIsInvalid.cs" />
     <Compile Include="DeviceNotify\Internal\SafeNotifyHandle.cs" />
     <Compile Include="DeviceNotify\Linux\LinuxDeviceNotifier.cs" />
     <Compile Include="DeviceNotify\Linux\LinuxDeviceNotifier.DeviceListPolling.cs" />
@@ -112,7 +114,9 @@
     <Compile Include="Info\UsbDeviceInfo.cs" />
     <Compile Include="Info\UsbEndpointInfo.cs" />
     <Compile Include="Info\UsbInterfaceInfo.cs" />
+    <Compile Include="Internal\RegistryKeyPermissionCheck.cs" />
     <Compile Include="Main\DataReceivedEnabledChangedEventArgs.cs" />
+    <Compile Include="Main\ManualResetEventExtensions.cs" />
     <Compile Include="Main\SafeContextHandle.cs" />
     <Compile Include="Internal\SetupApi.cs" />
     <Compile Include="LibUsb\LibUsbKernelType.cs" />
diff --git a/stage/LibWinUsb/LibUsbDotNet.snk b/stage/LibUsbDotNet/LibUsbDotNet.snk
similarity index 100%
rename from stage/LibWinUsb/LibUsbDotNet.snk
rename to stage/LibUsbDotNet/LibUsbDotNet.snk
diff --git a/stage/LibUsbDotNet/LibUsbDotNet.xproj b/stage/LibUsbDotNet/LibUsbDotNet.xproj
new file mode 100644
index 0000000..1f96e55
--- /dev/null
+++ b/stage/LibUsbDotNet/LibUsbDotNet.xproj
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>4becf403-a441-4671-84c5-47448f3e1079</ProjectGuid>
+    <RootNamespace>LibUsbDotnet</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/stage/LibWinUsb/Main/ControlEpLockType.cs b/stage/LibUsbDotNet/Main/ControlEpLockType.cs
similarity index 100%
rename from stage/LibWinUsb/Main/ControlEpLockType.cs
rename to stage/LibUsbDotNet/Main/ControlEpLockType.cs
diff --git a/stage/LibWinUsb/Main/DataEpLockType.cs b/stage/LibUsbDotNet/Main/DataEpLockType.cs
similarity index 100%
rename from stage/LibWinUsb/Main/DataEpLockType.cs
rename to stage/LibUsbDotNet/Main/DataEpLockType.cs
diff --git a/stage/LibWinUsb/Main/DataReceivedEnabledChangedEventArgs.cs b/stage/LibUsbDotNet/Main/DataReceivedEnabledChangedEventArgs.cs
similarity index 100%
rename from stage/LibWinUsb/Main/DataReceivedEnabledChangedEventArgs.cs
rename to stage/LibUsbDotNet/Main/DataReceivedEnabledChangedEventArgs.cs
diff --git a/stage/LibWinUsb/Main/DeviceLockType.cs b/stage/LibUsbDotNet/Main/DeviceLockType.cs
similarity index 100%
rename from stage/LibWinUsb/Main/DeviceLockType.cs
rename to stage/LibUsbDotNet/Main/DeviceLockType.cs
diff --git a/stage/LibWinUsb/Main/DevicePropertyType.cs b/stage/LibUsbDotNet/Main/DevicePropertyType.cs
similarity index 100%
rename from stage/LibWinUsb/Main/DevicePropertyType.cs
rename to stage/LibUsbDotNet/Main/DevicePropertyType.cs
diff --git a/stage/LibWinUsb/Main/EndpointDataEventArgs.cs b/stage/LibUsbDotNet/Main/EndpointDataEventArgs.cs
similarity index 100%
rename from stage/LibWinUsb/Main/EndpointDataEventArgs.cs
rename to stage/LibUsbDotNet/Main/EndpointDataEventArgs.cs
diff --git a/stage/LibWinUsb/Main/EndpointType.cs b/stage/LibUsbDotNet/Main/EndpointType.cs
similarity index 100%
rename from stage/LibWinUsb/Main/EndpointType.cs
rename to stage/LibUsbDotNet/Main/EndpointType.cs
diff --git a/stage/LibWinUsb/Main/ErrorCode.cs b/stage/LibUsbDotNet/Main/ErrorCode.cs
similarity index 100%
rename from stage/LibWinUsb/Main/ErrorCode.cs
rename to stage/LibUsbDotNet/Main/ErrorCode.cs
diff --git a/stage/LibWinUsb/Main/Helper.cs b/stage/LibUsbDotNet/Main/Helper.cs
similarity index 95%
rename from stage/LibWinUsb/Main/Helper.cs
rename to stage/LibUsbDotNet/Main/Helper.cs
index b2068ab..f2f4b06 100644
--- a/stage/LibWinUsb/Main/Helper.cs
+++ b/stage/LibUsbDotNet/Main/Helper.cs
@@ -33,6 +33,8 @@ namespace LibUsbDotNet.Main
     public static class Helper
     {
         private static object mIsLinux;
+
+#if !NETSTANDARD1_5
         private static OperatingSystem mOs;
 
         /// <summary>
@@ -48,6 +50,7 @@ public static OperatingSystem OSVersion
                 return mOs;
             }
         }
+#endif
 
         /// <summary>
         /// True if running on a unix-like operating system.
@@ -57,6 +60,7 @@ public static bool IsLinux
         {
             get
             {
+#if !NETSTANDARD1_5
                 if (ReferenceEquals(mIsLinux, null))
                 {
                     switch (OSVersion.Platform.ToString())
@@ -77,6 +81,9 @@ public static bool IsLinux
                     }
                 }
                 return (bool)mIsLinux;
+#else
+                return RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+#endif
             }
         }
 
@@ -105,7 +112,11 @@ public static void BytesToObject(byte[] sourceBytes, int iStartIndex, int iLengt
         public static Dictionary<string, int> GetEnumData(Type type)
         {
             Dictionary<string, int> dictEnum = new Dictionary<string, int>();
+#if !NETSTANDARD1_5
             FieldInfo[] enumFields = type.GetFields();
+#else
+            FieldInfo[] enumFields = type.GetTypeInfo().GetFields();
+#endif
             for (int iField = 1; iField < enumFields.Length; iField++)
             {
                 object oValue = enumFields[iField].GetRawConstantValue();
@@ -165,7 +176,7 @@ public static string ToString(string sep0, string[] names, string sep1, object[]
             return sb.ToString();
         }
 
-        #region Nested Types
+#region Nested Types
 
         [StructLayout(LayoutKind.Explicit, Pack = 1)]
         internal struct HostEndian16BitValue
@@ -187,7 +198,7 @@ public HostEndian16BitValue(short x)
             public readonly byte B1;
         }
 
-        #endregion
+#endregion
 
         /// <summary>
         /// Builds a formatted hexidecimal string from an array of bytes. 
@@ -270,7 +281,7 @@ public IntPtr Handle
             get { return handle; }
         }
 
-        #region IDisposable Members
+#region IDisposable Members
 
         /// <summary>
         /// Frees and disposes the <see cref="GCHandle"/> for this pinned object.
@@ -323,7 +334,7 @@ protected virtual void Dispose(bool disposing)
 
             }
         }
-        #endregion
+#endregion
 
         ~PinnedHandle()
         {
diff --git a/stage/LibWinUsb/Main/LegacyUsbRegistry.cs b/stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs
similarity index 96%
rename from stage/LibWinUsb/Main/LegacyUsbRegistry.cs
rename to stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs
index 0e74a0d..d7b9f14 100644
--- a/stage/LibWinUsb/Main/LegacyUsbRegistry.cs
+++ b/stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs
@@ -148,10 +148,10 @@ public static List<LegacyUsbRegistry> DeviceList
                             }
                             catch (Exception ex)
                             {
-                                Debug.Print(ex.Message);
+                                Debug.WriteLine(ex.Message);
                             }
                         }
-                        if (deviceHandle != null && !deviceHandle.IsClosed) deviceHandle.Close();
+                        if (deviceHandle != null && !deviceHandle.IsClosed) deviceHandle.Dispose();
                     }
                 }
                 return deviceList;
diff --git a/stage/LibUsbDotNet/Main/ManualResetEventExtensions.cs b/stage/LibUsbDotNet/Main/ManualResetEventExtensions.cs
new file mode 100644
index 0000000..b086273
--- /dev/null
+++ b/stage/LibUsbDotNet/Main/ManualResetEventExtensions.cs
@@ -0,0 +1,15 @@
+#if !NETSTANDARD1_5
+using Microsoft.Win32.SafeHandles;
+using System.Threading;
+
+namespace LibUsbDotNet.Main
+{
+    internal static class ManualResetEventExtensions
+    {
+        public static SafeWaitHandle GetSafeWaitHandle(this ManualResetEvent mre)
+        {
+            return mre.SafeWaitHandle;
+        }
+    }
+}
+#endif
diff --git a/stage/LibWinUsb/Main/ReadEndpointID.cs b/stage/LibUsbDotNet/Main/ReadEndpointID.cs
similarity index 100%
rename from stage/LibWinUsb/Main/ReadEndpointID.cs
rename to stage/LibUsbDotNet/Main/ReadEndpointID.cs
diff --git a/stage/LibWinUsb/Main/SPDRP.cs b/stage/LibUsbDotNet/Main/SPDRP.cs
similarity index 100%
rename from stage/LibWinUsb/Main/SPDRP.cs
rename to stage/LibUsbDotNet/Main/SPDRP.cs
diff --git a/stage/LibWinUsb/Main/SafeContextHandle.cs b/stage/LibUsbDotNet/Main/SafeContextHandle.cs
similarity index 100%
rename from stage/LibWinUsb/Main/SafeContextHandle.cs
rename to stage/LibUsbDotNet/Main/SafeContextHandle.cs
diff --git a/stage/LibWinUsb/Main/SetupApiRegistry.cs b/stage/LibUsbDotNet/Main/SetupApiRegistry.cs
similarity index 96%
rename from stage/LibWinUsb/Main/SetupApiRegistry.cs
rename to stage/LibUsbDotNet/Main/SetupApiRegistry.cs
index 1478f89..c62c803 100644
--- a/stage/LibWinUsb/Main/SetupApiRegistry.cs
+++ b/stage/LibUsbDotNet/Main/SetupApiRegistry.cs
@@ -19,6 +19,7 @@
 // visit www.gnu.org.
 // 
 // 
+#if WINDOWS_TESTING
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -101,7 +102,7 @@ private static bool FillWindowsMonoUsbDeviceRegistry(UsbRegistry usbRegistry, Mo
             {
                 if (priv.usb_interfaces[i].path == IntPtr.Zero) break;
                 path = Marshal.PtrToStringAnsi(priv.usb_interfaces[i].path);
-                Debug.Print("Intf:{0} Path:{1}",i,path);
+                Debug.WriteLine("Intf:{0} Path:{1}",i,path);
             }
             path = Marshal.PtrToStringAnsi(priv.path);
 
@@ -207,4 +208,5 @@ private static bool BuildMasterCallback(IntPtr deviceInfoSet, int deviceindex, r
             return false;
         }
     }
-}
\ No newline at end of file
+}
+#endif
diff --git a/stage/LibWinUsb/Main/UsbConstants.cs b/stage/LibUsbDotNet/Main/UsbConstants.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbConstants.cs
rename to stage/LibUsbDotNet/Main/UsbConstants.cs
diff --git a/stage/LibWinUsb/Main/UsbCtrlFlags.cs b/stage/LibUsbDotNet/Main/UsbCtrlFlags.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbCtrlFlags.cs
rename to stage/LibUsbDotNet/Main/UsbCtrlFlags.cs
diff --git a/stage/LibWinUsb/Main/UsbDeviceFinder.cs b/stage/LibUsbDotNet/Main/UsbDeviceFinder.cs
similarity index 96%
rename from stage/LibWinUsb/Main/UsbDeviceFinder.cs
rename to stage/LibUsbDotNet/Main/UsbDeviceFinder.cs
index 2c3e632..31a170c 100644
--- a/stage/LibWinUsb/Main/UsbDeviceFinder.cs
+++ b/stage/LibUsbDotNet/Main/UsbDeviceFinder.cs
@@ -22,8 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+#if !NETSTANDARD1_5
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
+#endif
 
 namespace LibUsbDotNet.Main
 {
@@ -52,7 +54,10 @@ namespace LibUsbDotNet.Main
     /// <example>
     /// <code source="..\Examples\Show.Info\ShowInfo.cs" lang="cs"/>
     /// </example>
-    public class UsbDeviceFinder : ISerializable
+    public class UsbDeviceFinder
+#if !NETSTANDARD1_5
+        : ISerializable
+#endif
     {
         ///<summary> The "exclude from search" value for <see cref="Pid"/>. </summary>
         public const int NO_PID = int.MaxValue;
@@ -139,6 +144,7 @@ public UsbDeviceFinder(string serialNumber)
         public UsbDeviceFinder(Guid deviceInterfaceGuid)
             : this(int.MaxValue, int.MaxValue, int.MaxValue, null, deviceInterfaceGuid) { }
 
+#if !NETSTANDARD1_5
         /// <summary>
         /// Use a serialization stream to fill the <see cref="UsbDeviceFinder"/> class. 
         /// </summary>
@@ -155,6 +161,7 @@ protected UsbDeviceFinder(SerializationInfo info, StreamingContext context)
             mSerialNumber = (string) info.GetValue("SerialNumber", typeof (string));
             mDeviceInterfaceGuid = (Guid) info.GetValue("DeviceInterfaceGuid", typeof (Guid));
         }
+#endif
 
         /// <summary>
         /// 
@@ -218,7 +225,8 @@ public int Vid
             set { mVid = value; }
         }
 
-        #region ISerializable Members
+#if !NETSTANDARD1_5
+#region ISerializable Members
 
         /// <summary>
         /// Store this class as a binary serializtion object.
@@ -237,8 +245,10 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)
             info.AddValue("DeviceInterfaceGuid", mDeviceInterfaceGuid);
         }
 
-        #endregion
+#endregion
+#endif
 
+#if !NETSTANDARD1_5
         /// <summary>
         /// Load usb device finder properties from a binary stream.
         /// </summary>
@@ -261,6 +271,7 @@ public static void Save(UsbDeviceFinder usbDeviceFinder, Stream outStream)
             BinaryFormatter formatter = new BinaryFormatter();
             formatter.Serialize(outStream, usbDeviceFinder);
         }
+#endif
 
         /// <summary>
         /// Dynamic predicate find function. Pass this function into any method that has a <see cref="Predicate{UsbRegistry}"/> parameter.
diff --git a/stage/LibWinUsb/Main/UsbEndpointBase.cs b/stage/LibUsbDotNet/Main/UsbEndpointBase.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbEndpointBase.cs
rename to stage/LibUsbDotNet/Main/UsbEndpointBase.cs
diff --git a/stage/LibWinUsb/Main/UsbEndpointDirection.cs b/stage/LibUsbDotNet/Main/UsbEndpointDirection.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbEndpointDirection.cs
rename to stage/LibUsbDotNet/Main/UsbEndpointDirection.cs
diff --git a/stage/LibWinUsb/Main/UsbEndpointList.cs b/stage/LibUsbDotNet/Main/UsbEndpointList.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbEndpointList.cs
rename to stage/LibUsbDotNet/Main/UsbEndpointList.cs
diff --git a/stage/LibWinUsb/Main/UsbException.cs b/stage/LibUsbDotNet/Main/UsbException.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbException.cs
rename to stage/LibUsbDotNet/Main/UsbException.cs
diff --git a/stage/LibWinUsb/Main/UsbKernelVersion.cs b/stage/LibUsbDotNet/Main/UsbKernelVersion.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbKernelVersion.cs
rename to stage/LibUsbDotNet/Main/UsbKernelVersion.cs
diff --git a/stage/LibWinUsb/Main/UsbLockStyle.cs b/stage/LibUsbDotNet/Main/UsbLockStyle.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbLockStyle.cs
rename to stage/LibUsbDotNet/Main/UsbLockStyle.cs
diff --git a/stage/LibWinUsb/Main/UsbRegDeviceList.cs b/stage/LibUsbDotNet/Main/UsbRegDeviceList.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbRegDeviceList.cs
rename to stage/LibUsbDotNet/Main/UsbRegDeviceList.cs
diff --git a/stage/LibWinUsb/Main/UsbRegistry.cs b/stage/LibUsbDotNet/Main/UsbRegistry.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbRegistry.cs
rename to stage/LibUsbDotNet/Main/UsbRegistry.cs
diff --git a/stage/LibWinUsb/Main/UsbRequestRecipient.cs b/stage/LibUsbDotNet/Main/UsbRequestRecipient.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbRequestRecipient.cs
rename to stage/LibUsbDotNet/Main/UsbRequestRecipient.cs
diff --git a/stage/LibWinUsb/Main/UsbRequestType.cs b/stage/LibUsbDotNet/Main/UsbRequestType.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbRequestType.cs
rename to stage/LibUsbDotNet/Main/UsbRequestType.cs
diff --git a/stage/LibWinUsb/Main/UsbSetupPacket.cs b/stage/LibUsbDotNet/Main/UsbSetupPacket.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbSetupPacket.cs
rename to stage/LibUsbDotNet/Main/UsbSetupPacket.cs
diff --git a/stage/LibWinUsb/Main/UsbStandardRequest.cs b/stage/LibUsbDotNet/Main/UsbStandardRequest.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbStandardRequest.cs
rename to stage/LibUsbDotNet/Main/UsbStandardRequest.cs
diff --git a/stage/LibWinUsb/Main/UsbStatusClodes.cs b/stage/LibUsbDotNet/Main/UsbStatusClodes.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbStatusClodes.cs
rename to stage/LibUsbDotNet/Main/UsbStatusClodes.cs
diff --git a/stage/LibWinUsb/Main/UsbStream.cs b/stage/LibUsbDotNet/Main/UsbStream.cs
similarity index 97%
rename from stage/LibWinUsb/Main/UsbStream.cs
rename to stage/LibUsbDotNet/Main/UsbStream.cs
index 542f65d..f42d9c1 100644
--- a/stage/LibWinUsb/Main/UsbStream.cs
+++ b/stage/LibUsbDotNet/Main/UsbStream.cs
@@ -19,6 +19,7 @@
 // visit www.gnu.org.
 // 
 // 
+#if !NETSTANDARD1_5
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -283,4 +284,5 @@ private static void AsyncTransferFn(object oContext)
 
         #endregion
     }
-}
\ No newline at end of file
+}
+#endif
diff --git a/stage/LibWinUsb/Main/UsbSymbolicName.cs b/stage/LibUsbDotNet/Main/UsbSymbolicName.cs
similarity index 100%
rename from stage/LibWinUsb/Main/UsbSymbolicName.cs
rename to stage/LibUsbDotNet/Main/UsbSymbolicName.cs
diff --git a/stage/LibWinUsb/Main/UsbTransfer.cs b/stage/LibUsbDotNet/Main/UsbTransfer.cs
similarity index 96%
rename from stage/LibWinUsb/Main/UsbTransfer.cs
rename to stage/LibUsbDotNet/Main/UsbTransfer.cs
index 55ee665..dcf4552 100644
--- a/stage/LibWinUsb/Main/UsbTransfer.cs
+++ b/stage/LibUsbDotNet/Main/UsbTransfer.cs
@@ -98,7 +98,7 @@ protected IntPtr NextBufPtr
         ///</summary>
         public bool IsCancelled
         {
-            get { return mTransferCancelEvent.WaitOne(0, UsbConstants.EXIT_CONTEXT); }
+            get { return mTransferCancelEvent.WaitOne(0); }
         }
 
         /// <summary>
@@ -155,7 +155,7 @@ protected virtual void Dispose(bool disposing)
                     }
                     catch (Exception ex)
                     {
-                        Debug.Print(ex.Message);
+                        Debug.WriteLine(ex.Message);
                     }
                 }
   
@@ -384,7 +384,7 @@ public void Reset()
         /// <filterpriority>2</filterpriority>
         public bool IsCompleted
         {
-            get { return mTransferCompleteEvent.WaitOne(0, UsbConstants.EXIT_CONTEXT); }
+            get { return mTransferCompleteEvent.WaitOne(0); }
         }
 
 
diff --git a/stage/LibWinUsb/Main/WriteEndpointID.cs b/stage/LibUsbDotNet/Main/WriteEndpointID.cs
similarity index 100%
rename from stage/LibWinUsb/Main/WriteEndpointID.cs
rename to stage/LibUsbDotNet/Main/WriteEndpointID.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/CallbackDelegates.cs b/stage/LibUsbDotNet/MonoLibUsb/CallbackDelegates.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/CallbackDelegates.cs
rename to stage/LibUsbDotNet/MonoLibUsb/CallbackDelegates.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbAltInterfaceDescriptor.cs b/stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbAltInterfaceDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbAltInterfaceDescriptor.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbAltInterfaceDescriptor.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbConfigDescriptor.cs b/stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbConfigDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbConfigDescriptor.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbConfigDescriptor.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbDeviceDescriptor.cs b/stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbDeviceDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbDeviceDescriptor.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbDeviceDescriptor.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbEndpointDescriptor.cs b/stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbEndpointDescriptor.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbEndpointDescriptor.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbEndpointDescriptor.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbInterface.cs b/stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbInterface.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Descriptors/MonoUsbInterface.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Descriptors/MonoUsbInterface.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoLibUsbApi.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoLibUsbApi.cs
similarity index 98%
rename from stage/LibWinUsb/MonoLibUsb/MonoLibUsbApi.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoLibUsbApi.cs
index be09cc6..fc6bd1c 100644
--- a/stage/LibWinUsb/MonoLibUsb/MonoLibUsbApi.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/MonoLibUsbApi.cs
@@ -922,7 +922,7 @@ public static int ControlTransferAsync([In] MonoUsbDeviceHandle deviceHandle,
 
             if (MonoUsbEventHandler.IsStopped)
             {
-                while (!completeEvent.WaitOne(0, false))
+                while (!completeEvent.WaitOne(0))
                 {
                     r = HandleEvents(pSessionHandle);
                     if (r < 0)
@@ -930,7 +930,7 @@ public static int ControlTransferAsync([In] MonoUsbDeviceHandle deviceHandle,
                         if (r == (int)MonoUsbError.ErrorInterrupted)
                             continue;
                         transfer.Cancel();
-                        while (!completeEvent.WaitOne(0, false))
+                        while (!completeEvent.WaitOne(0))
                             if (HandleEvents(pSessionHandle) < 0)
                                 break;
                         transfer.Free();
@@ -941,7 +941,7 @@ public static int ControlTransferAsync([In] MonoUsbDeviceHandle deviceHandle,
             }
             else
             {
-                completeEvent.WaitOne(Timeout.Infinite, UsbConstants.EXIT_CONTEXT);
+                completeEvent.WaitOne(Timeout.Infinite);
             }
 
             if (transfer.Status == MonoUsbTansferStatus.TransferCompleted)
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbDevice.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbDevice.cs
similarity index 96%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbDevice.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbDevice.cs
index 7ae2645..44bef61 100644
--- a/stage/LibWinUsb/MonoLibUsb/MonoUsbDevice.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbDevice.cs
@@ -170,7 +170,7 @@ public override DriverModeType DriverMode
         public override bool Close()
         {
             ActiveEndpoints.Clear();
-            if (IsOpen) mUsbHandle.Close();
+            if (IsOpen) mUsbHandle.Dispose();
 
             return true;
         }
@@ -263,7 +263,7 @@ public override bool Open()
             mUsbHandle = handle;
             if (IsOpen) return true;
 
-            mUsbHandle.Close();
+            mUsbHandle.Dispose();
             return false;
         }
 
@@ -501,7 +501,7 @@ private static ErrorCode GetConfigs(MonoUsbDevice usbDevice, out List<UsbConfigI
             {
                 MonoUsbConfigHandle nextConfigHandle;
                 int ret = MonoUsbApi.GetConfigDescriptor(usbDevice.mMonoUSBProfile.ProfileHandle, (byte) iConfig, out nextConfigHandle);
-                Debug.Print("GetConfigDescriptor:{0}", ret);
+                Debug.WriteLine(string.Format("GetConfigDescriptor:{0}", ret));
                 if (ret != 0 || nextConfigHandle.IsInvalid)
                 {
                     usbError = UsbError.Error(ErrorCode.MonoApiError,
@@ -525,7 +525,7 @@ private static ErrorCode GetConfigs(MonoUsbDevice usbDevice, out List<UsbConfigI
                 finally
                 {
                     if (!nextConfigHandle.IsInvalid)
-                        nextConfigHandle.Close();
+                        nextConfigHandle.Dispose();
                 }
             }
 
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbDeviceHandle.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbDeviceHandle.cs
similarity index 87%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbDeviceHandle.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbDeviceHandle.cs
index a9b977d..a084e2a 100644
--- a/stage/LibWinUsb/MonoLibUsb/MonoUsbDeviceHandle.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbDeviceHandle.cs
@@ -120,17 +120,5 @@ protected override bool ReleaseHandle()
             }
             return true;
         }
-
-        /// <summary>
-        /// Closes the <see cref="MonoUsbDeviceHandle"/> reference.  When all references are no longer is use, the device
-        /// is closed in the <see cref="ReleaseHandle"/> finalizer.
-        /// </summary>
-        /// <remarks>
-        /// <note title="Libusb-1.0 API Note:" type="cpp">The <see cref="Close"/> method is roughly equivalent to <a href="http://libusb.sourceforge.net/api-1.0/group__dev.html#ga779bc4f1316bdb0ac383bddbd538620e">libusb_close()</a>.</note>
-        /// </remarks>
-        public new void Close()
-        {
-            base.Close();
-        }
     }
 }
\ No newline at end of file
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbEndpointReader.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbEndpointReader.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbEndpointReader.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbEndpointReader.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbEndpointWriter.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbEndpointWriter.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbEndpointWriter.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbEndpointWriter.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbError.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbError.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbError.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbError.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbEventHandler.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbEventHandler.cs
similarity index 95%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbEventHandler.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbEventHandler.cs
index 3b5a272..59a8e02 100644
--- a/stage/LibWinUsb/MonoLibUsb/MonoUsbEventHandler.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbEventHandler.cs
@@ -38,7 +38,9 @@ public static class MonoUsbEventHandler
         private static bool mRunning;
         private static MonoUsbSessionHandle mSessionHandle;
         internal static Thread mUsbEventThread;
+#if !NETSTANDARD1_5
         private static ThreadPriority mPriority = ThreadPriority.Normal;
+#endif
 
         private static UnixNativeTimeval mWaitUnixNativeTimeval;
 
@@ -58,9 +60,10 @@ public static MonoUsbSessionHandle SessionHandle
         /// </summary>
         public static bool IsStopped
         {
-            get { return mIsStoppedEvent.WaitOne(0, false); }
+            get { return mIsStoppedEvent.WaitOne(0); }
         }
 
+#if !NETSTANDARD1_5
         /// <summary>
         /// Thread proirity to use for the handle events thread.
         /// </summary>
@@ -69,6 +72,7 @@ public static ThreadPriority Priority
             get { return mPriority; }
             set {mPriority=value;}
         }
+#endif
 
         /// <summary>
         /// Stops the handle events thread and closes the session handle.
@@ -79,7 +83,7 @@ public static void Exit()
             if (mSessionHandle == null) return;
 
             if (mSessionHandle.IsInvalid) return;
-            mSessionHandle.Close();
+            mSessionHandle.Dispose();
             mSessionHandle = null;
         }
 
@@ -148,7 +152,9 @@ public static bool Start()
             {
                 mRunning = true;
                 mUsbEventThread = new Thread(HandleEventFn);
+#if !NETSTANDARD1_5
                 mUsbEventThread.Priority = mPriority;
+#endif
                 mUsbEventThread.Start(mSessionHandle);
 
             }
@@ -178,7 +184,9 @@ public static void Stop(bool bWait)
                     //bool bSuccess = mIsStoppedEvent.WaitOne((int)((mWaitUnixNativeTimeval.tv_sec * 1000 + mWaitUnixNativeTimeval.tv_usec) * 1.2), false);
                     if (!bSuccess)
                     {
+#if !NETSTANDARD1_5
                         mUsbEventThread.Abort();
+#endif
                         throw new UsbException(typeof(MonoUsbEventHandler), "Critical timeout failure! MonoUsbApi.HandleEventsTimeout did not return within the allotted time.");
                         //LibUsbDotNet.UsbError.Error(ErrorCode.UnknownError, 0, "Critical timeout failure!", typeof(MonoUsbEventHandler));
                         //mIsStoppedEvent.Set();
diff --git a/stage/LibWinUsb/MonoLibUsb/MonoUsbSessionHandle.cs b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbSessionHandle.cs
similarity index 95%
rename from stage/LibWinUsb/MonoLibUsb/MonoUsbSessionHandle.cs
rename to stage/LibUsbDotNet/MonoLibUsb/MonoUsbSessionHandle.cs
index ef1e0cd..4faa504 100644
--- a/stage/LibWinUsb/MonoLibUsb/MonoUsbSessionHandle.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/MonoUsbSessionHandle.cs
@@ -106,7 +106,7 @@ protected override bool ReleaseHandle()
                     MonoUsbApi.Exit(handle);
                     SetHandleAsInvalid();
                     mSessionCount--;
-                    Debug.Print(GetType().Name + " : ReleaseHandle #{0}", mSessionCount);
+                    Debug.WriteLine(string.Format(GetType().Name + " : ReleaseHandle #{0}", mSessionCount));
 
                 }
             }
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/AddRemoveEventArgs.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/AddRemoveEventArgs.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Profile/AddRemoveEventArgs.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/AddRemoveEventArgs.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/AddRemoveType.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/AddRemoveType.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Profile/AddRemoveType.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/AddRemoveType.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbConfigHandle.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbConfigHandle.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbConfigHandle.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbConfigHandle.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfile.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfile.cs
similarity index 97%
rename from stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfile.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfile.cs
index 176e029..f956a70 100644
--- a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfile.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfile.cs
@@ -160,7 +160,7 @@ private MonoUsbError GetDeviceDescriptor(out MonoUsbDeviceDescriptor monoUsbDevi
         public void Close()
         {
             if (!mMonoUSBProfileHandle.IsClosed)
-                mMonoUSBProfileHandle.Close();
+                mMonoUSBProfileHandle.Dispose();
         }
 
         /// <summary>
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileHandle.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileHandle.cs
similarity index 94%
rename from stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileHandle.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileHandle.cs
index 3d93900..534b792 100644
--- a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileHandle.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileHandle.cs
@@ -83,7 +83,7 @@ protected override bool ReleaseHandle()
                     MonoUsbApi.UnrefDevice(handle);
                     mDeviceProfileRefCount--;
                     SetHandleAsInvalid();
-                    Debug.Print(GetType().Name + " : ReleaseHandle #{0}", mDeviceProfileRefCount);
+                    Debug.WriteLine(string.Format(GetType().Name + " : ReleaseHandle #{0}", mDeviceProfileRefCount));
                 }
                 return true;
             }
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileHandleEnumerator.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileHandleEnumerator.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileHandleEnumerator.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileHandleEnumerator.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileList.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileList.cs
similarity index 96%
rename from stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileList.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileList.cs
index 05d4fc7..0555885 100644
--- a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileList.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileList.cs
@@ -127,7 +127,7 @@ public int Refresh(MonoUsbSessionHandle sessionHandle)
 #if LIBUSBDOTNET
                     UsbError.Error(ErrorCode.MonoApiError, ret, "Refresh:GetDeviceList Failed", this);
 #else
-                    System.Diagnostics.Debug.Print("libusb_get_device_list failed:{0} {1}",
+                    System.Diagnostics.Debug.WriteLine("libusb_get_device_list failed:{0} {1}",
                                                    (MonoUsbError) ret,
                                                    MonoUsbApi.StrError((MonoUsbError) ret));
 #endif
@@ -141,7 +141,7 @@ public int Refresh(MonoUsbSessionHandle sessionHandle)
                     if (stopCount <= 0) break;
                 }
                 syncWith(newList);
-                monoUSBProfileListHandle.Close();
+                monoUSBProfileListHandle.Dispose();
 
                 return ret;
             }
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileListHandle.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileListHandle.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Profile/MonoUsbProfileListHandle.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/MonoUsbProfileListHandle.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Profile/PollfdItem.cs b/stage/LibUsbDotNet/MonoLibUsb/Profile/PollfdItem.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Profile/PollfdItem.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Profile/PollfdItem.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/Internal/libusb_control_setup.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/Internal/libusb_control_setup.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/Internal/libusb_control_setup.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/Internal/libusb_control_setup.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/Internal/libusb_iso_packet_descriptor.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/Internal/libusb_iso_packet_descriptor.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/Internal/libusb_iso_packet_descriptor.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/Internal/libusb_iso_packet_descriptor.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/Internal/libusb_transfer.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/Internal/libusb_transfer.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/Internal/libusb_transfer.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/Internal/libusb_transfer.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbControlSetup.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbControlSetup.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbControlSetup.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbControlSetup.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbControlSetupHandle.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbControlSetupHandle.cs
similarity index 96%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbControlSetupHandle.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbControlSetupHandle.cs
index 9f72127..058f749 100644
--- a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbControlSetupHandle.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbControlSetupHandle.cs
@@ -105,7 +105,7 @@ protected override bool ReleaseHandle()
             {
                 Marshal.FreeHGlobal(handle);
                 SetHandleAsInvalid();
-                Debug.Print(GetType().Name + " : ReleaseHandle");
+                Debug.WriteLine(GetType().Name + " : ReleaseHandle");
             }
             return true;
         }
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbIsoPacket.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbIsoPacket.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbIsoPacket.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbIsoPacket.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTansferStatus.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTansferStatus.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTansferStatus.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTansferStatus.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransfer.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransfer.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransfer.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransfer.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransferContext.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransferContext.cs
similarity index 93%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransferContext.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransferContext.cs
index 29421ed..69abc84 100644
--- a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransferContext.cs
+++ b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransferContext.cs
@@ -115,7 +115,7 @@ private void freeTransfer()
         {
             if (mTransfer.IsInvalid || mOwnsTransfer == false) return;
             mTransferCancelEvent.Set();
-            mTransferCompleteEvent.WaitOne(200, UsbConstants.EXIT_CONTEXT);
+            mTransferCompleteEvent.WaitOne(200);
             mTransfer.Free();
 
             if (mCompleteEventHandle.IsAllocated)
@@ -184,9 +184,9 @@ public override void Fill(IntPtr buffer, int offset, int count, int timeout, int
         /// </returns>
         public override ErrorCode Submit()
         {
-            if (mTransferCancelEvent.WaitOne(0, false)) return ErrorCode.IoCancelled;
+            if (mTransferCancelEvent.WaitOne(0)) return ErrorCode.IoCancelled;
 
-            if (!mTransferCompleteEvent.WaitOne(0, UsbConstants.EXIT_CONTEXT)) return ErrorCode.ResourceBusy;
+            if (!mTransferCompleteEvent.WaitOne(0)) return ErrorCode.ResourceBusy;
 
             mTransfer.PtrBuffer = NextBufPtr;
             mTransfer.Length = RequestCount;
@@ -218,8 +218,7 @@ public override ErrorCode Wait(out int transferredCount, bool cancel)
             ErrorCode ec;
 
             int iWait = WaitHandle.WaitAny(new WaitHandle[] {mTransferCompleteEvent, mTransferCancelEvent},
-                                           Timeout.Infinite,
-                                           UsbConstants.EXIT_CONTEXT);
+                                           Timeout.Infinite);
             switch (iWait)
             {
                 case 0: // TransferCompleteEvent
@@ -237,7 +236,7 @@ public override ErrorCode Wait(out int transferredCount, bool cancel)
                     return ec;
                 case 1: // TransferCancelEvent
                     ret = (int)mTransfer.Cancel();
-                    bool bTransferComplete = mTransferCompleteEvent.WaitOne(100, UsbConstants.EXIT_CONTEXT);
+                    bool bTransferComplete = mTransferCompleteEvent.WaitOne(100);
                     mTransferCompleteEvent.Set();
 
                     if (ret != 0 || !bTransferComplete)
diff --git a/stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransferFlags.cs b/stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransferFlags.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/Transfer/MonoUsbTransferFlags.cs
rename to stage/LibUsbDotNet/MonoLibUsb/Transfer/MonoUsbTransferFlags.cs
diff --git a/stage/LibWinUsb/MonoLibUsb/UnixNativeTimeval.cs b/stage/LibUsbDotNet/MonoLibUsb/UnixNativeTimeval.cs
similarity index 100%
rename from stage/LibWinUsb/MonoLibUsb/UnixNativeTimeval.cs
rename to stage/LibUsbDotNet/MonoLibUsb/UnixNativeTimeval.cs
diff --git a/stage/LibWinUsb/Properties/AssemblyInfo.cs b/stage/LibUsbDotNet/Properties/AssemblyInfo.cs
similarity index 100%
rename from stage/LibWinUsb/Properties/AssemblyInfo.cs
rename to stage/LibUsbDotNet/Properties/AssemblyInfo.cs
diff --git a/stage/LibWinUsb/UsbDevice.Common.cs b/stage/LibUsbDotNet/UsbDevice.Common.cs
similarity index 100%
rename from stage/LibWinUsb/UsbDevice.Common.cs
rename to stage/LibUsbDotNet/UsbDevice.Common.cs
diff --git a/stage/LibWinUsb/UsbDevice.Error.cs b/stage/LibUsbDotNet/UsbDevice.Error.cs
similarity index 100%
rename from stage/LibWinUsb/UsbDevice.Error.cs
rename to stage/LibUsbDotNet/UsbDevice.Error.cs
diff --git a/stage/LibWinUsb/UsbDevice.OS.Specific.cs b/stage/LibUsbDotNet/UsbDevice.OS.Specific.cs
similarity index 97%
rename from stage/LibWinUsb/UsbDevice.OS.Specific.cs
rename to stage/LibUsbDotNet/UsbDevice.OS.Specific.cs
index c5fa995..361da5b 100644
--- a/stage/LibWinUsb/UsbDevice.OS.Specific.cs
+++ b/stage/LibUsbDotNet/UsbDevice.OS.Specific.cs
@@ -276,7 +276,7 @@ public static UsbKernelVersion KernelVersion
             }
         }
 
-
+#if !NETSTANDARD1_5
         ///<summary>
         /// Gets a <see cref="System.OperatingSystem"/> object that contains the current platform identifier and version number.
         ///</summary>
@@ -287,5 +287,6 @@ public static OperatingSystem OSVersion
                 return Helper.OSVersion;
             }
         }
+#endif
     }
 }
\ No newline at end of file
diff --git a/stage/LibWinUsb/UsbDevice.cs b/stage/LibUsbDotNet/UsbDevice.cs
similarity index 100%
rename from stage/LibWinUsb/UsbDevice.cs
rename to stage/LibUsbDotNet/UsbDevice.cs
diff --git a/stage/LibWinUsb/UsbEndpointReader.cs b/stage/LibUsbDotNet/UsbEndpointReader.cs
similarity index 96%
rename from stage/LibWinUsb/UsbEndpointReader.cs
rename to stage/LibUsbDotNet/UsbEndpointReader.cs
index 2c82f55..a2ca626 100644
--- a/stage/LibWinUsb/UsbEndpointReader.cs
+++ b/stage/LibUsbDotNet/UsbEndpointReader.cs
@@ -22,7 +22,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Threading;
+#if !NETSTANDARD1_5
 using System.Windows.Forms;
+#endif
 using LibUsbDotNet.Internal;
 using LibUsbDotNet.Main;
 
@@ -44,7 +46,9 @@ public class UsbEndpointReader : UsbEndpointBase
         private bool mDataReceivedEnabled;
         private int mReadBufferSize;
         private Thread mReadThread;
+#if !NETSTANDARD1_5
         private ThreadPriority mReadThreadPriority = ThreadPriority.Normal;
+#endif
 
         internal UsbEndpointReader(UsbDevice usbDevice, int readBufferSize, byte alternateInterfaceID, ReadEndpointID readEndpointID, EndpointType endpointType)
             : base(usbDevice, alternateInterfaceID, (Byte)readEndpointID, endpointType) { mReadBufferSize = readBufferSize; }
@@ -93,6 +97,7 @@ public int ReadBufferSize
             set { mReadBufferSize = value; }
         }
 
+#if !NETSTANDARD1_5
         /// <summary>
         /// Gets/Sets the Priority level for the read thread when <see cref="DataReceivedEnabled"/> is true.
         /// </summary>
@@ -101,7 +106,7 @@ public ThreadPriority ReadThreadPriority
             get { return mReadThreadPriority; }
             set { mReadThreadPriority = value; }
         }
-
+#endif
 
         /// <summary>
         /// Reads data from the current <see cref="UsbEndpointReader"/>.
@@ -214,10 +219,12 @@ private static void ReadData(object context)
                     if (eReturn != ErrorCode.IoTimedOut) break;
                 }
             }
+#if !NETSTANDARD1_5
             catch (ThreadAbortException)
             {
                 UsbError.Error(ErrorCode.ReceiveThreadTerminated,0, "ReadData:Read thread aborted.", reader);
             }
+#endif
             finally
             {
                 reader.Abort();
@@ -233,27 +240,37 @@ private static void ReadData(object context)
         private void StartReadThread()
         {
             mReadThread = new Thread(ReadData);
+#if !NETSTANDARD1_5
             mReadThread.Priority = ReadThreadPriority;
+#endif
             mReadThread.Start(TransferContext);
             Thread.Sleep(1);
+#if !NETSTANDARD1_5
             Application.DoEvents();
+#endif
         }
 
         private bool StopReadThread()
         {
             Abort();
             Thread.Sleep(1);
+#if !NETSTANDARD1_5
             Application.DoEvents();
+#endif
             DateTime dtStart = DateTime.Now;
             while (mReadThread.IsAlive && ((DateTime.Now - dtStart).TotalSeconds < 5)) // 5 sec fail-safe
             {
                 Thread.Sleep(100);
+#if !NETSTANDARD1_5
                 Application.DoEvents();
+#endif
             }
             if (mReadThread.IsAlive)
             {
                 UsbError.Error(ErrorCode.ReceiveThreadTerminated,0, "Failed stopping read thread.", this);
+#if !NETSTANDARD1_5
                 mReadThread.Abort();
+#endif
                 return false;
             }
             return true;
diff --git a/stage/LibWinUsb/UsbEndpointWriter.cs b/stage/LibUsbDotNet/UsbEndpointWriter.cs
similarity index 100%
rename from stage/LibWinUsb/UsbEndpointWriter.cs
rename to stage/LibUsbDotNet/UsbEndpointWriter.cs
diff --git a/stage/LibWinUsb/UsbGlobals.cs b/stage/LibUsbDotNet/UsbGlobals.cs
similarity index 100%
rename from stage/LibWinUsb/UsbGlobals.cs
rename to stage/LibUsbDotNet/UsbGlobals.cs
diff --git a/stage/LibWinUsb/WinUsb/DeviceInformationTypes.cs b/stage/LibUsbDotNet/WinUsb/DeviceInformationTypes.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/DeviceInformationTypes.cs
rename to stage/LibUsbDotNet/WinUsb/DeviceInformationTypes.cs
diff --git a/stage/LibWinUsb/WinUsb/DeviceSpeedTypes.cs b/stage/LibUsbDotNet/WinUsb/DeviceSpeedTypes.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/DeviceSpeedTypes.cs
rename to stage/LibUsbDotNet/WinUsb/DeviceSpeedTypes.cs
diff --git a/stage/LibWinUsb/WinUsb/Internal/SafeWinUsbInterfaceHandle.cs b/stage/LibUsbDotNet/WinUsb/Internal/SafeWinUsbInterfaceHandle.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/Internal/SafeWinUsbInterfaceHandle.cs
rename to stage/LibUsbDotNet/WinUsb/Internal/SafeWinUsbInterfaceHandle.cs
diff --git a/stage/LibWinUsb/WinUsb/Internal/WinUsbAPI.cs b/stage/LibUsbDotNet/WinUsb/Internal/WinUsbAPI.cs
similarity index 98%
rename from stage/LibWinUsb/WinUsb/Internal/WinUsbAPI.cs
rename to stage/LibUsbDotNet/WinUsb/Internal/WinUsbAPI.cs
index 4a712b7..7fb69f9 100644
--- a/stage/LibWinUsb/WinUsb/Internal/WinUsbAPI.cs
+++ b/stage/LibUsbDotNet/WinUsb/Internal/WinUsbAPI.cs
@@ -32,7 +32,9 @@
 
 namespace LibUsbDotNet.WinUsb.Internal
 {
+#if !NETSTANDARD1_5
     [SuppressUnmanagedCodeSecurity]
+#endif
     internal class WinUsbAPI : UsbApiBase
     {
 #if USE_LUSBW_FOR_WINUSB
diff --git a/stage/LibWinUsb/WinUsb/PipeInformation.cs b/stage/LibUsbDotNet/WinUsb/PipeInformation.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/PipeInformation.cs
rename to stage/LibUsbDotNet/WinUsb/PipeInformation.cs
diff --git a/stage/LibWinUsb/WinUsb/PipePolicies.cs b/stage/LibUsbDotNet/WinUsb/PipePolicies.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/PipePolicies.cs
rename to stage/LibUsbDotNet/WinUsb/PipePolicies.cs
diff --git a/stage/LibWinUsb/WinUsb/PipePolicyType.cs b/stage/LibUsbDotNet/WinUsb/PipePolicyType.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/PipePolicyType.cs
rename to stage/LibUsbDotNet/WinUsb/PipePolicyType.cs
diff --git a/stage/LibWinUsb/WinUsb/PowerPolicies.cs b/stage/LibUsbDotNet/WinUsb/PowerPolicies.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/PowerPolicies.cs
rename to stage/LibUsbDotNet/WinUsb/PowerPolicies.cs
diff --git a/stage/LibWinUsb/WinUsb/PowerPolicyType.cs b/stage/LibUsbDotNet/WinUsb/PowerPolicyType.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/PowerPolicyType.cs
rename to stage/LibUsbDotNet/WinUsb/PowerPolicyType.cs
diff --git a/stage/LibWinUsb/WinUsb/WinUsbDevice.cs b/stage/LibUsbDotNet/WinUsb/WinUsbDevice.cs
similarity index 96%
rename from stage/LibWinUsb/WinUsb/WinUsbDevice.cs
rename to stage/LibUsbDotNet/WinUsb/WinUsbDevice.cs
index d6397fe..ae3de2a 100644
--- a/stage/LibWinUsb/WinUsb/WinUsbDevice.cs
+++ b/stage/LibUsbDotNet/WinUsb/WinUsbDevice.cs
@@ -92,11 +92,11 @@ public override bool Close()
             if (IsOpen)
             {
                 ActiveEndpoints.Clear();
-                mUsbHandle.Close();
+                mUsbHandle.Dispose();
 
                 if (mSafeDevHandle != null)
                     if (!mSafeDevHandle.IsClosed)
-                        mSafeDevHandle.Close();
+                        mSafeDevHandle.Dispose();
             }
             return true;
         }
diff --git a/stage/LibWinUsb/WinUsb/WinUsbRegistry.cs b/stage/LibUsbDotNet/WinUsb/WinUsbRegistry.cs
similarity index 100%
rename from stage/LibWinUsb/WinUsb/WinUsbRegistry.cs
rename to stage/LibUsbDotNet/WinUsb/WinUsbRegistry.cs
diff --git a/stage/LibUsbDotNet/project.json b/stage/LibUsbDotNet/project.json
new file mode 100644
index 0000000..fdaa4a9
--- /dev/null
+++ b/stage/LibUsbDotNet/project.json
@@ -0,0 +1,57 @@
+{
+  "name": "CoreCompat.LibUsbDotNet",
+  "title": "LibUsbDotNet for .NET Core",
+  "description": ".NET C# USB library for WinUSB, LibUsb-Win32, and libusb-1.0. Using the common device classes, applications work with all operating systems and drivers without modification. Lots of example code. Open source software at sourceforge.net.",
+  "version": "2.2.8-*",
+  "authors": [ "Travis Robinson", "Stevie-O", "Quamotion" ],
+  "buildOptions": {
+    "debugType": "portable",
+    "define": [ "LIBUSBDOTNET" ]
+  },
+  "packOptions": {
+     "owners": [ "Quamotion" ],
+     "projectUrl": "https://github.com/CoreCompat/LibUsbDotNet/",
+     "licenseUrl": "https://github.com/CoreCompat/LibUsbDotNet/blob/master/stage/gpl-3.0.txt",
+     "repository": 
+     {
+        "type": "git",
+        "url": "https://github.com/CoreCompat/LibUsbDotNet/"
+     }
+  },
+  "frameworks": {
+    "netstandard1.5": {
+      "dependencies": {
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Text.RegularExpressions": {
+          "version": "4.1.0",
+          "type": "platform"
+        },
+        "System.Threading": "4.0.11",
+        "System.Threading.Thread": "4.0.0",
+        "System.Threading.Timer": "4.0.1",
+        "Microsoft.Win32.Registry": "4.0.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.Collections": "4.0.11",
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.IO.FileSystem.Watcher": "4.0.0",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Threading.Overlapped": "4.0.1",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
+      }
+    },
+    "net45": {
+      "frameworkAssemblies": {
+        "System.Windows.Forms": "4.0.0.0"
+      }
+    },
+    "net35": {
+      "frameworkAssemblies": {
+        "System.Windows.Forms": "2.0.0.0"
+      }
+    }
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
diff --git a/stage/Test_Bulk/Properties/Resources.Designer.cs b/stage/Test_Bulk/Properties/Resources.Designer.cs
index 39f8a02..2909dd0 100644
--- a/stage/Test_Bulk/Properties/Resources.Designer.cs
+++ b/stage/Test_Bulk/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace Test_Bulk.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/stage/Test_Bulk/Properties/Settings.Designer.cs b/stage/Test_Bulk/Properties/Settings.Designer.cs
index 8823c7a..1c5dc93 100644
--- a/stage/Test_Bulk/Properties/Settings.Designer.cs
+++ b/stage/Test_Bulk/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Test_Bulk.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/stage/Test_Bulk/Test_Bulk.csproj b/stage/Test_Bulk/Test_Bulk.csproj
index a435f93..0eb7850 100644
--- a/stage/Test_Bulk/Test_Bulk.csproj
+++ b/stage/Test_Bulk/Test_Bulk.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,11 +12,12 @@
     <AssemblyName>Test_Bulk</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ApplicationIcon>UsbIco.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,6 +68,11 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="fTestBulk.resx">
       <DependentUpon>fTestBulk.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -74,15 +80,16 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <DependentUpon>Settings.settings</DependentUpon>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -90,8 +97,8 @@
     <Content Include="UsbIco.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/stage/Test_DeviceNotify/Properties/Resources.Designer.cs b/stage/Test_DeviceNotify/Properties/Resources.Designer.cs
index 2ec2d18..ea048d8 100644
--- a/stage/Test_DeviceNotify/Properties/Resources.Designer.cs
+++ b/stage/Test_DeviceNotify/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace Test_DeviceNotify.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/stage/Test_DeviceNotify/Properties/Settings.Designer.cs b/stage/Test_DeviceNotify/Properties/Settings.Designer.cs
index b41be02..df6c6cc 100644
--- a/stage/Test_DeviceNotify/Properties/Settings.Designer.cs
+++ b/stage/Test_DeviceNotify/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Test_DeviceNotify.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/stage/Test_DeviceNotify/Test_DeviceNotify.csproj b/stage/Test_DeviceNotify/Test_DeviceNotify.csproj
index bbea15f..b80bd43 100644
--- a/stage/Test_DeviceNotify/Test_DeviceNotify.csproj
+++ b/stage/Test_DeviceNotify/Test_DeviceNotify.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,11 +12,12 @@
     <AssemblyName>Test_DeviceNotify</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ApplicationIcon>UsbIco.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,11 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="fTestDeviceNotify.resx">
       <DependentUpon>fTestDeviceNotify.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -75,15 +81,16 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <DependentUpon>Settings.settings</DependentUpon>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -91,8 +98,8 @@
     <Content Include="UsbIco.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibWinUsb\LibUsbDotNet.csproj">
-      <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
+    <ProjectReference Include="..\LibUsbDotNet\LibUsbDotNet.csproj">
+      <Project>{0a78f6ff-5586-4052-8104-e23ff83a7ce1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/stage/Test_Info/Properties/Resources.Designer.cs b/stage/Test_Info/Properties/Resources.Designer.cs
index cf7326a..abc5096 100644
--- a/stage/Test_Info/Properties/Resources.Designer.cs
+++ b/stage/Test_Info/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace Test_Info.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/stage/Test_Info/Properties/Settings.Designer.cs b/stage/Test_Info/Properties/Settings.Designer.cs
index 7df2130..da3b898 100644
--- a/stage/Test_Info/Properties/Settings.Designer.cs
+++ b/stage/Test_Info/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Test_Info.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/stage/Test_Info/Test_Info.csproj b/stage/Test_Info/Test_Info.csproj
index ed9f612..69eb6d4 100644
--- a/stage/Test_Info/Test_Info.csproj
+++ b/stage/Test_Info/Test_Info.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,11 +12,12 @@
     <AssemblyName>Test_Info</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ApplicationIcon>UsbIco.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,6 +66,11 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="fTestInfo.resx">
       <DependentUpon>fTestInfo.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -72,15 +78,16 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <DependentUpon>Settings.settings</DependentUpon>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -88,7 +95,7 @@
     <Content Include="UsbIco.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibWinUsb\LibUsbDotNet.csproj">
+    <ProjectReference Include="..\LibUsbDotNet\LibUsbDotNet.csproj">
       <Project>{0A78F6FF-5586-4052-8104-E23FF83A7CE1}</Project>
       <Name>LibUsbDotNet</Name>
     </ProjectReference>