diff --git a/build/VStudio/install/Product.wxs b/build/VStudio/install/Product.wxs
index 7f780207..41f6c1c6 100644
--- a/build/VStudio/install/Product.wxs
+++ b/build/VStudio/install/Product.wxs
@@ -4,39 +4,67 @@
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser" InstallPrivileges="elevated" />
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
         <Media Id="1" Cabinet="WinFsp.cab" EmbedCab="yes" />
-        <Feature Id="F.User" Level="1" Title="User">
-            <ComponentRef Id="C.WinFsp.x64" />
-            <ComponentRef Id="C.WinFsp.x86" />
-        </Feature>
-        <Feature Id="F.Developer" Level="1" Title="Developer">
-            <ComponentRef Id="C.WinFsp.x64" />
-            <ComponentRef Id="C.WinFsp.x86" />
-            <ComponentRef Id="C.WinFsp.inc" />
-        </Feature>
-        <UI />
-    </Product>
-    <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLDIR" Name="WinFsp">
                     <Directory Id="BINDIR" Name="bin" />
                     <Directory Id="INCDIR" Name="inc" />
+                    <Directory Id="LIBDIR" Name="lib" />
                 </Directory>
             </Directory>
         </Directory>
-    </Fragment>
-    <Fragment>
-        <Component Id="C.WinFsp.x64" Directory="BINDIR">
-            <File Name="winfsp-x64.dll" />
-            <File Name="winfsp-x64.sys" />
-        </Component>
-        <Component Id="C.WinFsp.x86" Directory="BINDIR">
-            <File Name="winfsp-x86.dll" />
-            <File Name="winfsp-x86.sys" />
-        </Component>
-        <Component Id="C.WinFsp.inc" Directory="INCDIR">
-            <File Name="winfsp.h" />
-            <File Name="fsctl.h" />
-        </Component>
-    </Fragment>
+        <DirectoryRef Id="BINDIR" FileSource="..\build\Release">
+            <Component Id="C.winfsp-x64.sys">
+                <File Source="winfsp-x64.sys" KeyPath="yes" />
+            </Component>
+            <Component Id="C.winfsp-x86.sys">
+                <File Source="winfsp-x86.sys" KeyPath="yes" />
+            </Component>
+            <Component Id="C.winfsp-x64.dll">
+                <File Source="winfsp-x64.dll" KeyPath="yes" />
+            </Component>
+            <Component Id="C.winfsp-x86.dll">
+                <File Source="winfsp-x86.dll" KeyPath="yes" />
+            </Component>
+        </DirectoryRef>
+        <DirectoryRef Id="INCDIR" FileSource="..\..\inc">
+            <Component Id="C.fsctl.h" Directory="winfsp">
+                <File Source="fsctl.h" KeyPath="yes" />
+            </Component>
+            <Component Id="C.winfsp.h" Directory="winfsp">
+                <File Source="winfsp.h" KeyPath="yes" />
+            </Component>
+        </DirectoryRef>
+        <DirectoryRef Id="LIBDIR" FileSource="..\..\Release">
+            <Component Id="C.fsctl.h" Directory="winfsp">
+                <File Source="fsctl.h" KeyPath="yes" />
+            </Component>
+            <Component Id="C.winfsp.h" Directory="winfsp">
+                <File Source="winfsp.h" KeyPath="yes" />
+            </Component>
+        </DirectoryRef>
+        <ComponentGroup Id="C.WinFsp.bin">
+            <ComponentRef Id="C.winfsp-x64.sys" />
+            <ComponentRef Id="C.winfsp-x86.sys" />
+            <ComponentRef Id="C.winfsp-x64.dll" />
+            <ComponentRef Id="C.winfsp-x86.dll" />
+        </ComponentGroup>
+        <ComponentGroup Id="C.WinFsp.inc">
+            <ComponentRef Id="C.fsctl.h" />
+            <ComponentRef Id="C.winfsp.h" />
+        </ComponentGroup>
+        <ComponentGroup Id="C.WinFsp.lib">
+            <ComponentRef Id="C.winfsp-x64.lib" />
+            <ComponentRef Id="C.winfsp-x86.lib" />
+        </ComponentGroup>
+        <Feature Id="F.User" Level="1" Title="User">
+            <ComponentGroupRef Id="C.WinFsp.bin" />
+        </Feature>
+        <Feature Id="F.Developer" Level="1" Title="Developer">
+            <ComponentGroupRef Id="C.WinFsp.bin" />
+            <ComponentGroupRef Id="C.WinFsp.inc" />
+            <ComponentGroupRef Id="C.WinFsp.lib" />
+        </Feature>
+        <UI />
+    </Product>
 </Wix>
\ No newline at end of file
diff --git a/build/VStudio/install/winfsp.wixproj b/build/VStudio/install/winfsp.wixproj
index e273ed0d..6aa74712 100644
--- a/build/VStudio/install/winfsp.wixproj
+++ b/build/VStudio/install/winfsp.wixproj
@@ -21,6 +21,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressAllWarnings>False</SuppressAllWarnings>
+    <Pedantic>True</Pedantic>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />