diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index d15cf1293..ba447d80e 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -410,35 +410,35 @@
                 android:name="de.duenndns.ssl.MemorizingActivity"
                 android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
-        <receiver android:name=".StartupReceiver" >
+        <receiver android:name=".receiver.StartupReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
 
                 <category android:name="android.intent.category.HOME" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".PackageAddedReceiver" >
+        <receiver android:name=".receiver.PackageAddedReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_ADDED" />
 
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".PackageUpgradedReceiver" >
+        <receiver android:name=".receiver.PackageUpgradedReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
 
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".PackageRemovedReceiver" >
+        <receiver android:name=".receiver.PackageRemovedReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
 
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".WifiStateChangeReceiver" >
+        <receiver android:name=".receiver.WifiStateChangeReceiver" >
             <intent-filter>
                 <action android:name="android.net.wifi.STATE_CHANGE" />
             </intent-filter>
diff --git a/F-Droid/src/org/fdroid/fdroid/PackageAddedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java
similarity index 100%
rename from F-Droid/src/org/fdroid/fdroid/PackageAddedReceiver.java
rename to F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java
diff --git a/F-Droid/src/org/fdroid/fdroid/PackageReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java
similarity index 100%
rename from F-Droid/src/org/fdroid/fdroid/PackageReceiver.java
rename to F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java
diff --git a/F-Droid/src/org/fdroid/fdroid/PackageRemovedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java
similarity index 100%
rename from F-Droid/src/org/fdroid/fdroid/PackageRemovedReceiver.java
rename to F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java
diff --git a/F-Droid/src/org/fdroid/fdroid/PackageUpgradedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java
similarity index 100%
rename from F-Droid/src/org/fdroid/fdroid/PackageUpgradedReceiver.java
rename to F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java
diff --git a/F-Droid/src/org/fdroid/fdroid/StartupReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java
similarity index 100%
rename from F-Droid/src/org/fdroid/fdroid/StartupReceiver.java
rename to F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java
diff --git a/F-Droid/src/org/fdroid/fdroid/WifiStateChangeReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
similarity index 100%
rename from F-Droid/src/org/fdroid/fdroid/WifiStateChangeReceiver.java
rename to F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java