Masquerade: Re-masqueradify the package and fix storage issue
diff --git a/app/build.gradle b/app/build.gradle
index 9894f71..1257808 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@
         applicationId "masquerade.substratum"
         minSdkVersion 23
         targetSdkVersion 24
-        versionCode 4
-        versionName "four"
+        versionCode 6
+        versionName "six"
     }
     buildTypes {
         debug {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4023dcd..993969d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,24 +11,24 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <receiver android:name=".services.BootDetector">
+        <receiver android:name="masquerade.substratum.services.BootDetector">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-        <receiver android:name=".services.Helper">
+        <receiver android:name="masquerade.substratum.services.Helper">
             <intent-filter>
-                <action android:name="projekt.substratum.helper.COMMANDS"/>
+                <action android:name="masquerade.substratum.COMMANDS"/>
             </intent-filter>
         </receiver>
 
-        <activity android:name=".activities.MainActivity">
+        <activity android:name="masquerade.substratum.activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name=".activities.LoaderActivity">
+        <activity android:name="masquerade.substratum.activities.LoaderActivity">
             <intent-filter>
                 <action android:name="masquerade.substratum.INITIALIZE"/>
                 <category android:name="android.intent.category.DEFAULT"/>
diff --git a/app/src/main/java/masquerade/substratum/services/Helper.java b/app/src/main/java/masquerade/substratum/services/Helper.java
index e013e13..78b6b26 100644
--- a/app/src/main/java/masquerade/substratum/services/Helper.java
+++ b/app/src/main/java/masquerade/substratum/services/Helper.java
@@ -52,9 +52,9 @@
             String final_commands_uninstall = "";
 
             Root.runCommand(
-                    "pm grant projekt.substratum.helper android.permission.READ_EXTERNAL_STORAGE");
+                    "pm grant masquerade.substratum android.permission.READ_EXTERNAL_STORAGE");
             Root.runCommand(
-                    "pm grant projekt.substratum.helper android.permission.WRITE_EXTERNAL_STORAGE");
+                    "pm grant masquerade.substratum android.permission.WRITE_EXTERNAL_STORAGE");
 
             ArrayList<String> packages_to_uninstall =
                     new ArrayList<>(intent.getStringArrayListExtra(inheritor));
@@ -66,8 +66,8 @@
                         .getExternalStorageDirectory().getAbsolutePath() +
                         "/.substratum/current_overlays.xml");
             }
-            Root.runCommand("cp /data/system/overlays" +
-                    ".xml " + Environment.getExternalStorageDirectory().getAbsolutePath() +
+            Root.runCommand("cp /data/system/overlays.xml " +
+                    Environment.getExternalStorageDirectory().getAbsolutePath() +
                     "/.substratum/current_overlays.xml");
             String[] state5initial = {Environment.getExternalStorageDirectory().getAbsolutePath() +
                     "/.substratum/current_overlays.xml", "5"};