diff --git a/Core/System.cpp b/Core/System.cpp
index 7809a6406c..a5d764ed59 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -658,11 +658,6 @@ void InitSysDirectories() {
 			g_Config.memStickDirectory = myDocsPath;
 		INFO_LOG(COMMON, "Memstick directory not present, creating at '%s'", g_Config.memStickDirectory.c_str());
 	}
-	// Create the default directories that a real PSP creates. Good for homebrew so they can
-	// expect a standard environment. Skipping THEME though, that's pointless.
-	File::CreateDir(g_Config.memStickDirectory + "PSP/COMMON");
-	File::CreateDir(g_Config.memStickDirectory + "PSP/GAME");
-	File::CreateDir(g_Config.memStickDirectory + "PSP/SAVEDATA");
 
 	const std::string testFile = g_Config.memStickDirectory + "/_writable_test.$$$";
 
@@ -675,6 +670,18 @@ void InitSysDirectories() {
 	if (File::Exists(testFile))
 		File::Delete(testFile);
 
+	// Create the default directories that a real PSP creates. Good for homebrew so they can
+	// expect a standard environment. Skipping THEME though, that's pointless.
+	File::CreateDir(g_Config.memStickDirectory + "PSP");
+	File::CreateDir(g_Config.memStickDirectory + "PSP/COMMON");
+	File::CreateDir(g_Config.memStickDirectory + "PSP/GAME");
+	File::CreateDir(g_Config.memStickDirectory + "PSP/SAVEDATA");
+	File::CreateDir(g_Config.memStickDirectory + "PSP/PPSSPP_STATE");
+#ifdef ANDROID
+	// Avoid media scanners in PPSSPP_STATE directory
+	File::CreateEmptyFile(g_Config.memStickDirectory + "PSP/PPSSPP_STATE/.nomedia");
+#endif
+
 	if (g_Config.currentDirectory.empty()) {
 		g_Config.currentDirectory = GetSysDirectory(DIRECTORY_GAME);
 	}
diff --git a/copyrelease.sh b/copyrelease.sh
new file mode 100644
index 0000000000..1c0044d655
--- /dev/null
+++ b/copyrelease.sh
@@ -0,0 +1,14 @@
+TARGETDIR=$1
+VERSION=$2
+
+TARGETPATH=$1/$2
+
+echo "Copying to $TARGETPATH"
+
+mkdir -p $TARGETPATH
+cp PPSSPPWindows.exe $TARGETPATH
+cp PPSSPPWindows64.exe $TARGETPATH
+cp -r assets $TARGETPATH
+cp -r flash0 $TARGETPATH
+cp README.md $TARGETPATH
+rm $TARGETPATH/assets/lang/.git