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..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.localrepo.LocalRepoKeyStore;
-import org.fdroid.fdroid.localrepo.LocalRepoManager;
-import org.fdroid.fdroid.localrepo.LocalRepoService;
-import org.fdroid.fdroid.net.LocalHTTPD;
+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.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/bluetooth/BluetoothClient.java b/app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
similarity index 95%
rename from app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java
rename to app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
index bb095c56a..70fd65be9 100644
--- a/app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java
+++ b/app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.net.bluetooth;
+package org.fdroid.fdroid.nearby;
 
 /**
  * Dummy version for basic app flavor.
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/views/swap/SwapWorkflowActivity.java b/app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 90%
rename from app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
rename to app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index 1dcfaf9bd..dc9993e55 100644
--- a/app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.net.Uri;
@@ -26,8 +26,9 @@ import android.net.Uri;
  * Dummy version for basic app flavor.
  */
 public class SwapWorkflowActivity {
+
     public static final String EXTRA_PREVENT_FURTHER_SWAP_REQUESTS = "preventFurtherSwap";
-    public static final String EXTRA_CONFIRM = "EXTRA_CONFIRM";
+
     public static void requestSwap(Context context, Uri uri) {
-    };
+    }
 }
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/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/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
similarity index 96%
rename from app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java
rename to app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
index 02387a5a8..9dd25bf0e 100644
--- a/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java
+++ b/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.views.hiding;
+package org.fdroid.fdroid.panic;
 
 import android.content.Context;
 
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 7835b76a9..a1d1afc3b 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -50,7 +50,7 @@
 
         <activity
                 android:label="@string/swap"
-                android:name=".views.swap.SwapWorkflowActivity"
+                android:name=".nearby.SwapWorkflowActivity"
                 android:parentActivityName=".views.main.MainActivity"
                 android:launchMode="singleTask"
                 android:theme="@style/SwapTheme.Wizard"
@@ -61,7 +61,7 @@
                     android:value=".views.main.MainActivity"/>
         </activity>
 
-        <receiver android:name=".receiver.WifiStateChangeReceiver">
+        <receiver android:name=".nearby.WifiStateChangeReceiver">
             <intent-filter>
                 <action android:name="android.net.wifi.STATE_CHANGE"/>
             </intent-filter>
@@ -74,23 +74,23 @@
         </receiver>
 
         <service
-                android:name=".net.WifiStateChangeService"
+                android:name=".nearby.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
-                android:name=".views.panic.PanicPreferencesActivity"
+                android:name=".panic.PanicPreferencesActivity"
                 android:label="@string/panic_settings"
                 android:parentActivityName=".views.main.MainActivity">
             <meta-data
@@ -105,11 +105,11 @@
             </intent-filter>
         </activity>
         <activity
-                android:name=".views.panic.SelectInstalledAppsActivity"
-                android:parentActivityName=".views.panic.PanicPreferencesActivity"/>
+                android:name=".panic.SelectInstalledAppsActivity"
+                android:parentActivityName=".panic.PanicPreferencesActivity"/>
 
         <activity
-                android:name=".views.panic.PanicResponderActivity"
+                android:name=".panic.PanicResponderActivity"
                 android:noHistory="true"
                 android:theme="@android:style/Theme.NoDisplay">
 
@@ -121,10 +121,10 @@
             </intent-filter>
         </activity>
         <activity
-                android:name=".views.panic.ExitActivity"
+                android:name=".panic.ExitActivity"
                 android:theme="@android:style/Theme.NoDisplay"/>
         <activity
-                android:name=".views.hiding.CalculatorActivity"
+                android:name=".panic.CalculatorActivity"
                 android:enabled="false"
                 android:icon="@mipmap/ic_calculator_launcher"
                 android:label="@string/hiding_calculator"
diff --git a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
similarity index 95%
rename from app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
index 801280ca4..10eb0d8a4 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth;
+package org.fdroid.fdroid.nearby;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
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 97%
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..e9445185e 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,8 +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.net.bluetooth.BluetoothServer;
+import org.fdroid.fdroid.nearby.peers.BluetoothPeer;
 
 import java.lang.ref.WeakReference;
 
diff --git a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
index df20f70b8..47d181e95 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth;
+package org.fdroid.fdroid.nearby;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothServerSocket;
@@ -7,8 +7,8 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
 import fi.iki.elonen.NanoHTTPD;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.net.bluetooth.httpish.Request;
-import org.fdroid.fdroid.net.bluetooth.httpish.Response;
+import org.fdroid.fdroid.nearby.httpish.Request;
+import org.fdroid.fdroid.nearby.httpish.Response;
 
 import java.io.File;
 import java.io.FileInputStream;
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/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 beaf2b4c0..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.localrepo.LocalRepoKeyStore;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
 import javax.net.ssl.SSLServerSocketFactory;
 import java.io.File;
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 97%
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..1acbb8c81 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;
@@ -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/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/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
index 38ecf5ba9..9d01ecf82 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -29,8 +29,6 @@ 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;
 
 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/nearby/StartSwapView.java
similarity index 97%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index 36a33c989..177da7ee9 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
@@ -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.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.net.WifiStateChangeService;
+import org.fdroid.fdroid.nearby.peers.Peer;
 
 import java.util.ArrayList;
 
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..b2b9e76e7 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,10 +31,8 @@ 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;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
index e642a32a4..c6ef14113 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -43,7 +43,6 @@ 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.net.Downloader;
 import org.fdroid.fdroid.net.DownloaderService;
 
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 95%
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..864bc980c 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;
@@ -8,7 +8,6 @@ import android.support.annotation.LayoutRes;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
 /**
  * A {@link android.view.View} that registers to handle the swap events from
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index 6ae9d384c..a75ab838f 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -58,18 +58,11 @@ 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.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;
-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/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/receiver/WifiStateChangeReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
similarity index 87%
rename from app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
index 2a8e11607..fd1bae629 100644
--- a/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
@@ -1,11 +1,10 @@
-package org.fdroid.fdroid.receiver;
+package org.fdroid.fdroid.nearby;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.net.WifiStateChangeService;
 
 public class WifiStateChangeReceiver extends BroadcastReceiver {
     private static final String TAG = "WifiStateChangeReceiver";
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 98%
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 e2326dd73..4d2636b99 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.localrepo.LocalRepoKeyStore;
-import org.fdroid.fdroid.localrepo.LocalRepoManager;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -39,7 +37,7 @@ import java.util.Locale;
  * Handle state changes to the device's wifi, storing the required bits.
  * The {@link Intent} that starts it either has no extras included,
  * which is how it can be triggered by code, or it came in from the system
- * via {@link  org.fdroid.fdroid.receiver.WifiStateChangeReceiver}, in
+ * via {@link WifiStateChangeReceiver}, in
  * which case an instance of {@link NetworkInfo} is included.
  * <p>
  * The work is done in a {@link Thread} so that new incoming {@code Intents}
@@ -280,7 +278,7 @@ public class WifiStateChangeService extends IntentService {
             while (networkInterfaces.hasMoreElements()) {
                 NetworkInterface netIf = networkInterfaces.nextElement();
 
-                for (Enumeration<InetAddress> inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements();) {
+                for (Enumeration<InetAddress> inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements(); ) {
                     InetAddress inetAddress = inetAddresses.nextElement();
                     if (inetAddress.isLoopbackAddress() || inetAddress instanceof Inet6Address) {
                         continue;
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/views/hiding/CalculatorActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java
rename to app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
index 508f3f348..e81bd3864 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.hiding;
+package org.fdroid.fdroid.panic;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -8,7 +8,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import org.fdroid.fdroid.R;
 
 import java.util.regex.Pattern;
@@ -28,7 +27,8 @@ public class CalculatorActivity extends AppCompatActivity {
     // unary operators
     private static final String PERCENT = "%";
 
-    private @Nullable String lastOp;
+    @Nullable
+    private String lastOp;
 
     // views
     private TextView textView;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/DestructiveCheckBoxPreference.java b/app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java
similarity index 97%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/DestructiveCheckBoxPreference.java
rename to app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java
index 4eb209880..2fe0d9d4e 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/DestructiveCheckBoxPreference.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/DestructivePreference.java b/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
similarity index 96%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/DestructivePreference.java
rename to app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
index 990eff5bf..36c5432c8 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/DestructivePreference.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.content.Context;
 import android.support.v7.preference.Preference;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
similarity index 96%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java
rename to app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
index 0822aec03..4665500db 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
@@ -1,10 +1,9 @@
-package org.fdroid.fdroid.views.panic;
-
-import android.support.v7.app.AppCompatActivity;
+package org.fdroid.fdroid.panic;
 
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 
 public class ExitActivity extends AppCompatActivity {
 
diff --git a/app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java
rename to app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
index c0afc2217..f8afb217c 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.hiding;
+package org.fdroid.fdroid.panic;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
similarity index 96%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java
rename to app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
index b8016263e..7b771007a 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
@@ -1,11 +1,10 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
-
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java
rename to app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
index 3eb275950..ba9b2fbb9 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -29,7 +29,6 @@ import info.guardianproject.panic.PanicResponder;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.installer.PrivilegedInstaller;
-import org.fdroid.fdroid.views.hiding.HidingManager;
 
 import java.util.ArrayList;
 import java.util.Set;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java
rename to app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
index 6f3c9d9c6..b03b5480e 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -23,7 +23,6 @@ import org.fdroid.fdroid.data.Schema;
 import org.fdroid.fdroid.installer.Installer;
 import org.fdroid.fdroid.installer.InstallerService;
 import org.fdroid.fdroid.installer.PrivilegedInstaller;
-import org.fdroid.fdroid.views.hiding.HidingManager;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppListAdapter.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
similarity index 96%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppListAdapter.java
rename to app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
index e0c49c927..6fcaeb452 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppListAdapter.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppListItemController.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
similarity index 96%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppListItemController.java
rename to app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
index eac2c9f2d..63f560edd 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppListItemController.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppsActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppsActivity.java
rename to app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
index 73ba4db50..f9f630e96 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/panic/SelectInstalledAppsActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.annotation.SuppressLint;
 import android.content.res.Resources;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
index 874390bba..c0a995e1d 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
@@ -24,7 +24,7 @@ import org.fdroid.fdroid.data.Schema;
 import org.fdroid.fdroid.views.apps.AppListActivity;
 import org.fdroid.fdroid.views.categories.CategoryAdapter;
 import org.fdroid.fdroid.views.categories.CategoryController;
-import org.fdroid.fdroid.views.hiding.HidingManager;
+import org.fdroid.fdroid.panic.HidingManager;
 
 import java.util.ArrayList;
 import java.util.Collections;
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/res/layout/activity_calculator.xml b/app/src/full/res/layout/activity_calculator.xml
index 6f1fc6cc8..2115cdd0a 100644
--- a/app/src/full/res/layout/activity_calculator.xml
+++ b/app/src/full/res/layout/activity_calculator.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".views.hiding.CalculatorActivity">
+    tools:context=".panic.CalculatorActivity">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
diff --git a/app/src/full/res/layout/activity_panic_settings.xml b/app/src/full/res/layout/activity_panic_settings.xml
index 2919b6ac1..1d06ce14f 100644
--- a/app/src/full/res/layout/activity_panic_settings.xml
+++ b/app/src/full/res/layout/activity_panic_settings.xml
@@ -14,7 +14,7 @@
 
     <fragment xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/fragment_container"
-        class="org.fdroid.fdroid.views.panic.PanicPreferencesFragment"
+        class="org.fdroid.fdroid.panic.PanicPreferencesFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
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..c25e8be00 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"
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/swap_blue"
-        tools:context=".views.swap.SwapWorkflowActivity">
+        tools:context=".nearby.SwapWorkflowActivity">
 
     <TextView
             android:layout_width="wrap_content"
@@ -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_select_apps.xml b/app/src/full/res/layout/swap_select_apps.xml
index a422e701a..6243e7486 100644
--- a/app/src/full/res/layout/swap_select_apps.xml
+++ b/app/src/full/res/layout/swap_select_apps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.SelectAppsView
+<org.fdroid.fdroid.nearby.SelectAppsView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
@@ -15,4 +15,4 @@
             android:layout_height="match_parent"
             android:orientation="vertical"/>
 
-</org.fdroid.fdroid.views.swap.SelectAppsView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SelectAppsView>
\ 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_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 5c9b51b3f..21a488b63 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.fdroid.fdroid.views.swap.StartSwapView
+<org.fdroid.fdroid.nearby.StartSwapView
         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"
@@ -8,7 +8,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.swap.SwapWorkflowActivity">
+        tools:context=".nearby.SwapWorkflowActivity">
 
     <!-- Misc header -->
     <include layout="@layout/start_swap_header"/>
@@ -209,4 +209,4 @@
 
     </ListView>
 
-</org.fdroid.fdroid.views.swap.StartSwapView>
+</org.fdroid.fdroid.nearby.StartSwapView>
diff --git a/app/src/full/res/layout/swap_success.xml b/app/src/full/res/layout/swap_success.xml
index ffcb3c180..2c6cd1647 100644
--- a/app/src/full/res/layout/swap_success.xml
+++ b/app/src/full/res/layout/swap_success.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.SwapSuccessView
+<org.fdroid.fdroid.nearby.SwapSuccessView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
@@ -15,4 +15,4 @@
             android:layout_height="match_parent"
             android:orientation="vertical"/>
 
-</org.fdroid.fdroid.views.swap.SwapSuccessView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SwapSuccessView>
\ 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..7cb4482a7 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -70,13 +70,13 @@ 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;
 import org.fdroid.fdroid.net.ImageLoaderForUIL;
-import org.fdroid.fdroid.net.WifiStateChangeService;
-import org.fdroid.fdroid.views.hiding.HidingManager;
+import org.fdroid.fdroid.nearby.WifiStateChangeService;
+import org.fdroid.fdroid.panic.HidingManager;
 
 import javax.microedition.khronos.opengles.GL10;
 import java.io.IOException;
@@ -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/data/NewRepoConfig.java b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
index c4411321b..28c847b9c 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
@@ -7,8 +7,8 @@ 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.views.swap.SwapWorkflowActivity;
+import org.fdroid.fdroid.nearby.peers.WifiPeer;
+import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
similarity index 97%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
index 8ea05577d..7b1fc8041 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth;
+package org.fdroid.fdroid.nearby;
 
 import android.bluetooth.BluetoothSocket;
 import org.fdroid.fdroid.Utils;
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
similarity index 93%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
index 973fa26e2..f7c34dc3d 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth;
+package org.fdroid.fdroid.nearby;
 
 import java.util.UUID;
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
similarity index 70%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
index a2cc07c6c..53c2bbd9e 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
@@ -1,6 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth.httpish.headers;
-
-import org.fdroid.fdroid.net.bluetooth.FileDetails;
+package org.fdroid.fdroid.nearby.httpish;
 
 public class ContentLengthHeader extends Header {
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
similarity index 66%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
index 81eb41dc3..1b00fbe4f 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
@@ -1,6 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth.httpish.headers;
-
-import org.fdroid.fdroid.net.bluetooth.FileDetails;
+package org.fdroid.fdroid.nearby.httpish;
 
 public class ETagHeader extends Header {
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
similarity index 69%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
index 96c57f63c..a01f81ab8 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.net.bluetooth;
+package org.fdroid.fdroid.nearby.httpish;
 
 public class FileDetails {
 
@@ -13,11 +13,11 @@ public class FileDetails {
         return fileSize;
     }
 
-    public void setFileSize(int fileSize) {
+    void setFileSize(int fileSize) {
         this.fileSize = fileSize;
     }
 
-    public void setCacheTag(String cacheTag) {
+    void setCacheTag(String cacheTag) {
         this.cacheTag = cacheTag;
     }
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
similarity index 77%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
index e5c013ca8..0484f4cf9 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
@@ -1,14 +1,12 @@
-package org.fdroid.fdroid.net.bluetooth.httpish.headers;
-
-import org.fdroid.fdroid.net.bluetooth.FileDetails;
+package org.fdroid.fdroid.nearby.httpish;
 
 import java.util.Locale;
 
 public abstract class Header {
 
     private static final Header[] VALID_HEADERS = {
-        new ContentLengthHeader(),
-        new ETagHeader(),
+            new ContentLengthHeader(),
+            new ETagHeader(),
     };
 
     protected abstract String getName();
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
similarity index 98%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
index 4523eed83..ee8687ae4 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
@@ -1,7 +1,7 @@
-package org.fdroid.fdroid.net.bluetooth.httpish;
+package org.fdroid.fdroid.nearby.httpish;
 
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.net.bluetooth.BluetoothConnection;
+import org.fdroid.fdroid.nearby.BluetoothConnection;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
similarity index 94%
rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
rename to app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
index dd999a14a..09fb39b95 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
+++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
@@ -1,10 +1,8 @@
-package org.fdroid.fdroid.net.bluetooth.httpish;
+package org.fdroid.fdroid.nearby.httpish;
 
 import android.util.Log;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.net.bluetooth.BluetoothConnection;
-import org.fdroid.fdroid.net.bluetooth.FileDetails;
-import org.fdroid.fdroid.net.bluetooth.httpish.headers.Header;
+import org.fdroid.fdroid.nearby.BluetoothConnection;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -87,7 +85,7 @@ public class Response {
 
     /**
      * Extracts meaningful headers from the response into a more useful and safe
-     * {@link org.fdroid.fdroid.net.bluetooth.FileDetails} object.
+     * {@link FileDetails} object.
      */
     public FileDetails toFileDetails() {
         FileDetails details = new FileDetails();
diff --git a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
index 46912bcee..15f6b7849 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
@@ -5,11 +5,11 @@ import android.support.annotation.Nullable;
 import android.util.Log;
 import org.apache.commons.io.input.BoundedInputStream;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.net.bluetooth.BluetoothClient;
-import org.fdroid.fdroid.net.bluetooth.BluetoothConnection;
-import org.fdroid.fdroid.net.bluetooth.FileDetails;
-import org.fdroid.fdroid.net.bluetooth.httpish.Request;
-import org.fdroid.fdroid.net.bluetooth.httpish.Response;
+import org.fdroid.fdroid.nearby.BluetoothClient;
+import org.fdroid.fdroid.nearby.BluetoothConnection;
+import org.fdroid.fdroid.nearby.httpish.FileDetails;
+import org.fdroid.fdroid.nearby.httpish.Request;
+import org.fdroid.fdroid.nearby.httpish.Response;
 
 import java.io.File;
 import java.io.IOException;
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 e4ea38c39..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
@@ -56,13 +56,13 @@ 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.net.WifiStateChangeService;
+import org.fdroid.fdroid.nearby.SDCardScannerService;
+import org.fdroid.fdroid.nearby.SwapService;
+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;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
 
 import java.lang.reflect.Field;
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
index 4178eced2..d11cc5fa0 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
@@ -25,7 +25,7 @@ import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable;
 import org.fdroid.fdroid.views.apps.AppListActivity;
-import org.fdroid.fdroid.views.hiding.HidingManager;
+import org.fdroid.fdroid.panic.HidingManager;
 import org.fdroid.fdroid.views.whatsnew.WhatsNewAdapter;
 
 import java.util.Date;
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 889b380b7..0c75fbd64 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -149,7 +149,7 @@
                 android:title="@string/panic_settings">
             <intent
                     android:action="android.intent.action.MAIN"
-                    android:targetClass="org.fdroid.fdroid.views.panic.PanicPreferencesActivity"
+                    android:targetClass="org.fdroid.fdroid.panic.PanicPreferencesActivity"
                     android:targetPackage="@string/applicationId"/>
         </android.support.v7.preference.PreferenceScreen>
     </android.support.v7.preference.PreferenceCategory>
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/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/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/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/views/panic/PanicResponderActivityTest.java b/app/src/testFull/java/org/fdroid/fdroid/panic/PanicResponderActivityTest.java
similarity index 98%
rename from app/src/testFull/java/org/fdroid/fdroid/views/panic/PanicResponderActivityTest.java
rename to app/src/testFull/java/org/fdroid/fdroid/panic/PanicResponderActivityTest.java
index 6c4fdca82..b2334b27b 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/views/panic/PanicResponderActivityTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/panic/PanicResponderActivityTest.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import org.fdroid.fdroid.data.DBHelper;
 import org.fdroid.fdroid.data.FDroidProviderTest;
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..c0b1eb078 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java
@@ -23,10 +23,11 @@ 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.net.LocalHTTPD;
+import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
+import org.fdroid.fdroid.nearby.LocalRepoManager;
+import org.fdroid.fdroid.nearby.LocalRepoService;
+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()