diff --git a/Wox.Plugin.System/AppPathsProgramSource.cs b/Wox.Plugin.System/ProgramSources/AppPathsProgramSource.cs
similarity index 97%
rename from Wox.Plugin.System/AppPathsProgramSource.cs
rename to Wox.Plugin.System/ProgramSources/AppPathsProgramSource.cs
index 6b645c972..96f66c860 100644
--- a/Wox.Plugin.System/AppPathsProgramSource.cs
+++ b/Wox.Plugin.System/ProgramSources/AppPathsProgramSource.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Wox.Plugin.System
+namespace Wox.Plugin.System.ProgramSources
 {
     [global::System.ComponentModel.Browsable(false)]
     public class AppPathsProgramSource: AbstractProgramSource
diff --git a/Wox.Plugin.System/CommonStartMenuProgramSource.cs b/Wox.Plugin.System/ProgramSources/CommonStartMenuProgramSource.cs
similarity index 96%
rename from Wox.Plugin.System/CommonStartMenuProgramSource.cs
rename to Wox.Plugin.System/ProgramSources/CommonStartMenuProgramSource.cs
index 37169e008..c0e8ca4da 100644
--- a/Wox.Plugin.System/CommonStartMenuProgramSource.cs
+++ b/Wox.Plugin.System/ProgramSources/CommonStartMenuProgramSource.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace Wox.Plugin.System
+namespace Wox.Plugin.System.ProgramSources
 {
     [global::System.ComponentModel.Browsable(false)]
     public class CommonStartMenuProgramSource : FileSystemProgramSource
diff --git a/Wox.Plugin.System/FileSystemProgramSource.cs b/Wox.Plugin.System/ProgramSources/FileSystemProgramSource.cs
similarity index 97%
rename from Wox.Plugin.System/FileSystemProgramSource.cs
rename to Wox.Plugin.System/ProgramSources/FileSystemProgramSource.cs
index 5f3a142f4..57440ed1f 100644
--- a/Wox.Plugin.System/FileSystemProgramSource.cs
+++ b/Wox.Plugin.System/ProgramSources/FileSystemProgramSource.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-namespace Wox.Plugin.System
+namespace Wox.Plugin.System.ProgramSources
 {
     public class FileSystemProgramSource : AbstractProgramSource
     {
diff --git a/Wox.Plugin.System/PortableAppsProgramSource.cs b/Wox.Plugin.System/ProgramSources/PortableAppsProgramSource.cs
similarity index 99%
rename from Wox.Plugin.System/PortableAppsProgramSource.cs
rename to Wox.Plugin.System/ProgramSources/PortableAppsProgramSource.cs
index a2600116c..41a6d7ce9 100644
--- a/Wox.Plugin.System/PortableAppsProgramSource.cs
+++ b/Wox.Plugin.System/ProgramSources/PortableAppsProgramSource.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 using IniParser;
-namespace Wox.Plugin.System
+namespace Wox.Plugin.System.ProgramSources
 {
     public class PortableAppsProgramSource : AbstractProgramSource
     {
diff --git a/Wox.Plugin.System/UserStartMenuProgramSource.cs b/Wox.Plugin.System/ProgramSources/UserStartMenuProgramSource.cs
similarity index 94%
rename from Wox.Plugin.System/UserStartMenuProgramSource.cs
rename to Wox.Plugin.System/ProgramSources/UserStartMenuProgramSource.cs
index bdb902d56..e4976797e 100644
--- a/Wox.Plugin.System/UserStartMenuProgramSource.cs
+++ b/Wox.Plugin.System/ProgramSources/UserStartMenuProgramSource.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Wox.Plugin.System
+namespace Wox.Plugin.System.ProgramSources
 {
     [global::System.ComponentModel.Browsable(false)]
     public class UserStartMenuProgramSource : FileSystemProgramSource
diff --git a/Wox.Plugin.System/Programs.cs b/Wox.Plugin.System/Programs.cs
index 67f492cbf..9d6140132 100644
--- a/Wox.Plugin.System/Programs.cs
+++ b/Wox.Plugin.System/Programs.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Windows.Forms;
 using Microsoft.Win32;
 using Wox.Infrastructure;
+using Wox.Plugin.System.ProgramSources;
 
 namespace Wox.Plugin.System
 {
@@ -45,11 +46,11 @@ namespace Wox.Plugin.System
         List<Program> installedList = new List<Program>();
         List<IProgramSource> sources = new List<IProgramSource>();
         public static Dictionary<string, Type> SourceTypes = new Dictionary<string, Type>() { 
+            {"FileSystemProgramSource", typeof(FileSystemProgramSource)},
+            {"PortableAppsProgramSource", typeof(PortableAppsProgramSource)},
             {"CommonStartMenuProgramSource", typeof(CommonStartMenuProgramSource)},
             {"UserStartMenuProgramSource", typeof(UserStartMenuProgramSource)},
             {"AppPathsProgramSource", typeof(AppPathsProgramSource)},
-            {"PortableAppsProgramSource", typeof(PortableAppsProgramSource)},
-            {"FileSystemProgramSource", typeof(FileSystemProgramSource)},
         };
         private PluginInitContext context;
 
diff --git a/Wox.Plugin.System/Wox.Plugin.System.csproj b/Wox.Plugin.System/Wox.Plugin.System.csproj
index 7de509b30..34611c97b 100644
--- a/Wox.Plugin.System/Wox.Plugin.System.csproj
+++ b/Wox.Plugin.System/Wox.Plugin.System.csproj
@@ -51,15 +51,15 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AppPathsProgramSource.cs" />
-    <Compile Include="CommonStartMenuProgramSource.cs" />
-    <Compile Include="PortableAppsProgramSource.cs" />
+    <Compile Include="ProgramSources\AppPathsProgramSource.cs" />
+    <Compile Include="ProgramSources\CommonStartMenuProgramSource.cs" />
+    <Compile Include="ProgramSources\PortableAppsProgramSource.cs" />
     <Compile Include="IProgramSource.cs" />
     <Compile Include="BaseSystemPlugin.cs" />
     <Compile Include="BrowserBookmarks.cs" />
     <Compile Include="Calculator.cs" />
-    <Compile Include="FileSystemProgramSource.cs" />
-    <Compile Include="UserStartMenuProgramSource.cs" />
+    <Compile Include="ProgramSources\FileSystemProgramSource.cs" />
+    <Compile Include="ProgramSources\UserStartMenuProgramSource.cs" />
     <Compile Include="WebSearchPlugin.cs" />
     <Compile Include="CMD.cs" />
     <Compile Include="DirectoryIndicator.cs" />