diff --git a/app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java b/app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
index f3972dcab..3e58e3416 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
@@ -23,10 +23,10 @@ import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema;
+import org.fdroid.fdroid.nearby.LocalHTTPD;
 import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
 import org.fdroid.fdroid.nearby.LocalRepoManager;
 import org.fdroid.fdroid.nearby.LocalRepoService;
-import org.fdroid.fdroid.net.LocalHTTPD;
 import org.junit.Test;
 
 import java.io.File;
@@ -52,7 +52,7 @@ public class SwapRepoEmulatorTest {
     public static final String TAG = "SwapRepoEmulatorTest";
 
     /**
-     * @see org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread#run()
+     * @see org.fdroid.fdroid.nearby.WifiStateChangeService.WifiInfoThread#run()
      */
     @Test
     public void testSwap()
diff --git a/app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
similarity index 97%
rename from app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java
rename to app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
index 4a7e652f0..24ebdaa4f 100644
--- a/app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.net;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index efca3680a..43c6b4381 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -74,7 +74,7 @@
         </receiver>
 
         <service
-                android:name=".net.WifiStateChangeService"
+                android:name=".nearby.WifiStateChangeService"
                 android:exported="false"/>
         <service android:name=".nearby.SwapService"/>
 
diff --git a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
index a5e16e7fc..cda15831e 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net;
+package org.fdroid.fdroid.nearby;
 
 /*
  * #%L
@@ -38,8 +38,6 @@ import android.net.Uri;
 import fi.iki.elonen.NanoHTTPD;
 import fi.iki.elonen.NanoHTTPD.Response.IStatus;
 import org.fdroid.fdroid.BuildConfig;
-import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
-import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
 
 import javax.net.ssl.SSLServerSocketFactory;
 import java.io.File;
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
index 13355cf10..1acbb8c81 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
@@ -10,8 +10,6 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
-import org.fdroid.fdroid.net.LocalHTTPD;
-import org.fdroid.fdroid.net.WifiStateChangeService;
 
 import java.io.IOException;
 import java.net.BindException;
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index bc123f35b..177da7ee9 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -26,11 +26,7 @@ import cc.mvdan.accesspoint.WifiApControl;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.nearby.BluetoothManager;
-import org.fdroid.fdroid.nearby.SwapService;
-import org.fdroid.fdroid.nearby.SwapView;
 import org.fdroid.fdroid.nearby.peers.Peer;
-import org.fdroid.fdroid.net.WifiStateChangeService;
 
 import java.util.ArrayList;
 
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
index d515f9628..b2b9e76e7 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
@@ -33,7 +33,6 @@ import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema;
 import org.fdroid.fdroid.nearby.peers.Peer;
 import org.fdroid.fdroid.net.Downloader;
-import org.fdroid.fdroid.net.WifiStateChangeService;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index de1126078..a75ab838f 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -63,7 +63,6 @@ import org.fdroid.fdroid.nearby.peers.Peer;
 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;
diff --git a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
index 77e638f4a..6a299758b 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net;
+package org.fdroid.fdroid.nearby;
 
 import android.app.IntentService;
 import android.content.ComponentName;
@@ -23,8 +23,6 @@ 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.nearby.LocalRepoKeyStore;
-import org.fdroid.fdroid.nearby.LocalRepoManager;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;
diff --git a/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
index 2a8e11607..f23d4b774 100644
--- a/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
+++ b/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.fdroid.fdroid.nearby.WifiStateChangeService;
 
 public class WifiStateChangeReceiver extends BroadcastReceiver {
     private static final String TAG = "WifiStateChangeReceiver";
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index 193d07f77..136a5568f 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -75,7 +75,7 @@ import org.fdroid.fdroid.net.ConnectivityMonitorService;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.HttpDownloader;
 import org.fdroid.fdroid.net.ImageLoaderForUIL;
-import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.fdroid.fdroid.nearby.WifiStateChangeService;
 import org.fdroid.fdroid.views.hiding.HidingManager;
 
 import javax.microedition.khronos.opengles.GL10;
@@ -234,7 +234,7 @@ public class FDroidApp extends Application {
 
     /**
      * Initialize the settings needed to run a local swap repo. This should
-     * only ever be called in {@link org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread},
+     * only ever be called in {@link WifiStateChangeService.WifiInfoThread},
      * after the single init call in {@link FDroidApp#onCreate()}.
      */
     public static void initWifiSettings() {
diff --git a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
index 243613425..db7a13cde 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
@@ -52,7 +52,7 @@ import java.net.URL;
 public class HttpDownloader extends Downloader {
     private static final String TAG = "HttpDownloader";
 
-    static final String HEADER_FIELD_ETAG = "ETag";
+    public static final String HEADER_FIELD_ETAG = "ETag";
 
     private final String username;
     private final String password;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 23e3d3a3c..b0e1f1c6b 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -58,7 +58,7 @@ import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.NewRepoConfig;
 import org.fdroid.fdroid.nearby.SDCardScannerService;
 import org.fdroid.fdroid.nearby.SwapService;
-import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.fdroid.fdroid.nearby.WifiStateChangeService;
 import org.fdroid.fdroid.views.AppDetailsActivity;
 import org.fdroid.fdroid.views.ManageReposActivity;
 import org.fdroid.fdroid.views.apps.AppListActivity;
diff --git a/app/src/testFull/java/org/fdroid/fdroid/net/LocalHTTPDTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
similarity index 99%
rename from app/src/testFull/java/org/fdroid/fdroid/net/LocalHTTPDTest.java
rename to app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
index 7f6e11766..b720d1bd1 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/net/LocalHTTPDTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net;
+package org.fdroid.fdroid.nearby;
 
 /*
  * #%L
@@ -38,6 +38,7 @@ import android.text.TextUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.net.HttpDownloader;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
similarity index 95%
rename from app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java
rename to app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
index 365b81ffc..58a1df118 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net;
+package org.fdroid.fdroid.nearby;
 
 import org.junit.Test;
 
diff --git a/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java b/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
index e31e26fdd..c0b1eb078 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
@@ -26,7 +26,8 @@ import org.fdroid.fdroid.data.TempAppProvider;
 import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
 import org.fdroid.fdroid.nearby.LocalRepoManager;
 import org.fdroid.fdroid.nearby.LocalRepoService;
-import org.fdroid.fdroid.net.LocalHTTPD;
+import org.fdroid.fdroid.nearby.WifiStateChangeService;
+import org.fdroid.fdroid.nearby.LocalHTTPD;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -94,7 +95,7 @@ public class SwapRepoTest {
     }
 
     /**
-     * @see org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread#run()
+     * @see WifiStateChangeService.WifiInfoThread#run()
      */
     @Test
     public void testSwap()