diff --git a/Data/Sys/Wii/setting-kor.txt b/Data/Sys/Wii/setting-kor.txt
deleted file mode 100644
index 8c04855554..0000000000
Binary files a/Data/Sys/Wii/setting-kor.txt and /dev/null differ
diff --git a/Data/User/Wii/shared2/ec/shopsetu.log b/Data/Sys/Wii/shared2/ec/shopsetu.log
similarity index 100%
rename from Data/User/Wii/shared2/ec/shopsetu.log
rename to Data/Sys/Wii/shared2/ec/shopsetu.log
diff --git a/Data/User/Wii/shared2/succession/shop.log b/Data/Sys/Wii/shared2/succession/shop.log
similarity index 100%
rename from Data/User/Wii/shared2/succession/shop.log
rename to Data/Sys/Wii/shared2/succession/shop.log
diff --git a/Data/User/Wii/shared2/sys/SYSCONF b/Data/Sys/Wii/shared2/sys/SYSCONF
similarity index 100%
rename from Data/User/Wii/shared2/sys/SYSCONF
rename to Data/Sys/Wii/shared2/sys/SYSCONF
diff --git a/Data/User/Wii/shared2/wc24/mbox/Readme.txt b/Data/Sys/Wii/shared2/wc24/mbox/Readme.txt
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/Readme.txt
rename to Data/Sys/Wii/shared2/wc24/mbox/Readme.txt
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24send.ctl
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24send.mbx
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx
diff --git a/Data/User/Wii/shared2/wc24/misc.bin b/Data/Sys/Wii/shared2/wc24/misc.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/misc.bin
rename to Data/Sys/Wii/shared2/wc24/misc.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24dl.bin b/Data/Sys/Wii/shared2/wc24/nwc24dl.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24dl.bin
rename to Data/Sys/Wii/shared2/wc24/nwc24dl.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24fl.bin b/Data/Sys/Wii/shared2/wc24/nwc24fl.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24fl.bin
rename to Data/Sys/Wii/shared2/wc24/nwc24fl.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24fls.bin b/Data/Sys/Wii/shared2/wc24/nwc24fls.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24fls.bin
rename to Data/Sys/Wii/shared2/wc24/nwc24fls.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cbk b/Data/Sys/Wii/shared2/wc24/nwc24msg.cbk
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24msg.cbk
rename to Data/Sys/Wii/shared2/wc24/nwc24msg.cbk
diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cfg b/Data/Sys/Wii/shared2/wc24/nwc24msg.cfg
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24msg.cfg
rename to Data/Sys/Wii/shared2/wc24/nwc24msg.cfg
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 6703c5710c..07bfaf8a63 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -64,10 +64,9 @@ public final class DolphinEmulator extends Activity
 			String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
 			String ConfigDir = BaseDir + File.separator + "Config";
 			String GCDir = BaseDir + File.separator + "GC";
-			String WiiDir = BaseDir + File.separator + "Wii";
 
 			// Copy assets if needed
-			File file = new File(WiiDir + File.separator + "setting-usa.txt");
+			File file = new File(GCDir + File.separator + "font_sjis.bin");
 			if(!file.exists())
 			{
 				NativeLibrary.CreateUserFolders();
@@ -81,10 +80,6 @@ public final class DolphinEmulator extends Activity
 				CopyAsset("dsp_rom.bin",     GCDir + File.separator + "dsp_rom.bin");
 				CopyAsset("font_ansi.bin",   GCDir + File.separator + "font_ansi.bin");
 				CopyAsset("font_sjis.bin",   GCDir + File.separator + "font_sjis.bin");
-				CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt");
-				CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt");
-				CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt");
-				CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt");
 			}
 
 			// Load the configuration keys set in the Dolphin ini and gfx ini files
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index cf75db6a75..5a5a836b65 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -212,9 +212,6 @@ if(ANDROID)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
 		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
 	)
-	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/Wii/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
-	)
 else()
 	add_executable(${DOLPHIN_EXE} ${SRCS})
 	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 7ba77501c0..eac7be46b3 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -249,12 +249,13 @@ bool DolphinApp::OnInit()
 	}
 #endif
 
-	//create all necessary directories in user directory
-	//TODO : detect the revision and upgrade where necessary
+	// Copy initial Wii NAND data from Sys to User.
+	File::CopyDir(File::GetSysDirectory() + WII_USER_DIR,
+	              File::GetUserPath(D_WIIUSER_IDX));
+
+	// TODO: replace these with overlays
 	File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP),
 			File::GetUserPath(D_GAMECONFIG_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR WII_USER_DIR DIR_SEP),
-			File::GetUserPath(D_WIIUSER_IDX));
 	File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP),
 			File::GetUserPath(D_OPENCL_IDX));