diff --git a/QuickLook.Native.Shell32.x64/QuickLook.Native.Shell32.x64.vcxproj.filters b/QuickLook.Native.Shell32.x64/QuickLook.Native.Shell32.x64.vcxproj.filters
deleted file mode 100644
index 2af5468..0000000
--- a/QuickLook.Native.Shell32.x64/QuickLook.Native.Shell32.x64.vcxproj.filters
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\QuickLook.Native.Shell32\QuickLook.Native.Shell32.cpp" />
-    <ClCompile Include="..\QuickLook.Native.Shell32\dllmain.cpp" />
-    <ClCompile Include="..\QuickLook.Native.Shell32\Shell32.cpp" />
-    <ClCompile Include="..\QuickLook.Native.Shell32\stdafx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\QuickLook.Native.Shell32\QuickLook.Native.Shell32.h" />
-    <ClInclude Include="..\QuickLook.Native.Shell32\Shell32.h" />
-    <ClInclude Include="..\QuickLook.Native.Shell32\stdafx.h" />
-    <ClInclude Include="..\QuickLook.Native.Shell32\targetver.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/QuickLook.Native.Shell32/QuickLook.Native.Shell32.h b/QuickLook.Native.Shell32/QuickLook.Native.Shell32.h
deleted file mode 100644
index e69de29..0000000
diff --git a/QuickLook.Native.Shell32/QuickLook.Native.Shell32.cpp b/QuickLook.Native/QuickLook.Native32/QuickLook.Native32.cpp
similarity index 100%
rename from QuickLook.Native.Shell32/QuickLook.Native.Shell32.cpp
rename to QuickLook.Native/QuickLook.Native32/QuickLook.Native32.cpp
diff --git a/QuickLook.Native.Shell32/QuickLook.Native.Shell32.vcxproj b/QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj
similarity index 96%
rename from QuickLook.Native.Shell32/QuickLook.Native.Shell32.vcxproj
rename to QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj
index 48df4f8..339d722 100644
--- a/QuickLook.Native.Shell32/QuickLook.Native.Shell32.vcxproj
+++ b/QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj
@@ -14,9 +14,9 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{D31EE321-C2B0-4984-B749-736F7DE509F1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>QuickLookShell32Helper</RootNamespace>
+    <RootNamespace>QuickLookNative32</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <ProjectName>QuickLook.Native.Shell32</ProjectName>
+    <ProjectName>QuickLook.Native32</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -98,7 +98,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="QuickLook.Native.Shell32.cpp" />
+    <ClCompile Include="QuickLook.Native32.cpp" />
     <ClCompile Include="Shell32.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
diff --git a/QuickLook.Native.Shell32/QuickLook.Shell32Helper.vcxproj.filters b/QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj.filters
similarity index 96%
rename from QuickLook.Native.Shell32/QuickLook.Shell32Helper.vcxproj.filters
rename to QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj.filters
index 4a95b94..6162c6b 100644
--- a/QuickLook.Native.Shell32/QuickLook.Shell32Helper.vcxproj.filters
+++ b/QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj.filters
@@ -32,14 +32,14 @@
     <ClCompile Include="stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="QuickLook.Native.Shell32.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Shell32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="QuickLook.Native32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/QuickLook.Native.Shell32/Shell32.cpp b/QuickLook.Native/QuickLook.Native32/Shell32.cpp
similarity index 100%
rename from QuickLook.Native.Shell32/Shell32.cpp
rename to QuickLook.Native/QuickLook.Native32/Shell32.cpp
diff --git a/QuickLook.Native.Shell32/Shell32.h b/QuickLook.Native/QuickLook.Native32/Shell32.h
similarity index 100%
rename from QuickLook.Native.Shell32/Shell32.h
rename to QuickLook.Native/QuickLook.Native32/Shell32.h
diff --git a/QuickLook.Native.Shell32/dllmain.cpp b/QuickLook.Native/QuickLook.Native32/dllmain.cpp
similarity index 100%
rename from QuickLook.Native.Shell32/dllmain.cpp
rename to QuickLook.Native/QuickLook.Native32/dllmain.cpp
diff --git a/QuickLook.Native.Shell32/stdafx.cpp b/QuickLook.Native/QuickLook.Native32/stdafx.cpp
similarity index 100%
rename from QuickLook.Native.Shell32/stdafx.cpp
rename to QuickLook.Native/QuickLook.Native32/stdafx.cpp
diff --git a/QuickLook.Native.Shell32/stdafx.h b/QuickLook.Native/QuickLook.Native32/stdafx.h
similarity index 100%
rename from QuickLook.Native.Shell32/stdafx.h
rename to QuickLook.Native/QuickLook.Native32/stdafx.h
diff --git a/QuickLook.Native.Shell32/targetver.h b/QuickLook.Native/QuickLook.Native32/targetver.h
similarity index 100%
rename from QuickLook.Native.Shell32/targetver.h
rename to QuickLook.Native/QuickLook.Native32/targetver.h
diff --git a/QuickLook.Native.Shell32.x64/QuickLook.Native.Shell32.x64.vcxproj b/QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj
similarity index 85%
rename from QuickLook.Native.Shell32.x64/QuickLook.Native.Shell32.x64.vcxproj
rename to QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj
index ff9c606..5d21ee2 100644
--- a/QuickLook.Native.Shell32.x64/QuickLook.Native.Shell32.x64.vcxproj
+++ b/QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj
@@ -13,8 +13,9 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{794E4DCF-F715-4836-9D30-ABD296586D23}</ProjectGuid>
-    <RootNamespace>QuickLookNativeShell32x64</RootNamespace>
+    <RootNamespace>QuickLookNative64</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <ProjectName>QuickLook.Native64</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -72,16 +73,15 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\QuickLook.Native.Shell32\dllmain.cpp" />
-    <ClCompile Include="..\QuickLook.Native.Shell32\QuickLook.Native.Shell32.cpp" />
-    <ClCompile Include="..\QuickLook.Native.Shell32\Shell32.cpp" />
-    <ClCompile Include="..\QuickLook.Native.Shell32\stdafx.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\dllmain.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\QuickLook.Native32.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\Shell32.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\QuickLook.Native.Shell32\QuickLook.Native.Shell32.h" />
-    <ClInclude Include="..\QuickLook.Native.Shell32\Shell32.h" />
-    <ClInclude Include="..\QuickLook.Native.Shell32\stdafx.h" />
-    <ClInclude Include="..\QuickLook.Native.Shell32\targetver.h" />
+    <ClInclude Include="..\QuickLook.Native32\Shell32.h" />
+    <ClInclude Include="..\QuickLook.Native32\stdafx.h" />
+    <ClInclude Include="..\QuickLook.Native32\targetver.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj.filters b/QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj.filters
new file mode 100644
index 0000000..2717474
--- /dev/null
+++ b/QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\QuickLook.Native32\QuickLook.Native32.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\dllmain.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\Shell32.cpp" />
+    <ClCompile Include="..\QuickLook.Native32\stdafx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\QuickLook.Native32\Shell32.h" />
+    <ClInclude Include="..\QuickLook.Native32\stdafx.h" />
+    <ClInclude Include="..\QuickLook.Native32\targetver.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config
index 1419a16..786174f 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config
+++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="SharpCompress" version="0.17.0" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.cs b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.cs
index 4dfec3e..cffa7d7 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.cs
@@ -142,125 +142,128 @@ namespace QuickLook.Plugin.PDFViewer
                     : NewContext_32(IntPtr.Zero, IntPtr.Zero, FzStoreDefault, MuPdfVersion);
             }
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_new_context_imp", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_new_context_imp",
+                CallingConvention = CallingConvention.Cdecl)]
             private static extern IntPtr NewContext_32(IntPtr alloc, IntPtr locks, uint maxStore, string version);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_free_context", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_free_context", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr FreeContext_32(IntPtr ctx);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_open_file_w", CharSet = CharSet.Unicode,
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_open_file_w", CharSet = CharSet.Unicode,
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr OpenFile_32(IntPtr ctx, string fileName);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_open_document_with_stream",
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_open_document_with_stream",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr OpenDocumentStream_32(IntPtr ctx, IntPtr stm);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_close", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_close", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr CloseStream_32(IntPtr stm);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_close_document", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_close_document",
+                CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr CloseDocument_32(IntPtr doc);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_count_pages", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_count_pages", CallingConvention = CallingConvention.Cdecl)]
             public static extern int CountPages_32(IntPtr doc);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_bound_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_bound_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern void BoundPage_32(IntPtr doc, IntPtr page, ref Rectangle bound);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_clear_pixmap_with_value",
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_clear_pixmap_with_value",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern void ClearPixmap_32(IntPtr ctx, IntPtr pix, int byteValue);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_lookup_device_colorspace",
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_lookup_device_colorspace",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr LookupDeviceColorSpace_32(IntPtr ctx, string colorspace);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_free_device", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_free_device", CallingConvention = CallingConvention.Cdecl)]
             public static extern void FreeDevice_32(IntPtr dev);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_free_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_free_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern void FreePage_32(IntPtr doc, IntPtr page);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_load_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_load_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr LoadPage_32(IntPtr doc, int pageNumber);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_new_draw_device", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_new_draw_device",
+                CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr NewDrawDevice_32(IntPtr ctx, IntPtr pix);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_new_pixmap", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_new_pixmap", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr NewPixmap_32(IntPtr ctx, IntPtr colorspace, int width, int height);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "pdf_run_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "pdf_run_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern void RunPage_32(IntPtr doc, IntPtr page, IntPtr dev, ref Matrix transform,
                 IntPtr cookie);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_drop_pixmap", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_drop_pixmap", CallingConvention = CallingConvention.Cdecl)]
             public static extern void DropPixmap_32(IntPtr ctx, IntPtr pix);
 
-            [DllImport("LibMuPdf.dll", EntryPoint = "fz_pixmap_samples", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf32.dll", EntryPoint = "fz_pixmap_samples", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr GetSamples_32(IntPtr ctx, IntPtr pix);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_new_context_imp",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_new_context_imp",
                 CallingConvention = CallingConvention.Cdecl)]
             private static extern IntPtr NewContext_64(IntPtr alloc, IntPtr locks, uint maxStore, string version);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_free_context", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_free_context", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr FreeContext_64(IntPtr ctx);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_open_file_w", CharSet = CharSet.Unicode,
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_open_file_w", CharSet = CharSet.Unicode,
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr OpenFile_64(IntPtr ctx, string fileName);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_open_document_with_stream",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_open_document_with_stream",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr OpenDocumentStream_64(IntPtr ctx, IntPtr stm);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_close", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_close", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr CloseStream_64(IntPtr stm);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_close_document",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_close_document",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr CloseDocument_64(IntPtr doc);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_count_pages", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_count_pages", CallingConvention = CallingConvention.Cdecl)]
             public static extern int CountPages_64(IntPtr doc);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_bound_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_bound_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern void BoundPage_64(IntPtr doc, IntPtr page, ref Rectangle bound);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_clear_pixmap_with_value",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_clear_pixmap_with_value",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern void ClearPixmap_64(IntPtr ctx, IntPtr pix, int byteValue);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_lookup_device_colorspace",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_lookup_device_colorspace",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr LookupDeviceColorSpace_64(IntPtr ctx, string colorspace);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_free_device", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_free_device", CallingConvention = CallingConvention.Cdecl)]
             public static extern void FreeDevice_64(IntPtr dev);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_free_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_free_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern void FreePage_64(IntPtr doc, IntPtr page);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_load_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_load_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr LoadPage_64(IntPtr doc, int pageNumber);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_new_draw_device",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_new_draw_device",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr NewDrawDevice_64(IntPtr ctx, IntPtr pix);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_new_pixmap", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_new_pixmap", CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr NewPixmap_64(IntPtr ctx, IntPtr colorspace, int width, int height);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "pdf_run_page", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "pdf_run_page", CallingConvention = CallingConvention.Cdecl)]
             public static extern void RunPage_64(IntPtr doc, IntPtr page, IntPtr dev, ref Matrix transform,
                 IntPtr cookie);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_drop_pixmap", CallingConvention = CallingConvention.Cdecl)]
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_drop_pixmap", CallingConvention = CallingConvention.Cdecl)]
             public static extern void DropPixmap_64(IntPtr ctx, IntPtr pix);
 
-            [DllImport("LibMuPdf.x64.dll", EntryPoint = "fz_pixmap_samples",
+            [DllImport("LibMuPdf64.dll", EntryPoint = "fz_pixmap_samples",
                 CallingConvention = CallingConvention.Cdecl)]
             public static extern IntPtr GetSamples_64(IntPtr ctx, IntPtr pix);
         }
diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.dll b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf32.dll
similarity index 100%
rename from QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.dll
rename to QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf32.dll
diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.x64.dll b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf64.dll
similarity index 100%
rename from QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf.x64.dll
rename to QuickLook.Plugin/QuickLook.Plugin.PDFViewer/LibMuPdf64.dll
diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj
index dbe9fd9..7e0f8e7 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj
@@ -86,10 +86,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="LibMuPdf.dll">
+    <Content Include="LibMuPdf32.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="LibMuPdf.x64.dll">
+    <Content Include="LibMuPdf64.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/QuickLook.sln b/QuickLook.sln
index d58f86f..44e8638 100644
--- a/QuickLook.sln
+++ b/QuickLook.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook", "QuickLook\Quic
 		{794E4DCF-F715-4836-9D30-ABD296586D23} = {794E4DCF-F715-4836-9D30-ABD296586D23}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickLook.Native.Shell32", "QuickLook.Native.Shell32\QuickLook.Native.Shell32.vcxproj", "{D31EE321-C2B0-4984-B749-736F7DE509F1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickLook.Native32", "QuickLook.Native\QuickLook.Native32\QuickLook.Native32.vcxproj", "{D31EE321-C2B0-4984-B749-736F7DE509F1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickLook.Plugin", "QuickLook.Plugin", "{06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}"
 EndProject
@@ -49,7 +49,9 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "QuickLook.Installer", "Quic
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Plugin.IPreviewHandlers", "QuickLook.Plugin\QuickLook.Plugin.IPreviewHandlers\QuickLook.Plugin.IPreviewHandlers.csproj", "{E37675EA-D957-4495-8655-2609BF86756C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickLook.Native.Shell32.x64", "QuickLook.Native.Shell32.x64\QuickLook.Native.Shell32.x64.vcxproj", "{794E4DCF-F715-4836-9D30-ABD296586D23}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickLook.Native64", "QuickLook.Native\QuickLook.Native64\QuickLook.Native64.vcxproj", "{794E4DCF-F715-4836-9D30-ABD296586D23}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickLook.Native", "QuickLook.Native", "{D18A23FF-76BD-43BD-AC32-786D166EBAC9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -156,6 +158,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{D31EE321-C2B0-4984-B749-736F7DE509F1} = {D18A23FF-76BD-43BD-AC32-786D166EBAC9}
 		{DE2E3BC5-6AB2-4420-A160-48C7A7506C1C} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 		{FE5A5111-9607-4721-A7BE-422754002ED8} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 		{A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
@@ -164,5 +167,6 @@ Global
 		{CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 		{AB1270AF-7EB4-4B4F-9E09-6404F1A28EA0} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 		{E37675EA-D957-4495-8655-2609BF86756C} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
+		{794E4DCF-F715-4836-9D30-ABD296586D23} = {D18A23FF-76BD-43BD-AC32-786D166EBAC9}
 	EndGlobalSection
 EndGlobal
diff --git a/QuickLook/NativeMethods/QuickLook.cs b/QuickLook/NativeMethods/QuickLook.cs
index 4f5d8db..9a36bd8 100644
--- a/QuickLook/NativeMethods/QuickLook.cs
+++ b/QuickLook/NativeMethods/QuickLook.cs
@@ -8,19 +8,19 @@ namespace QuickLook.NativeMethods
     {
         private const int MaxPath = 260;
 
-        [DllImport("QuickLook.Native.Shell32.dll", EntryPoint = "GetFocusedWindowType",
+        [DllImport("QuickLook.Native32.dll", EntryPoint = "GetFocusedWindowType",
             CallingConvention = CallingConvention.Cdecl)]
         private static extern FocusedWindowType GetFocusedWindowTypeNative_32();
 
-        [DllImport("QuickLook.Native.Shell32.dll", EntryPoint = "GetCurrentSelection",
+        [DllImport("QuickLook.Native32.dll", EntryPoint = "GetCurrentSelection",
             CallingConvention = CallingConvention.Cdecl)]
         private static extern void GetCurrentSelectionNative_32([MarshalAs(UnmanagedType.LPWStr)] StringBuilder sb);
 
-        [DllImport("QuickLook.Native.Shell32.x64.dll", EntryPoint = "GetFocusedWindowType",
+        [DllImport("QuickLook.Native64.dll", EntryPoint = "GetFocusedWindowType",
             CallingConvention = CallingConvention.Cdecl)]
         private static extern FocusedWindowType GetFocusedWindowTypeNative_64();
 
-        [DllImport("QuickLook.Native.Shell32.x64.dll", EntryPoint = "GetCurrentSelection",
+        [DllImport("QuickLook.Native64.dll", EntryPoint = "GetCurrentSelection",
             CallingConvention = CallingConvention.Cdecl)]
         private static extern void GetCurrentSelectionNative_64([MarshalAs(UnmanagedType.LPWStr)] StringBuilder sb);