diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 520203cdb6..7ba3ee9447 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -74,8 +74,10 @@ static void frontend_ctr_get_environment_settings(int *argc, char *argv[],
          "system", sizeof(g_defaults.dir.system));
    fill_pathname_join(g_defaults.dir.playlist, g_defaults.dir.core,
          "playlists", sizeof(g_defaults.dir.playlist));
+   fill_pathname_join(g_defaults.dir.menu_config, g_defaults.dir.port,
+      "config", sizeof(g_defaults.dir.menu_config));
    fill_pathname_join(g_defaults.dir.remap, g_defaults.dir.port,
-         "remaps", sizeof(g_defaults.dir.remap));
+         "config/remaps", sizeof(g_defaults.dir.remap));
    fill_pathname_join(g_defaults.dir.video_filter, g_defaults.dir.port,
          "filters", sizeof(g_defaults.dir.remap));
    fill_pathname_join(g_defaults.path.config, g_defaults.dir.port,
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index f6a7e409a4..3ff4041f29 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -361,7 +361,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.dir.core_assets, home_dir_buf, "downloads", sizeof(g_defaults.dir.core_assets));
    fill_pathname_join(g_defaults.dir.assets, home_dir_buf, "assets", sizeof(g_defaults.dir.assets));
    fill_pathname_join(g_defaults.dir.system, home_dir_buf, "system", sizeof(g_defaults.dir.system));
-   fill_pathname_join(g_defaults.dir.menu_config, home_dir_buf, "configs", sizeof(g_defaults.dir.menu_config));
+   fill_pathname_join(g_defaults.dir.menu_config, home_dir_buf, "config", sizeof(g_defaults.dir.menu_config));
    fill_pathname_join(g_defaults.path.config, g_defaults.dir.menu_config, "retroarch.cfg", sizeof(g_defaults.path.config));
    fill_pathname_join(g_defaults.dir.database, home_dir_buf, "database/rdb", sizeof(g_defaults.dir.database));
    fill_pathname_join(g_defaults.dir.cursor, home_dir_buf, "database/cursors", sizeof(g_defaults.dir.cursor));
@@ -369,7 +369,8 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.dir.thumbnails, home_dir_buf, "thumbnails", sizeof(g_defaults.dir.thumbnails));
    fill_pathname_join(g_defaults.dir.sram, home_dir_buf, "saves", sizeof(g_defaults.dir.sram));
    fill_pathname_join(g_defaults.dir.savestate, home_dir_buf, "states", sizeof(g_defaults.dir.savestate));
-   fill_pathname_join(g_defaults.dir.remap, home_dir_buf, "remaps", sizeof(g_defaults.dir.remap));
+   fill_pathname_join(g_defaults.dir.menu_config, application_data, "config", sizeof(g_defaults.dir.menu_config));
+   fill_pathname_join(g_defaults.dir.remap, home_dir_buf, "config/remaps", sizeof(g_defaults.dir.remap));
 #if defined(IOS)
    fill_pathname_join(g_defaults.dir.playlist, home_dir_buf, "playlists", sizeof(g_defaults.dir.playlist));
 #endif
@@ -384,10 +385,10 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.dir.audio_filter, home_dir_buf, "audio_filters", sizeof(g_defaults.dir.audio_filter));
    fill_pathname_join(g_defaults.dir.video_filter, home_dir_buf, "video_filters", sizeof(g_defaults.dir.video_filter));
    fill_pathname_join(g_defaults.dir.playlist, application_data, "playlists", sizeof(g_defaults.dir.playlist));
-   fill_pathname_join(g_defaults.dir.menu_config, application_data, "configs", sizeof(g_defaults.dir.menu_config));
    fill_pathname_join(g_defaults.path.config, g_defaults.dir.menu_config, "retroarch.cfg", sizeof(g_defaults.path.config));
    fill_pathname_join(g_defaults.dir.thumbnails, application_data, "thumbnails", sizeof(g_defaults.dir.thumbnails));
-   fill_pathname_join(g_defaults.dir.remap, application_data, "remaps", sizeof(g_defaults.dir.remap));
+   fill_pathname_join(g_defaults.dir.menu_config, application_data, "config", sizeof(g_defaults.dir.menu_config));
+   fill_pathname_join(g_defaults.dir.remap, application_data, "config/remaps", sizeof(g_defaults.dir.remap));
    fill_pathname_join(g_defaults.dir.core_assets, application_data, "downloads", sizeof(g_defaults.dir.core_assets));
    fill_pathname_join(g_defaults.dir.screenshot, application_data, "screenshots", sizeof(g_defaults.dir.screenshot));
 #if defined(RELEASE_BUILD)
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 8c440eedd1..088b14f064 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -255,8 +255,10 @@ static void frontend_win32_environment_get(int *argc, char *argv[],
    ":/database/cursors", sizeof(g_defaults.dir.cursor));
    fill_pathname_expand_special(g_defaults.dir.playlist,
       ":/playlists", sizeof(g_defaults.dir.assets));
+   fill_pathname_expand_special(g_defaults.dir.menu_config,
+      ":/config", sizeof(g_defaults.dir.menu_config));
    fill_pathname_expand_special(g_defaults.dir.remap,
-      ":/config/remap", sizeof(g_defaults.dir.remap));
+      ":/config/remaps", sizeof(g_defaults.dir.remap));
    fill_pathname_expand_special(g_defaults.dir.wallpapers,
       ":/assets/wallpapers", sizeof(g_defaults.dir.wallpapers));
    fill_pathname_expand_special(g_defaults.dir.thumbnails,
@@ -273,8 +275,6 @@ static void frontend_win32_environment_get(int *argc, char *argv[],
       ":/info", sizeof(g_defaults.dir.core_info));
    fill_pathname_expand_special(g_defaults.dir.autoconfig,
       ":/autoconfig", sizeof(g_defaults.dir.autoconfig));
-   fill_pathname_expand_special(g_defaults.dir.menu_config,
-      ":/config", sizeof(g_defaults.dir.menu_config));
    fill_pathname_expand_special(g_defaults.dir.shader,
       ":/shaders", sizeof(g_defaults.dir.shader));
    fill_pathname_expand_special(g_defaults.dir.core_assets,