diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
index 255b6a1a5..615dec331 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
@@ -40,7 +40,7 @@ import com.reicast.emulator.config.InputFragment;
 import com.reicast.emulator.config.OptionsFragment;
 import com.reicast.emulator.config.PGConfigFragment;
 import com.reicast.emulator.debug.GenerateLogs;
-import com.reicast.emulator.dropbox.CloudFragment;
+import com.reicast.emulator.cloud.CloudFragment;
 import com.reicast.emulator.emu.JNIdc;
 
 import java.lang.Thread.UncaughtExceptionHandler;
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/dropbox/CloudFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/cloud/CloudFragment.java
similarity index 95%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/dropbox/CloudFragment.java
rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/cloud/CloudFragment.java
index af26833d0..5f680ccd7 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/dropbox/CloudFragment.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/cloud/CloudFragment.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.dropbox;
+package com.reicast.emulator.cloud;
 
 /*
  *  Author: Luca D'Amico (Luca91)
@@ -84,10 +84,10 @@ public class CloudFragment extends Fragment {
 			accessToken = Auth.getOAuth2Token();
 			if (accessToken != null) {
 				mPrefs.edit().putString("access-token", accessToken).apply();
-				ClientFactory.init(accessToken);
+				DbxClientFactory.init(accessToken);
 			}
 		} else {
-			ClientFactory.init(accessToken);
+			DbxClientFactory.init(accessToken);
 		}
 	}
 
@@ -134,7 +134,7 @@ public class CloudFragment extends Fragment {
 		dialog.show();
 
 		try {
-			new UploadFileTask(getActivity(), ClientFactory.getClient(), new UploadFileTask.Callback() {
+			new UploadFileTask(getActivity(), DbxClientFactory.getClient(), new UploadFileTask.Callback() {
 				@Override
 				public void onUploadComplete(FileMetadata result) {
 					dialog.dismiss();
@@ -165,7 +165,7 @@ public class CloudFragment extends Fragment {
 		dialog.show();
 
 		try {
-			new ListFolderTask(ClientFactory.getClient(), new ListFolderTask.Callback() {
+			new ListFolderTask(DbxClientFactory.getClient(), new ListFolderTask.Callback() {
 				@Override
 				public void onDataLoaded(ListFolderResult result) {
 					dialog.dismiss();
@@ -203,7 +203,7 @@ public class CloudFragment extends Fragment {
 		dialog.show();
 
 		try {
-			new DownloadFileTask(this, ClientFactory.getClient(), new DownloadFileTask.Callback() {
+			new DownloadFileTask(this, DbxClientFactory.getClient(), new DownloadFileTask.Callback() {
 				@Override
 				public void onDownloadComplete(File result) {
 					dialog.dismiss();
@@ -398,13 +398,13 @@ public class CloudFragment extends Fragment {
 	}
 
 	void createBackupOfVmu(String vmuName) {
-		File backupDir = new File(home_directory, "VmuBackups");
+		File backupDir = new File(home_directory, "vmu_backup");
 		if (!backupDir.exists()) {
 			backupDir.mkdirs();
 		}
 
 		File source = new File(home_directory, vmuName);
-		File destination = new File(home_directory, "VmuBackups/" + vmuName);
+		File destination = new File(home_directory, "vmu_backup/" + vmuName);
 		if (!destination.exists()) {
 			try {
 				destination.createNewFile();
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/dropbox/ClientFactory.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/cloud/DbxClientFactory.java
similarity index 93%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/dropbox/ClientFactory.java
rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/cloud/DbxClientFactory.java
index c944340fd..1fceb1058 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/dropbox/ClientFactory.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/cloud/DbxClientFactory.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.dropbox;
+package com.reicast.emulator.cloud;
 
 import com.dropbox.core.DbxRequestConfig;
 import com.dropbox.core.http.StandardHttpRequestor;
@@ -7,7 +7,7 @@ import com.dropbox.core.v2.DbxClientV2;
 /**
  * Singleton instance of {@link DbxClientV2} and friends
  */
-public class ClientFactory {
+public class DbxClientFactory {
 
     private static DbxClientV2 sDbxClient;