diff --git a/app/src/androidTest/java/org/fdroid/fdroid/localrepo/BonjourManagerTest.java b/app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
similarity index 99%
rename from app/src/androidTest/java/org/fdroid/fdroid/localrepo/BonjourManagerTest.java
rename to app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
index 71eaa653d..41db1ed8c 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/localrepo/BonjourManagerTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/localrepo/LocalHTTPDManagerTest.java b/app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
similarity index 99%
rename from app/src/androidTest/java/org/fdroid/fdroid/localrepo/LocalHTTPDManagerTest.java
rename to app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
index ca4155de9..8ce9843d8 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/localrepo/LocalHTTPDManagerTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
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 9b66614ac..f3972dcab 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
@@ -23,9 +23,9 @@ 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.localrepo.LocalRepoKeyStore;
-import org.fdroid.fdroid.localrepo.LocalRepoManager;
-import org.fdroid.fdroid.localrepo.LocalRepoService;
+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;
 
diff --git a/app/src/basic/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java b/app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
similarity index 96%
rename from app/src/basic/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java
rename to app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
index 3fc00c4ce..c1d7d5ba1 100644
--- a/app/src/basic/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java
+++ b/app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 
diff --git a/app/src/basic/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
similarity index 96%
rename from app/src/basic/java/org/fdroid/fdroid/localrepo/SwapService.java
rename to app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
index 534c7ac23..35b645e8a 100644
--- a/app/src/basic/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 
diff --git a/app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java b/app/src/basic/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
similarity index 95%
rename from app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java
rename to app/src/basic/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
index 112dfdce7..fc969a842 100644
--- a/app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java
+++ b/app/src/basic/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.localrepo.peers;
+package org.fdroid.fdroid.nearby.peers;
 
 import org.fdroid.fdroid.data.NewRepoConfig;
 
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 7835b76a9..23e43c7f6 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -76,17 +76,17 @@
         <service
                 android:name=".net.WifiStateChangeService"
                 android:exported="false"/>
-        <service android:name=".localrepo.SwapService"/>
+        <service android:name=".nearby.SwapService"/>
 
-        <service android:name=".localrepo.LocalHTTPDManager"/>
+        <service android:name=".nearby.LocalHTTPDManager"/>
         <service
-                android:name=".localrepo.LocalRepoService"
+                android:name=".nearby.LocalRepoService"
                 android:exported="false"/>
         <service
-                android:name=".localrepo.TreeUriScannerIntentService"
+                android:name=".nearby.TreeUriScannerIntentService"
                 android:exported="false"/>
         <service
-                android:name=".localrepo.SDCardScannerService"
+                android:name=".nearby.SDCardScannerService"
                 android:exported="false"/>
 
         <activity
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/BluetoothManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/BluetoothManager.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
index 310c26cab..8be08fe88 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/BluetoothManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -15,7 +15,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.localrepo.peers.BluetoothPeer;
+import org.fdroid.fdroid.nearby.peers.BluetoothPeer;
 import org.fdroid.fdroid.net.bluetooth.BluetoothServer;
 
 import java.lang.ref.WeakReference;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/BonjourManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/BonjourManager.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
index e579a65c2..1daa0a5a4 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/BonjourManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,7 +13,7 @@ import android.util.Log;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.localrepo.peers.BonjourPeer;
+import org.fdroid.fdroid.nearby.peers.BonjourPeer;
 
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceEvent;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalHTTPDManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/LocalHTTPDManager.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
index eabbd0a46..13355cf10 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalHTTPDManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
index d41bab19d..829d92815 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
@@ -1,10 +1,8 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.util.Log;
 import kellinwood.security.zipsigner.ZipSigner;
-import org.fdroid.fdroid.FDroidApp;
-import org.fdroid.fdroid.Utils;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.GeneralName;
@@ -18,6 +16,8 @@ import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.fdroid.fdroid.FDroidApp;
+import org.fdroid.fdroid.Utils;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
index c495ebd2e..e5f8d7f13 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -386,7 +386,7 @@ public final class LocalRepoManager {
         }
 
         /**
-         * Alias for {@link org.fdroid.fdroid.localrepo.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
+         * Alias for {@link org.fdroid.fdroid.nearby.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
          * That accepts a number instead of string.
          *
          * @see IndexXmlBuilder#tag(String, String)
@@ -396,7 +396,7 @@ public final class LocalRepoManager {
         }
 
         /**
-         * Alias for {@link org.fdroid.fdroid.localrepo.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
+         * Alias for {@link org.fdroid.fdroid.nearby.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
          * that accepts a date instead of a string.
          *
          * @see IndexXmlBuilder#tag(String, String)
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoService.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoService.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
index 42551bb78..03151cbf0 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -29,8 +29,8 @@ import java.util.Set;
 public class LocalRepoService extends IntentService {
     public static final String TAG = "LocalRepoService";
 
-    public static final String ACTION_CREATE = "org.fdroid.fdroid.localrepo.action.CREATE";
-    public static final String EXTRA_PACKAGE_NAMES = "org.fdroid.fdroid.localrepo.extra.PACKAGE_NAMES";
+    public static final String ACTION_CREATE = "org.fdroid.fdroid.nearby.action.CREATE";
+    public static final String EXTRA_PACKAGE_NAMES = "org.fdroid.fdroid.nearby.extra.PACKAGE_NAMES";
 
     public static final String ACTION_STATUS = "localRepoStatusAction";
     public static final String EXTRA_STATUS = "localRepoStatusExtra";
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
index 8d92f0bae..d0531fec4 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.Manifest;
 import android.app.IntentService;
@@ -66,7 +66,7 @@ import java.util.List;
 public class SDCardScannerService extends IntentService {
     public static final String TAG = "SDCardScannerService";
 
-    private static final String ACTION_SCAN = "org.fdroid.fdroid.localrepo.SCAN";
+    private static final String ACTION_SCAN = "org.fdroid.fdroid.nearby.SCAN";
 
     private static final List<String> SKIP_DIRS = Arrays.asList(".android_secure", "LOST.DIR");
 
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
index 08b4ac91f..6bf2f1caf 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ -31,7 +31,7 @@ import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema;
-import org.fdroid.fdroid.localrepo.peers.Peer;
+import org.fdroid.fdroid.nearby.peers.Peer;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
index 668827827..57cf2ba71 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/TreeUriScannerIntentService.java b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/TreeUriScannerIntentService.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
index 33eb0374c..b27c57256 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/TreeUriScannerIntentService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.app.IntentService;
@@ -66,7 +66,7 @@ import java.util.jar.JarInputStream;
 public class TreeUriScannerIntentService extends IntentService {
     public static final String TAG = "TreeUriScannerIntentSer";
 
-    private static final String ACTION_SCAN_TREE_URI = "org.fdroid.fdroid.localrepo.action.SCAN_TREE_URI";
+    private static final String ACTION_SCAN_TREE_URI = "org.fdroid.fdroid.nearby.action.SCAN_TREE_URI";
 
     public TreeUriScannerIntentService() {
         super("TreeUriScannerIntentService");
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
index 42b9c1153..75964a738 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.fdroid.fdroid.nearby.peers;
 
 import android.bluetooth.BluetoothClass.Device;
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
index b40809dfa..582cc4d3a 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.fdroid.fdroid.nearby.peers;
 
 import android.net.Uri;
 import android.os.Parcel;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
similarity index 94%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
index 14a45db29..42d03d758 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.fdroid.fdroid.nearby.peers;
 
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
index 03d913bab..bbfc0b2e0 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.fdroid.fdroid.nearby.peers;
 
 import android.net.Uri;
 import android.os.Parcel;
diff --git a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
index beaf2b4c0..cdde5d8be 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
+++ b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
@@ -38,7 +38,7 @@ 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.localrepo.LocalRepoKeyStore;
+import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
 import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
 import javax.net.ssl.SSLServerSocketFactory;
diff --git a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
index e2326dd73..77e638f4a 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -23,8 +23,8 @@ 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.localrepo.LocalRepoKeyStore;
-import org.fdroid.fdroid.localrepo.LocalRepoManager;
+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/views/main/NearbyViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
index 96e33b552..88a00c973 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
@@ -17,9 +17,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.localrepo.SDCardScannerService;
-import org.fdroid.fdroid.localrepo.SwapService;
-import org.fdroid.fdroid.localrepo.TreeUriScannerIntentService;
+import org.fdroid.fdroid.nearby.SDCardScannerService;
+import org.fdroid.fdroid.nearby.SwapService;
+import org.fdroid.fdroid.nearby.TreeUriScannerIntentService;
 
 import java.io.File;
 
@@ -48,7 +48,7 @@ import java.io.File;
  * write access to the the removable storage.
  *
  * @see TreeUriScannerIntentService
- * @see org.fdroid.fdroid.localrepo.SDCardScannerService
+ * @see org.fdroid.fdroid.nearby.SDCardScannerService
  */
 class NearbyViewBinder {
     public static final String TAG = "NearbyViewBinder";
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
index 38ecf5ba9..ef88933c8 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
@@ -29,8 +29,8 @@ import android.widget.TextView;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.InstalledAppProvider;
 import org.fdroid.fdroid.data.Schema.InstalledAppTable;
-import org.fdroid.fdroid.localrepo.LocalRepoService;
-import org.fdroid.fdroid.localrepo.SwapView;
+import org.fdroid.fdroid.nearby.LocalRepoService;
+import org.fdroid.fdroid.nearby.SwapView;
 
 public class SelectAppsView extends SwapView implements LoaderManager.LoaderCallbacks<Cursor> {
 
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
index 36a33c989..1f70e99d6 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -26,10 +26,10 @@ import cc.mvdan.accesspoint.WifiApControl;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.localrepo.BluetoothManager;
-import org.fdroid.fdroid.localrepo.SwapService;
-import org.fdroid.fdroid.localrepo.SwapView;
-import org.fdroid.fdroid.localrepo.peers.Peer;
+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/views/swap/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
index e642a32a4..192945b54 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
@@ -43,7 +43,7 @@ import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable;
 import org.fdroid.fdroid.installer.InstallManagerService;
 import org.fdroid.fdroid.installer.Installer;
-import org.fdroid.fdroid.localrepo.SwapView;
+import org.fdroid.fdroid.nearby.SwapView;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.DownloaderService;
 
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 6ae9d384c..5aee52285 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
@@ -58,14 +58,14 @@ import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.NewRepoConfig;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
-import org.fdroid.fdroid.localrepo.BluetoothManager;
-import org.fdroid.fdroid.localrepo.BonjourManager;
-import org.fdroid.fdroid.localrepo.LocalHTTPDManager;
-import org.fdroid.fdroid.localrepo.LocalRepoService;
-import org.fdroid.fdroid.localrepo.SwapService;
-import org.fdroid.fdroid.localrepo.SwapView;
-import org.fdroid.fdroid.localrepo.peers.BluetoothPeer;
-import org.fdroid.fdroid.localrepo.peers.Peer;
+import org.fdroid.fdroid.nearby.BluetoothManager;
+import org.fdroid.fdroid.nearby.BonjourManager;
+import org.fdroid.fdroid.nearby.LocalHTTPDManager;
+import org.fdroid.fdroid.nearby.LocalRepoService;
+import org.fdroid.fdroid.nearby.SwapService;
+import org.fdroid.fdroid.nearby.SwapView;
+import org.fdroid.fdroid.nearby.peers.BluetoothPeer;
+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;
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/app/src/full/res/layout/swap_confirm_receive.xml
index a65d43043..f7bfd49aa 100644
--- a/app/src/full/res/layout/swap_confirm_receive.xml
+++ b/app/src/full/res/layout/swap_confirm_receive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.localrepo.SwapView
+<org.fdroid.fdroid.nearby.SwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
@@ -74,4 +74,4 @@
 
     </LinearLayout>
 
-</org.fdroid.fdroid.localrepo.SwapView>
+</org.fdroid.fdroid.nearby.SwapView>
diff --git a/app/src/full/res/layout/swap_connecting.xml b/app/src/full/res/layout/swap_connecting.xml
index c4ecd31a6..58e1a62d0 100644
--- a/app/src/full/res/layout/swap_connecting.xml
+++ b/app/src/full/res/layout/swap_connecting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.localrepo.SwapView
+<org.fdroid.fdroid.nearby.SwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
@@ -38,4 +38,4 @@
             android:visibility="gone"
             android:text="@string/try_again"/>
 
-</org.fdroid.fdroid.localrepo.SwapView>
+</org.fdroid.fdroid.nearby.SwapView>
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/app/src/full/res/layout/swap_join_wifi.xml
index 7cc0244fe..014eae77e 100644
--- a/app/src/full/res/layout/swap_join_wifi.xml
+++ b/app/src/full/res/layout/swap_join_wifi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.localrepo.SwapView
+<org.fdroid.fdroid.nearby.SwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
@@ -57,4 +57,4 @@
             android:paddingBottom="20dp"/>
     <!-- android:layout_above="@id/btn_learn_more_about_wifi" -->
 
-</org.fdroid.fdroid.localrepo.SwapView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SwapView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_nfc.xml b/app/src/full/res/layout/swap_nfc.xml
index 454ceee21..2d116a234 100644
--- a/app/src/full/res/layout/swap_nfc.xml
+++ b/app/src/full/res/layout/swap_nfc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.localrepo.SwapView
+<org.fdroid.fdroid.nearby.SwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarTitle="@string/swap_nfc_title"
@@ -35,4 +35,4 @@
             android:layout_below="@+id/text_description"
             android:layout_centerHorizontal="true"/>
 
-</org.fdroid.fdroid.localrepo.SwapView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SwapView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_send_fdroid.xml b/app/src/full/res/layout/swap_send_fdroid.xml
index d0a8fa371..6970dcd6e 100644
--- a/app/src/full/res/layout/swap_send_fdroid.xml
+++ b/app/src/full/res/layout/swap_send_fdroid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.localrepo.SwapView
+<org.fdroid.fdroid.nearby.SwapView
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
@@ -50,4 +50,4 @@
 
     </LinearLayout>
     </ScrollView>
-</org.fdroid.fdroid.localrepo.SwapView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SwapView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_wifi_qr.xml b/app/src/full/res/layout/swap_wifi_qr.xml
index 7e46c10d1..ceea837b2 100644
--- a/app/src/full/res/layout/swap_wifi_qr.xml
+++ b/app/src/full/res/layout/swap_wifi_qr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.localrepo.SwapView
+<org.fdroid.fdroid.nearby.SwapView
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
@@ -57,4 +57,4 @@
 
     </LinearLayout>
     </ScrollView>
-</org.fdroid.fdroid.localrepo.SwapView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SwapView>
\ No newline at end of file
diff --git a/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java b/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java
index f28fb0e00..7df483c64 100644
--- a/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java
+++ b/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java
@@ -21,8 +21,8 @@ import java.util.Locale;
 /**
  * Handles requests to add new repos via URLs.  This is an {@code IntentService}
  * so that requests are queued, which is necessary when either
- * {@link org.fdroid.fdroid.localrepo.TreeUriScannerIntentService} or
- * {@link org.fdroid.fdroid.localrepo.SDCardScannerService} finds multiple
+ * {@link org.fdroid.fdroid.nearby.TreeUriScannerIntentService} or
+ * {@link org.fdroid.fdroid.nearby.SDCardScannerService} finds multiple
  * repos on a disk.  This should hopefully also serve as the beginnings of
  * a new architecture for handling these requests.  This does all the
  * processing first, up front, then only launches UI as needed.
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index 17da8d506..193d07f77 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -70,7 +70,7 @@ import org.fdroid.fdroid.data.InstalledAppProviderService;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.installer.ApkFileProvider;
 import org.fdroid.fdroid.installer.InstallHistoryService;
-import org.fdroid.fdroid.localrepo.SDCardScannerService;
+import org.fdroid.fdroid.nearby.SDCardScannerService;
 import org.fdroid.fdroid.net.ConnectivityMonitorService;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.HttpDownloader;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
index c4411321b..10a5cf0e2 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
@@ -7,7 +7,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.localrepo.peers.WifiPeer;
+import org.fdroid.fdroid.nearby.peers.WifiPeer;
 import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
 import java.util.Arrays;
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 e4ea38c39..f96efce75 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
@@ -56,8 +56,8 @@ import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.NewRepoConfig;
-import org.fdroid.fdroid.localrepo.SDCardScannerService;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.nearby.SDCardScannerService;
+import org.fdroid.fdroid.nearby.SwapService;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 import org.fdroid.fdroid.views.AppDetailsActivity;
 import org.fdroid.fdroid.views.ManageReposActivity;
diff --git a/app/src/testFull/java/org/fdroid/fdroid/localrepo/LocalHTTPDManagerTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
similarity index 98%
rename from app/src/testFull/java/org/fdroid/fdroid/localrepo/LocalHTTPDManagerTest.java
rename to app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
index 6326e38ad..1236f2b71 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/localrepo/LocalHTTPDManagerTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import org.fdroid.fdroid.FDroidApp;
diff --git a/app/src/testFull/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStoreTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
similarity index 98%
rename from app/src/testFull/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStoreTest.java
rename to app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
index 18247a99e..027d41074 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStoreTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.text.TextUtils;
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 1436c5040..e31e26fdd 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
@@ -23,9 +23,9 @@ import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema;
 import org.fdroid.fdroid.data.ShadowApp;
 import org.fdroid.fdroid.data.TempAppProvider;
-import org.fdroid.fdroid.localrepo.LocalRepoKeyStore;
-import org.fdroid.fdroid.localrepo.LocalRepoManager;
-import org.fdroid.fdroid.localrepo.LocalRepoService;
+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.After;
 import org.junit.Before;