diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj
index c1bff7605..c0630294d 100644
--- a/SIL.Windows.Forms/SIL.Windows.Forms.csproj
+++ b/SIL.Windows.Forms/SIL.Windows.Forms.csproj
@@ -45,10 +45,10 @@
       <Pack>true</Pack>
       <PackagePath>build</PackagePath>
     </None>
-    <None Include="../lib/Interop.WIA.x64.dll">
+    <None Include="../lib/x64/Interop.WIA.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <Pack>true</Pack>
-      <PackagePath>build</PackagePath>
+      <PackagePath>build/x64</PackagePath>
     </None>
     <Content Include="SIL.Windows.Forms.targets">
       <Pack>true</Pack>
diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.targets b/SIL.Windows.Forms/SIL.Windows.Forms.targets
index 2bb6eac62..d196782e7 100644
--- a/SIL.Windows.Forms/SIL.Windows.Forms.targets
+++ b/SIL.Windows.Forms/SIL.Windows.Forms.targets
@@ -1,6 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)**\*.dll">
+    <None Include="$(MSBuildThisFileDirectory)**\*.dll"
+          Exclude="$(MSBuildThisFileDirectory)x64\**\*.dll">
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/lib/Interop.WIA.x64.dll b/lib/x64/Interop.WIA.dll
similarity index 100%
rename from lib/Interop.WIA.x64.dll
rename to lib/x64/Interop.WIA.dll