diff --git a/Wox.Infrastructure/MFTSearch/MFTSearchRecord.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/MFTSearchRecord.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/MFTSearchRecord.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/MFTSearchRecord.cs
diff --git a/Wox.Infrastructure/MFTSearch/MFTSearcher.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/MFTSearcher.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/MFTSearcher.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/MFTSearcher.cs
diff --git a/Wox.Infrastructure/MFTSearch/MFTSearcherCache.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/MFTSearcherCache.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/MFTSearcherCache.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/MFTSearcherCache.cs
diff --git a/Wox.Infrastructure/MFTSearch/PInvokeWin32.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/PInvokeWin32.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/PInvokeWin32.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/PInvokeWin32.cs
diff --git a/Wox.Infrastructure/MFTSearch/USNChangeReason.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/USNChangeReason.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/USNChangeReason.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/USNChangeReason.cs
diff --git a/Wox.Infrastructure/MFTSearch/USNRecord.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/USNRecord.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/USNRecord.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/USNRecord.cs
diff --git a/Wox.Infrastructure/MFTSearch/USNRecordType.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/USNRecordType.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/USNRecordType.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/USNRecordType.cs
diff --git a/Wox.Infrastructure/MFTSearch/VolumeMonitor.cs b/Plugins/Wox.Plugin.FindFile/MFTSearch/VolumeMonitor.cs
similarity index 100%
rename from Wox.Infrastructure/MFTSearch/VolumeMonitor.cs
rename to Plugins/Wox.Plugin.FindFile/MFTSearch/VolumeMonitor.cs
diff --git a/Plugins/Wox.Plugin.FindFile/Wox.Plugin.FindFile.csproj b/Plugins/Wox.Plugin.FindFile/Wox.Plugin.FindFile.csproj
index 4db15cf579..3cabda2b97 100644
--- a/Plugins/Wox.Plugin.FindFile/Wox.Plugin.FindFile.csproj
+++ b/Plugins/Wox.Plugin.FindFile/Wox.Plugin.FindFile.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -41,6 +43,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
+    <Compile Include="MFTSearch\MFTSearcher.cs" />
+    <Compile Include="MFTSearch\MFTSearcherCache.cs" />
+    <Compile Include="MFTSearch\MFTSearchRecord.cs" />
+    <Compile Include="MFTSearch\PInvokeWin32.cs" />
+    <Compile Include="MFTSearch\USNChangeReason.cs" />
+    <Compile Include="MFTSearch\USNRecord.cs" />
+    <Compile Include="MFTSearch\USNRecordType.cs" />
+    <Compile Include="MFTSearch\VolumeMonitor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj
index fb42df5417..df363b7421 100644
--- a/Wox.Infrastructure/Wox.Infrastructure.csproj
+++ b/Wox.Infrastructure/Wox.Infrastructure.csproj
@@ -31,7 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -57,14 +57,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Logger\Log.cs" />
-    <Compile Include="MFTSearch\MFTSearcher.cs" />
-    <Compile Include="MFTSearch\MFTSearcherCache.cs" />
-    <Compile Include="MFTSearch\MFTSearchRecord.cs" />
-    <Compile Include="MFTSearch\USNRecord.cs" />
-    <Compile Include="MFTSearch\USNRecordType.cs" />
-    <Compile Include="MFTSearch\PInvokeWin32.cs" />
-    <Compile Include="MFTSearch\USNChangeReason.cs" />
-    <Compile Include="MFTSearch\VolumeMonitor.cs" />
     <Compile Include="PeHeaderReader.cs" />
     <Compile Include="Storage\UserSettings\CustomizedPluginConfig.cs" />
     <Compile Include="Storage\UserSettings\FolderLink.cs" />
diff --git a/Wox.Test/Wox.Test.csproj b/Wox.Test/Wox.Test.csproj
index 54cdca3d43..c34a3ec954 100644
--- a/Wox.Test/Wox.Test.csproj
+++ b/Wox.Test/Wox.Test.csproj
@@ -52,6 +52,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Plugins\Wox.Plugin.FindFile\Wox.Plugin.FindFile.csproj">
+      <Project>{84EA88B4-71F2-4A3D-9771-D7B0244C0D81}</Project>
+      <Name>Wox.Plugin.FindFile</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj">
       <Project>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</Project>
       <Name>Wox.Infrastructure</Name>
diff --git a/Wox/Commands/SystemCommand.cs b/Wox/Commands/SystemCommand.cs
index 1a5a1949b7..a1fc477a82 100644
--- a/Wox/Commands/SystemCommand.cs
+++ b/Wox/Commands/SystemCommand.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using Wox.Infrastructure.MFTSearch;
 using Wox.Infrastructure.Storage.UserSettings;
 using Wox.Plugin;
 using Wox.Plugin.SystemPlugins;
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index dc3e617dd2..e6ecf4cb53 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -17,7 +17,6 @@ using NHotkey.Wpf;
 using Wox.Commands;
 using Wox.Helper;
 using Wox.Infrastructure;
-using Wox.Infrastructure.MFTSearch;
 using Wox.Infrastructure.Storage;
 using Wox.Infrastructure.Storage.UserSettings;
 using Wox.Plugin;