diff --git a/ExplorerPatcher/ExplorerPatcher.rc b/ExplorerPatcher/ExplorerPatcher.rc
index 3e006d9..feff20c 100644
Binary files a/ExplorerPatcher/ExplorerPatcher.rc and b/ExplorerPatcher/ExplorerPatcher.rc differ
diff --git a/ExplorerPatcher/ExplorerPatcher.vcxproj b/ExplorerPatcher/ExplorerPatcher.vcxproj
index 10dadad..b6c92c5 100644
--- a/ExplorerPatcher/ExplorerPatcher.vcxproj
+++ b/ExplorerPatcher/ExplorerPatcher.vcxproj
@@ -254,10 +254,6 @@
     <ClCompile Include="dllmain.c" />
     <ClCompile Include="fmemopen.c" />
     <ClCompile Include="getline.c" />
-    <ClCompile Include="GUI.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="HideExplorerSearchBar.c" />
     <ClCompile Include="ImmersiveFlyouts.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -322,7 +318,6 @@
     <ClInclude Include="dxgi_imp.h" />
     <ClInclude Include="fmemopen.h" />
     <ClInclude Include="getline.h" />
-    <ClInclude Include="GUI.h" />
     <ClInclude Include="HideExplorerSearchBar.h" />
     <ClInclude Include="hooking.h" />
     <ClInclude Include="ep_private.h" />
@@ -344,8 +339,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="settings.reg" />
-    <None Include="settings10.reg" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/ExplorerPatcher/ExplorerPatcher.vcxproj.filters b/ExplorerPatcher/ExplorerPatcher.vcxproj.filters
index 1cb4c14..c4be604 100644
--- a/ExplorerPatcher/ExplorerPatcher.vcxproj.filters
+++ b/ExplorerPatcher/ExplorerPatcher.vcxproj.filters
@@ -60,9 +60,6 @@
     <ClInclude Include="utility.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GUI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TaskbarCenter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -166,9 +163,6 @@
     <ClCompile Include="utility.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GUI.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TaskbarCenter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -219,12 +213,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="settings.reg">
-      <Filter>Settings</Filter>
-    </None>
-    <None Include="settings10.reg">
-      <Filter>Settings</Filter>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 48b2a5d..4a37f1e 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -208,7 +208,6 @@ BOOL g_bIsDesktopRaised = FALSE;
 #include "ArchiveMenu.h"
 #include "StartupSound.h"
 #include "StartMenu.h"
-#include "GUI.h"
 #include "TaskbarCenter.h"
 #include "../libs/sws/SimpleWindowSwitcher/sws_WindowSwitcher.h"
 #endif
diff --git a/ExplorerPatcher/resource.h b/ExplorerPatcher/resource.h
index 2e86782..12163a7 100644
--- a/ExplorerPatcher/resource.h
+++ b/ExplorerPatcher/resource.h
@@ -2,7 +2,6 @@
 // Microsoft Visual C++ generated include file.
 // Used by ExplorerPatcher.rc
 //
-#define IDR_REGISTRY1                   101
 #define IDS_PRODUCTNAME                 102
 #define IDS_COPYRIGHT                   103
 #define IDS_VERSION                     104
@@ -15,7 +14,6 @@
 #define IDS_UNINSTALL_SUCCESS_TEXT      111
 #define IDS_UNINSTALL_ERROR_TEXT        112
 #define IDS_OPERATION_NONE              113
-#define IDR_REGISTRY2                   114
 #define IDR_REFRESHEDSTYLES_XBF         115
 #define IDS_DRIVECATEGORY_HARDDISKDRIVES              40000
 #define IDS_DRIVECATEGORY_REMOVABLESTORAGE            40001
diff --git a/ExplorerPatcher/GUI.c b/ep_gui/GUI.c
similarity index 100%
rename from ExplorerPatcher/GUI.c
rename to ep_gui/GUI.c
diff --git a/ExplorerPatcher/GUI.h b/ep_gui/GUI.h
similarity index 100%
rename from ExplorerPatcher/GUI.h
rename to ep_gui/GUI.h
diff --git a/ExplorerPatcher/settings.reg b/ep_gui/resources/settings.reg
similarity index 100%
rename from ExplorerPatcher/settings.reg
rename to ep_gui/resources/settings.reg
diff --git a/ExplorerPatcher/settings10.reg b/ep_gui/resources/settings10.reg
similarity index 100%
rename from ExplorerPatcher/settings10.reg
rename to ep_gui/resources/settings10.reg