diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 43c6b4381..5a174ecdb 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -90,7 +90,7 @@
                 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,7 +121,7 @@
             </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"
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..c2de55d3f 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,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.support.v7.app.AppCompatActivity;
 
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..fad33d2bd 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,4 +1,4 @@
-package org.fdroid.fdroid.views.panic;
+package org.fdroid.fdroid.panic;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
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..5bc41f5ce 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;
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 99%
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..61b6d1605 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;
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/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/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/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;