diff --git a/frontend/menu/file_browser.c b/frontend/menu/file_browser.c
new file mode 100644
index 0000000000..4e72ae558b
--- /dev/null
+++ b/frontend/menu/file_browser.c
@@ -0,0 +1,169 @@
+static bool directory_parse(void *data, const char *path)
+{
+   filebrowser_t *filebrowser = (filebrowser_t*)data;
+
+   struct string_list *list = dir_list_new(path,
+         filebrowser->current_dir.extensions, true);
+   if(!list || list->size < 1)
+      return false;
+   
+   dir_list_sort(list, true);
+
+   filebrowser->current_dir.ptr   = 0;
+   strlcpy(filebrowser->current_dir.directory_path,
+         path, sizeof(filebrowser->current_dir.directory_path));
+
+   if (filebrowser->list)
+      dir_list_free(filebrowser->list);
+
+   filebrowser->list = list;
+
+   return true;
+
+}
+
+static void filebrowser_free(void *data)
+{
+   filebrowser_t *filebrowser = (filebrowser_t*)data;
+
+   dir_list_free(filebrowser->list);
+   filebrowser->list = NULL;
+   filebrowser->current_dir.ptr   = 0;
+   free(filebrowser);
+}
+
+void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_dir)
+{
+   filebrowser_t *filebrowser = (filebrowser_t*)data;
+   
+   if (ext)
+      strlcpy(filebrowser->current_dir.extensions, ext,
+            sizeof(filebrowser->current_dir.extensions));
+
+   strlcpy(filebrowser->current_dir.root_dir,
+         root_dir, sizeof(filebrowser->current_dir.root_dir));
+   filebrowser_iterate(filebrowser, FILEBROWSER_ACTION_RESET);
+}
+
+#define GET_CURRENT_PATH(browser) (browser->list->elems[browser->current_dir.ptr].data)
+
+bool filebrowser_iterate(void *data, unsigned action)
+{
+   filebrowser_t *filebrowser = (filebrowser_t*)data;
+   bool ret = true;
+   unsigned entries_to_scroll = 19;
+
+   switch(action)
+   {
+      case FILEBROWSER_ACTION_UP:
+         filebrowser->current_dir.ptr--;
+         if (filebrowser->current_dir.ptr >= filebrowser->list->size)
+            filebrowser->current_dir.ptr = filebrowser->list->size - 1;
+         break;
+      case FILEBROWSER_ACTION_DOWN:
+         filebrowser->current_dir.ptr++;
+         if (filebrowser->current_dir.ptr >= filebrowser->list->size)
+            filebrowser->current_dir.ptr = 0;
+         break;
+      case FILEBROWSER_ACTION_LEFT:
+         if (filebrowser->current_dir.ptr <= 5)
+            filebrowser->current_dir.ptr = 0;
+         else
+            filebrowser->current_dir.ptr -= 5;
+         break;
+      case FILEBROWSER_ACTION_RIGHT:
+         filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + 5, 
+         filebrowser->list->size-1));
+         break;
+      case FILEBROWSER_ACTION_SCROLL_UP:
+         if (filebrowser->current_dir.ptr <= entries_to_scroll)
+            filebrowser->current_dir.ptr= 0;
+         else
+            filebrowser->current_dir.ptr -= entries_to_scroll;
+         break;
+      case FILEBROWSER_ACTION_SCROLL_DOWN:
+         filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + 
+         entries_to_scroll, filebrowser->list->size-1));
+         break;
+      case FILEBROWSER_ACTION_OK:
+         ret = directory_parse(filebrowser, GET_CURRENT_PATH(filebrowser));
+         break;
+      case FILEBROWSER_ACTION_CANCEL:
+         fill_pathname_parent_dir(filebrowser->current_dir.directory_path,
+               filebrowser->current_dir.directory_path,
+               sizeof(filebrowser->current_dir.directory_path));
+
+         ret = directory_parse(filebrowser, filebrowser->current_dir.directory_path);
+         break;
+      case FILEBROWSER_ACTION_RESET:
+         ret = directory_parse(filebrowser, filebrowser->current_dir.root_dir);
+         break;
+      case FILEBROWSER_ACTION_RESET_CURRENT_DIR:
+         ret = directory_parse(filebrowser, filebrowser->current_dir.directory_path);
+         break;
+      case FILEBROWSER_ACTION_PATH_ISDIR:
+         ret = filebrowser->list->elems[filebrowser->current_dir.ptr].attr.b;
+         break;
+      case FILEBROWSER_ACTION_NOOP:
+      default:
+         break;
+   }
+
+   if (ret)
+      strlcpy(filebrowser->current_dir.path, GET_CURRENT_PATH(filebrowser),
+         sizeof(filebrowser->current_dir.path));
+
+   return ret;
+}
+
+void filebrowser_update(void *data, uint64_t action_ori, const char *extensions)
+{
+   filebrowser_action_t action = FILEBROWSER_ACTION_NOOP;
+   bool ret = true;
+
+   switch (action_ori)
+   {
+      case RGUI_ACTION_DOWN:
+         action = FILEBROWSER_ACTION_DOWN;
+         break;
+      case RGUI_ACTION_UP:
+         action = FILEBROWSER_ACTION_UP;
+         break;
+      case RGUI_ACTION_RIGHT:
+         action = FILEBROWSER_ACTION_RIGHT;
+         break;
+      case RGUI_ACTION_LEFT:
+         action = FILEBROWSER_ACTION_LEFT;
+         break;
+      case RGUI_ACTION_SCROLL_DOWN:
+         action = FILEBROWSER_ACTION_SCROLL_DOWN;
+         break;
+      case RGUI_ACTION_SCROLL_UP:
+         action = FILEBROWSER_ACTION_SCROLL_UP;
+         break;
+      case RGUI_ACTION_CANCEL:
+         {
+            char tmp_str[PATH_MAX];
+            fill_pathname_parent_dir(tmp_str, rgui->browser->current_dir.directory_path, sizeof(tmp_str));
+
+            if (tmp_str[0] != '\0')
+               action = FILEBROWSER_ACTION_CANCEL;
+         }
+         break;
+      case RGUI_ACTION_START:
+         action = FILEBROWSER_ACTION_RESET;
+         filebrowser_set_root_and_ext(rgui->browser, NULL, default_paths.filesystem_root_dir);
+         strlcpy(rgui->browser->current_dir.extensions, extensions,
+               sizeof(rgui->browser->current_dir.extensions));
+#ifdef HAVE_RMENU_XUI
+         filebrowser_fetch_directory_entries(1ULL << RETRO_DEVICE_ID_JOYPAD_B);
+#endif
+         break;
+   }
+
+   if (action != FILEBROWSER_ACTION_NOOP)
+      ret = filebrowser_iterate(rgui->browser, action);
+
+   if (!ret)
+      msg_queue_push(g_extern.msg_queue, "ERROR - Failed to open directory.", 1, 180);
+}
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 11c183e75f..72541fda1a 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -146,175 +146,7 @@ void shader_manager_get_str(struct gfx_shader *shader,
 #endif
 
 #ifdef HAVE_FILEBROWSER
-static bool directory_parse(void *data, const char *path)
-{
-   filebrowser_t *filebrowser = (filebrowser_t*)data;
-
-   struct string_list *list = dir_list_new(path,
-         filebrowser->current_dir.extensions, true);
-   if(!list || list->size < 1)
-      return false;
-   
-   dir_list_sort(list, true);
-
-   filebrowser->current_dir.ptr   = 0;
-   strlcpy(filebrowser->current_dir.directory_path,
-         path, sizeof(filebrowser->current_dir.directory_path));
-
-   if (filebrowser->list)
-      dir_list_free(filebrowser->list);
-
-   filebrowser->list = list;
-
-   return true;
-
-}
-
-static void filebrowser_free(void *data)
-{
-   filebrowser_t *filebrowser = (filebrowser_t*)data;
-
-   dir_list_free(filebrowser->list);
-   filebrowser->list = NULL;
-   filebrowser->current_dir.ptr   = 0;
-   free(filebrowser);
-}
-
-void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_dir)
-{
-   filebrowser_t *filebrowser = (filebrowser_t*)data;
-   
-   if (ext)
-      strlcpy(filebrowser->current_dir.extensions, ext,
-            sizeof(filebrowser->current_dir.extensions));
-
-   strlcpy(filebrowser->current_dir.root_dir,
-         root_dir, sizeof(filebrowser->current_dir.root_dir));
-   filebrowser_iterate(filebrowser, FILEBROWSER_ACTION_RESET);
-}
-
-#define GET_CURRENT_PATH(browser) (browser->list->elems[browser->current_dir.ptr].data)
-
-bool filebrowser_iterate(void *data, unsigned action)
-{
-   filebrowser_t *filebrowser = (filebrowser_t*)data;
-   bool ret = true;
-   unsigned entries_to_scroll = 19;
-
-   switch(action)
-   {
-      case FILEBROWSER_ACTION_UP:
-         filebrowser->current_dir.ptr--;
-         if (filebrowser->current_dir.ptr >= filebrowser->list->size)
-            filebrowser->current_dir.ptr = filebrowser->list->size - 1;
-         break;
-      case FILEBROWSER_ACTION_DOWN:
-         filebrowser->current_dir.ptr++;
-         if (filebrowser->current_dir.ptr >= filebrowser->list->size)
-            filebrowser->current_dir.ptr = 0;
-         break;
-      case FILEBROWSER_ACTION_LEFT:
-         if (filebrowser->current_dir.ptr <= 5)
-            filebrowser->current_dir.ptr = 0;
-         else
-            filebrowser->current_dir.ptr -= 5;
-         break;
-      case FILEBROWSER_ACTION_RIGHT:
-         filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + 5, 
-         filebrowser->list->size-1));
-         break;
-      case FILEBROWSER_ACTION_SCROLL_UP:
-         if (filebrowser->current_dir.ptr <= entries_to_scroll)
-            filebrowser->current_dir.ptr= 0;
-         else
-            filebrowser->current_dir.ptr -= entries_to_scroll;
-         break;
-      case FILEBROWSER_ACTION_SCROLL_DOWN:
-         filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + 
-         entries_to_scroll, filebrowser->list->size-1));
-         break;
-      case FILEBROWSER_ACTION_OK:
-         ret = directory_parse(filebrowser, GET_CURRENT_PATH(filebrowser));
-         break;
-      case FILEBROWSER_ACTION_CANCEL:
-         fill_pathname_parent_dir(filebrowser->current_dir.directory_path,
-               filebrowser->current_dir.directory_path,
-               sizeof(filebrowser->current_dir.directory_path));
-
-         ret = directory_parse(filebrowser, filebrowser->current_dir.directory_path);
-         break;
-      case FILEBROWSER_ACTION_RESET:
-         ret = directory_parse(filebrowser, filebrowser->current_dir.root_dir);
-         break;
-      case FILEBROWSER_ACTION_RESET_CURRENT_DIR:
-         ret = directory_parse(filebrowser, filebrowser->current_dir.directory_path);
-         break;
-      case FILEBROWSER_ACTION_PATH_ISDIR:
-         ret = filebrowser->list->elems[filebrowser->current_dir.ptr].attr.b;
-         break;
-      case FILEBROWSER_ACTION_NOOP:
-      default:
-         break;
-   }
-
-   if (ret)
-      strlcpy(filebrowser->current_dir.path, GET_CURRENT_PATH(filebrowser),
-         sizeof(filebrowser->current_dir.path));
-
-   return ret;
-}
-
-void filebrowser_update(void *data, uint64_t action_ori, const char *extensions)
-{
-   filebrowser_action_t action = FILEBROWSER_ACTION_NOOP;
-   bool ret = true;
-
-   switch (action_ori)
-   {
-      case RGUI_ACTION_DOWN:
-         action = FILEBROWSER_ACTION_DOWN;
-         break;
-      case RGUI_ACTION_UP:
-         action = FILEBROWSER_ACTION_UP;
-         break;
-      case RGUI_ACTION_RIGHT:
-         action = FILEBROWSER_ACTION_RIGHT;
-         break;
-      case RGUI_ACTION_LEFT:
-         action = FILEBROWSER_ACTION_LEFT;
-         break;
-      case RGUI_ACTION_SCROLL_DOWN:
-         action = FILEBROWSER_ACTION_SCROLL_DOWN;
-         break;
-      case RGUI_ACTION_SCROLL_UP:
-         action = FILEBROWSER_ACTION_SCROLL_UP;
-         break;
-      case RGUI_ACTION_CANCEL:
-         {
-            char tmp_str[PATH_MAX];
-            fill_pathname_parent_dir(tmp_str, rgui->browser->current_dir.directory_path, sizeof(tmp_str));
-
-            if (tmp_str[0] != '\0')
-               action = FILEBROWSER_ACTION_CANCEL;
-         }
-         break;
-      case RGUI_ACTION_START:
-         action = FILEBROWSER_ACTION_RESET;
-         filebrowser_set_root_and_ext(rgui->browser, NULL, default_paths.filesystem_root_dir);
-         strlcpy(rgui->browser->current_dir.extensions, extensions,
-               sizeof(rgui->browser->current_dir.extensions));
-#ifdef HAVE_RMENU_XUI
-         filebrowser_fetch_directory_entries(1ULL << RETRO_DEVICE_ID_JOYPAD_B);
-#endif
-         break;
-   }
-
-   if (action != FILEBROWSER_ACTION_NOOP)
-      ret = filebrowser_iterate(rgui->browser, action);
-
-   if (!ret)
-      msg_queue_push(g_extern.msg_queue, "ERROR - Failed to open directory.", 1, 180);
-}
+#include "file_browser.c"
 #endif
 
 struct rgui_file