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 5a174ecdb..9e0d84c84 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -124,7 +124,7 @@
                 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/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/panic/ExitActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
index c2de55d3f..4665500db 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
@@ -1,10 +1,9 @@
 package org.fdroid.fdroid.panic;
 
-import android.support.v7.app.AppCompatActivity;
-
 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/panic/PanicPreferencesActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
index fad33d2bd..7b771007a 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
@@ -5,7 +5,6 @@ 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/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
index 5bc41f5ce..ba9b2fbb9 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
@@ -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/panic/PanicResponderActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
index 61b6d1605..b03b5480e 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
@@ -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/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/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/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index 136a5568f..7cb4482a7 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -76,7 +76,7 @@ import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.HttpDownloader;
 import org.fdroid.fdroid.net.ImageLoaderForUIL;
 import org.fdroid.fdroid.nearby.WifiStateChangeService;
-import org.fdroid.fdroid.views.hiding.HidingManager;
+import org.fdroid.fdroid.panic.HidingManager;
 
 import javax.microedition.khronos.opengles.GL10;
 import java.io.IOException;
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;