diff --git a/Source/Project64/Plugins/Plugin List.h b/Source/Project64/Plugins/Plugin List.h
index f1ee46064..04a566351 100644
--- a/Source/Project64/Plugins/Plugin List.h	
+++ b/Source/Project64/Plugins/Plugin List.h	
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #pragma once
 
-#include <Project64/Settings.h>
+#include <Project64/Settings/Settings.h>
 
 class CPluginList
 {
diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 0cea30d80..517fca83e 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -183,7 +183,7 @@
     <ClInclude Include="N64 System\Mips\Rumblepak.h" />
     <ClInclude Include="Plugin.h" />
     <ClInclude Include="Plugins\Plugin Base.h" />
-    <ClInclude Include="Settings.h" />
+    <ClInclude Include="Settings\Settings.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="User Interface.h" />
     <ClInclude Include="User Interface\Cheat Class UI.h" />
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index 1ae4ebd97..437ae1cbf 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -464,9 +464,6 @@
     <ClInclude Include="Plugin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Settings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -833,5 +830,8 @@
     <ClInclude Include="Logging.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Settings\Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64/Settings.h b/Source/Project64/Settings/Settings.h
similarity index 100%
rename from Source/Project64/Settings.h
rename to Source/Project64/Settings/Settings.h
diff --git a/Source/Project64/User Interface.h b/Source/Project64/User Interface.h
index 9eaa923c0..1479e1d56 100644
--- a/Source/Project64/User Interface.h	
+++ b/Source/Project64/User Interface.h	
@@ -13,8 +13,8 @@
 #pragma warning(disable:4786)
 #include "Support.h"
 
-#include "Multilanguage.h"
-#include "Settings.h"
+#include <Project64\Multilanguage.h>
+#include <Project64\Settings\Settings Class.h>
 
 typedef unsigned char    BYTE;
 typedef unsigned short   WORD;