diff --git a/.gitignore b/.gitignore
index a6e0a23..844d133 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # Custom files
-src/
+src/Riverside.Win32*
 
 # User-specific files
 *.rsuser
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..71181dd
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/Riverside.Private.CsWin32"]
+	path = src/Riverside.Private.CsWin32
+	url = https://github.com/Lamparter/CsWin32
diff --git a/Directory.Build.props b/Directory.Build.props
index 4cb7679..1b38e9c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,6 +13,9 @@
 		<LangVersion>12.0</LangVersion>
 		<Nullable>enable</Nullable>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+		<RootDirectory>$(MSBuildThisFileDirectory)</RootDirectory>
+		<CsWin32LocalTargets>$(RootDirectory)\src\Riverside.Private.CsWin32.props</CsWin32LocalTargets>
 	</PropertyGroup>
 
 	<!-- Versioning -->
@@ -65,13 +68,14 @@
 		</None>
 	</ItemGroup>
 
+
 	<!-- Package references -->
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Win32.Registry" Version="*" />
-		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
+		<!--<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
 			<PrivateAssets>all</PrivateAssets>
   			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
+		</PackageReference>-->
 		<PackageReference Include="System.Memory" Version="*" />
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="*" />
 	</ItemGroup>
diff --git a/GenerateSolution.ps1 b/GenerateSolution.ps1
index 2190cbc..c315998 100644
--- a/GenerateSolution.ps1
+++ b/GenerateSolution.ps1
@@ -3,7 +3,9 @@ param(
 )
 
 if (Test-Path $WorkingDirectory) {
-	Remove-Item -Path $WorkingDirectory -Recurse -Force
+	Get-ChildItem -Path $WorkingDirectory | Where-Object {
+		$_.Name -notlike '*Riverside.Private.CsWin32*'
+	} | Remove-Item -Recurse -Force
 }
 
 # Dictionary of DLLs with 'pretty' names
@@ -94,6 +96,7 @@ foreach ($dll in $dlls.Keys) {
 	# Add .csproj content
 	$csprojContent = @"
 <Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="`$(CsWin32LocalTargets)" />
 	<PropertyGroup>
 		<Description>Win32 P/Invoke ($dll.dll) bindings for .NET Standard</Description>
 		<PackageTags>`$(PackageTags); $dll</PackageTags>
@@ -109,9 +112,10 @@ foreach ($dll in $dlls.Keys) {
 	# NativeMethods.json
 	$nativeMethodsConfigContent = @"
 {
-	"`$schema": "https://aka.ms/CsWin32.schema.json",
+	"`$schema": "..\\Riverside.Private.CsWin32\\src\\Microsoft.Windows.CsWin32\\settings.schema.json",
 	"allowMarshaling": false,
 	"public": true,
+	"namespace": "$projectName",
 	"comInterop": {
 		"preserveSigMethods": [
 			"*"
@@ -155,4 +159,8 @@ $mainCsprojContent | Set-Content -Path $mainProjectFile
 
 dotnet sln $solutionFile add $mainProjectFile
 
+$CsWin32ProjectDir = Join-Path $WorkingDirectory "Riverside.Private.CsWin32\src\Microsoft.Windows.CsWin32\Microsoft.Windows.CsWin32.csproj"
+
+dotnet sln $solutionFile add $CsWin32ProjectDir
+
 Write-Host "Solution and projects have been successfully created in $WorkingDirectory."
\ No newline at end of file
diff --git a/README.md b/README.md
index efabf30..f07f224 100644
--- a/README.md
+++ b/README.md
@@ -10,57 +10,57 @@ You can then use the packages just as you would with CsWin32, but installing the
 | Package | Latest | Associated DLL |
 |--------|--------|--------|
 | `Riverside.Win32` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32)](https://nuget.org/packages/Riverside.Win32) | <kbd>*</kbd> |
-| `Riverside.Win32.NewTechnology` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.NewTechnology)](https://nuget.org/packages/Riverside.Win32.NewTechnology) | <kbd>ntdll.dll</kbd> |
-| `Riverside.Win32.DirectX.Direct3D.12` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.12)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.12) | <kbd>d3d12.dll</kbd> |
-| `Riverside.Win32.Security` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Security)](https://nuget.org/packages/Riverside.Win32.Security) | <kbd>secur32.dll</kbd> |
-| `Riverside.Win32.PEImage` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.PEImage)](https://nuget.org/packages/Riverside.Win32.PEImage) | <kbd>imagehlp.dll</kbd> |
-| `Riverside.Win32.Setup` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Setup)](https://nuget.org/packages/Riverside.Win32.Setup) | <kbd>setupapi.dll</kbd> |
-| `Riverside.Win32.Installer` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Installer)](https://nuget.org/packages/Riverside.Win32.Installer) | <kbd>msi.dll</kbd> |
-| `Riverside.Win32.InputMethod` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.InputMethod)](https://nuget.org/packages/Riverside.Win32.InputMethod) | <kbd>imm32.dll</kbd> |
+| `Riverside.Win32.DirectX.DirectSound` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.DirectSound)](https://nuget.org/packages/Riverside.Win32.DirectX.DirectSound) | <kbd>dsound.dll</kbd> |
+| `Riverside.Win32.Cryptography.Legacy` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cryptography.Legacy)](https://nuget.org/packages/Riverside.Win32.Cryptography.Legacy) | <kbd>crypt32.dll</kbd> |
+| `Riverside.Win32.RemoteDesktop` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.RemoteDesktop)](https://nuget.org/packages/Riverside.Win32.RemoteDesktop) | <kbd>wtsapi32.dll</kbd> |
+| `Riverside.Win32.ObjectLinking.Automation` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.ObjectLinking.Automation)](https://nuget.org/packages/Riverside.Win32.ObjectLinking.Automation) | <kbd>oleaut32.dll</kbd> |
+| `Riverside.Win32.Shell.Lightweight` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Shell.Lightweight)](https://nuget.org/packages/Riverside.Win32.Shell.Lightweight) | <kbd>shlwapi.dll</kbd> |
+| `Riverside.Win32.Usb` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Usb)](https://nuget.org/packages/Riverside.Win32.Usb) | <kbd>winusb.dll</kbd> |
+| `Riverside.Win32.Hardware` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Hardware)](https://nuget.org/packages/Riverside.Win32.Hardware) | <kbd>cfgmgr32.dll</kbd> |
 | `Riverside.Win32.Multimedia.Realtime` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Multimedia.Realtime)](https://nuget.org/packages/Riverside.Win32.Multimedia.Realtime) | <kbd>avrt.dll</kbd> |
+| `Riverside.Win32.Debugging` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Debugging)](https://nuget.org/packages/Riverside.Win32.Debugging) | <kbd>dbghelp.dll</kbd> |
+| `Riverside.Win32.NETFramework` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.NETFramework)](https://nuget.org/packages/Riverside.Win32.NETFramework) | <kbd>mscoree.dll</kbd> |
+| `Riverside.Win32.Network` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Network)](https://nuget.org/packages/Riverside.Win32.Network) | <kbd>netapi32.dll</kbd> |
+| `Riverside.Win32.Magnification` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Magnification)](https://nuget.org/packages/Riverside.Win32.Magnification) | <kbd>magnification.dll</kbd> |
+| `Riverside.Win32.Graphics` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Graphics)](https://nuget.org/packages/Riverside.Win32.Graphics) | <kbd>gdi32.dll</kbd> |
 | `Riverside.Win32.MediaFoundation.Platform` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.MediaFoundation.Platform)](https://nuget.org/packages/Riverside.Win32.MediaFoundation.Platform) | <kbd>mfplat.dll</kbd> |
-| `Riverside.Win32.Networking.Internet` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Networking.Internet)](https://nuget.org/packages/Riverside.Win32.Networking.Internet) | <kbd>wininet.dll</kbd> |
+| `Riverside.Win32.CommonControls` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.CommonControls)](https://nuget.org/packages/Riverside.Win32.CommonControls) | <kbd>comctl32.dll</kbd> |
 | `Riverside.Win32.MediaFoundation` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.MediaFoundation)](https://nuget.org/packages/Riverside.Win32.MediaFoundation) | <kbd>mf.dll</kbd> |
-| `Riverside.Win32.ObjectLinking.Automation` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.ObjectLinking.Automation)](https://nuget.org/packages/Riverside.Win32.ObjectLinking.Automation) | <kbd>oleaut32.dll</kbd> |
-| `Riverside.Win32.Rpc` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Rpc)](https://nuget.org/packages/Riverside.Win32.Rpc) | <kbd>rpcrt4.dll</kbd> |
-| `Riverside.Win32.MultipleProviderRouter` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.MultipleProviderRouter)](https://nuget.org/packages/Riverside.Win32.MultipleProviderRouter) | <kbd>mpr.dll</kbd> |
-| `Riverside.Win32.Multimedia` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Multimedia)](https://nuget.org/packages/Riverside.Win32.Multimedia) | <kbd>winmm.dll</kbd> |
-| `Riverside.Win32.Themes` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Themes)](https://nuget.org/packages/Riverside.Win32.Themes) | <kbd>uxtheme.dll</kbd> |
-| `Riverside.Win32.ObjectLinking` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.ObjectLinking)](https://nuget.org/packages/Riverside.Win32.ObjectLinking) | <kbd>ole32.dll</kbd> |
-| `Riverside.Win32.Debugging` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Debugging)](https://nuget.org/packages/Riverside.Win32.Debugging) | <kbd>dbghelp.dll</kbd> |
-| `Riverside.Win32.DirectX.Direct3D.10.1` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.10.1)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.10.1) | <kbd>d3d10_1.dll</kbd> |
-| `Riverside.Win32.DirectX.GraphicsInfrastructure` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.GraphicsInfrastructure)](https://nuget.org/packages/Riverside.Win32.DirectX.GraphicsInfrastructure) | <kbd>dxgi.dll</kbd> |
-| `Riverside.Win32.Hardware` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Hardware)](https://nuget.org/packages/Riverside.Win32.Hardware) | <kbd>cfgmgr32.dll</kbd> |
 | `Riverside.Win32.NewDevice` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.NewDevice)](https://nuget.org/packages/Riverside.Win32.NewDevice) | <kbd>newdev.dll</kbd> |
-| `Riverside.Win32.Network` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Network)](https://nuget.org/packages/Riverside.Win32.Network) | <kbd>netapi32.dll</kbd> |
+| `Riverside.Win32.Process` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Process)](https://nuget.org/packages/Riverside.Win32.Process) | <kbd>psapi.dll</kbd> |
+| `Riverside.Win32.Cryptography.BCrypt` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cryptography.BCrypt)](https://nuget.org/packages/Riverside.Win32.Cryptography.BCrypt) | <kbd>bcrypt.dll</kbd> |
+| `Riverside.Win32.UserEnvironment` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.UserEnvironment)](https://nuget.org/packages/Riverside.Win32.UserEnvironment) | <kbd>userenv.dll</kbd> |
+| `Riverside.Win32.DirectX.DirectInput` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.DirectInput)](https://nuget.org/packages/Riverside.Win32.DirectX.DirectInput) | <kbd>dinput8.dll</kbd> |
+| `Riverside.Win32.DirectX.Direct3D.12` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.12)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.12) | <kbd>d3d12.dll</kbd> |
+| `Riverside.Win32.Multimedia` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Multimedia)](https://nuget.org/packages/Riverside.Win32.Multimedia) | <kbd>winmm.dll</kbd> |
+| `Riverside.Win32.Installer` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Installer)](https://nuget.org/packages/Riverside.Win32.Installer) | <kbd>msi.dll</kbd> |
+| `Riverside.Win32.KernelStreaming` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.KernelStreaming)](https://nuget.org/packages/Riverside.Win32.KernelStreaming) | <kbd>ksuser.dll</kbd> |
+| `Riverside.Win32.Rpc` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Rpc)](https://nuget.org/packages/Riverside.Win32.Rpc) | <kbd>rpcrt4.dll</kbd> |
+| `Riverside.Win32.Cryptography.NCrypt` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cryptography.NCrypt)](https://nuget.org/packages/Riverside.Win32.Cryptography.NCrypt) | <kbd>ncrypt.dll</kbd> |
 | `Riverside.Win32.DirectX.Direct3D.11` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.11)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.11) | <kbd>d3d11.dll</kbd> |
-| `Riverside.Win32.Network.IPHelper` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Network.IPHelper)](https://nuget.org/packages/Riverside.Win32.Network.IPHelper) | <kbd>iphlpapi.dll</kbd> |
+| `Riverside.Win32.Setup` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Setup)](https://nuget.org/packages/Riverside.Win32.Setup) | <kbd>setupapi.dll</kbd> |
+| `Riverside.Win32.Shell` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Shell)](https://nuget.org/packages/Riverside.Win32.Shell) | <kbd>shell32.dll</kbd> |
 | `Riverside.Win32.MediaFoundation.ReadWrite` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.MediaFoundation.ReadWrite)](https://nuget.org/packages/Riverside.Win32.MediaFoundation.ReadWrite) | <kbd>mfreadwrite.dll</kbd> |
 | `Riverside.Win32.Desktop` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Desktop)](https://nuget.org/packages/Riverside.Win32.Desktop) | <kbd>dwmapi.dll</kbd> |
-| `Riverside.Win32.Cabinet` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cabinet)](https://nuget.org/packages/Riverside.Win32.Cabinet) | <kbd>cabinet.dll</kbd> |
-| `Riverside.Win32.Graphics.OpenGL` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Graphics.OpenGL)](https://nuget.org/packages/Riverside.Win32.Graphics.OpenGL) | <kbd>opengl32.dll</kbd> |
-| `Riverside.Win32.Cryptography.BCrypt` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cryptography.BCrypt)](https://nuget.org/packages/Riverside.Win32.Cryptography.BCrypt) | <kbd>bcrypt.dll</kbd> |
-| `Riverside.Win32.UserInterface` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.UserInterface)](https://nuget.org/packages/Riverside.Win32.UserInterface) | <kbd>user32.dll</kbd> |
+| `Riverside.Win32.Kernel` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Kernel)](https://nuget.org/packages/Riverside.Win32.Kernel) | <kbd>kernel32.dll</kbd> |
+| `Riverside.Win32.Networking.Internet` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Networking.Internet)](https://nuget.org/packages/Riverside.Win32.Networking.Internet) | <kbd>wininet.dll</kbd> |
+| `Riverside.Win32.Graphics.OpenGLUtility` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Graphics.OpenGLUtility)](https://nuget.org/packages/Riverside.Win32.Graphics.OpenGLUtility) | <kbd>glu32.dll</kbd> |
+| `Riverside.Win32.DirectX.GraphicsInfrastructure` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.GraphicsInfrastructure)](https://nuget.org/packages/Riverside.Win32.DirectX.GraphicsInfrastructure) | <kbd>dxgi.dll</kbd> |
+| `Riverside.Win32.InputMethod` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.InputMethod)](https://nuget.org/packages/Riverside.Win32.InputMethod) | <kbd>imm32.dll</kbd> |
+| `Riverside.Win32.Networking.Sockets` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Networking.Sockets)](https://nuget.org/packages/Riverside.Win32.Networking.Sockets) | <kbd>ws2_32.dll</kbd> |
+| `Riverside.Win32.PEImage` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.PEImage)](https://nuget.org/packages/Riverside.Win32.PEImage) | <kbd>imagehlp.dll</kbd> |
 | `Riverside.Win32.Advanced` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Advanced)](https://nuget.org/packages/Riverside.Win32.Advanced) | <kbd>advapi32.dll</kbd> |
-| `Riverside.Win32.KernelStreaming` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.KernelStreaming)](https://nuget.org/packages/Riverside.Win32.KernelStreaming) | <kbd>ksuser.dll</kbd> |
-| `Riverside.Win32.Cryptography.Legacy` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cryptography.Legacy)](https://nuget.org/packages/Riverside.Win32.Cryptography.Legacy) | <kbd>crypt32.dll</kbd> |
-| `Riverside.Win32.Graphics` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Graphics)](https://nuget.org/packages/Riverside.Win32.Graphics) | <kbd>gdi32.dll</kbd> |
-| `Riverside.Win32.Magnification` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Magnification)](https://nuget.org/packages/Riverside.Win32.Magnification) | <kbd>magnification.dll</kbd> |
+| `Riverside.Win32.Themes` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Themes)](https://nuget.org/packages/Riverside.Win32.Themes) | <kbd>uxtheme.dll</kbd> |
+| `Riverside.Win32.DirectX.Direct3D.10.1` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.10.1)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.10.1) | <kbd>d3d10_1.dll</kbd> |
 | `Riverside.Win32.DirectX.Direct3D.10` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.10)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.10) | <kbd>d3d10.dll</kbd> |
-| `Riverside.Win32.NETFramework` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.NETFramework)](https://nuget.org/packages/Riverside.Win32.NETFramework) | <kbd>mscoree.dll</kbd> |
-| `Riverside.Win32.RemoteDesktop` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.RemoteDesktop)](https://nuget.org/packages/Riverside.Win32.RemoteDesktop) | <kbd>wtsapi32.dll</kbd> |
-| `Riverside.Win32.Shell` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Shell)](https://nuget.org/packages/Riverside.Win32.Shell) | <kbd>shell32.dll</kbd> |
-| `Riverside.Win32.Cryptography.NCrypt` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cryptography.NCrypt)](https://nuget.org/packages/Riverside.Win32.Cryptography.NCrypt) | <kbd>ncrypt.dll</kbd> |
-| `Riverside.Win32.Networking.Sockets` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Networking.Sockets)](https://nuget.org/packages/Riverside.Win32.Networking.Sockets) | <kbd>ws2_32.dll</kbd> |
-| `Riverside.Win32.Usb` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Usb)](https://nuget.org/packages/Riverside.Win32.Usb) | <kbd>winusb.dll</kbd> |
-| `Riverside.Win32.CommonControls` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.CommonControls)](https://nuget.org/packages/Riverside.Win32.CommonControls) | <kbd>comctl32.dll</kbd> |
-| `Riverside.Win32.UserEnvironment` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.UserEnvironment)](https://nuget.org/packages/Riverside.Win32.UserEnvironment) | <kbd>userenv.dll</kbd> |
-| `Riverside.Win32.Graphics.OpenGLUtility` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Graphics.OpenGLUtility)](https://nuget.org/packages/Riverside.Win32.Graphics.OpenGLUtility) | <kbd>glu32.dll</kbd> |
+| `Riverside.Win32.ObjectLinking` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.ObjectLinking)](https://nuget.org/packages/Riverside.Win32.ObjectLinking) | <kbd>ole32.dll</kbd> |
+| `Riverside.Win32.MultipleProviderRouter` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.MultipleProviderRouter)](https://nuget.org/packages/Riverside.Win32.MultipleProviderRouter) | <kbd>mpr.dll</kbd> |
+| `Riverside.Win32.Cabinet` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Cabinet)](https://nuget.org/packages/Riverside.Win32.Cabinet) | <kbd>cabinet.dll</kbd> |
+| `Riverside.Win32.NewTechnology` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.NewTechnology)](https://nuget.org/packages/Riverside.Win32.NewTechnology) | <kbd>ntdll.dll</kbd> |
 | `Riverside.Win32.Usb.HumanInterface` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Usb.HumanInterface)](https://nuget.org/packages/Riverside.Win32.Usb.HumanInterface) | <kbd>hid.dll</kbd> |
-| `Riverside.Win32.Shell.Lightweight` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Shell.Lightweight)](https://nuget.org/packages/Riverside.Win32.Shell.Lightweight) | <kbd>shlwapi.dll</kbd> |
-| `Riverside.Win32.Kernel` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Kernel)](https://nuget.org/packages/Riverside.Win32.Kernel) | <kbd>kernel32.dll</kbd> |
-| `Riverside.Win32.Version` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Version)](https://nuget.org/packages/Riverside.Win32.Version) | <kbd>version.dll</kbd> |
-| `Riverside.Win32.DirectX.DirectInput` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.DirectInput)](https://nuget.org/packages/Riverside.Win32.DirectX.DirectInput) | <kbd>dinput8.dll</kbd> |
+| `Riverside.Win32.Security` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Security)](https://nuget.org/packages/Riverside.Win32.Security) | <kbd>secur32.dll</kbd> |
+| `Riverside.Win32.UserInterface` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.UserInterface)](https://nuget.org/packages/Riverside.Win32.UserInterface) | <kbd>user32.dll</kbd> |
+| `Riverside.Win32.Graphics.OpenGL` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Graphics.OpenGL)](https://nuget.org/packages/Riverside.Win32.Graphics.OpenGL) | <kbd>opengl32.dll</kbd> |
+| `Riverside.Win32.Network.IPHelper` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Network.IPHelper)](https://nuget.org/packages/Riverside.Win32.Network.IPHelper) | <kbd>iphlpapi.dll</kbd> |
 | `Riverside.Win32.DirectX.Direct3D.9` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.Direct3D.9)](https://nuget.org/packages/Riverside.Win32.DirectX.Direct3D.9) | <kbd>d3d9.dll</kbd> |
-| `Riverside.Win32.DirectX.DirectSound` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.DirectX.DirectSound)](https://nuget.org/packages/Riverside.Win32.DirectX.DirectSound) | <kbd>dsound.dll</kbd> |
-| `Riverside.Win32.Process` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Process)](https://nuget.org/packages/Riverside.Win32.Process) | <kbd>psapi.dll</kbd> |
+| `Riverside.Win32.Version` | [![NuGet Version](https://img.shields.io/nuget/v/Riverside.Win32.Version)](https://nuget.org/packages/Riverside.Win32.Version) | <kbd>version.dll</kbd> |
diff --git a/src/Riverside.Private.CsWin32 b/src/Riverside.Private.CsWin32
new file mode 160000
index 0000000..3b4291a
--- /dev/null
+++ b/src/Riverside.Private.CsWin32
@@ -0,0 +1 @@
+Subproject commit 3b4291aa5b0910ae220d334cfc572fbb3fd3cffc
diff --git a/src/Riverside.Private.CsWin32.props b/src/Riverside.Private.CsWin32.props
new file mode 100644
index 0000000..4272680
--- /dev/null
+++ b/src/Riverside.Private.CsWin32.props
@@ -0,0 +1,27 @@
+<Project>
+	<Import Project="$(RootDirectory)\src\Riverside.Private.CsWin32\src\Microsoft.Windows.CsWin32\build\Microsoft.Windows.CsWin32.props" />
+
+	<PropertyGroup>
+		<CsWin32LocalDir>$(RootDirectory)\src\Riverside.Private.CsWin32\</CsWin32LocalDir>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="$(RootDirectory)\src\Riverside.Private.CsWin32\src\Microsoft.Windows.CsWin32\Microsoft.Windows.CsWin32.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+		<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" GeneratePathProperty="true" PrivateAssets="none" Version="61.0.15-preview" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Analyzer Include="$(CsWin32LocalDir)bin\Microsoft.Windows.CsWin32\$(Configuration)\netstandard2.0\System.Text.Json.dll" />
+		<Analyzer Include="$(CsWin32LocalDir)bin\Microsoft.Windows.CsWin32\$(Configuration)\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll" />
+		<Analyzer Include="$(CsWin32LocalDir)bin\Microsoft.Windows.CsWin32\$(Configuration)\netstandard2.0\System.Text.Encodings.Web.dll" />
+		<Analyzer Include="$(CsWin32LocalDir)bin\Microsoft.Windows.CsWin32\$(Configuration)\netstandard2.0\Microsoft.Windows.SDK.Win32Docs.dll" />
+		<Analyzer Include="$(CsWin32LocalDir)bin\Microsoft.Windows.CsWin32\$(Configuration)\netstandard2.0\MessagePack.dll" />
+		<Analyzer Include="$(CsWin32LocalDir)bin\Microsoft.Windows.CsWin32\$(Configuration)\netstandard2.0\MessagePack.Annotations.dll" />
+	</ItemGroup>
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties nativemethods_1json__JsonSchema="$(RootDirectory)\src\Riverside.Private.CsWin32\src\Microsoft.Windows.CsWin32\settings.schema.json" />
+		</VisualStudio>
+	</ProjectExtensions>
+</Project>
\ No newline at end of file