diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
index 3b942cdb0..ec7e13f8a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -25,6 +25,7 @@ import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import org.briarproject.bramble.api.reporting.DevConfig;
 import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory;
 import org.briarproject.bramble.plugin.file.AndroidRemovableDrivePluginFactory;
+import org.briarproject.bramble.plugin.file.RemovableDriveModule;
 import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory;
 import org.briarproject.bramble.util.AndroidUtils;
@@ -92,6 +93,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		GroupListModule.class,
 		GroupConversationModule.class,
 		SharingModule.class,
+		RemovableDriveModule.class
 })
 public class AppModule {
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveModule.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveModule.java
new file mode 100644
index 000000000..44dd6e69a
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveModule.java
@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.removabledrive;
+
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public interface RemovableDriveModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(RemovableDriveViewModel.class)
+	ViewModel bindRemovableDriveViewModel(RemovableDriveViewModel removableDriveViewModel);
+
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/RemovableDriveViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/conversation/RemovableDriveViewModel.java
rename to briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java
index e9aff76b7..a17fe7a3e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/RemovableDriveViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.conversation;
+package org.briarproject.briar.android.removabledrive;
 
 import android.app.Application;
 import android.net.Uri;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
index e75045eb4..6e8d295f1 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
@@ -4,7 +4,7 @@ import org.briarproject.briar.android.contact.add.remote.AddContactViewModel;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListViewModel;
 import org.briarproject.briar.android.conversation.ConversationViewModel;
 import org.briarproject.briar.android.conversation.ImageViewModel;
-import org.briarproject.briar.android.conversation.RemovableDriveViewModel;
+import org.briarproject.briar.android.removabledrive.RemovableDriveViewModel;
 
 import javax.inject.Singleton;
 
@@ -41,12 +41,6 @@ public abstract class ViewModelModule {
 	abstract ViewModel bindPendingRequestsViewModel(
 			PendingContactListViewModel pendingContactListViewModel);
 
-	@Binds
-	@IntoMap
-	@ViewModelKey(RemovableDriveViewModel.class)
-	abstract ViewModel bindRemovableDriveViewModel(
-			RemovableDriveViewModel removableDriveViewModel);
-
 	@Binds
 	@Singleton
 	abstract ViewModelProvider.Factory bindViewModelFactory(