diff --git a/Source/Project64-core/Project64-core.vcproj b/Source/Project64-core/Project64-core.vcproj
index d8f9ec2ef..942b63ab5 100644
--- a/Source/Project64-core/Project64-core.vcproj
+++ b/Source/Project64-core/Project64-core.vcproj
@@ -510,6 +510,14 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
+			<Filter
+				Name="Rom List"
+				>
+				<File
+					RelativePath=".\RomList\RomList.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -736,6 +744,14 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Rom List"
+				>
+				<File
+					RelativePath=".\RomList\RomList.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj
index 7df7e86be..d3b3e0a40 100644
--- a/Source/Project64-core/Project64-core.vcxproj
+++ b/Source/Project64-core/Project64-core.vcxproj
@@ -86,6 +86,7 @@
     <ClCompile Include="Plugins\PluginBase.cpp" />
     <ClCompile Include="Plugins\PluginClass.cpp" />
     <ClCompile Include="Plugins\RSPPlugin.cpp" />
+    <ClCompile Include="RomList\RomList.cpp" />
     <ClCompile Include="Settings\DebugSettings.cpp" />
     <ClCompile Include="Settings\GameSettings.cpp" />
     <ClCompile Include="Settings\LoggingSettings.cpp" />
@@ -180,6 +181,7 @@
     <ClInclude Include="Plugins\PluginBase.h" />
     <ClInclude Include="Plugins\PluginClass.h" />
     <ClInclude Include="Plugins\RSPPlugin.h" />
+    <ClInclude Include="RomList\RomList.h" />
     <ClInclude Include="Settings\DebugSettings.h" />
     <ClInclude Include="Settings\GameSettings.h" />
     <ClInclude Include="Settings\LoggingSettings.h" />
diff --git a/Source/Project64-core/Project64-core.vcxproj.filters b/Source/Project64-core/Project64-core.vcxproj.filters
index 3bedcc21d..2ef1471f1 100644
--- a/Source/Project64-core/Project64-core.vcxproj.filters
+++ b/Source/Project64-core/Project64-core.vcxproj.filters
@@ -70,6 +70,12 @@
     <Filter Include="Header Files\3rd Party\Zlib">
       <UniqueIdentifier>{1478740a-b66b-41bd-833c-917c0cb85047}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Rom List">
+      <UniqueIdentifier>{1cc42db5-377e-4882-9afa-4e6b2a3e389d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Rom List">
+      <UniqueIdentifier>{1030356f-55d6-4fef-9ee2-64c45b9c8ff2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -593,5 +599,8 @@
     <ClInclude Include="N64System\Mips\GBCart.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
+    <ClInclude Include="RomList\RomList.h">
+      <Filter>Header Files\Rom List</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64/UserInterface/RomList.cpp b/Source/Project64-core/RomList/RomList.cpp
similarity index 100%
rename from Source/Project64/UserInterface/RomList.cpp
rename to Source/Project64-core/RomList/RomList.cpp
diff --git a/Source/Project64/UserInterface/RomList.h b/Source/Project64-core/RomList/RomList.h
similarity index 100%
rename from Source/Project64/UserInterface/RomList.h
rename to Source/Project64-core/RomList/RomList.h
diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj
index 7fccc378f..0d4fbed5c 100644
--- a/Source/Project64/Project64.vcproj
+++ b/Source/Project64/Project64.vcproj
@@ -224,10 +224,6 @@
 					RelativePath=".\UserInterface\RomInformationClass.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\UserInterface\RomList.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\UserInterface\SettingsConfig.cpp"
 					>
@@ -458,10 +454,6 @@
 					RelativePath=".\UserInterface\RomInformationClass.h"
 					>
 				</File>
-				<File
-					RelativePath=".\UserInterface\RomList.h"
-					>
-				</File>
 				<File
 					RelativePath=".\UserInterface\SettingsConfig.h"
 					>
diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 34a28e729..18cd3804f 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -67,7 +67,6 @@
     <ClCompile Include="UserInterface\NotificationClass.cpp" />
     <ClCompile Include="UserInterface\RomBrowserClass.cpp" />
     <ClCompile Include="UserInterface\RomInformationClass.cpp" />
-    <ClCompile Include="UserInterface\RomList.cpp" />
     <ClCompile Include="UserInterface\SettingsConfig.cpp" />
     <ClCompile Include="UserInterface\Settings\SettingsPage-AdvancedOptions.cpp" />
     <ClCompile Include="UserInterface\Settings\SettingsPage-Directories.cpp" />
@@ -109,7 +108,6 @@
     <ClInclude Include="UserInterface\resource.h" />
     <ClInclude Include="UserInterface\RomBrowser.h" />
     <ClInclude Include="UserInterface\RomInformationClass.h" />
-    <ClInclude Include="UserInterface\RomList.h" />
     <ClInclude Include="UserInterface\SettingsConfig.h" />
     <ClInclude Include="UserInterface\Settings\SettingsPage-AdvancedOptions.h" />
     <ClInclude Include="UserInterface\Settings\SettingsPage-Directories.h" />
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index 1df1b52f8..74c85c08d 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -162,9 +162,6 @@
     <ClCompile Include="Settings\UISettings.cpp">
       <Filter>Source Files\Settings Files</Filter>
     </ClCompile>
-    <ClCompile Include="UserInterface\RomList.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="UserInterface\resource.h">
@@ -296,9 +293,6 @@
     <ClInclude Include="Settings\UISettings.h">
       <Filter>Header Files\Settings</Filter>
     </ClInclude>
-    <ClInclude Include="UserInterface\RomList.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\divider.cur">
diff --git a/Source/Project64/UserInterface/RomBrowser.h b/Source/Project64/UserInterface/RomBrowser.h
index 80ae59d70..4ad3e5173 100644
--- a/Source/Project64/UserInterface/RomBrowser.h
+++ b/Source/Project64/UserInterface/RomBrowser.h
@@ -12,7 +12,7 @@
 
 #include <vector>
 #include <Project64/Settings/UISettings.h>
-#include "RomList.h"
+#include <Project64-core/RomList/RomList.h>
 
 class CMainGui;
 class CPlugins;