diff --git a/.gitignore b/.gitignore
index 43de866..ba49e95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,12 @@
 /Release
 
 # Static Driver Verifier Output
-/sdv
-/smvbuild.log
-/smvstats.txt
+/driver/sdv
+/driver/smvbuild.log
+/driver/smvstats.txt
 
 # Driver Verification Log
-/wintun.DVL.XML
+/driver/wintun.DVL.XML
 
 # Temporary files
 *~
diff --git a/wintun.vcxproj b/driver/driver.vcxproj
similarity index 95%
rename from wintun.vcxproj
rename to driver/driver.vcxproj
index 55b160f..cbfed3e 100644
--- a/wintun.vcxproj
+++ b/driver/driver.vcxproj
@@ -71,12 +71,12 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <Import Project="wintun.props" />
+  <Import Project="..\wintun.props" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-    <IntDir>$(ConfigurationName)\$(WintunPlatform)\</IntDir>
-    <OutDir>$(ConfigurationName)\$(WintunPlatform)\</OutDir>
+    <IntDir>..\$(Configuration)\$(WintunPlatform)\$(ProjectName)-intermediate\</IntDir>
+    <OutDir>..\$(ConfigurationName)\$(WintunPlatform)\</OutDir>
     <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -132,4 +132,5 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
+  <Import Project="..\wintun.vcxproj.user" Condition="exists('..\wintun.vcxproj.user')" />
 </Project>
diff --git a/wintun.vcxproj.filters b/driver/driver.vcxproj.filters
similarity index 100%
rename from wintun.vcxproj.filters
rename to driver/driver.vcxproj.filters
diff --git a/undocumented.h b/driver/undocumented.h
similarity index 100%
rename from undocumented.h
rename to driver/undocumented.h
diff --git a/wintun.c b/driver/wintun.c
similarity index 100%
rename from wintun.c
rename to driver/wintun.c
diff --git a/wintun.inf b/driver/wintun.inf
similarity index 100%
rename from wintun.inf
rename to driver/wintun.inf
diff --git a/wintun.rc b/driver/wintun.rc
similarity index 100%
rename from wintun.rc
rename to driver/wintun.rc
diff --git a/wintun.proj b/wintun.proj
index 73060f2..c1efd3e 100644
--- a/wintun.proj
+++ b/wintun.proj
@@ -21,9 +21,8 @@
     <RemoveDir Directories="$(Configuration)\arm\" />
     <RemoveDir Directories="$(Configuration)\arm64\" />
     <RemoveDir Directories="$(Configuration)\x86\" />
-    <RemoveDir Directories="$(SDVDir)" />
-    <RemoveDir Directories="$(DistributionDir)" />
-    <Delete Files="smvbuild.log;smvstats.txt;wintun.DVL.XML" />
+    <RemoveDir Directories="driver\sdv\;dist\" />
+    <Delete Files="driver\smvbuild.log;driver\smvstats.txt;driver\wintun.DVL.XML" />
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
@@ -32,46 +31,46 @@
     Note: Use explicit Inputs/Outputs as WindowsDriver.Common.targets triggers driver re-packaging and signing on every invocation.
   -->
   <PropertyGroup>
-    <DriverInputs>atomic.h;undocumented.h;wintun.c;wintun.inf;wintun.props;wintun.rc;wintun.vcxproj;$(DriverInputs)</DriverInputs>
+    <DriverInputs>driver\undocumented.h;driver\wintun.c;driver\wintun.inf;wintun.props;driver\wintun.rc;driver\driver.vcxproj;$(DriverInputs)</DriverInputs>
   </PropertyGroup>
   <Target Name="Driver-x86"
     Outputs="$(Configuration)\x86\wintun\wintun.sys;$(Configuration)\x86\wintun\wintun.inf;$(Configuration)\x86\wintun\wintun.cat"
     Inputs="$(DriverInputs)">
-    <MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Win32" />
+    <MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Win32" />
   </Target>
   <Target Name="Driver-amd64"
     Outputs="$(Configuration)\amd64\wintun\wintun.sys;$(Configuration)\amd64\wintun\wintun.inf;$(Configuration)\amd64\wintun\wintun.cat"
     Inputs="$(DriverInputs)">
-    <MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64" />
+    <MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64" />
   </Target>
   <Target Name="Driver-arm"
     Outputs="$(Configuration)\arm\wintun\wintun.sys;$(Configuration)\arm\wintun\wintun.inf;$(Configuration)\arm\wintun\wintun.cat"
     Inputs="$(DriverInputs)">
-    <MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=ARM" />
+    <MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=ARM" />
   </Target>
   <Target Name="Driver-arm64"
     Outputs="$(Configuration)\arm64\wintun\wintun.sys;$(Configuration)\arm64\wintun\wintun.inf;$(Configuration)\arm64\wintun\wintun.cat"
     Inputs="$(DriverInputs)">
-    <MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=ARM64" />
+    <MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=ARM64" />
   </Target>
 
   <!--
     Static Driver Verifier
   -->
-  <Target Name="SDV" Outputs="$(SDVDir)SDV.DVL.xml;$(Configuration)\amd64\vc.nativecodeanalysis.all.xml">
-    <MSBuild Projects="wintun.vcxproj" Targets="sdv" Properties="Inputs=/check:*;Configuration=$(Configuration);Platform=x64" />
+  <Target Name="SDV" Outputs="driver\sdv\SDV.DVL.xml;$(Configuration)\amd64\wintun-intermediate\vc.nativecodeanalysis.all.xml">
+    <Exec WorkingDirectory="driver" Command="msbuild.exe driver.vcxproj /t:sdv /p:Inputs=/check:*;Configuration=$(Configuration);Platform=x64 /nologo" />
   </Target>
   <Target Name="SDVView">
-    <MSBuild Projects="wintun.vcxproj" Targets="sdv" Properties="Inputs=/view;Configuration=$(Configuration);Platform=x64" />
+    <Exec WorkingDirectory="driver" Command="msbuild.exe driver.vcxproj /t:sdv /p:Inputs=/view;Configuration=$(Configuration);Platform=x64 /nologo" />
   </Target>
 
   <!--
     Driver Verification Log
   -->
   <Target Name="DVL" DependsOnTargets="SDV"
-    Outputs="wintun.DVL.XML"
-    Inputs="$(SDVDir)SDV.DVL.xml;$(Configuration)\amd64\vc.nativecodeanalysis.all.xml">
-    <MSBuild Projects="wintun.vcxproj" Targets="dvl" Properties="Configuration=$(Configuration);Platform=x64" />
+    Outputs="driver\wintun.DVL.XML"
+    Inputs="driver\sdv\SDV.DVL.xml;$(Configuration)\amd64\wintun-intermediate\vc.nativecodeanalysis.all.xml">
+    <Exec WorkingDirectory="driver" Command="msbuild.exe driver.vcxproj /t:dvl /p:Configuration=$(Configuration);Platform=x64 /nologo" />
   </Target>
 
   <!--
@@ -101,8 +100,8 @@
     Zip Building
   -->
   <PropertyGroup>
-    <ZipTargetPath>$(DistributionDir)wintun-$(WintunVersionStr).zip</ZipTargetPath>
-    <ZipIntDir>$(DistributionDir).tmp\</ZipIntDir>
+    <ZipTargetPath>dist\wintun-$(WintunVersionStr).zip</ZipTargetPath>
+    <ZipIntDir>dist\.tmp\</ZipIntDir>
   </PropertyGroup>
   <ItemGroup>
     <ZipFilesSrc Include="COPYING"                           /><ZipFilesDst Include="$(ZipIntDir)wintun\COPYING"              />
diff --git a/wintun.props b/wintun.props
index cb71aa9..6c9f707 100644
--- a/wintun.props
+++ b/wintun.props
@@ -16,9 +16,6 @@
     <WintunPlatform Condition="'$(Platform)'=='ARM64'">arm64</WintunPlatform>
     <WintunPlatform Condition="'$(Platform)'=='Win32'">x86</WintunPlatform>
     <WintunPlatform Condition="'$(Platform)'=='x64'">amd64</WintunPlatform>
-
-    <DistributionDir>dist\</DistributionDir>
-    <SDVDir>sdv\</SDVDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/wintun.sln b/wintun.sln
index 1c51ade..6ee43df 100644
--- a/wintun.sln
+++ b/wintun.sln
@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api", "api\api.vcxproj", "{
 		{F7679B65-2FEC-469A-8BAC-B07BF4439422} = {F7679B65-2FEC-469A-8BAC-B07BF4439422}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wintun", "wintun.vcxproj", "{F7679B65-2FEC-469A-8BAC-B07BF4439422}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wintun", "driver\driver.vcxproj", "{F7679B65-2FEC-469A-8BAC-B07BF4439422}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A98F138-EE02-4488-B856-B3C48500BEA8}"
 	ProjectSection(SolutionItems) = preProject