3 files changed, 4 insertions, 20 deletions

diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index e307ca9f3..0ecf2d9de 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -40,12 +40,8 @@
 #define MAPS_DIR                 "maps"
 #define CACHE_DIR                "cache"
 #define SDMC_DIR                 "sdmc"
-#define EXTSAVEDATA_DIR          "sdmc/Nintendo 3DS/extdata"
-#define SHAREDEXTSAVEDATA_DIR    "nand/data/extdata"
-#define SAVEDATA_DIR             "savedata"
-#define SAVEDATACHECK_DIR        "nand/title"
+#define NAND_DIR                 "nand"
 #define SYSDATA_DIR              "sysdata"
-#define SYSSAVEDATA_DIR          "nand/data/sysdata"
 #define SHADERCACHE_DIR          "shader_cache"
 #define STATESAVES_DIR           "state_saves"
 #define SCREENSHOTS_DIR          "screenShots"
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index f8d140d84..706e7c842 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -676,12 +676,8 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
         paths[D_MAPS_IDX]           = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
         paths[D_CACHE_IDX]          = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
         paths[D_SDMC_IDX]           = paths[D_USER_IDX] + SDMC_DIR DIR_SEP;
-        paths[D_EXTSAVEDATA]        = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP;
-        paths[D_SHAREDEXTSAVEDATA]  = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP;
-        paths[D_SAVEDATA_IDX]       = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP;
-        paths[D_SAVEDATACHECK_IDX]  = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP;
+        paths[D_NAND_IDX]           = paths[D_USER_IDX] + NAND_DIR DIR_SEP;
         paths[D_SYSDATA_IDX]        = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP;
-        paths[D_SYSSAVEDATA_IDX]    = paths[D_USER_IDX] + SYSSAVEDATA_DIR DIR_SEP;
         paths[D_SHADERCACHE_IDX]    = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
         paths[D_SHADERS_IDX]        = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
         paths[D_STATESAVES_IDX]     = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
@@ -723,11 +719,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
             paths[D_MAPS_IDX]           = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
             paths[D_CACHE_IDX]          = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
             paths[D_SDMC_IDX]           = paths[D_USER_IDX] + SDMC_DIR DIR_SEP;
-            paths[D_EXTSAVEDATA]        = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP;
-            paths[D_SHAREDEXTSAVEDATA]  = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP;
-            paths[D_SAVEDATA_IDX]       = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP;
-            paths[D_SAVEDATACHECK_IDX]  = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP;
-            paths[D_SYSSAVEDATA_IDX]    = paths[D_USER_IDX] + SYSSAVEDATA_DIR DIR_SEP;
+            paths[D_NAND_IDX]           = paths[D_USER_IDX] + NAND_DIR DIR_SEP;
             paths[D_SHADERCACHE_IDX]    = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
             paths[D_SHADERS_IDX]        = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
             paths[D_STATESAVES_IDX]     = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 4d6155f1f..86aab2e3d 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -27,12 +27,8 @@ enum {
     D_STATESAVES_IDX,
     D_SCREENSHOTS_IDX,
     D_SDMC_IDX,
-    D_EXTSAVEDATA,
-    D_SHAREDEXTSAVEDATA,
-    D_SAVEDATA_IDX,
-    D_SAVEDATACHECK_IDX,
+    D_NAND_IDX,
     D_SYSDATA_IDX,
-    D_SYSSAVEDATA_IDX,
     D_HIRESTEXTURES_IDX,
     D_DUMP_IDX,
     D_DUMPFRAMES_IDX,