diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 515fe879d5..bf98840b2b 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -332,7 +332,7 @@ DYNAMIC
 FILE
 ============================================================ */
 #ifdef HAVE_FILEBROWSER
-#include "../fileio/file_browser.c"
+#include "../../frontend/menu/utils/file_browser.c"
 #endif
 #include "../../file.c"
 #include "../../file_path.c"
@@ -403,17 +403,17 @@ SCREENSHOTS
 MENU
 ============================================================ */
 #if defined(HAVE_RMENU_GUI)
-#include "../rmenu/rmenu_stack.c"
-#include "../rmenu/rmenu.c"
+#include "../../frontend/menu/utils/menu_stack.c"
+#include "../../frontend/menu/rmenu.c"
 #endif
 
 #ifdef HAVE_RGUI
-#include "../rgui/rgui.c"
-#include "../rgui/list.c"
+#include "../../frontend/menu/utils/file_list.c"
+#include "../../frontend/menu/rgui.c"
 #endif
 
 #if defined(_XBOX360)
-#include "../../360/frontend-xdk/menu.cpp"
+#include "../../frontend/menu/rmenu_xui.cpp"
 #endif
 
 #ifdef __cplusplus
diff --git a/console/rgui/rgui.c b/frontend/menu/rgui.c
similarity index 99%
rename from console/rgui/rgui.c
rename to frontend/menu/rgui.c
index b53ed6e06b..fbbdacfa0f 100644
--- a/console/rgui/rgui.c
+++ b/frontend/menu/rgui.c
@@ -13,17 +13,18 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgui.h"
-#include "list.h"
-#include "../rarch_console_video.h"
-#include "../../gfx/fonts/bitmap.h"
-#include "../../screenshot.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
 
+#include "rgui.h"
+#include "utils/file_list.h"
+#include "../../console/rarch_console_video.h"
+#include "../../gfx/fonts/bitmap.h"
+#include "../../screenshot.h"
+
 #define TERM_START_X 15
 #define TERM_START_Y 27
 #define TERM_WIDTH (((RGUI_WIDTH - TERM_START_X - 15) / (FONT_WIDTH_STRIDE)))
diff --git a/console/rgui/rgui.h b/frontend/menu/rgui.h
similarity index 100%
rename from console/rgui/rgui.h
rename to frontend/menu/rgui.h
diff --git a/console/rmenu/rmenu.c b/frontend/menu/rmenu.c
similarity index 99%
rename from console/rmenu/rmenu.c
rename to frontend/menu/rmenu.c
index 6efec38349..f653e06cc5 100644
--- a/console/rmenu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -14,6 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "rmenu.h"
+#include "utils/file_browser.h"
+#include "utils/menu_stack.h"
+
 #if defined(__CELLOS_LV2__)
 #include <sdk_version.h>
 
@@ -23,8 +27,6 @@
 
 #endif
 
-#include "../../console/fileio/file_browser.h"
-
 #include "../../console/rarch_console.h"
 #include "../../console/rarch_console_rom_ext.h"
 #include "../../console/rarch_console_input.h"
@@ -44,7 +46,6 @@
 #include "../../file.h"
 #include "../../general.h"
 
-#include "rmenu.h"
 
 rmenu_state_t rmenu_state;
 
diff --git a/console/rmenu/rmenu.h b/frontend/menu/rmenu.h
similarity index 100%
rename from console/rmenu/rmenu.h
rename to frontend/menu/rmenu.h
diff --git a/360/frontend-xdk/menu.cpp b/frontend/menu/rmenu_xui.cpp
similarity index 99%
rename from 360/frontend-xdk/menu.cpp
rename to frontend/menu/rmenu_xui.cpp
index 96a910ce9c..4271d8a8d5 100644
--- a/360/frontend-xdk/menu.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -18,6 +18,9 @@
 #include <crtdefs.h>
 #include <tchar.h>
 #include <xtl.h>
+
+#include "rmenu_xui.h"
+
 #include "../../console/fileio/file_browser.h"
 
 #include "../../console/rarch_console.h"
@@ -28,7 +31,6 @@
 #include "../../gfx/gfx_context.h"
 
 #include "../../xdk/xdk_d3d.h"
-#include "menu.h"
 #include "../../message.h"
 
 #include "../../general.h"
diff --git a/360/frontend-xdk/menu.h b/frontend/menu/rmenu_xui.h
similarity index 99%
rename from 360/frontend-xdk/menu.h
rename to frontend/menu/rmenu_xui.h
index dafeb6404e..a3f955c218 100644
--- a/360/frontend-xdk/menu.h
+++ b/frontend/menu/rmenu_xui.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MENU_XUI_H_
-#define _MENU_XUI_H_
+#ifndef _RMENU_XUI_H_
+#define _RMENU_XUI_H_
 
 #include <xui.h>
 #include <xuiapp.h>
diff --git a/console/fileio/file_browser.c b/frontend/menu/utils/file_browser.c
similarity index 99%
rename from console/fileio/file_browser.c
rename to frontend/menu/utils/file_browser.c
index bdc25ca0d1..51a504f70d 100644
--- a/console/fileio/file_browser.c
+++ b/frontend/menu/utils/file_browser.c
@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <stdlib.h>
 #include "file_browser.h"
 
 static bool filebrowser_parse_directory(void *data, unsigned stack_size, 
diff --git a/console/fileio/file_browser.h b/frontend/menu/utils/file_browser.h
similarity index 96%
rename from console/fileio/file_browser.h
rename to frontend/menu/utils/file_browser.h
index 5325aaad8b..0e9644d0d5 100644
--- a/console/fileio/file_browser.h
+++ b/frontend/menu/utils/file_browser.h
@@ -17,9 +17,7 @@
 #ifndef FILEBROWSER_H_
 #define FILEBROWSER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
-#include "../../general.h"
+#include "../../../general.h"
 
 typedef struct
 {
diff --git a/console/rgui/list.c b/frontend/menu/utils/file_list.c
similarity index 98%
rename from console/rgui/list.c
rename to frontend/menu/utils/file_list.c
index 439c86dad4..98444c7f00 100644
--- a/console/rgui/list.c
+++ b/frontend/menu/utils/file_list.c
@@ -13,12 +13,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "list.h"
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 
+#include "file_list.h"
+#include "../rgui.h"
+
 struct rgui_file
 {
    char *path;
diff --git a/console/rgui/list.h b/frontend/menu/utils/file_list.h
similarity index 97%
rename from console/rgui/list.h
rename to frontend/menu/utils/file_list.h
index 5856c985a1..10a34cf62f 100644
--- a/console/rgui/list.h
+++ b/frontend/menu/utils/file_list.h
@@ -16,9 +16,6 @@
 #ifndef RGUI_LIST_H__
 #define RGUI_LIST_H__
 
-#include "rgui.h"
-#include <stddef.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/console/rmenu/rmenu_stack.c b/frontend/menu/utils/menu_stack.c
similarity index 99%
rename from console/rmenu/rmenu_stack.c
rename to frontend/menu/utils/menu_stack.c
index 1d20f98072..c4640474ce 100644
--- a/console/rmenu/rmenu_stack.c
+++ b/frontend/menu/utils/menu_stack.c
@@ -14,8 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rmenu_stack.h"
+#include <stdint.h>
+#include <stddef.h>
+#include <string.h>
 
+#include "menu_stack.h"
 
 static unsigned char menu_stack_enum_array[10];
 static unsigned stack_idx = 0;
diff --git a/console/rmenu/rmenu_stack.h b/frontend/menu/utils/menu_stack.h
similarity index 100%
rename from console/rmenu/rmenu_stack.h
rename to frontend/menu/utils/menu_stack.h
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index 4cd8914408..f54bf01845 100644
--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -22,7 +22,7 @@
 
 #include "platform_inl.h"
 
-#include "../../console/rgui/rgui.h"
+#include "../menu/rgui.h"
 
 #ifndef IS_SALAMANDER
 #include "../../gfx/fonts/bitmap.h"
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index c90b10d0f7..503e03ea73 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -29,7 +29,7 @@
 #include "../../general.h"
 #include "../../file.h"
 
-#include "../../console/rmenu/rmenu.h"
+#include "../menu/rmenu.h"
 
 #define EMULATOR_CONTENT_DIR "SSNE10000"
 
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index a64fa5838c..bf9c28dc3b 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -25,9 +25,9 @@
 
 #if defined(_XBOX360)
 #include <xfilecache.h>
-#include "../../360/frontend-xdk/menu.h"
+#include "../menu/menu_xui.h"
 #elif defined(_XBOX1)
-#include "../../console/rmenu/rmenu.h"
+#include "../menu/rmenu.h"
 #endif
 
 #include <xbdm.h>
diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h
index 918e721e80..3a4453e49a 100644
--- a/gfx/gfx_context.h
+++ b/gfx/gfx_context.h
@@ -24,7 +24,7 @@
 #endif
 
 #if defined(RARCH_CONSOLE) || defined(HAVE_RMENU)
-#include "../console/rmenu/rmenu.h"
+#include "../frontend/menu/rmenu.h"
 #endif
 
 #define MAX_EGLIMAGE_TEXTURES 32
diff --git a/gx/gx_video.c b/gx/gx_video.c
index 8c919ac43a..b59792935a 100644
--- a/gx/gx_video.c
+++ b/gx/gx_video.c
@@ -19,7 +19,7 @@
 #include "../general.h"
 #include "../console/rarch_console_video.h"
 #include "../gfx/fonts/bitmap.h"
-#include "../console/rgui/rgui.h"
+#include "../frontend/menu/rgui.h"
 #include "../gfx/gfx_common.h"
 
 #ifdef HW_RVL