diff --git a/Wox.Plugin.SystemPlugins/IProgramSource.cs b/Wox.Plugin.SystemPlugins/Program/IProgramSource.cs
similarity index 86%
rename from Wox.Plugin.SystemPlugins/IProgramSource.cs
rename to Wox.Plugin.SystemPlugins/Program/IProgramSource.cs
index 239c482bec..4efcb1e409 100644
--- a/Wox.Plugin.SystemPlugins/IProgramSource.cs
+++ b/Wox.Plugin.SystemPlugins/Program/IProgramSource.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Diagnostics;
 
-namespace Wox.Plugin.SystemPlugins
+namespace Wox.Plugin.SystemPlugins.Program
 {
     public interface IProgramSource
     {
@@ -21,9 +19,9 @@ namespace Wox.Plugin.SystemPlugins
             get; set;
         }
 
-        protected Program CreateEntry(string file)
+        protected SystemPlugins.Program.Program CreateEntry(string file)
         {
-            Program p = new Program()
+            SystemPlugins.Program.Program p = new SystemPlugins.Program.Program()
             {
                 Title = global::System.IO.Path.GetFileNameWithoutExtension(file),
                 IcoPath = file,
diff --git a/Wox.Plugin.SystemPlugins/ProgramSetting.xaml b/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml
similarity index 97%
rename from Wox.Plugin.SystemPlugins/ProgramSetting.xaml
rename to Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml
index 468ab5953a..ad3b05f08b 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSetting.xaml
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Wox.Plugin.SystemPlugins.ProgramSetting"
+<UserControl x:Class="Wox.Plugin.SystemPlugins.Program.ProgramSetting"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/Wox.Plugin.SystemPlugins/ProgramSetting.xaml.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml.cs
similarity index 85%
rename from Wox.Plugin.SystemPlugins/ProgramSetting.xaml.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml.cs
index 55f190a2cb..04c9d9c036 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSetting.xaml.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml.cs
@@ -1,19 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Wox.Infrastructure.Storage.UserSettings;
 
-namespace Wox.Plugin.SystemPlugins
+namespace Wox.Plugin.SystemPlugins.Program
 {
     /// <summary>
     /// Interaction logic for ProgramSetting.xaml
diff --git a/Wox.Plugin.SystemPlugins/ProgramSourceSetting.xaml b/Wox.Plugin.SystemPlugins/Program/ProgramSourceSetting.xaml
similarity index 97%
rename from Wox.Plugin.SystemPlugins/ProgramSourceSetting.xaml
rename to Wox.Plugin.SystemPlugins/Program/ProgramSourceSetting.xaml
index a3a3da77a6..1d09c9e65c 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSourceSetting.xaml
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSourceSetting.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Wox.Plugin.SystemPlugins.ProgramSourceSetting"
+<Window x:Class="Wox.Plugin.SystemPlugins.Program.ProgramSourceSetting"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         ResizeMode="NoResize"
diff --git a/Wox.Plugin.SystemPlugins/ProgramSourceSetting.xaml.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSourceSetting.xaml.cs
similarity index 88%
rename from Wox.Plugin.SystemPlugins/ProgramSourceSetting.xaml.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSourceSetting.xaml.cs
index c629fe406f..d38a97bca5 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSourceSetting.xaml.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSourceSetting.xaml.cs
@@ -1,23 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using Wox.Infrastructure;
-using Wox.Infrastructure.Storage;
 using Wox.Infrastructure.Storage.UserSettings;
 using MessageBox = System.Windows.MessageBox;
 
-namespace Wox.Plugin.SystemPlugins
+namespace Wox.Plugin.SystemPlugins.Program
 {
     public partial class ProgramSourceSetting : Window
     {
@@ -30,7 +19,7 @@ namespace Wox.Plugin.SystemPlugins
             this.settingWindow = settingWidow;
             InitializeComponent();
 
-            this.cbType.ItemsSource = Wox.Plugin.SystemPlugins.Programs.SourceTypes.Select(o => o.Key).ToList();
+            this.cbType.ItemsSource = Programs.SourceTypes.Select(o => o.Key).ToList();
         }
 
         public void UpdateItem(ProgramSource programSource)
@@ -115,7 +104,7 @@ namespace Wox.Plugin.SystemPlugins
         {
             string item = cbType.SelectedItem as String;
             Type type;
-            if (item != null && Wox.Plugin.SystemPlugins.Programs.SourceTypes.TryGetValue(item, out type))
+            if (item != null && Programs.SourceTypes.TryGetValue(item, out type))
             {
                 var attrs = type.GetCustomAttributes(typeof(BrowsableAttribute), false);
                 if (attrs.Length > 0 && (attrs[0] as BrowsableAttribute).Browsable == false)
diff --git a/Wox.Plugin.SystemPlugins/ProgramSources/AppPathsProgramSource.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSources/AppPathsProgramSource.cs
similarity index 92%
rename from Wox.Plugin.SystemPlugins/ProgramSources/AppPathsProgramSource.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSources/AppPathsProgramSource.cs
index a55cf13364..f6777e93e4 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSources/AppPathsProgramSource.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSources/AppPathsProgramSource.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Wox.Infrastructure.Storage.UserSettings;
 
-namespace Wox.Plugin.SystemPlugins.ProgramSources
+namespace Wox.Plugin.SystemPlugins.Program.ProgramSources
 {
     [global::System.ComponentModel.Browsable(false)]
     public class AppPathsProgramSource: AbstractProgramSource
diff --git a/Wox.Plugin.SystemPlugins/ProgramSources/CommonStartMenuProgramSource.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSources/CommonStartMenuProgramSource.cs
similarity index 92%
rename from Wox.Plugin.SystemPlugins/ProgramSources/CommonStartMenuProgramSource.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSources/CommonStartMenuProgramSource.cs
index a49720325d..9e940faf8e 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSources/CommonStartMenuProgramSource.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSources/CommonStartMenuProgramSource.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.InteropServices;
+using System.Text;
 using Wox.Infrastructure.Storage.UserSettings;
 
-namespace Wox.Plugin.SystemPlugins.ProgramSources
+namespace Wox.Plugin.SystemPlugins.Program.ProgramSources
 {
     [global::System.ComponentModel.Browsable(false)]
     public class CommonStartMenuProgramSource : FileSystemProgramSource
diff --git a/Wox.Plugin.SystemPlugins/ProgramSources/FileSystemFolderSourceShallow.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSources/FileSystemFolderSourceShallow.cs
similarity index 93%
rename from Wox.Plugin.SystemPlugins/ProgramSources/FileSystemFolderSourceShallow.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSources/FileSystemFolderSourceShallow.cs
index ad2db77bc7..ba1b0828ea 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSources/FileSystemFolderSourceShallow.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSources/FileSystemFolderSourceShallow.cs
@@ -1,16 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using Wox.Infrastructure;
 using Wox.Infrastructure.Storage.UserSettings;
-using Wox.Plugin.SystemPlugins;
-using Wox.Plugin.SystemPlugins.ProgramSources;
 
-namespace Wox.Plugin.SystemPlugins.ProgramSources {
+namespace Wox.Plugin.SystemPlugins.Program.ProgramSources {
 	//TODO: Create Deep Version that grabs all subfolders like FileSystemProgramSource
 
 	/// <summary>
diff --git a/Wox.Plugin.SystemPlugins/ProgramSources/FileSystemProgramSource.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSources/FileSystemProgramSource.cs
similarity index 93%
rename from Wox.Plugin.SystemPlugins/ProgramSources/FileSystemProgramSource.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSources/FileSystemProgramSource.cs
index 67826f077b..a1985a7ede 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSources/FileSystemProgramSource.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSources/FileSystemProgramSource.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Wox.Infrastructure.Storage.UserSettings;
 
-namespace Wox.Plugin.SystemPlugins.ProgramSources
+namespace Wox.Plugin.SystemPlugins.Program.ProgramSources
 {
     public class FileSystemProgramSource : AbstractProgramSource
     {
diff --git a/Wox.Plugin.SystemPlugins/ProgramSources/PortableAppsProgramSource.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSources/PortableAppsProgramSource.cs
similarity index 98%
rename from Wox.Plugin.SystemPlugins/ProgramSources/PortableAppsProgramSource.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSources/PortableAppsProgramSource.cs
index fb048400bb..284f99e98f 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSources/PortableAppsProgramSource.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSources/PortableAppsProgramSource.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using IniParser;
+using System.Text;
 using Wox.Infrastructure.Storage.UserSettings;
 
-namespace Wox.Plugin.SystemPlugins.ProgramSources
+namespace Wox.Plugin.SystemPlugins.Program.ProgramSources
 {
     public class PortableAppsProgramSource : AbstractProgramSource
     {
diff --git a/Wox.Plugin.SystemPlugins/ProgramSources/UserStartMenuProgramSource.cs b/Wox.Plugin.SystemPlugins/Program/ProgramSources/UserStartMenuProgramSource.cs
similarity index 83%
rename from Wox.Plugin.SystemPlugins/ProgramSources/UserStartMenuProgramSource.cs
rename to Wox.Plugin.SystemPlugins/Program/ProgramSources/UserStartMenuProgramSource.cs
index df249b141b..5ee04c3760 100644
--- a/Wox.Plugin.SystemPlugins/ProgramSources/UserStartMenuProgramSource.cs
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSources/UserStartMenuProgramSource.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Wox.Infrastructure.Storage.UserSettings;
 
-namespace Wox.Plugin.SystemPlugins.ProgramSources
+namespace Wox.Plugin.SystemPlugins.Program.ProgramSources
 {
     [global::System.ComponentModel.Browsable(false)]
     public class UserStartMenuProgramSource : FileSystemProgramSource
diff --git a/Wox.Plugin.SystemPlugins/Programs.cs b/Wox.Plugin.SystemPlugins/Program/Programs.cs
similarity index 95%
rename from Wox.Plugin.SystemPlugins/Programs.cs
rename to Wox.Plugin.SystemPlugins/Program/Programs.cs
index 1ec59f18bd..edfd948dbe 100644
--- a/Wox.Plugin.SystemPlugins/Programs.cs
+++ b/Wox.Plugin.SystemPlugins/Program/Programs.cs
@@ -1,19 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.Win32;
 using Wox.Infrastructure;
-using Wox.Infrastructure.Storage;
 using Wox.Infrastructure.Storage.UserSettings;
-using Wox.Plugin.SystemPlugins.ProgramSources;
+using Wox.Plugin.SystemPlugins.Program.ProgramSources;
 
-namespace Wox.Plugin.SystemPlugins
+namespace Wox.Plugin.SystemPlugins.Program
 {
     public class Program
     {
diff --git a/Wox.Plugin.SystemPlugins/WebSearchPlugin.cs b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs
similarity index 100%
rename from Wox.Plugin.SystemPlugins/WebSearchPlugin.cs
rename to Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs
diff --git a/Wox.Plugin.SystemPlugins/WebSearchSetting.xaml b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchSetting.xaml
similarity index 100%
rename from Wox.Plugin.SystemPlugins/WebSearchSetting.xaml
rename to Wox.Plugin.SystemPlugins/WebSearch/WebSearchSetting.xaml
diff --git a/Wox.Plugin.SystemPlugins/WebSearchSetting.xaml.cs b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchSetting.xaml.cs
similarity index 100%
rename from Wox.Plugin.SystemPlugins/WebSearchSetting.xaml.cs
rename to Wox.Plugin.SystemPlugins/WebSearch/WebSearchSetting.xaml.cs
diff --git a/Wox.Plugin.SystemPlugins/WebSearchesSetting.xaml b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchesSetting.xaml
similarity index 100%
rename from Wox.Plugin.SystemPlugins/WebSearchesSetting.xaml
rename to Wox.Plugin.SystemPlugins/WebSearch/WebSearchesSetting.xaml
diff --git a/Wox.Plugin.SystemPlugins/WebSearchesSetting.xaml.cs b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchesSetting.xaml.cs
similarity index 100%
rename from Wox.Plugin.SystemPlugins/WebSearchesSetting.xaml.cs
rename to Wox.Plugin.SystemPlugins/WebSearch/WebSearchesSetting.xaml.cs
diff --git a/Wox.Plugin.SystemPlugins/Wox.Plugin.SystemPlugins.csproj b/Wox.Plugin.SystemPlugins/Wox.Plugin.SystemPlugins.csproj
index d813bdea13..1f945e09c9 100644
--- a/Wox.Plugin.SystemPlugins/Wox.Plugin.SystemPlugins.csproj
+++ b/Wox.Plugin.SystemPlugins/Wox.Plugin.SystemPlugins.csproj
@@ -55,36 +55,36 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CMD\CMDStorage.cs" />
-    <Compile Include="ProgramSetting.xaml.cs">
+    <Compile Include="Program\ProgramSetting.xaml.cs">
       <DependentUpon>ProgramSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProgramSourceSetting.xaml.cs">
+    <Compile Include="Program\ProgramSourceSetting.xaml.cs">
       <DependentUpon>ProgramSourceSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProgramSources\AppPathsProgramSource.cs" />
-    <Compile Include="ProgramSources\CommonStartMenuProgramSource.cs" />
-    <Compile Include="ProgramSources\FileSystemFolderSourceShallow.cs" />
-    <Compile Include="ProgramSources\PortableAppsProgramSource.cs" />
-    <Compile Include="IProgramSource.cs" />
+    <Compile Include="Program\ProgramSources\AppPathsProgramSource.cs" />
+    <Compile Include="Program\ProgramSources\CommonStartMenuProgramSource.cs" />
+    <Compile Include="Program\ProgramSources\FileSystemFolderSourceShallow.cs" />
+    <Compile Include="Program\ProgramSources\PortableAppsProgramSource.cs" />
+    <Compile Include="Program\IProgramSource.cs" />
     <Compile Include="BaseSystemPlugin.cs" />
     <Compile Include="BrowserBookmarks.cs" />
     <Compile Include="Calculator.cs" />
-    <Compile Include="ProgramSources\FileSystemProgramSource.cs" />
-    <Compile Include="ProgramSources\UserStartMenuProgramSource.cs" />
-    <Compile Include="WebSearchesSetting.xaml.cs">
+    <Compile Include="Program\ProgramSources\FileSystemProgramSource.cs" />
+    <Compile Include="Program\ProgramSources\UserStartMenuProgramSource.cs" />
+    <Compile Include="WebSearch\WebSearchesSetting.xaml.cs">
       <DependentUpon>WebSearchesSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="WebSearchPlugin.cs" />
+    <Compile Include="WebSearch\WebSearchPlugin.cs" />
     <Compile Include="CMD\CMD.cs" />
     <Compile Include="DirectoryIndicator.cs" />
     <Compile Include="ISystemPlugin.cs" />
-    <Compile Include="Programs.cs" />
+    <Compile Include="Program\Programs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Sys.cs" />
     <Compile Include="ThirdpartyPluginIndicator.cs" />
     <Compile Include="SuggestionSources\Google.cs" />
     <Compile Include="SuggestionSources\ISuggestionSource.cs" />
-    <Compile Include="WebSearchSetting.xaml.cs">
+    <Compile Include="WebSearch\WebSearchSetting.xaml.cs">
       <DependentUpon>WebSearchSetting.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -99,22 +99,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="ProgramSetting.xaml">
+    <Page Include="Program\ProgramSetting.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProgramSourceSetting.xaml">
+    <Page Include="Program\ProgramSourceSetting.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="WebSearchesSetting.xaml">
+    <Page Include="WebSearch\WebSearchesSetting.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="WebSearchSetting.xaml">
+    <Page Include="WebSearch\WebSearchSetting.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>