diff --git a/QuickLook.Plugin.IViewerPlugin/ContextObject.cs b/QuickLook.Common/ContextObject.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/ContextObject.cs
rename to QuickLook.Common/ContextObject.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/ExtensionMethods/BitmapExtensions.cs b/QuickLook.Common/ExtensionMethods/BitmapExtensions.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/ExtensionMethods/BitmapExtensions.cs
rename to QuickLook.Common/ExtensionMethods/BitmapExtensions.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/ExtensionMethods/DispatcherExtensions.cs b/QuickLook.Common/ExtensionMethods/DispatcherExtensions.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/ExtensionMethods/DispatcherExtensions.cs
rename to QuickLook.Common/ExtensionMethods/DispatcherExtensions.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/ExtensionMethods/EnumerableExtensions.cs b/QuickLook.Common/ExtensionMethods/EnumerableExtensions.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/ExtensionMethods/EnumerableExtensions.cs
rename to QuickLook.Common/ExtensionMethods/EnumerableExtensions.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/ExtensionMethods/FileExtensions.cs b/QuickLook.Common/ExtensionMethods/FileExtensions.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/ExtensionMethods/FileExtensions.cs
rename to QuickLook.Common/ExtensionMethods/FileExtensions.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/ExtensionMethods/TypeExtensions.cs b/QuickLook.Common/ExtensionMethods/TypeExtensions.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/ExtensionMethods/TypeExtensions.cs
rename to QuickLook.Common/ExtensionMethods/TypeExtensions.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Helpers/DpiHelper.cs b/QuickLook.Common/Helpers/DpiHelper.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Helpers/DpiHelper.cs
rename to QuickLook.Common/Helpers/DpiHelper.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Helpers/FileHelper.cs b/QuickLook.Common/Helpers/FileHelper.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Helpers/FileHelper.cs
rename to QuickLook.Common/Helpers/FileHelper.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Helpers/ProcessHelper.cs b/QuickLook.Common/Helpers/ProcessHelper.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Helpers/ProcessHelper.cs
rename to QuickLook.Common/Helpers/ProcessHelper.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Helpers/SettingHelper.cs b/QuickLook.Common/Helpers/SettingHelper.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Helpers/SettingHelper.cs
rename to QuickLook.Common/Helpers/SettingHelper.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Helpers/TranslationHelper.cs b/QuickLook.Common/Helpers/TranslationHelper.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Helpers/TranslationHelper.cs
rename to QuickLook.Common/Helpers/TranslationHelper.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Helpers/WindowHelper.cs b/QuickLook.Common/Helpers/WindowHelper.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Helpers/WindowHelper.cs
rename to QuickLook.Common/Helpers/WindowHelper.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/IViewer.cs b/QuickLook.Common/IViewer.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/IViewer.cs
rename to QuickLook.Common/IViewer.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/NativeMethods/Kernel32.cs b/QuickLook.Common/NativeMethods/Kernel32.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/NativeMethods/Kernel32.cs
rename to QuickLook.Common/NativeMethods/Kernel32.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/NativeMethods/User32.cs b/QuickLook.Common/NativeMethods/User32.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/NativeMethods/User32.cs
rename to QuickLook.Common/NativeMethods/User32.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Properties/Annotations.cs b/QuickLook.Common/Properties/Annotations.cs
similarity index 100%
rename from QuickLook.Plugin.IViewerPlugin/Properties/Annotations.cs
rename to QuickLook.Common/Properties/Annotations.cs
diff --git a/QuickLook.Plugin.IViewerPlugin/Properties/AssemblyInfo.cs b/QuickLook.Common/Properties/AssemblyInfo.cs
similarity index 90%
rename from QuickLook.Plugin.IViewerPlugin/Properties/AssemblyInfo.cs
rename to QuickLook.Common/Properties/AssemblyInfo.cs
index 2adce7a..5dd010b 100644
--- a/QuickLook.Plugin.IViewerPlugin/Properties/AssemblyInfo.cs
+++ b/QuickLook.Common/Properties/AssemblyInfo.cs
@@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("QuickLook.Plugin.IViewerPlugin")]
+[assembly: AssemblyTitle("QuickLook.Common")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("QuickLook.Plugin.IViewerPlugin")]
+[assembly: AssemblyProduct("QuickLook.Common")]
 [assembly: AssemblyCopyright("Copyright © Paddy Xu 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/QuickLook.Plugin.IViewerPlugin/QuickLook.Common.csproj b/QuickLook.Common/QuickLook.Common.csproj
similarity index 91%
rename from QuickLook.Plugin.IViewerPlugin/QuickLook.Common.csproj
rename to QuickLook.Common/QuickLook.Common.csproj
index f3f09f9..2fe5a00 100644
--- a/QuickLook.Plugin.IViewerPlugin/QuickLook.Common.csproj
+++ b/QuickLook.Common/QuickLook.Common.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>QuickLook.Common</RootNamespace>
-    <AssemblyName>QuickLook.Plugin.IViewerPlugin</AssemblyName>
+    <AssemblyName>QuickLook.Common</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -39,11 +39,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj
index 08f2c76..9acca64 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj
@@ -90,7 +90,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj
index 294e464..5dc38a6 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj
@@ -85,7 +85,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj
index cdeb26b..bb8c37a 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj
@@ -93,7 +93,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.IPreviewHandlers/QuickLook.Plugin.IPreviewHandlers.csproj b/QuickLook.Plugin/QuickLook.Plugin.IPreviewHandlers/QuickLook.Plugin.IPreviewHandlers.csproj
index 89d0bc3..f487101 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.IPreviewHandlers/QuickLook.Plugin.IPreviewHandlers.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.IPreviewHandlers/QuickLook.Plugin.IPreviewHandlers.csproj
@@ -92,7 +92,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
index c4c3028..d835958 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
@@ -91,7 +91,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj
index eea8cf5..4f53db9 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj
@@ -88,7 +88,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/QuickLook.Plugin.MarkdownViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/QuickLook.Plugin.MarkdownViewer.csproj
index a7a682a..a34f437 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/QuickLook.Plugin.MarkdownViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/QuickLook.Plugin.MarkdownViewer.csproj
@@ -77,7 +77,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj
index d38fb9d..0960cd2 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj
@@ -88,7 +88,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj
index a65407e..685a6b1 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj
@@ -81,7 +81,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj
index c1e38e7..24ba91c 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj
@@ -102,7 +102,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>
diff --git a/QuickLook.sln b/QuickLook.sln
index e21a297..6b3fd0c 100644
--- a/QuickLook.sln
+++ b/QuickLook.sln
@@ -68,7 +68,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Plugin.CsvViewer"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Plugin.MailViewer", "QuickLook.Plugin\QuickLook.Plugin.MailViewer\QuickLook.Plugin.MailViewer.csproj", "{45E94893-3076-4A8E-8969-6955B6340739}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Common", "QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj", "{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Common", "QuickLook.Common\QuickLook.Common.csproj", "{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/QuickLook/App.config b/QuickLook/App.config
index d7d44a4..01c325b 100644
--- a/QuickLook/App.config
+++ b/QuickLook/App.config
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <configuration>
-  <configSections>
-    <sectionGroup name="userSettings"
-                  type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="QuickLook.Properties.Settings"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
@@ -16,14 +8,4 @@
     <legacyCorruptedStateExceptionsPolicy enabled="true" />
     <legacyUnhandledExceptionPolicy enabled="1" />
   </runtime>
-  <userSettings>
-    <QuickLook.Properties.Settings>
-      <setting name="Upgraded" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="LastUpdate" serializeAs="String">
-        <value>2017-01-01</value>
-      </setting>
-    </QuickLook.Properties.Settings>
-  </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/QuickLook/QuickLook.csproj b/QuickLook/QuickLook.csproj
index 61cf279..6888706 100644
--- a/QuickLook/QuickLook.csproj
+++ b/QuickLook/QuickLook.csproj
@@ -98,7 +98,6 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -262,7 +261,7 @@
     <None Include="Controls\GlassLayer\GaussianBlur.fx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\QuickLook.Plugin.IViewerPlugin\QuickLook.Common.csproj">
+    <ProjectReference Include="..\QuickLook.Common\QuickLook.Common.csproj">
       <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
       <Name>QuickLook.Common</Name>
       <Private>False</Private>