diff --git a/Makefile b/Makefile
index 3606780c11..452d4417bf 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ OBJ = frontend/frontend.o \
 		core_options.o \
 		compat/compat.o \
 		cheats.o \
-		core_info.o \
+		frontend/info/core_info.o \
 		conf/config_file.o \
 		screenshot.o \
 		gfx/scaler/scaler.o \
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 0f1c48a8b2..0629ffa15f 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -40,7 +40,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		audio/sinc.o \
 		audio/null.o \
 		performance.o \
-		core_info.o \
+		frontend/info/core_info.o \
 		camera/rwebcam.o
 
 HAVE_OPENGL = 1
diff --git a/Makefile.win b/Makefile.win
index 6ea9ffd980..3d43a3d8e1 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -26,7 +26,7 @@ OBJ = frontend/frontend.o \
 		compat/compat.o \
 		screenshot.o \
 		cheats.o \
-		core_info.o \
+		frontend/info/core_info.o \
 		audio/utils.o \
 		input/overlay.o \
 		fifo_buffer.o \
diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h
index b82b6965ad..102143cd2d 100644
--- a/apple/common/RetroArch_Apple.h
+++ b/apple/common/RetroArch_Apple.h
@@ -20,7 +20,7 @@
 #include <Foundation/Foundation.h>
 #import <CoreFoundation/CoreFoundation.h>
 
-#include "../../core_info.h"
+#include "../../frontend/info/core_info.h"
 #include "core_info_ext.h"
 #include "setting_data.h"
 #include "apple_export.h"
diff --git a/apple/common/core_info_ext.h b/apple/common/core_info_ext.h
index ca10476271..abb8ed1266 100644
--- a/apple/common/core_info_ext.h
+++ b/apple/common/core_info_ext.h
@@ -16,7 +16,7 @@
 #ifndef __APPLE_RARCH_CORE_INFO_EXT_H__
 #define __APPLE_RARCH_CORE_INFO_EXT_H__
 
-#include "../../core_info.h"
+#include "../../frontend/info/core_info.h"
 #include "../../frontend/menu/history.h"
 
 void apple_core_info_set_core_path(const char* core_path);
diff --git a/blackberry-qnx/bb10/src/RetroArch-Cascades.h b/blackberry-qnx/bb10/src/RetroArch-Cascades.h
index 5b356af8bf..c8bcc921e4 100644
--- a/blackberry-qnx/bb10/src/RetroArch-Cascades.h
+++ b/blackberry-qnx/bb10/src/RetroArch-Cascades.h
@@ -9,7 +9,7 @@
 #include <screen/screen.h>
 #include <sys/neutrino.h>
 #include "ButtonMap.h"
-#include "../../../core_info.h"
+#include "../../../frontend/info/core_info.h"
 
 using namespace bb::cascades;
 
diff --git a/core_info.c b/frontend/info/core_info.c
similarity index 100%
rename from core_info.c
rename to frontend/info/core_info.c
diff --git a/core_info.h b/frontend/info/core_info.h
similarity index 100%
rename from core_info.h
rename to frontend/info/core_info.h
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 32855d26b5..455213a515 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -24,7 +24,7 @@
 #endif
 
 #include "../../performance.h"
-#include "../../core_info.h"
+#include "../info/core_info.h"
 #include "menu_context.h"
 
 #ifdef HAVE_RGUI
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3688316896..266bd0f1b7 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -84,7 +84,6 @@ CONFIG FILE
 
 #include "../conf/config_file.c"
 #include "../core_options.c"
-#include "../core_info.c"
 
 /*============================================================
 CHEATS
@@ -523,6 +522,8 @@ FRONTEND
 #include "../frontend/platform/platform_android.c"
 #endif
 
+#include "../frontend/info/core_info.c"
+
 /*============================================================
 MAIN
 ============================================================ */
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 49898d1120..11ca515f88 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -197,7 +197,6 @@
     </ClCompile>
     <ClCompile Include="..\..\cheats.c" />
     <ClCompile Include="..\..\compat\rxml\rxml.c" />
-    <ClCompile Include="..\..\core_info.c" />
     <ClCompile Include="..\..\core_options.c" />
     <ClCompile Include="..\..\deps\rzlib\adler32.c" />
     <ClCompile Include="..\..\deps\rzlib\compress.c" />
@@ -223,6 +222,7 @@
     <ClCompile Include="..\..\frontend\menu\menu_navigation.c" />
     <ClCompile Include="..\..\frontend\menu\menu_settings.c" />
     <ClCompile Include="..\..\frontend\menu\menu_context.c" />
+    <ClCompile Include="..\..\frontend\info\core_info.c" />
     <ClCompile Include="..\..\gfx\d3d9\d3d.cpp" />
     <ClCompile Include="..\..\gfx\d3d9\d3d9_pc.cpp" />
     <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index 354911fd4f..09ae16c05e 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -3,11 +3,11 @@
   <ItemGroup>
     <ClCompile Include="..\..\autosave.c" />
     <ClCompile Include="..\..\cheats.c" />
-    <ClCompile Include="..\..\core_info.c" />
     <ClCompile Include="..\..\core_options.c" />
     <ClCompile Include="..\..\file_extract.c" />
     <ClCompile Include="..\..\frontend\menu\history.c" />
     <ClCompile Include="..\..\frontend\menu\file_list.c" />
+    <ClCompile Include="..\..\frontend\info\core_info.c" />
     <ClCompile Include="..\..\performance.c" />
     <ClCompile Include="..\..\command.c" />
     <ClCompile Include="..\..\conf\config_file.c" />