diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 7909a95e2..c4a5ed457 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -52,7 +52,6 @@ import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.NfcHelper;
 import org.fdroid.fdroid.Preferences;
-import org.fdroid.fdroid.QrGenAsyncTask;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.Utils;
@@ -71,8 +70,9 @@ import org.fdroid.fdroid.net.BluetoothDownloader;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.HttpDownloader;
 import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.fdroid.fdroid.qr.CameraCharacteristicsChecker;
+import org.fdroid.fdroid.qr.QrGenAsyncTask;
 import org.fdroid.fdroid.views.main.MainActivity;
-import org.fdroid.fdroid.views.swap.device.camera.CameraCharacteristicsChecker;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
similarity index 92%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java
rename to app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
index bdb23d306..3686dbe58 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java
+++ b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap.device.camera;
+package org.fdroid.fdroid.qr;
 
 import android.content.Context;
 
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMaxApiLevel20.java
similarity index 96%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java
rename to app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMaxApiLevel20.java
index 38d31fc96..e97f76758 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java
+++ b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMaxApiLevel20.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap.device.camera;
+package org.fdroid.fdroid.qr;
 
 import android.hardware.Camera;
 import android.util.Log;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java
rename to app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
index 84f8d88e3..639e14d2a 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java
+++ b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap.device.camera;
+package org.fdroid.fdroid.qr;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/org/fdroid/fdroid/QrGenAsyncTask.java b/app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java
similarity index 97%
rename from app/src/main/java/org/fdroid/fdroid/QrGenAsyncTask.java
rename to app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java
index ed17c160e..2a50bc475 100644
--- a/app/src/main/java/org/fdroid/fdroid/QrGenAsyncTask.java
+++ b/app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.qr;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -12,6 +12,7 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
 import com.google.zxing.encode.Contents;
 import com.google.zxing.encode.QRCodeEncoder;
+import org.fdroid.fdroid.Utils;
 
 public class QrGenAsyncTask extends AsyncTask<String, Void, Void> {
     private static final String TAG = "QrGenAsyncTask";
diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 55846ac36..408a18fcf 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -36,13 +36,13 @@ import android.widget.Toast;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.NfcHelper;
 import org.fdroid.fdroid.NfcNotEnabledActivity;
-import org.fdroid.fdroid.QrGenAsyncTask;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.fdroid.fdroid.qr.QrGenAsyncTask;
 
 import java.util.Arrays;
 import java.util.HashSet;