From 4f1e5e681d6157ee42cc233720aa5c89008c1532 Mon Sep 17 00:00:00 2001
From: Joshua Ott <jj.ott@gmx.net>
Date: Mon, 14 Aug 2017 19:12:31 +0200
Subject: [PATCH] #29: Clean out and remove the framework module

---
 .gitignore                                    |   3 +-
 .idea/gradle.xml                              |   5 +-
 .idea/modules.xml                             |   2 +-
 .idea/vcs.xml                                 |   2 +-
 build.gradle                                  |   2 +-
 framework/.gitignore                          |   1 -
 framework/build.gradle                        |  46 --
 .../de/arcus/framework/ApplicationTest.java   |  35 -
 framework/src/main/AndroidManifest.xml        |  36 -
 .../framework/activities/CrashActivity.java   | 184 -----
 .../activities/DirectoryBrowserActivity.java  | 161 ----
 .../framework/adapter/DirectoryAdapter.java   |  48 --
 .../framework/crashhandler/CrashHandler.java  | 127 ---
 .../arcus/framework/items/FileSystemItem.java |  47 --
 .../de/arcus/framework/logger/Logger.java     | 229 ------
 .../arcus/framework/utils/MediaScanner.java   |  68 --
 .../res/drawable-hdpi/ic_action_accept.png    | Bin 401 -> 0 bytes
 .../main/res/drawable-hdpi/ic_action_back.png | Bin 301 -> 0 bytes
 .../res/drawable-hdpi/ic_action_cancel.png    | Bin 353 -> 0 bytes
 .../res/drawable-mdpi/ic_action_accept.png    | Bin 246 -> 0 bytes
 .../main/res/drawable-mdpi/ic_action_back.png | Bin 272 -> 0 bytes
 .../res/drawable-mdpi/ic_action_cancel.png    | Bin 272 -> 0 bytes
 .../res/drawable-xhdpi/ic_action_accept.png   | Bin 475 -> 0 bytes
 .../res/drawable-xhdpi/ic_action_back.png     | Bin 401 -> 0 bytes
 .../res/drawable-xhdpi/ic_action_cancel.png   | Bin 415 -> 0 bytes
 .../res/drawable-xxhdpi/ic_action_accept.png  | Bin 619 -> 0 bytes
 .../res/drawable-xxhdpi/ic_action_back.png    | Bin 449 -> 0 bytes
 .../res/drawable-xxhdpi/ic_action_cancel.png  | Bin 574 -> 0 bytes
 .../src/main/res/layout/activity_crash.xml    |  45 -
 .../res/layout/activity_directory_browser.xml |  32 -
 framework/src/main/res/menu/menu_crash.xml    |  35 -
 .../main/res/menu/menu_directory_browser.xml  |  43 -
 .../res/values-de/strings_crashhandler.xml    |  35 -
 .../values-de/strings_directory_browser.xml   |  28 -
 .../src/main/res/values-w820dp/dimens.xml     |  28 -
 framework/src/main/res/values/dimens.xml      |  27 -
 .../main/res/values/strings_crashhandler.xml  |  35 -
 .../res/values/strings_directory_browser.xml  |  28 -
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 playmusicexporter/.gitignore                  |   1 -
 playmusicexporter/build.gradle                |   2 +-
 .../playmusicexporter/ApplicationTest.java    |  35 -
 .../src/main/AndroidManifest.xml              |  10 +-
 .../playmusicexporter/activities/Intro.java   |   2 +-
 .../MusicContainerListActivity.java           |   6 +-
 .../activities/MusicTrackListActivity.java    |   4 -
 .../items/SelectedTrackList.java              |   2 +-
 .../services/ExportService.java               |   4 -
 .../utils/MusicPathBuilder.java               |   6 -
 .../utils/SelectionList.java                  |   2 +-
 playmusiclib/.gitignore                       |   1 -
 playmusiclib/build.gradle                     |   2 +-
 .../arcus/playmusiclib/ApplicationTest.java   |  35 -
 playmusiclib/src/main/AndroidManifest.xml     |   9 +-
 .../de/arcus/playmusiclib/ArtworkLoader.java  |  18 +-
 .../arcus/playmusiclib/PlayMusicManager.java  |  39 +-
 .../arcus/playmusiclib}/utils/FileTools.java  |  32 +-
 .../arcus/playmusiclib}/utils/ImageTools.java |   2 +-
 settings.gradle                               |   2 +-
 {framework => superuser}/proguard-rules.pro   |   0
 .../src/main/AndroidManifest.xml              |   7 +-
 .../java/rc/jcg/superuser}/ByteBuffer.java    |   2 +-
 .../java/rc/jcg}/superuser/SuperUser.java     | 299 ++++---
 .../rc/jcg}/superuser/SuperUserCommand.java   | 777 +++++++++---------
 .../superuser/SuperUserCommandCallback.java   |   2 +-
 .../SuperUserPermissionRequestListener.java   |   2 +-
 .../rc/jcg}/superuser/SuperUserTools.java     |   2 +-
 67 files changed, 576 insertions(+), 2065 deletions(-)
 delete mode 100644 framework/.gitignore
 delete mode 100644 framework/build.gradle
 delete mode 100644 framework/src/androidTest/java/de/arcus/framework/ApplicationTest.java
 delete mode 100644 framework/src/main/AndroidManifest.xml
 delete mode 100644 framework/src/main/java/de/arcus/framework/activities/CrashActivity.java
 delete mode 100644 framework/src/main/java/de/arcus/framework/activities/DirectoryBrowserActivity.java
 delete mode 100644 framework/src/main/java/de/arcus/framework/adapter/DirectoryAdapter.java
 delete mode 100644 framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
 delete mode 100644 framework/src/main/java/de/arcus/framework/items/FileSystemItem.java
 delete mode 100644 framework/src/main/java/de/arcus/framework/logger/Logger.java
 delete mode 100644 framework/src/main/java/de/arcus/framework/utils/MediaScanner.java
 delete mode 100644 framework/src/main/res/drawable-hdpi/ic_action_accept.png
 delete mode 100644 framework/src/main/res/drawable-hdpi/ic_action_back.png
 delete mode 100644 framework/src/main/res/drawable-hdpi/ic_action_cancel.png
 delete mode 100644 framework/src/main/res/drawable-mdpi/ic_action_accept.png
 delete mode 100644 framework/src/main/res/drawable-mdpi/ic_action_back.png
 delete mode 100644 framework/src/main/res/drawable-mdpi/ic_action_cancel.png
 delete mode 100644 framework/src/main/res/drawable-xhdpi/ic_action_accept.png
 delete mode 100644 framework/src/main/res/drawable-xhdpi/ic_action_back.png
 delete mode 100644 framework/src/main/res/drawable-xhdpi/ic_action_cancel.png
 delete mode 100644 framework/src/main/res/drawable-xxhdpi/ic_action_accept.png
 delete mode 100644 framework/src/main/res/drawable-xxhdpi/ic_action_back.png
 delete mode 100644 framework/src/main/res/drawable-xxhdpi/ic_action_cancel.png
 delete mode 100644 framework/src/main/res/layout/activity_crash.xml
 delete mode 100644 framework/src/main/res/layout/activity_directory_browser.xml
 delete mode 100644 framework/src/main/res/menu/menu_crash.xml
 delete mode 100644 framework/src/main/res/menu/menu_directory_browser.xml
 delete mode 100644 framework/src/main/res/values-de/strings_crashhandler.xml
 delete mode 100644 framework/src/main/res/values-de/strings_directory_browser.xml
 delete mode 100644 framework/src/main/res/values-w820dp/dimens.xml
 delete mode 100644 framework/src/main/res/values/dimens.xml
 delete mode 100644 framework/src/main/res/values/strings_crashhandler.xml
 delete mode 100644 framework/src/main/res/values/strings_directory_browser.xml
 delete mode 100644 playmusicexporter/.gitignore
 delete mode 100644 playmusicexporter/src/androidTest/java/re/jcg/playmusicexporter/ApplicationTest.java
 rename {framework/src/main/java/de/arcus/framework => playmusicexporter/src/main/java/re/jcg/playmusicexporter}/utils/SelectionList.java (99%)
 delete mode 100644 playmusiclib/.gitignore
 delete mode 100644 playmusiclib/src/androidTest/java/de/arcus/playmusiclib/ApplicationTest.java
 rename {framework/src/main/java/de/arcus/framework => playmusiclib/src/main/java/de/arcus/playmusiclib}/utils/FileTools.java (88%)
 rename {framework/src/main/java/de/arcus/framework => playmusiclib/src/main/java/de/arcus/playmusiclib}/utils/ImageTools.java (98%)
 rename {framework => superuser}/proguard-rules.pro (100%)
 rename framework/src/main/res/layout/adapter_directory.xml => superuser/src/main/AndroidManifest.xml (85%)
 rename {framework/src/main/java/de/arcus/framework/utils => superuser/src/main/java/rc/jcg/superuser}/ByteBuffer.java (99%)
 rename {framework/src/main/java/de/arcus/framework => superuser/src/main/java/rc/jcg}/superuser/SuperUser.java (93%)
 rename {framework/src/main/java/de/arcus/framework => superuser/src/main/java/rc/jcg}/superuser/SuperUserCommand.java (92%)
 rename {framework/src/main/java/de/arcus/framework => superuser/src/main/java/rc/jcg}/superuser/SuperUserCommandCallback.java (97%)
 rename {framework/src/main/java/de/arcus/framework => superuser/src/main/java/rc/jcg}/superuser/SuperUserPermissionRequestListener.java (72%)
 rename {framework/src/main/java/de/arcus/framework => superuser/src/main/java/rc/jcg}/superuser/SuperUserTools.java (99%)

diff --git a/.gitignore b/.gitignore
index e7c8a01..6304253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ out/
 
 # Gradle files
 .gradle/
+build.gradle
 build/
 
 # Local configuration file (sdk path, etc)
@@ -108,4 +109,4 @@ captures/
 
 # Keystore files
 *.jks
-gradle/wrapper/gradle-wrapper.properties
+gradle/wrapper/gradle-wrapper.properties
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bdb59ca..3c2d384 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,15 +3,14 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/framework" />
             <option value="$PROJECT_DIR$/playmusicexporter" />
             <option value="$PROJECT_DIR$/playmusiclib" />
+            <option value="$PROJECT_DIR$/superuser" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3321dbd..bd45cb4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,9 +3,9 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/PlayMusicExporter.iml" filepath="$PROJECT_DIR$/PlayMusicExporter.iml" />
-      <module fileurl="file://$PROJECT_DIR$/framework/framework.iml" filepath="$PROJECT_DIR$/framework/framework.iml" />
       <module fileurl="file://$PROJECT_DIR$/playmusicexporter/playmusicexporter.iml" filepath="$PROJECT_DIR$/playmusicexporter/playmusicexporter.iml" />
       <module fileurl="file://$PROJECT_DIR$/playmusiclib/playmusiclib.iml" filepath="$PROJECT_DIR$/playmusiclib/playmusiclib.iml" />
+      <module fileurl="file://$PROJECT_DIR$/superuser/superuser.iml" filepath="$PROJECT_DIR$/superuser/superuser.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f2c0b11..65c7ae6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
     }
 }
 
diff --git a/framework/.gitignore b/framework/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/framework/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/framework/build.gradle b/framework/build.gradle
deleted file mode 100644
index b025ec0..0000000
--- a/framework/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
-
-    defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-}
diff --git a/framework/src/androidTest/java/de/arcus/framework/ApplicationTest.java b/framework/src/androidTest/java/de/arcus/framework/ApplicationTest.java
deleted file mode 100644
index 1dab1c7..0000000
--- a/framework/src/androidTest/java/de/arcus/framework/ApplicationTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/framework/src/main/AndroidManifest.xml b/framework/src/main/AndroidManifest.xml
deleted file mode 100644
index 09822b2..0000000
--- a/framework/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.arcus.framework">
-
-    <application android:allowBackup="true" >
-        <activity
-            android:name=".activities.CrashActivity"
-            android:launchMode="singleInstance" >
-        </activity>
-        <activity
-            android:name="de.arcus.framework.activities.DirectoryBrowserActivity"
-            android:launchMode="singleInstance" >
-        </activity>
-    </application>
-</manifest>
diff --git a/framework/src/main/java/de/arcus/framework/activities/CrashActivity.java b/framework/src/main/java/de/arcus/framework/activities/CrashActivity.java
deleted file mode 100644
index 0702c9d..0000000
--- a/framework/src/main/java/de/arcus/framework/activities/CrashActivity.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.activities;
-
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.support.v4.app.ShareCompat;
-import android.support.v7.app.ActionBar;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-import de.arcus.framework.logger.Logger;
-import de.arcus.framework.R;
-
-public class CrashActivity extends AppCompatActivity {
-    // Extra flags
-    public static final String EXTRA_FLAG_CRASH_MESSAGE = "CRASH_TITLE";
-    public static final String EXTRA_FLAG_CRASH_LOG = "CRASH_LOG";
-
-    /**
-     * StackTrace of the exception
-     */
-    private String mCrashMessage;
-
-    /**
-     * Log of the exception
-     */
-    private String mCrashLog;
-
-    /**
-     * The name of the app
-     */
-    private String mAppName;
-
-    /**
-     * The intent to start the app (for restart the app)
-     */
-    private Intent mLaunchIntent;
-    /**
-     * Email address to send the crash log to
-     * Set this in AndroidManifest.xml: <meta-data android:name="crashhandler.email" android:value="..." />
-     */
-    private String mMetaDataEmail;
-
-    /**
-     * URL of a bugtracker or a support homepage
-     * Set this in AndroidManifest.xml: <meta-data android:name="crashhandler.supporturl" android:value="..." />
-     */
-    private String mMetaDataSupportURL;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_crash);
-
-        // Reads the crash information
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            if (bundle.containsKey(EXTRA_FLAG_CRASH_MESSAGE))
-                mCrashMessage = bundle.getString(EXTRA_FLAG_CRASH_MESSAGE);
-            if (bundle.containsKey(EXTRA_FLAG_CRASH_LOG))
-                mCrashLog = bundle.getString(EXTRA_FLAG_CRASH_LOG);
-        } else {
-            // No information; close activity
-            finish();
-            return;
-        }
-
-        try {
-            // Get the PackageManager to load information about the app
-            PackageManager packageManager = getPackageManager();
-            // Loads the ApplicationInfo with meta data
-            ApplicationInfo applicationInfo = packageManager.getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
-
-            if (applicationInfo.metaData != null) {
-                // Reads the crash handler settings from meta data
-                if (applicationInfo.metaData.containsKey("crashhandler.email"))
-                    mMetaDataEmail = applicationInfo.metaData.getString("crashhandler.email");
-                if (applicationInfo.metaData.containsKey("crashhandler.supporturl"))
-                    mMetaDataSupportURL = applicationInfo.metaData.getString("crashhandler.supporturl");
-            }
-
-            // Gets the app name
-            mAppName = packageManager.getApplicationLabel(applicationInfo).toString();
-            // Gets the launch intent for the restart
-            mLaunchIntent = packageManager.getLaunchIntentForPackage(getPackageName());
-
-        } catch (PackageManager.NameNotFoundException ex) {
-            // If this occurs then god must be already dead
-            Logger.getInstance().logError("CrashHandler", ex.toString());
-        }
-
-        // Set the action bar title
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setTitle(getString(R.string.crashhandler_app_has_stopped_working, mAppName));
-        }
-
-        // Set the message
-        TextView textViewMessage = (TextView) findViewById(R.id.text_view_crash_message);
-        if (textViewMessage != null) {
-            textViewMessage.setText(mCrashLog);
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_crash, menu);
-
-        // Hide the email button if there is no crashhandler.email in AndroidManifest.xml
-        menu.findItem(R.id.action_email).setVisible(!TextUtils.isEmpty(mMetaDataEmail));
-
-        // Hide the homepage if there is no crashhandler.supporturl in AndroidManifest.xml
-        menu.findItem(R.id.action_support).setVisible(!TextUtils.isEmpty(mMetaDataSupportURL));
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        if (id == R.id.action_restart) {
-            // Close this window
-            finish();
-
-            // Restart the app
-            startActivity(mLaunchIntent);
-        } else if (id == R.id.action_email) {
-            // Send email
-            ShareCompat.IntentBuilder builder = ShareCompat.IntentBuilder.from(this);
-            builder.setType("message/rfc822");
-            builder.addEmailTo(mMetaDataEmail);
-            builder.setSubject("Crash log for " + mAppName);
-            builder.setChooserTitle(R.string.crashhandler_choose_email_title);
-            builder.setText(mCrashLog);
-            builder.startChooser();
-        } else if (id == R.id.action_support) {
-            // Open Homepage
-            Intent intentUrl = new Intent(Intent.ACTION_VIEW, Uri.parse(mMetaDataSupportURL));
-            startActivity(intentUrl);
-
-        } else if (id == R.id.action_close_dialog) {
-            // Close this window
-            finish();
-        } else { // Other
-            return super.onOptionsItemSelected(item);
-        }
-
-
-        // One of our items was selected
-        return true;
-    }
-}
diff --git a/framework/src/main/java/de/arcus/framework/activities/DirectoryBrowserActivity.java b/framework/src/main/java/de/arcus/framework/activities/DirectoryBrowserActivity.java
deleted file mode 100644
index 9d475b0..0000000
--- a/framework/src/main/java/de/arcus/framework/activities/DirectoryBrowserActivity.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.activities;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import java.io.File;
-
-import de.arcus.framework.R;
-
-/**
- * Activity to browse for a directory
- */
-public class DirectoryBrowserActivity extends AppCompatActivity {
-    // The intent extra names
-    public final static String EXTRA_PATH = "path";
-    public final static String EXTRA_TITLE = "title";
-
-    /**
-     * The title
-     */
-    private String mTitle = "";
-
-    /**
-     * The current path
-     */
-    private File mPath;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Set the layout
-        setContentView(R.layout.activity_directory_browser);
-
-        // Gets the bundle data
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            // Reads the title
-            if (bundle.containsKey(EXTRA_TITLE))
-                mTitle = bundle.getString(EXTRA_TITLE);
-
-            // Reads the start path
-            if (bundle.containsKey(EXTRA_PATH)) {
-                String path = bundle.getString(EXTRA_PATH);
-                if (path != null) {
-                    mPath = new File(path);
-
-                    // Default directory
-                    if (!mPath.exists()) {
-                        mPath = Environment.getExternalStorageDirectory();
-                    }
-                }
-            }
-        }
-
-        // Setup the actionbar
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            // Set the title
-            actionBar.setTitle(mTitle);
-            actionBar.setSubtitle(mPath.getAbsolutePath());
-        }
-
-
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_directory_browser, menu);
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        if (id == R.id.action_accept) {
-            // Result the path
-            getIntent().setData(Uri.fromFile(mPath));
-            setResult(RESULT_OK, getIntent());
-            finish();
-
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * Opens the directory browser (use the Lollipop API if it's available)
-     * @param context The Context
-     * @param defaultPath The default path
-     * @param title The title
-     */
-    public static Intent openDirectoryBrowser(Context context, Uri defaultPath, String title) {
-        return openDirectoryBrowser(context, defaultPath, title, false);
-    }
-
-    /**
-     * Opens the directory browser (use the Lollipop API if it's available)
-     * @param context The Context
-     * @param defaultPath The default path
-     * @param title The title
-     * @param forceBuildInBrowser Set this to true to use the build-in browser even for Lollipop
-     */
-    public static Intent openDirectoryBrowser(Context context, Uri defaultPath, String title, boolean forceBuildInBrowser) {
-        Intent intent;
-
-        // Check for Lollipop
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !forceBuildInBrowser) {
-            // Opens the Lollipop directory browser
-
-            intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        } else {
-            // Opens the build-in directory browser
-            intent = new Intent(context, DirectoryBrowserActivity.class);
-
-            // The current path
-            intent.putExtra(DirectoryBrowserActivity.EXTRA_PATH, defaultPath.getPath());
-            intent.putExtra(DirectoryBrowserActivity.EXTRA_TITLE, title);
-        }
-
-        return intent;
-    }
-}
diff --git a/framework/src/main/java/de/arcus/framework/adapter/DirectoryAdapter.java b/framework/src/main/java/de/arcus/framework/adapter/DirectoryAdapter.java
deleted file mode 100644
index 738aba1..0000000
--- a/framework/src/main/java/de/arcus/framework/adapter/DirectoryAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.adapter;
-
-import android.content.Context;
-import android.widget.ArrayAdapter;
-
-import de.arcus.framework.R;
-import de.arcus.framework.items.FileSystemItem;
-
-/**
- * Adapter for directories
- */
-public class DirectoryAdapter extends ArrayAdapter<FileSystemItem> {
-    /**
-     * The context of the app
-     */
-    private Context mContext;
-
-    /**
-     * Create a new directory adapter
-     * @param context The app context
-     */
-    public DirectoryAdapter(Context context) {
-        super(context, R.layout.adapter_directory);
-        mContext = context;
-    }
-}
diff --git a/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java b/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
deleted file mode 100644
index 00ea15b..0000000
--- a/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.crashhandler;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-
-import de.arcus.framework.BuildConfig;
-import de.arcus.framework.activities.CrashActivity;
-import de.arcus.framework.logger.Logger;
-
-/**
- * Handles crashes of activities and shows a nice dialog with
- * options to send the developer an email with the crash log
- *
- * Use in onCreate in every activity:
- * CrashHandler.addCrashHandler(this);
- *
- * Created by ds on 22.01.2015.
- */
-public class CrashHandler implements Thread.UncaughtExceptionHandler {
-    /**
-     * Activity of the app
-     */
-    private Activity mActivity;
-
-    /**
-     * The default crash handler
-     */
-    private Thread.UncaughtExceptionHandler mDefaultHandler;
-
-    /**
-     * Addes a crash handler to the app context
-     * @param activity The activity of the app
-     */
-    public static void addCrashHandler(Activity activity)
-    {
-        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(activity));
-    }
-
-    public CrashHandler(Activity activity)
-    {
-        mActivity = activity;
-        mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();
-    }
-
-    @Override
-    public void uncaughtException(Thread thread, Throwable ex) {
-        // Log crash
-        Logger.getInstance().logError("CrashHandler", ex.toString());
-
-        StringBuilder logBuilder = new StringBuilder();
-
-        //Device Information
-        logBuilder.append("---------- Device Information -----------\n");
-        logBuilder.append("Manufacturer: ").append(Build.MANUFACTURER).append("\n");
-        logBuilder.append("Model: ").append(Build.MODEL).append("\n");
-        logBuilder.append("Device API: ").append(Build.VERSION.RELEASE).append("\n");
-        logBuilder.append("Product: ").append(Build.PRODUCT).append("\n");
-        logBuilder.append("Build Number: ").append(Build.DISPLAY).append("\n");
-        logBuilder.append("Build Tags: ").append(Build.TAGS).append("\n");
-        logBuilder.append("\n");
-
-
-        // Information
-        logBuilder.append("---------- App Information -----------\n");
-        logBuilder.append("PackageName: ").append(mActivity.getPackageName()).append("\n");
-        logBuilder.append("Crashed activity: ").append(mActivity.getLocalClassName()).append("\n");
-        logBuilder.append("Version number: ").append(BuildConfig.VERSION_NAME).append("\n");
-        logBuilder.append("Version code: ").append(BuildConfig.VERSION_CODE).append("\n");
-        logBuilder.append("\n");
-
-
-        logBuilder.append("----------- Exception ------------\n");
-        logBuilder.append(ex.getMessage()).append("\n");
-        logBuilder.append(ex.getClass().getCanonicalName()).append(" at \n");
-
-        // Log stack trace
-        for (StackTraceElement stackTraceElement : ex.getStackTrace())
-        {
-            logBuilder.append("\t").append(stackTraceElement.toString()).append("\n");
-        }
-
-        // Log Caused by
-        if (ex.getCause() != null) {
-            logBuilder.append("----------- Caused by ------------\n");
-            logBuilder.append(ex.getCause().getMessage()).append("\n");
-
-            // Log stack trace
-            for (StackTraceElement stackTraceElement : ex.getCause().getStackTrace())
-            {
-                logBuilder.append("\t").append(stackTraceElement.toString()).append("\n");
-            }
-        }
-
-        // Opens a crash window
-        Intent intendCrash = new Intent(mActivity, CrashActivity.class);
-        intendCrash.putExtra(CrashActivity.EXTRA_FLAG_CRASH_MESSAGE, ex.getMessage());
-        intendCrash.putExtra(CrashActivity.EXTRA_FLAG_CRASH_LOG, logBuilder.toString());
-        intendCrash.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        mActivity.startActivity(intendCrash);
-
-        // Close this app
-        System.exit(0);
-    }
-}
diff --git a/framework/src/main/java/de/arcus/framework/items/FileSystemItem.java b/framework/src/main/java/de/arcus/framework/items/FileSystemItem.java
deleted file mode 100644
index 76e0e7b..0000000
--- a/framework/src/main/java/de/arcus/framework/items/FileSystemItem.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.items;
-
-/**
- * Item for directory adapter
- */
-public class FileSystemItem {
-    /**
-     * File system types (directory or file)
-     */
-    public enum FileSystemType { File, Directory }
-
-    /**
-     * The type of the entry
-     */
-    private FileSystemType mFileType;
-
-    /**
-     * @return Gets the file system type
-     */
-    public FileSystemType getFileType() {
-        return mFileType;
-    }
-
-
-}
diff --git a/framework/src/main/java/de/arcus/framework/logger/Logger.java b/framework/src/main/java/de/arcus/framework/logger/Logger.java
deleted file mode 100644
index 3f9d9ae..0000000
--- a/framework/src/main/java/de/arcus/framework/logger/Logger.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.logger;
-
-import android.util.Log;
-
-import java.util.LinkedList;
-import java.util.Queue;
-
-/**
- * Helper class to write into a log file and to logcat
- */
-public class Logger {
-    /**
-     * Type of the log entry
-     */
-    public enum LogEntryType { Verbose, Debug, Info, Warning, Error }
-
-    /**
-     * Instance of the logger
-     */
-    private static Logger instance;
-
-    /**
-     * Get the active instance of the Logger
-     * Creates an instance if not exists
-     * @return Gets the logger
-     */
-    public static Logger getInstance() {
-        // Create new Instance
-        if (instance == null)
-            instance = new Logger();
-
-        return instance;
-    }
-
-    /**
-     * List of all entries
-     */
-    private Queue<LogEntry> mEntryList = new LinkedList<>();
-
-    /**
-     * @return Gets the entry list
-     */
-    public Queue<LogEntry> getEntryList() {
-        return mEntryList;
-    }
-
-    /**
-     * The minimum level to log messages
-     */
-    private LogEntryType mLogLevel = LogEntryType.Debug;
-
-    /**
-     * @return Gets the log level
-     */
-    public LogEntryType getLogLevel() {
-        return mLogLevel;
-    }
-
-    /**
-     * Sets the log level
-     * @param type The minimal log level to log messages
-     */
-    public void setLogLevel(LogEntryType type) {
-        mLogLevel = type;
-    }
-
-    /**
-     * Adds a verbose entry to the log
-     * @param tag Tag of the log entry (function or section)
-     * @param message Message of the log entry
-     */
-    public void logVerbose(String tag, String message) {
-        log(LogEntryType.Verbose, tag, message);
-    }
-
-    /**
-     * Adds a debug entry to the log
-     * @param tag Tag of the log entry (function or section)
-     * @param message Message of the log entry
-     */
-    public void logDebug(String tag, String message) {
-        log(LogEntryType.Debug, tag, message);
-    }
-
-    /**
-     * Adds a info entry to the log
-     * @param tag Tag of the log entry (function or section)
-     * @param message Message of the log entry
-     */
-    public void logInfo(String tag, String message) {
-        log(LogEntryType.Info, tag, message);
-    }
-
-    /**
-     * Adds a warning entry to the log
-     * @param tag Tag of the log entry (function or section)
-     * @param message Message of the log entry
-     */
-    public void logWarning(String tag, String message) {
-        log(LogEntryType.Warning, tag, message);
-    }
-
-    /**
-     * Adds a error entry to the log
-     * @param tag Tag of the log entry (function or section)
-     * @param message Message of the log entry
-     */
-    public void logError(String tag, String message) {
-        log(LogEntryType.Error, tag, message);
-    }
-
-    /**
-     * Adds a entry to the log
-     * @param type Entry type (Debug, Info, Warning, Error)
-     * @param tag Tag of the log entry (function or section)
-     * @param message Message of the log entry
-     */
-    private void log(LogEntryType type, String tag, String message) {
-        // Entry type will be logged
-        if (type.ordinal() >= mLogLevel.ordinal())
-        {
-            LogEntry logEntry = new LogEntry(type, tag, message);
-
-            // LogCat
-            logEntry.writeToLogCat();
-
-            // Push entry to list
-            mEntryList.add(logEntry);
-        }
-    }
-
-    /**
-     * A single log entry
-     */
-    public class LogEntry {
-        /**
-         * Type of the log entry
-         */
-        private LogEntryType mType;
-
-        /**
-         * Tag of the log entry
-         */
-        private String mTag;
-
-        /**
-         * Message of the log entry
-         */
-        private String mMessage;
-
-        /**
-         * @return Gets the Type of the log entry
-         */
-        public LogEntryType getType() {
-            return mType;
-        }
-
-        /**
-         * @return Gets the tag of the log entry
-         */
-        public String getTag() {
-            return mTag;
-        }
-
-        /**
-         * @return Gets the message of the log entry
-         */
-        public String getMessage() {
-            return mMessage;
-        }
-
-        /**
-         * Creates a log entry
-         * @param type Entry type (Debug, Info, Warning, Error)
-         * @param tag Tag of the log entry (function or section)
-         * @param message Message of the log entry
-         */
-        public LogEntry(LogEntryType type, String tag, String message) {
-            mType = type;
-            mTag = tag;
-            mMessage = message;
-        }
-
-        /**
-         * Writes the entry to logcat
-         */
-        public void writeToLogCat() {
-            switch (mType) {
-                case Verbose:
-                    Log.v(mTag, mMessage);
-                    break;
-                case Debug:
-                    Log.d(mTag, mMessage);
-                    break;
-                case Info:
-                    Log.i(mTag, mMessage);
-                    break;
-                case Warning:
-                    Log.w(mTag, mMessage);
-                    break;
-                case Error:
-                    Log.e(mTag, mMessage);
-                    break;
-            }
-        }
-    }
-}
diff --git a/framework/src/main/java/de/arcus/framework/utils/MediaScanner.java b/framework/src/main/java/de/arcus/framework/utils/MediaScanner.java
deleted file mode 100644
index 27476ee..0000000
--- a/framework/src/main/java/de/arcus/framework/utils/MediaScanner.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.utils;
-
-import android.content.Context;
-import android.media.MediaScannerConnection;
-import android.net.Uri;
-
-/**
- * A media scanner which adds files to the android media system
- */
-public class MediaScanner implements MediaScannerConnection.MediaScannerConnectionClient {
-    /**
-     * Connection to the media scanner
-     */
-    private MediaScannerConnection mMediaScanner;
-
-    /**
-     * File to scan
-     */
-    private String mFile;
-
-    /**
-     * Adds a file to the android media system
-     * @param context The context of the app
-     * @param string Path to the file
-     */
-    public MediaScanner(Context context, String string) {
-        mFile = string;
-
-        // Connect the media scanner
-        mMediaScanner = new MediaScannerConnection(context, this);
-        mMediaScanner.connect();
-    }
-
-    @Override
-    public void onMediaScannerConnected() {
-        // Is connected
-        mMediaScanner.scanFile(mFile, null);
-    }
-
-    @Override
-    public void onScanCompleted(String path, Uri uri) {
-        // Done; close the connection
-        mMediaScanner.disconnect();
-    }
-
-}
\ No newline at end of file
diff --git a/framework/src/main/res/drawable-hdpi/ic_action_accept.png b/framework/src/main/res/drawable-hdpi/ic_action_accept.png
deleted file mode 100644
index 700fc81518fcf6b50df4f4813efd0578c420279c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@jK-cWjv*Dd-b}yG+hicnuK95)V@yNtjKi!o;_L+sVg-yf
z<xJuQj6n7tZ?B{+Q~u?9)=iJmQ&jwGck5DiY_3ffhXVtXKm!Ad0z>2f8Ov5KmD!o+
z=itOYrFxxJ=dOewZg!7u<vKYqo-Y)3is=$psAzj9`l0q?wZoy$)AMs5bPIfFJg@hF
zdw!?_OO07$z=uc{r$g%E9K8Fr9GJ_deBWB9BEBcA;o-_TPYxRW@Ho=6J<{o%km19v
zOeP0Bp1x5Ql&&jft5FF$Ag!w?-Wl@YSoHz7B*uS&%=cc&7)*?4s1K6s-XZ*2#pDBf
z)q7cQ2aA8#pBpFfvDGYXdw#<*^0Lnam#?Z9|J+$J=|J^Yr>>_{WbW;r8SJ6b%6~Jp
s=yLf~Y01Dpy*yA4GIE^w!C}C_#CG_t@}%d+z%XX;boFyt=akR{0HbJ|djJ3c

diff --git a/framework/src/main/res/drawable-hdpi/ic_action_back.png b/framework/src/main/res/drawable-hdpi/ic_action_back.png
deleted file mode 100644
index 58d22d6d4c42f579b1e574e0bde0650749413550..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy&q+i<RCwC#n86K$Fc1WN5gmmxQWVq_
z%1CN5Ao;<|0>jzMvLjjWV-^JLIRqhu5W;~N<FGF8>vUf7%i)vGgPFMnF;DpolUImW
z1^Jaf{1eE?kIUWvLI-Fie@TFr@}~o|mOm8$LB2QuihNN3B>BSu(BuyVK$PDd09Afh
zfQ)=SNwdDF3n9o?Epu=IQU#un1Mt7Z6rWLw9~niJpeS<`b(&(Jp%^JChI)!^m6jnc
zEpwUf^uAR?Ogq!Rw1!*O+*;e~LI@$A%`CtG>wTc_a;s!Z00000NkvXXu0mjf+I4po

diff --git a/framework/src/main/res/drawable-hdpi/ic_action_cancel.png b/framework/src/main/res/drawable-hdpi/ic_action_cancel.png
deleted file mode 100644
index e206f296c2535b11a2243ae93a31b2957f42ab7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz14%?dRCwC#n86K$FbqW#?yS*ivOp(b
z4c1@*CSZ(C&^0<h8dM*8KurwaqHh0_EZ~6se-gkX1VRWQgg7GSd@a!%<n7no*5bz!
zw-PhbgovLd_o%tI(~NvMB)Pnlm=Go;$0Rvdl4d44MXja8{q6d&i4E~VYAmfeBB<aH
zV|<*ED*{KYxiE4dB6#Yn0+8Z&8`vuZE&h-Jtso2WhYhp}vl0(6P!lNUCgNcRDkg%J
zc&LF7CW4iCxPgiZxOi<V@s)51{lr7;`ZenML*}}baNW$gZl_)U(767kv{=80oSIf5
z!QUXSdxwqPj`TMhTYHN6-C87s5JCu;rvL*0$X7g0L(`tR00000NkvXXu0mjfMDmg#

diff --git a/framework/src/main/res/drawable-mdpi/ic_action_accept.png b/framework/src/main/res/drawable-mdpi/ic_action_accept.png
deleted file mode 100644
index 41107b870a6cdf2fa983574294361cb545ad68ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GGdx`!Ln>}1B}lL?P7vu~`SAaLeVl@yw8!b`j2|Tx@*Jk8
zFWUOlAxlkQwPWi!zA5J&Z<Js86nNUxa0PqERkkC~9nKmrY<r`AOfZDMY{Jrj)0|dK
zX@!10${F(>e6VcFTPZtRc}1?JvSDAtwC4+o{u&F|yKCK+mXwq<zpUJ^+|KfsTT-WQ
s!TP5eeG(F<-4AL=ux?>uU}R%>+m>-ZX1@3)pc@%HUHx3vIVCg!05Z{8<NyEw

diff --git a/framework/src/main/res/drawable-mdpi/ic_action_back.png b/framework/src/main/res/drawable-mdpi/ic_action_back.png
deleted file mode 100644
index 8da54cde96ad78df9690fa67f76dcf32161a99de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gn><|{Ln>}1B}lL?PFT_O|NsBbOog``qW1B0oM$LxR!uXU
zm~1&=7Uz+y0LAJBGelx#8jgNC?=a`wi4#A1V%QCW4t|QB;==gYA<AzGb4I46Bm0G0
zMSJ)bv_G|wZ8%yaV8L)?O4L49+v5g8nU-4_G+53Dg$M*n^X$`*5a}!kNIC2nD8Spb
zs3IW5ZA%G@@=B=!3#D0i%otCy3SLm!uzupHmgXrY9&KrhOGJ8@vX~kem>G<Iw|xxS
S|7kbS^$eb_elF{r5}E+5C1Xwi

diff --git a/framework/src/main/res/drawable-mdpi/ic_action_cancel.png b/framework/src/main/res/drawable-mdpi/ic_action_cancel.png
deleted file mode 100644
index 70e6d2d2a0e95eb311fe958b897f3a99391ab00f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gn><|{Ln>}1B}pV4FnQGw$lhbcF#pN_|Nm<nE9?bUPs}p#
z;15}^e{)^4R6$#ayFw)2HE&OmCCnew6`rv^nt8;6X;qq9$ocdYk~~vdnxr-=I(9{^
zvTjP7CY;Q8R`+<i;L>TvlOA(yaXHp7=YfQzWd6l13QbWBbF5EntH}^M8nLKhNl}v$
z`vZ-XOPZxe9-MDujuPO_2=wV|3@K%?U6t&_#+%cevc=Z|<hBdU3@j21lcblV@3a3V
Q19Uxur>mdKI;Vst0JaBXn*aa+

diff --git a/framework/src/main/res/drawable-xhdpi/ic_action_accept.png b/framework/src/main/res/drawable-xhdpi/ic_action_accept.png
deleted file mode 100644
index 6ee32b64df5f43346d78bf38a30c6194ae37e6a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 475
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7;8OU978H@y_t1Tu*pEcwX>Z20@IqqOj{Uq9k@3ze9U9M
z)lmL*9cu(5Z$ty@gS0m0_72Y*2ipFaZ*FFOJmGt<v)Qavpj}|#@MTJ>rEg@N+t&rB
zf~VDorivcQ(D+nh5!jo(T)d>t_y<GXiEOS_r}uwf&3HP0YS8?HYzGwOa~Wbj1+pE`
zl#gY&^C^&3z{zeFgVRZOK?je@kBlwT#AO}CKP53MRO;56p4h+gTFfWEy$y0ASNAAa
zURGbfw0zE|Ym8UeN|#(e&G#got<v@__q%GX^Nz9^2HS5u%}qaW%3y`<bDtO9_p}&x
z{hY~Hepq#yz^^IgRa_y_KHP^@->-MR|LI)6<2eD96V+>(Eu1DOz27U4CETR)GfdlY
zzQB@`+vB))w<rY8TPnVR({YtewDA=YrmMlLY_iR72sFKWpeFS6=Iw`V0xqZ6Z}R^T
zZqoRfAgyHYB%m%|m8`t}Z^+*j+jd-9#HHx_Gm7Kozf@LeSTzLfW8z`hR%QAuE&KEf
Okf5ilpUXO@geCx?AHK{0

diff --git a/framework/src/main/res/drawable-xhdpi/ic_action_back.png b/framework/src/main/res/drawable-xhdpi/ic_action_back.png
deleted file mode 100644
index d5760406180becfb647bc7ed6f6f40ce2517e738..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7>zw$978H@y_t2Ex5+`kE%MP-Hk|`(InJ*a@ZR3QxA%5~
zSpu_I0;9$3jHEplhu*yVQ=@;gKtZvR-!Wp_YoH}Su;P?O-|7>evZd0cexLX>{d$I!
z;?-%(&o&<Wlzm-u=@k{1^$vEMm;SZh&RBP1e?6o7^yv)2b?-mPEr{Kh!NC3LC{x5l
zeW3%B_Ea!re_F(-bE=zlgBDO=)1NmC*Pf=ceo(NtY!LtH$!K%(ziflz{GD2b$$Jy^
zTAmt9t1?EYFA|?-?tY)OU9@4{Qt4baDgJ!M8{Zpb8ueNaUhw_Ux8Ko*<6)qLzH^1_
zu@;Y3hH1(PK_R~y7A`-k>vmxI#!2k_e+#d8wP<;#n7FSnQam)n|HEFFHo=8Ag=W6W
sh*rC9<z(}-pQCX4DJHOAS#4M)7`7e$5mn?KWCjxPboFyt=akR{028vF+5i9m

diff --git a/framework/src/main/res/drawable-xhdpi/ic_action_cancel.png b/framework/src/main/res/drawable-xhdpi/ic_action_cancel.png
deleted file mode 100644
index d1634205dfec57c9ce660a6bd6e9338c4a4a7b86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzK}keGRCwC#n%xb9Fbss_s;{iUG@YOe
zbd5~I1dP!MScax5Jd}d?Nqh<QeNu#!2kbi~A#rey5JCtcgb+dq*+t*?RcK9UK0|Cj
z#IACSe-6!q#gB2LOpu5qn((M6-K~gtZSmo8n{;;}?)}L7E)ltOGkrJBk+2|sDHq)l
zu#!;nk)RbzN=*zELrPCj+h8eqh$2RplsZpQ>q}AtQYDUDT$39RD*!28&48mq(Bf4M
z*efW9cy$A|3d<!PV!)cfaSNS8Jj{R<6I?FwPy=?D022>4V1o%z@v+C@zkpMKi=gq(
z;I)vA(3}bH@|rvKM#%J5*z{q@^l{j9LBw=P%yd!IbXnZ=#fa&vu^iuQjhHdV;Tpbc
z`@Fl|n2Wjr5BGg7jj7@Nn$Qio;4%G+3?YONLI@#*kQ4I~U;up6U|mr}u3rEE002ov
JPDHLkV1oU%v4;Qv

diff --git a/framework/src/main/res/drawable-xxhdpi/ic_action_accept.png b/framework/src/main/res/drawable-xxhdpi/ic_action_accept.png
deleted file mode 100644
index 68c41deccb550fc809319aa8efb46f392c6281c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n0P&1978H@y_s{+_ppJ8!{n}P_Jl^g15&Add<^BctYsTm
z4>5e<V?MyNW+LOE?IHrJt}N-4t-t->_GDLs#>D%<ldM*)&;nY90vhaht=m2QV*{t{
z&-s6E{FYhm_Ppfhrb?^dUstYsZOd5lq}nxNp=n3W@vv_@l^gnMjytYv(9d(M`gFg7
zEk$iU!{JZnn=;+Xth@e%&;R^^XNS)J)RgU$*Vn9TNc{O)@aJ!V=gJL>YM3-mt2b-{
zQReav(feL9Xr3^aRuKKE#=J!3eoVuaC$qUGEUGbP44Rs+<Z$X!H~)lPHOEgCH)Tuq
zz7IEEbE^E#j}!0JU#RVxIA8ni$tP;{-*jL2)CEmG<@s+71M{b=>eFZc*?GR<c3n);
z>W@Ar0{5NQ)mVA*nb!T+$r)Oc&qeP0Zskz@Y3FJFO#+uE1vLFh(0+Ks$ZMkfmrxfS
zP1Te9QVMNzE<IuA->_s!9pjCjHI8;qcJzn3vHZ_l!SQ3-SwA=Ftc~CDzuKzYpZh%^
z^;pvS#m=#u;d_4ln7V&*@>UiOiG?LUyV*Z<COFnjVJKFLm?*D%U<!v(U)U3OUIRrZ
z>rda4p1AWHC^m8a)MB(z5>b!WJ<!A9dMX?wyYbUi<`}_+89zN)Bsv22{8>^Un6l^l
sf0mUm#gi8ZJe2&25@A5j&d<sR7(R1N?pFVE_B%+@)78&qol`;+07VN60{{R3

diff --git a/framework/src/main/res/drawable-xxhdpi/ic_action_back.png b/framework/src/main/res/drawable-xxhdpi/ic_action_back.png
deleted file mode 100644
index 5b41aa4db79b72d396e7d821f2436ef6a9958184..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7?V9+978H@y}7f|m)ViQC2)SRSFx-fb1*|`0K*hU-V1E3
zGSUuCX_IE|t&O*e+~i_(KE0*n%}W)}Ne~orW8eGfg?Du(O8@`+e3o3|?A$*eKmB<A
zc6;vaJO-o3{{0(d6aK6e+}7Ol|MqEz3bqN7|FdJRGk)Ma@S~V{jZvNI0k6l`8P}NA
zi5}>Be4Sy9RUPYrQ;&}`hRNG=CHzrn_}I*FjGsxuo&zuEz}(038~Z;d?)vwf{rs`>
zWoG}DFdWn0!7RcevA-nl`02@<&E*U&P3sjn{s}NMEM#GDVq|DxV&Gt95a41^5Mgl8
zU}y+nU|7h2D)GZSlwq~9#VUpaw>bJ%Gj1?zQa*hs)Lyduxw1b0<6S$Li^`jlwVOHk
x@_3beYD+$r$iDsXZl++5J}h*Wy@+mLWYB$?t(v?r(-Rmc44$rjF6*2UngFdcsP_N>

diff --git a/framework/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/framework/src/main/res/drawable-xxhdpi/ic_action_cancel.png
deleted file mode 100644
index 5dc214356fa92bfe1ed3809118ede20f6f853656..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7$11LIEGZ*dNb#3?jZva*W7=b-L@w-lrbK2kZop7XjpfV
zGh#9GlD1_*tsx!?-*%f@x^Hq&IP%%{XW!f@Ks%7ZfywJ$n=O^~ik7~*=Uw)_Gm3xC
z?~C;KA^b1@Zm8;$Sr4aAzkBug@=Mz+pX*=!aQgJVEz?)8zvq2c-i+xVXMEJ5-Vdw2
zB0^uCf8G23oa`O#+&;FJ`t|-rOxylW($h~&__2JSf7tJagR<SXWHhhLcz)0E>#a{g
zR;!|d<D%NHigoN+5*k;So1>;+#c=g+U@&8#qlP?>iTDL8fv<-j3NWs1Dzp&i6b`Uf
zX#a4S^$OQ1)f!I5VD@Js`+6EyHWhQndmY%!Xw{~#{@|iQ?BVGm24)xj?M?l$iOJ2&
zW8Fh<ZV5%joo)L14?H<PJ&fk42xxNsVFr}j!1@1-7GpNUY=yEz91jep2ph5#Xdcq3
z(L2W3Vt+JWaKaA7WchuoS@KTl|6FEsI7niKs9xj3&Vxb{bEI_|AHF;&G-H9FPNSw5
zkg-HOM)-2bb1UDeowpj9=IF7yT#xcTpePwTQATUwmEUGx>#s{qD=Ojqze(iZm7@2I
z%I@218TfOAUI_H-2v0oV{2Mtkfb0dj_nCMYChW}1JZTwX29or2^>bP0l+XkKmnG>o

diff --git a/framework/src/main/res/layout/activity_crash.xml b/framework/src/main/res/layout/activity_crash.xml
deleted file mode 100644
index a8c2269..0000000
--- a/framework/src/main/res/layout/activity_crash.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="de.arcus.framework.activities.CrashActivity">
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:id="@+id/scrollView">
-
-        <TextView android:text="@string/crashhandler_log" android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/text_view_crash_message"
-            android:textIsSelectable="true"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:typeface="monospace" />
-    </ScrollView>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/framework/src/main/res/layout/activity_directory_browser.xml b/framework/src/main/res/layout/activity_directory_browser.xml
deleted file mode 100644
index b00213c..0000000
--- a/framework/src/main/res/layout/activity_directory_browser.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/listView" />
-</LinearLayout>
\ No newline at end of file
diff --git a/framework/src/main/res/menu/menu_crash.xml b/framework/src/main/res/menu/menu_crash.xml
deleted file mode 100644
index 2cb2240..0000000
--- a/framework/src/main/res/menu/menu_crash.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" tools:context="de.arcus.framework.activities.CrashActivity">
-    <item android:id="@+id/action_restart" android:title="@string/crashhandler_action_restart"
-        android:orderInCategory="100" app:showAsAction="never" />
-    <item android:id="@+id/action_email" android:title="@string/crashhandler_action_email_log"
-        android:orderInCategory="101" app:showAsAction="never" />
-    <item android:id="@+id/action_support" android:title="@string/crashhandler_action_support_homepage"
-        android:orderInCategory="102" app:showAsAction="never" />
-    <item android:id="@+id/action_close_dialog" android:title="@string/crashhandler_action_close_dialog"
-        android:orderInCategory="103" app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/framework/src/main/res/menu/menu_directory_browser.xml b/framework/src/main/res/menu/menu_directory_browser.xml
deleted file mode 100644
index ca32f8a..0000000
--- a/framework/src/main/res/menu/menu_directory_browser.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
-    <item
-        android:id="@+id/action_move_up"
-        android:title="@string/directory_browser_action_move_up"
-        android:icon="@drawable/ic_action_back"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_accept"
-        android:title="@string/directory_browser_action_accept"
-        android:icon="@drawable/ic_action_accept"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_cancel"
-        android:title="@string/directory_browser_action_cancel"
-        android:icon="@drawable/ic_action_cancel"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/framework/src/main/res/values-de/strings_crashhandler.xml b/framework/src/main/res/values-de/strings_crashhandler.xml
deleted file mode 100644
index 70c079e..0000000
--- a/framework/src/main/res/values-de/strings_crashhandler.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<resources>
-    <string name="crashhandler_app_has_stopped_working">%1$s funktioniert nicht mehr!</string>
-
-    <string name="crashhandler_log">Bericht</string>
-
-    <string name="crashhandler_choose_email_title">Absturzbericht senden</string>
-
-    <string name="crashhandler_action_restart">App neustarten</string>
-    <string name="crashhandler_action_email_log">Bereicht per E-Mail senden</string>
-    <string name="crashhandler_action_support_homepage">Support-Homepage öffnen</string>
-    <string name="crashhandler_action_close_dialog">Schließen</string>
-</resources>
\ No newline at end of file
diff --git a/framework/src/main/res/values-de/strings_directory_browser.xml b/framework/src/main/res/values-de/strings_directory_browser.xml
deleted file mode 100644
index b3b4031..0000000
--- a/framework/src/main/res/values-de/strings_directory_browser.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<resources>
-  <string name="directory_browser_action_move_up">Zurück</string>
-  <string name="directory_browser_action_accept">Bestätigen</string>
-  <string name="directory_browser_action_cancel">Abbrechen</string>
-</resources>
\ No newline at end of file
diff --git a/framework/src/main/res/values-w820dp/dimens.xml b/framework/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index a80d0f9..0000000
--- a/framework/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/framework/src/main/res/values/dimens.xml b/framework/src/main/res/values/dimens.xml
deleted file mode 100644
index 3ad9c86..0000000
--- a/framework/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/framework/src/main/res/values/strings_crashhandler.xml b/framework/src/main/res/values/strings_crashhandler.xml
deleted file mode 100644
index 0cbf693..0000000
--- a/framework/src/main/res/values/strings_crashhandler.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<resources>
-    <string name="crashhandler_app_has_stopped_working">%1$s has stopped working!</string>
-
-    <string name="crashhandler_log">Log</string>
-
-    <string name="crashhandler_choose_email_title">Send crash log</string>
-
-    <string name="crashhandler_action_restart">Restart app</string>
-    <string name="crashhandler_action_email_log">Send log via email</string>
-    <string name="crashhandler_action_support_homepage">Open support homepage</string>
-    <string name="crashhandler_action_close_dialog">Close</string>
-</resources>
\ No newline at end of file
diff --git a/framework/src/main/res/values/strings_directory_browser.xml b/framework/src/main/res/values/strings_directory_browser.xml
deleted file mode 100644
index 9901af1..0000000
--- a/framework/src/main/res/values/strings_directory_browser.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 David Schulte
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<resources>
-  <string name="directory_browser_action_move_up">Move up</string>
-  <string name="directory_browser_action_accept">Accept</string>
-  <string name="directory_browser_action_cancel">Cancel</string>
-</resources>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 31198d4..42c104e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 28 12:22:37 CEST 2017
+#Sun Aug 13 12:29:14 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
diff --git a/playmusicexporter/.gitignore b/playmusicexporter/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/playmusicexporter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/playmusicexporter/build.gradle b/playmusicexporter/build.gradle
index 4d383fb..c288dca 100644
--- a/playmusicexporter/build.gradle
+++ b/playmusicexporter/build.gradle
@@ -51,7 +51,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':framework')
+    compile project(':superuser')
     compile project(':playmusiclib')
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:support-v4:25.3.1'
diff --git a/playmusicexporter/src/androidTest/java/re/jcg/playmusicexporter/ApplicationTest.java b/playmusicexporter/src/androidTest/java/re/jcg/playmusicexporter/ApplicationTest.java
deleted file mode 100644
index 08553f4..0000000
--- a/playmusicexporter/src/androidTest/java/re/jcg/playmusicexporter/ApplicationTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package re.jcg.playmusicexporter;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/playmusicexporter/src/main/AndroidManifest.xml b/playmusicexporter/src/main/AndroidManifest.xml
index 4c4aa17..986a320 100644
--- a/playmusicexporter/src/main/AndroidManifest.xml
+++ b/playmusicexporter/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2015 David Schulte
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -61,13 +62,6 @@
             android:name=".services.ExportAllJob"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <meta-data
-            android:name="crashhandler.email"
-            android:value="mail@janchristiangruenhage.de" />
-        <meta-data
-            android:name="crashhandler.supporturl"
-            android:value="https://jcg.re/" />
-
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/title_settings"
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/Intro.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/Intro.java
index 9b50411..85c71b4 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/Intro.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/Intro.java
@@ -18,7 +18,7 @@ import com.github.paolorotolo.appintro.AppIntroFragment;
 
 import java.util.Optional;
 
-import de.arcus.framework.superuser.SuperUser;
+import rc.jcg.superuser.SuperUser;
 import re.jcg.playmusicexporter.R;
 import re.jcg.playmusicexporter.settings.PlayMusicExporterPreferences;
 
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java
index 8f0e87c..7da8dc7 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java
@@ -42,7 +42,6 @@ import android.view.MenuItem;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import de.arcus.framework.logger.Logger;
 import de.arcus.playmusiclib.exceptions.CouldNotOpenDatabaseException;
 import de.arcus.playmusiclib.exceptions.NoSuperUserException;
 import ly.count.android.sdk.Countly;
@@ -119,9 +118,6 @@ public class MusicContainerListActivity extends AppCompatActivity
             }
             setContentView(R.layout.activity_track_list);
 
-
-            Logger.getInstance().logVerbose("Activity", "onCreate(" + this.getLocalClassName() + ")");
-
             // Setup ActionBar
             ActionBar actionBar = getSupportActionBar();
             if (actionBar != null) {
@@ -221,7 +217,7 @@ public class MusicContainerListActivity extends AppCompatActivity
                 mPlayMusicManager.setID3ArtworkMaximumSize(PlayMusicExporterPreferences.getAlbumArtSize());
 
             } catch (Exception e) {
-                Logger.getInstance().logError("SetupPlayMusicExporter", e.toString());
+                // Failed
             }
         }
 
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicTrackListActivity.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicTrackListActivity.java
index df4d2e2..2818c58 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicTrackListActivity.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicTrackListActivity.java
@@ -29,7 +29,6 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
-import de.arcus.framework.crashhandler.CrashHandler;
 import re.jcg.playmusicexporter.R;
 import re.jcg.playmusicexporter.fragments.MusicTrackListFragment;
 import re.jcg.playmusicexporter.items.SelectedTrackList;
@@ -53,9 +52,6 @@ public class MusicTrackListActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_track_detail);
 
-        // Adds the crash handler to this class
-        CrashHandler.addCrashHandler(this);
-
         // Show the Up button in the action bar.
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/items/SelectedTrackList.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/items/SelectedTrackList.java
index 4615c6d..125a522 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/items/SelectedTrackList.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/items/SelectedTrackList.java
@@ -25,7 +25,7 @@ package re.jcg.playmusicexporter.items;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.view.ActionMode;
 
-import de.arcus.framework.utils.SelectionList;
+import re.jcg.playmusicexporter.utils.SelectionList;
 import re.jcg.playmusicexporter.R;
 import re.jcg.playmusicexporter.actionmode.ActionModeTitle;
 
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportService.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportService.java
index 42d723a..39ee8c0 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportService.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportService.java
@@ -30,7 +30,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 
-import de.arcus.framework.logger.Logger;
 import ly.count.android.sdk.Countly;
 import re.jcg.playmusicexporter.R;
 import de.arcus.playmusiclib.PlayMusicManager;
@@ -97,8 +96,6 @@ public class ExportService extends IntentService {
     public void onCreate() {
         super.onCreate();
 
-        Logger.getInstance().logDebug("ExportService", "Start");
-
         // Creates a notification builder
         mNotificationBuilder = new NotificationCompat.Builder(this);
     }
@@ -108,7 +105,6 @@ public class ExportService extends IntentService {
         super.onDestroy();
 
         // Finish
-        Logger.getInstance().logDebug("ExportService", "End");
         mFinished = true;
 
         updateNotification();
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/MusicPathBuilder.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/MusicPathBuilder.java
index e2d43bf..cf88185 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/MusicPathBuilder.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/MusicPathBuilder.java
@@ -24,7 +24,6 @@ package re.jcg.playmusicexporter.utils;
 
 import android.text.TextUtils;
 
-import de.arcus.framework.logger.Logger;
 import de.arcus.playmusiclib.items.MusicTrack;
 
 /**
@@ -120,7 +119,6 @@ public class MusicPathBuilder {
                         break;
                     default:
                         // Unknown tag
-                        Logger.getInstance().logWarning("MusicPathBuilder", "Unknown tag '" + name + "'");
                         break;
                 }
 
@@ -146,9 +144,6 @@ public class MusicPathBuilder {
                         // Adds the rest of the format to the value
                         value = format.substring(0, posInsertStart) + value + format.substring(posInsertEnd);
 
-                    } else {
-                        // Missing insert sign
-                        Logger.getInstance().logWarning("MusicPathBuilder", "Cloud not find replace symbol ('$') of format attribute in tag '" + name + "'");
                     }
                 }
 
@@ -159,7 +154,6 @@ public class MusicPathBuilder {
             } else {
                 path += "{";
                 pos = posStart + 1;
-                Logger.getInstance().logWarning("MusicPathBuilder", "Cloud not find end symbol ('}') of the tag in patter '" + patter + "'");
             }
         }
 
diff --git a/framework/src/main/java/de/arcus/framework/utils/SelectionList.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/SelectionList.java
similarity index 99%
rename from framework/src/main/java/de/arcus/framework/utils/SelectionList.java
rename to playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/SelectionList.java
index 42d00a8..017c6be 100644
--- a/framework/src/main/java/de/arcus/framework/utils/SelectionList.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/utils/SelectionList.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package de.arcus.framework.utils;
+package re.jcg.playmusicexporter.utils;
 
 import android.support.annotation.ColorRes;
 import android.support.v4.content.ContextCompat;
diff --git a/playmusiclib/.gitignore b/playmusiclib/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/playmusiclib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/playmusiclib/build.gradle b/playmusiclib/build.gradle
index 16d367f..8266084 100644
--- a/playmusiclib/build.gradle
+++ b/playmusiclib/build.gradle
@@ -41,6 +41,6 @@ android {
 }
 
 dependencies {
-    compile project(':framework')
+    compile project(':superuser')
     compile 'com.mpatric:mp3agic:0.9.0'
 }
diff --git a/playmusiclib/src/androidTest/java/de/arcus/playmusiclib/ApplicationTest.java b/playmusiclib/src/androidTest/java/de/arcus/playmusiclib/ApplicationTest.java
deleted file mode 100644
index d8afff3..0000000
--- a/playmusiclib/src/androidTest/java/de/arcus/playmusiclib/ApplicationTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.playmusiclib;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/playmusiclib/src/main/AndroidManifest.xml b/playmusiclib/src/main/AndroidManifest.xml
index fcfee82..f3afdf4 100644
--- a/playmusiclib/src/main/AndroidManifest.xml
+++ b/playmusiclib/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (c) 2015 David Schulte
   ~
@@ -20,11 +21,5 @@
   ~ THE SOFTWARE.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.arcus.playmusiclib">
-
-    <application android:allowBackup="true">
-
-    </application>
-
+<manifest package="de.arcus.playmusiclib">
 </manifest>
diff --git a/playmusiclib/src/main/java/de/arcus/playmusiclib/ArtworkLoader.java b/playmusiclib/src/main/java/de/arcus/playmusiclib/ArtworkLoader.java
index eeaf483..5393274 100644
--- a/playmusiclib/src/main/java/de/arcus/playmusiclib/ArtworkLoader.java
+++ b/playmusiclib/src/main/java/de/arcus/playmusiclib/ArtworkLoader.java
@@ -29,9 +29,8 @@ import android.text.TextUtils;
 
 import java.net.URL;
 
-import de.arcus.framework.logger.Logger;
-import de.arcus.framework.superuser.SuperUserTools;
-import de.arcus.framework.utils.ImageTools;
+import rc.jcg.superuser.SuperUserTools;
+import de.arcus.playmusiclib.utils.ImageTools;
 import de.arcus.playmusiclib.items.ArtworkEntry;
 
 /**
@@ -59,7 +58,6 @@ public class ArtworkLoader {
                 bitmap = ImageTools.decodeByteArraySubsampled(bitmapData, artworkSize, artworkSize);
             } catch (Exception e) {
                 // Error
-                Logger.getInstance().logError("LoadArtwork", e.toString());
             }
         }
 
@@ -69,16 +67,12 @@ public class ArtworkLoader {
             if (!TextUtils.isEmpty(artworkUrl)) {
                 // Tries to load the artwork via internet
                 try {
-                    if (artworkUrl.contains("mediastore")) {
-						Logger.getInstance().logError("LoadArtwork", "mediastore artwork");
-                        //TODO handle mediastore album art using ContentResolver
-						} else {
-                            URL url = new URL(artworkUrl);
-                            bitmap = BitmapFactory.decodeStream(url.openStream());
-						}
+                    if (!artworkUrl.contains("mediastore")) {
+                        URL url = new URL(artworkUrl);
+                        bitmap = BitmapFactory.decodeStream(url.openStream());
+                    }
                 } catch (Exception e) {
                     // Error
-                    Logger.getInstance().logError("LoadArtwork", e.toString());
                 }
             }
         }
diff --git a/playmusiclib/src/main/java/de/arcus/playmusiclib/PlayMusicManager.java b/playmusiclib/src/main/java/de/arcus/playmusiclib/PlayMusicManager.java
index 48bca36..d8bfefe 100644
--- a/playmusiclib/src/main/java/de/arcus/playmusiclib/PlayMusicManager.java
+++ b/playmusiclib/src/main/java/de/arcus/playmusiclib/PlayMusicManager.java
@@ -56,10 +56,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import de.arcus.framework.logger.Logger;
-import de.arcus.framework.superuser.SuperUser;
-import de.arcus.framework.superuser.SuperUserTools;
-import de.arcus.framework.utils.FileTools;
+import rc.jcg.superuser.SuperUser;
+import rc.jcg.superuser.SuperUserTools;
+import de.arcus.playmusiclib.utils.FileTools;
 import de.arcus.playmusiclib.enums.ID3v2Version;
 import de.arcus.playmusiclib.exceptions.CouldNotOpenDatabaseException;
 import de.arcus.playmusiclib.exceptions.NoSuperUserException;
@@ -532,8 +531,6 @@ public class PlayMusicManager {
 
                     // New tmp file
                     fileTmp = fileTmpCrypt;
-                } else {
-                    Logger.getInstance().logWarning("ExportMusicTrack", "Encrypting failed! Continue with decrypted file.");
                 }
             }
 
@@ -583,9 +580,6 @@ public class PlayMusicManager {
                     if (subDocument.isFile()) {
                         if (filename != null && subDocument.getName().equalsIgnoreCase(filename)) {
                             // Delete the file
-                            if (forceOverwrite) {
-                                Logger.getInstance().logWarning("ExportMusicTrack", "(forceOverwrite)  Deleting original file: " + filename);
-                            }
                             subDocument.delete();
                             break;
                         }
@@ -604,12 +598,8 @@ public class PlayMusicManager {
             if (mID3Enable) {
                 // Adds the meta data
                 if (!trackWriteID3(musicTrack, fileTmp, dest)) {
-                    Logger.getInstance().logWarning("ExportMusicTrack", "ID3 writer failed! Continue without ID3 tags.");
-
                     // Failed, moving without meta data
                     if (!FileTools.fileMove(fileTmp, dest)) {
-                        Logger.getInstance().logError("ExportMusicTrack", "Moving the raw file failed!");
-
                         // Could not copy the file
                         return false;
                     }
@@ -617,8 +607,6 @@ public class PlayMusicManager {
             } else {
                 // Moving the file
                 if (!FileTools.fileMove(fileTmp, dest)) {
-                    Logger.getInstance().logError("ExportMusicTrack", "Moving the raw file failed!");
-
                     // Could not copy the file
                     return false;
                 }
@@ -647,13 +635,9 @@ public class PlayMusicManager {
                         parcelFileDescriptor.close();
 
                     } catch (FileNotFoundException e) {
-                        Logger.getInstance().logError("ExportMusicTrack", "File not found!");
-
                         // Could not copy the file
                         return false;
                     } catch (IOException e) {
-                        Logger.getInstance().logError("ExportMusicTrack", "Failed to write the document: " + e.toString());
-
                         // Could not copy the file
                         return false;
                     }
@@ -662,12 +646,6 @@ public class PlayMusicManager {
 
             // Delete temp files
             cleanUp(uniqueID);
-
-            // Adds the file to the media system
-            //new MediaScanner(mContext, dest);
-
-        } else {
-            Logger.getInstance().logInfo("exportMusicTrack", path + " already exists, skipping.");
         }
 
         // Done
@@ -691,13 +669,7 @@ public class PlayMusicManager {
             for (String lDisplayName : pPath.split("/")) {
                 if (lDocumentFile.findFile(lDisplayName) != null) {
                     lDocumentFile = lDocumentFile.findFile(lDisplayName);
-                    if (lDocumentFile.length() == 0) {
-                        if (!lDocumentFile.isDirectory()) {
-                            Logger.getInstance().logInfo("isAlreadyThere", pPath + " File exists, but is 0 bytes in size.");
-                        }
-                    }
                 } else {
-                    Logger.getInstance().logInfo("isAlreadyThere", pPath + " does not exist yet.");
                     return false;
                 }
             }
@@ -779,7 +751,7 @@ public class PlayMusicManager {
                 // Maybe the genre is not supported
                 tagID3v2.setGenreDescription(musicTrack.getGenre());
             } catch (IllegalArgumentException e) {
-                Logger.getInstance().logWarning("TrackWriteID3", e.getMessage());
+                // Failed
             }
         }
 
@@ -827,14 +799,13 @@ public class PlayMusicManager {
 
             // Checks the magic number
             if (!allAccessExporter.hasValidMagicNumber()) {
-                Logger.getInstance().logError("TrackEncrypt", "Invalid magic number! This is not an AllAccess file");
                 return false;
             }
 
             // Saves the file
             return allAccessExporter.save(dest);
         } catch (Exception e) {
-            Logger.getInstance().logError("TrackEncrypt", e.toString());
+            // Failed
         }
 
         // Failed
diff --git a/framework/src/main/java/de/arcus/framework/utils/FileTools.java b/playmusiclib/src/main/java/de/arcus/playmusiclib/utils/FileTools.java
similarity index 88%
rename from framework/src/main/java/de/arcus/framework/utils/FileTools.java
rename to playmusiclib/src/main/java/de/arcus/playmusiclib/utils/FileTools.java
index 9589ce6..5e86edc 100644
--- a/framework/src/main/java/de/arcus/framework/utils/FileTools.java
+++ b/playmusiclib/src/main/java/de/arcus/playmusiclib/utils/FileTools.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package de.arcus.framework.utils;
+package de.arcus.playmusiclib.utils;
 
 import android.os.Environment;
 
@@ -35,8 +35,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import de.arcus.framework.logger.Logger;
-
 /**
  * Help function for files
  */
@@ -57,22 +55,15 @@ public class FileTools {
         File fileDirectory = new File(dir);
         try {
             if (!fileDirectory.exists()) {
-                Logger.getInstance().logVerbose("DirectoryCreate", "Create directory: " + dir);
-
                 // Creates the directory
                 if (fileDirectory.mkdirs())
                     return true;
-                else
-                    Logger.getInstance().logWarning("DirectoryCreate", "MkDir failed");
             } else {
                 // Directory exists
-                Logger.getInstance().logDebug("DirectoryCreate", "Directory already exists");
-
                 return true;
             }
         } catch (Exception e) {
             // Failed
-            Logger.getInstance().logError("DirectoryCreate", "Failed: " + e.getMessage());
         }
         return false;
     }
@@ -97,15 +88,10 @@ public class FileTools {
      * @return Returns true if the file was successfully created
      */
     public static boolean fileCreate(String file) {
-        Logger.getInstance().logVerbose("FileCreate", "File: " + file);
-
         try {
             // Create the file
             return (new File(file)).createNewFile();
         } catch (IOException e) {
-            // Failed
-            Logger.getInstance().logError("FileCreate", "Could not create file: " + e.getMessage());
-
             return false;
         }
     }
@@ -118,8 +104,6 @@ public class FileTools {
      * @return Return whether the moving was successful
      */
     public static boolean fileMove(String src, String dest) {
-        Logger.getInstance().logVerbose("FileMove", "From " + src + " to " + dest);
-
         File fileSrc = new File(src);
         File fileDest = new File(dest);
 
@@ -139,7 +123,7 @@ public class FileTools {
         final int BUFFER_SIZE = 1024;
 
         // Will be set on true if the file was copied correctly
-        boolean success = false;
+        boolean success;
 
         try {
             // The copy buffer
@@ -152,10 +136,10 @@ public class FileTools {
             }
 
             // Copy was successful
-            success = true;
+             success = true;
         } catch (IOException ex) {
             // Failed
-            Logger.getInstance().logError("FileCopy", "Failed: " + ex.toString());
+            success = false;
         }
 
         return success;
@@ -169,10 +153,8 @@ public class FileTools {
      * @return Return whether the file was copied successful
      */
     public static boolean fileCopy(String src, String dest) {
-        Logger.getInstance().logVerbose("FileCopy", "From " + src + " to " + dest);
-
         // Will be set on true if the file was copied correctly
-        boolean success = false;
+        boolean success;
 
         InputStream inputStream = null;
         OutputStream outputStream = null;
@@ -185,7 +167,7 @@ public class FileTools {
             success = fileCopy(inputStream, outputStream);
         } catch (IOException ex) {
             // Failed
-            Logger.getInstance().logError("FileCopy", "Failed: " + ex.toString());
+            success = false;
         }
 
         try {
@@ -196,7 +178,7 @@ public class FileTools {
                 outputStream.close();
         } catch (IOException ex) {
             // Failed
-            Logger.getInstance().logError("FileCopy", "Failed: " + ex.toString());
+            success = false;
         }
 
         return success;
diff --git a/framework/src/main/java/de/arcus/framework/utils/ImageTools.java b/playmusiclib/src/main/java/de/arcus/playmusiclib/utils/ImageTools.java
similarity index 98%
rename from framework/src/main/java/de/arcus/framework/utils/ImageTools.java
rename to playmusiclib/src/main/java/de/arcus/playmusiclib/utils/ImageTools.java
index 2b60a3e..c1ff01b 100644
--- a/framework/src/main/java/de/arcus/framework/utils/ImageTools.java
+++ b/playmusiclib/src/main/java/de/arcus/playmusiclib/utils/ImageTools.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package de.arcus.framework.utils;
+package de.arcus.playmusiclib.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/settings.gradle b/settings.gradle
index 5ed8e41..41565a6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,4 +22,4 @@
 
 
 
-include ':playmusicexporter', ':framework', ':playmusiclib'
+include ':playmusicexporter', ':superuser', ':playmusiclib'
diff --git a/framework/proguard-rules.pro b/superuser/proguard-rules.pro
similarity index 100%
rename from framework/proguard-rules.pro
rename to superuser/proguard-rules.pro
diff --git a/framework/src/main/res/layout/adapter_directory.xml b/superuser/src/main/AndroidManifest.xml
similarity index 85%
rename from framework/src/main/res/layout/adapter_directory.xml
rename to superuser/src/main/AndroidManifest.xml
index af4bfa7..f6a4ac0 100644
--- a/framework/src/main/res/layout/adapter_directory.xml
+++ b/superuser/src/main/AndroidManifest.xml
@@ -21,8 +21,5 @@
   ~ THE SOFTWARE.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>
\ No newline at end of file
+<manifest package="re.icg.superuser">
+</manifest>
\ No newline at end of file
diff --git a/framework/src/main/java/de/arcus/framework/utils/ByteBuffer.java b/superuser/src/main/java/rc/jcg/superuser/ByteBuffer.java
similarity index 99%
rename from framework/src/main/java/de/arcus/framework/utils/ByteBuffer.java
rename to superuser/src/main/java/rc/jcg/superuser/ByteBuffer.java
index 2b8d99a..7cf11b9 100644
--- a/framework/src/main/java/de/arcus/framework/utils/ByteBuffer.java
+++ b/superuser/src/main/java/rc/jcg/superuser/ByteBuffer.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package de.arcus.framework.utils;
+package rc.jcg.superuser;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/framework/src/main/java/de/arcus/framework/superuser/SuperUser.java b/superuser/src/main/java/rc/jcg/superuser/SuperUser.java
similarity index 93%
rename from framework/src/main/java/de/arcus/framework/superuser/SuperUser.java
rename to superuser/src/main/java/rc/jcg/superuser/SuperUser.java
index 3976165..6d30f7e 100644
--- a/framework/src/main/java/de/arcus/framework/superuser/SuperUser.java
+++ b/superuser/src/main/java/rc/jcg/superuser/SuperUser.java
@@ -1,151 +1,148 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.superuser;
-
-import android.os.AsyncTask;
-
-import java.io.IOException;
-
-import de.arcus.framework.logger.Logger;
-
-/**
- * The superuser managers
- *
- * This static class handles the superuser session.
- * Start the session with {@link #askForPermissions() askForPermissions}.
- * To run a command create an instance of {@link SuperUserCommand SuperUserCommand} and {@link SuperUserCommand#execute() execute} it.
- */
-public class SuperUser {
-    /**
-     * The su process
-     */
-    private static Process mProcess;
-
-    /**
-     * Gets the active su process
-     * @return Process
-     */
-    static Process getProcess() {
-        return mProcess;
-    }
-
-    /**
-     * Starts the superuser session
-     * To start the session in your app use {@link #askForPermissions()}
-     */
-    private static boolean sessionStart() {
-        // Starts the su process
-        try {
-            mProcess = Runtime.getRuntime().exec("su");
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * Stops the superuser session
-     */
-    public static void sessionStop() {
-        if (mProcess == null) return;
-
-        // End the process
-        mProcess.destroy();
-        mProcess = null;
-    }
-
-    /**
-     * Gets whether the su session is running
-     * @return Return whether the su session is running
-     */
-    public static boolean sessionIsRunning() {
-        if (mProcess == null) return false;
-
-        // Hack to see if the process is running
-        // This is not nice, but there is no other way to check this
-        try {
-            mProcess.exitValue();
-            return false;
-        } catch(IllegalThreadStateException ex) {
-            // Could not get the return value => process is running
-            return true;
-        }
-    }
-
-    /**
-     * Checks whether superuser permissions were granted
-     * @return Return whether superuser permissions were granted
-     */
-    public static boolean hasPermissions() {
-        // Just check whether the session is running
-        return sessionIsRunning();
-    }
-
-    /**
-     * This is like hasPermissions() but asks for the superuser permissions
-     * and give the user a change to grant it now.
-     * Use this to start you session
-     * @return Return whether superuser permissions were granted
-     */
-    public static boolean askForPermissions() {
-        // We already have superuser permissions
-        if (hasPermissions()) return true;
-
-        // Starts the process
-        if (sessionStart()) {
-            // Test for superuser
-            SuperUserCommand superUserCommand = new SuperUserCommand("echo 'root'");
-
-            Logger.getInstance().logInfo("SuperUser", "askForPermissions");
-            if (superUserCommand.execute()) {
-                // Gets the whoami username
-                String[] output = superUserCommand.getStandardOutput();
-                if (output.length >= 1 && output[0].equals("root")) {
-                    // We are root
-                    return true;
-                }
-            }
-        }
-
-        // We don't have superuser permissions; abort session
-        sessionStop();
-        return false;
-    }
-
-    public static void askForPermissionInBackground(final SuperUserPermissionRequestListener listener) {
-        new AsyncTask<Void, Void, Void>() {
-            boolean hasPermissions;
-            @Override
-            protected Void doInBackground(Void... params) {
-                hasPermissions = askForPermissions();
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void result) {
-                listener.superUserGranted(hasPermissions);
-            }
-        }.execute();
-    }
-}
+/*
+ * Copyright (c) 2015 David Schulte
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package rc.jcg.superuser;
+
+import android.os.AsyncTask;
+
+import java.io.IOException;
+
+/**
+ * The superuser managers
+ *
+ * This static class handles the superuser session.
+ * Start the session with {@link #askForPermissions() askForPermissions}.
+ * To run a command create an instance of {@link SuperUserCommand SuperUserCommand} and {@link SuperUserCommand#execute() execute} it.
+ */
+public class SuperUser {
+    /**
+     * The su process
+     */
+    private static Process mProcess;
+
+    /**
+     * Gets the active su process
+     * @return Process
+     */
+    static Process getProcess() {
+        return mProcess;
+    }
+
+    /**
+     * Starts the superuser session
+     * To start the session in your app use {@link #askForPermissions()}
+     */
+    private static boolean sessionStart() {
+        // Starts the su process
+        try {
+            mProcess = Runtime.getRuntime().exec("su");
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * Stops the superuser session
+     */
+    public static void sessionStop() {
+        if (mProcess == null) return;
+
+        // End the process
+        mProcess.destroy();
+        mProcess = null;
+    }
+
+    /**
+     * Gets whether the su session is running
+     * @return Return whether the su session is running
+     */
+    public static boolean sessionIsRunning() {
+        if (mProcess == null) return false;
+
+        // Hack to see if the process is running
+        // This is not nice, but there is no other way to check this
+        try {
+            mProcess.exitValue();
+            return false;
+        } catch(IllegalThreadStateException ex) {
+            // Could not get the return value => process is running
+            return true;
+        }
+    }
+
+    /**
+     * Checks whether superuser permissions were granted
+     * @return Return whether superuser permissions were granted
+     */
+    public static boolean hasPermissions() {
+        // Just check whether the session is running
+        return sessionIsRunning();
+    }
+
+    /**
+     * This is like hasPermissions() but asks for the superuser permissions
+     * and give the user a change to grant it now.
+     * Use this to start you session
+     * @return Return whether superuser permissions were granted
+     */
+    public static boolean askForPermissions() {
+        // We already have superuser permissions
+        if (hasPermissions()) return true;
+
+        // Starts the process
+        if (sessionStart()) {
+            // Test for superuser
+            SuperUserCommand superUserCommand = new SuperUserCommand("echo 'root'");
+
+            if (superUserCommand.execute()) {
+                // Gets the whoami username
+                String[] output = superUserCommand.getStandardOutput();
+                if (output.length >= 1 && output[0].equals("root")) {
+                    // We are root
+                    return true;
+                }
+            }
+        }
+
+        // We don't have superuser permissions; abort session
+        sessionStop();
+        return false;
+    }
+
+    public static void askForPermissionInBackground(final SuperUserPermissionRequestListener listener) {
+        new AsyncTask<Void, Void, Void>() {
+            boolean hasPermissions;
+            @Override
+            protected Void doInBackground(Void... params) {
+                hasPermissions = askForPermissions();
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void result) {
+                listener.superUserGranted(hasPermissions);
+            }
+        }.execute();
+    }
+}
diff --git a/framework/src/main/java/de/arcus/framework/superuser/SuperUserCommand.java b/superuser/src/main/java/rc/jcg/superuser/SuperUserCommand.java
similarity index 92%
rename from framework/src/main/java/de/arcus/framework/superuser/SuperUserCommand.java
rename to superuser/src/main/java/rc/jcg/superuser/SuperUserCommand.java
index 3bda77a..97abdbe 100644
--- a/framework/src/main/java/de/arcus/framework/superuser/SuperUserCommand.java
+++ b/superuser/src/main/java/rc/jcg/superuser/SuperUserCommand.java
@@ -1,394 +1,383 @@
-/*
- * Copyright (c) 2015 David Schulte
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.arcus.framework.superuser;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import de.arcus.framework.logger.Logger;
-import de.arcus.framework.utils.ByteBuffer;
-
-/**
- * This class executes superuser commands.
- */
-public class SuperUserCommand {
-    /**
-     * The default timeout for each command in milliseconds
-     */
-    private static final long DEFAULT_COMMAND_TIMEOUT = 30 * 1000; // 30 seconds
-
-    private String[] mCommands = new String[] {};
-    private String[] mOutputStandard = new String[] {};
-    private String[] mOutputError = new String[] {};
-
-    // If we want to get a binary return
-    private byte[] mOutputStandardBinary = new byte[] {};
-
-    /**
-     * Command failed?
-     */
-    private boolean mSuperUserFailed;
-
-    /**
-     * If this value is set, the command will not store any input to the logger
-     */
-    private boolean mHideInput = false;
-    /**
-     * If this value is set, the command will not store any standard output to the logger
-     */
-    private boolean mHideStandardOutput = false;
-    /**
-     * If this value is set, the command will not store any error output to the logger
-     */
-    private boolean mHideErrorOutput = false;
-
-    /**
-     * @return Gets whether the command hides the input log
-     */
-    public boolean getHideInput() {
-        return mHideInput;
-    }
-
-    /**
-     * @param hideInput Set this to hide the input to the logger
-     */
-    public void setHideInput(boolean hideInput) {
-        mHideInput = hideInput;
-    }
-
-    /**
-     * @return Gets whether the command hides the standard output log
-     */
-    public boolean getHideStandardOutput() {
-        return mHideStandardOutput;
-    }
-
-    /**
-     * @param hideStandardOutput Set this to hide the standard output to the logger
-     */
-    public void setHideStandardOutput(boolean hideStandardOutput) {
-        mHideStandardOutput = hideStandardOutput;
-    }
-
-    /**
-     * @return Gets whether the command hides the error output log
-     */
-    public boolean getHideErrorOutput() {
-        return mHideErrorOutput;
-    }
-
-    /**
-     * @param hideErrorOutput Set this to hide the error output to the logger
-     */
-    public void setHideErrorOutput(boolean hideErrorOutput) {
-        mHideErrorOutput = hideErrorOutput;
-    }
-
-    /**
-     * If this value is set the command will read the standard output as binary
-     */
-    private boolean mBinaryStandardOutput = false;
-
-    /**
-     * @return Gets whether the output will be binary
-     */
-    public boolean getBinaryStandardOutput() {
-        return mBinaryStandardOutput;
-    }
-
-    /**
-     * @param binaryStandardOutput Set this if you want a binary output
-     */
-    public void setBinaryStandardOutput(boolean binaryStandardOutput) {
-        mBinaryStandardOutput = binaryStandardOutput;
-    }
-
-    /**
-     * The timeout for this command in milliseconds
-     */
-    private long mTimeout;
-
-    /**
-     * @return Gets the timeout for this command in milliseconds
-     */
-    public long getTimeout() {
-        return mTimeout;
-    }
-
-    /**
-     * Set the timeout for this command in milliseconds
-     * @param timeout Timeout
-     * @return Itself
-     */
-    public SuperUserCommand setTimeout(long timeout) {
-        mTimeout = timeout;
-        return this;
-    }
-
-    /**
-     * @return Gets the executed commands
-     */
-    public String[] getCommands() {
-        return mCommands;
-    }
-
-    /**
-     * @return Gets the standard output
-     */
-    public String[] getStandardOutput() {
-        return mOutputStandard;
-    }
-
-    /**
-     * @return Gets the error output
-     */
-    public String[] getErrorOutput() {
-        return mOutputError;
-    }
-
-    /**
-     * @return Gets the standard output as binary
-     */
-    public byte[] getStandardOutputBinary() {
-        return mOutputStandardBinary;
-    }
-
-    /**
-     * @return Gets whether the command was executed without errors, even without error outputs from the command.
-     */
-    public boolean commandWasSuccessful() {
-        return (!mSuperUserFailed && mOutputError.length == 0);
-    }
-
-    /**
-     * @return Gets whether the command was granted superuser permissions, but maybe has some error outputs.
-     */
-    public boolean superuserWasSuccessful() {
-        return (!mSuperUserFailed);
-    }
-
-    /**
-     * The async execution thread
-     */
-    private SuperUserCommandThread mThread;
-
-    /**
-     * The async callback
-     */
-    private SuperUserCommandCallback mCallback;
-
-    /**
-     * Creates a command with one command line
-     * @param command The command
-     */
-    public SuperUserCommand(String command) {
-        this(new String[] {command});
-    }
-
-    /**
-     * Creates a command with multiple command lines
-     * @param commands The command lines
-     */
-    public SuperUserCommand(String[] commands) {
-        mCommands = commands;
-
-        // Default timeout
-        mTimeout = DEFAULT_COMMAND_TIMEOUT;
-    }
-
-    /**
-     * Execute the command asynchronously.
-     * Please notice that the commands will only executed one after another.
-     * The command will wait until the su process is free.
-     * @param callback The callback instance
-     */
-    public void executeAsync(SuperUserCommandCallback callback) {
-        mCallback = callback;
-
-        // Thread is running
-        if (mThread != null) return;
-
-        // Create a new thread
-        mThread = new SuperUserCommandThread();
-
-        // Starts a thread
-        mThread.start();
-    }
-
-    /**
-     * Execute the command and return whether the command was executed.
-     * It will only return false if the app wasn't granted superuser permissions, like {@link #superuserWasSuccessful()}.
-     * It will also return true if the command itself returns error outputs. To check this case you should use {@link #commandWasSuccessful()} instead.
-     * Please consider to use {@link #executeAsync} instead of this and execute the command asynchronously.
-     * @return Gets whether the execution was successful.
-     */
-    public boolean execute() {
-        String tmpLine;
-        List<String> tmpList = new ArrayList<>();
-
-        mSuperUserFailed = false;
-
-        // Opps, we don't have superuser permissions
-        // Did you run SuperUser.askForPermissions()?
-        if (!SuperUser.hasPermissions()) {
-            mSuperUserFailed = true;
-            return false;
-        }
-
-        // Thread safe
-        synchronized (SuperUser.getProcess()) {
-            try {
-                // Gets the streams
-                DataOutputStream dataOutputStream = new DataOutputStream(SuperUser.getProcess().getOutputStream());
-                BufferedReader bufferedInputReader = new BufferedReader(new InputStreamReader(SuperUser.getProcess().getInputStream()));
-                BufferedReader bufferedErrorReader = new BufferedReader(new InputStreamReader(SuperUser.getProcess().getErrorStream()));
-
-                // Sends the command
-                for (String command : mCommands) {
-                    if (!mHideInput) // Check if we want to hide this
-                        Logger.getInstance().logInfo("SuperUser", "< " + command);
-                    dataOutputStream.writeBytes(command + "\n");
-                }
-                dataOutputStream.flush();
-
-                // TODO: This class cannot execute commands without any output (standard and error). These commands will run until the timeout will kill them!
-
-                // Start waiting
-                long timeStarted = System.currentTimeMillis();
-
-                // Wait for first data
-                while (!bufferedInputReader.ready() && !bufferedErrorReader.ready()) {
-                    try {
-                        // Waiting
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-
-                    long timeNow = System.currentTimeMillis();
-
-                    // TimeOut
-                    if (timeNow - timeStarted >= mTimeout) break;
-                }
-
-                // We want to read the data as binary
-                if (mBinaryStandardOutput) {
-                    int len;
-                    byte[] buffer = new byte[1024];
-
-                    // Byte buffer
-                    ByteBuffer byteBuffer = new ByteBuffer();
-
-                    // Need the direct input stream
-                    InputStream inputStream = SuperUser.getProcess().getInputStream();
-
-                    do {
-                        while (bufferedInputReader.ready()) {
-                            // Read to buffer
-                            len = inputStream.read(buffer);
-
-                            // Write to buffer
-                            byteBuffer.append(buffer, 0, len);
-                        }
-
-                        // Fix: Wait for the buffer and try again
-                        try {
-                            // Sometimes cat is to slow.
-                            // If there is no data anymore we will wait 100ms and check again.
-                            Thread.sleep(100);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    } while (bufferedInputReader.ready());
-
-                    mOutputStandardBinary = byteBuffer.toByteArray();
-                } else {
-                    // Reads the standard output as text
-                    tmpList.clear();
-                    while (bufferedInputReader.ready()) {
-                        tmpLine = bufferedInputReader.readLine();
-
-                        // End of data
-                        if (tmpLine == null) break;
-
-                        if (!mHideStandardOutput)
-                            Logger.getInstance().logInfo("SuperUser", "> " + tmpLine);
-
-                        tmpList.add(tmpLine);
-                    }
-                    // Convert list to array
-                    mOutputStandard = tmpList.toArray(new String[tmpList.size()]);
-                }
-
-                // Reads the error output
-                tmpList.clear();
-                while (bufferedErrorReader.ready()) {
-                    tmpLine = bufferedErrorReader.readLine();
-
-                    // End of data
-                    if (tmpLine == null) break;
-
-                    if (!mHideErrorOutput)
-                        Logger.getInstance().logError("SuperUser", "> " + tmpLine);
-
-                    tmpList.add(tmpLine);
-                }
-                // Convert list to array
-                mOutputError = tmpList.toArray(new String[tmpList.size()]);
-
-                // Done
-                return true;
-            } catch (IOException e) {
-                e.printStackTrace();
-
-                mSuperUserFailed = true;
-
-                // Command failed
-                return false;
-            }
-        }
-    }
-
-
-    /**
-     * Thread to executes the command asynchronously
-     */
-    private class SuperUserCommandThread extends Thread {
-        @Override
-        public void run() {
-
-            super.run();
-
-            // Executes the command
-            execute();
-
-            if (mCallback != null)
-                mCallback.onFinished(SuperUserCommand.this);
-        }
-    }
-}
+/*
+ * Copyright (c) 2015 David Schulte
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package rc.jcg.superuser;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class executes superuser commands.
+ */
+public class SuperUserCommand {
+    /**
+     * The default timeout for each command in milliseconds
+     */
+    private static final long DEFAULT_COMMAND_TIMEOUT = 30 * 1000; // 30 seconds
+
+    private String[] mCommands = new String[] {};
+    private String[] mOutputStandard = new String[] {};
+    private String[] mOutputError = new String[] {};
+
+    // If we want to get a binary return
+    private byte[] mOutputStandardBinary = new byte[] {};
+
+    /**
+     * Command failed?
+     */
+    private boolean mSuperUserFailed;
+
+    /**
+     * If this value is set, the command will not store any input to the logger
+     */
+    private boolean mHideInput = false;
+    /**
+     * If this value is set, the command will not store any standard output to the logger
+     */
+    private boolean mHideStandardOutput = false;
+    /**
+     * If this value is set, the command will not store any error output to the logger
+     */
+    private boolean mHideErrorOutput = false;
+
+    /**
+     * @return Gets whether the command hides the input log
+     */
+    public boolean getHideInput() {
+        return mHideInput;
+    }
+
+    /**
+     * @param hideInput Set this to hide the input to the logger
+     */
+    public void setHideInput(boolean hideInput) {
+        mHideInput = hideInput;
+    }
+
+    /**
+     * @return Gets whether the command hides the standard output log
+     */
+    public boolean getHideStandardOutput() {
+        return mHideStandardOutput;
+    }
+
+    /**
+     * @param hideStandardOutput Set this to hide the standard output to the logger
+     */
+    public void setHideStandardOutput(boolean hideStandardOutput) {
+        mHideStandardOutput = hideStandardOutput;
+    }
+
+    /**
+     * @return Gets whether the command hides the error output log
+     */
+    public boolean getHideErrorOutput() {
+        return mHideErrorOutput;
+    }
+
+    /**
+     * @param hideErrorOutput Set this to hide the error output to the logger
+     */
+    public void setHideErrorOutput(boolean hideErrorOutput) {
+        mHideErrorOutput = hideErrorOutput;
+    }
+
+    /**
+     * If this value is set the command will read the standard output as binary
+     */
+    private boolean mBinaryStandardOutput = false;
+
+    /**
+     * @return Gets whether the output will be binary
+     */
+    public boolean getBinaryStandardOutput() {
+        return mBinaryStandardOutput;
+    }
+
+    /**
+     * @param binaryStandardOutput Set this if you want a binary output
+     */
+    public void setBinaryStandardOutput(boolean binaryStandardOutput) {
+        mBinaryStandardOutput = binaryStandardOutput;
+    }
+
+    /**
+     * The timeout for this command in milliseconds
+     */
+    private long mTimeout;
+
+    /**
+     * @return Gets the timeout for this command in milliseconds
+     */
+    public long getTimeout() {
+        return mTimeout;
+    }
+
+    /**
+     * Set the timeout for this command in milliseconds
+     * @param timeout Timeout
+     * @return Itself
+     */
+    public SuperUserCommand setTimeout(long timeout) {
+        mTimeout = timeout;
+        return this;
+    }
+
+    /**
+     * @return Gets the executed commands
+     */
+    public String[] getCommands() {
+        return mCommands;
+    }
+
+    /**
+     * @return Gets the standard output
+     */
+    public String[] getStandardOutput() {
+        return mOutputStandard;
+    }
+
+    /**
+     * @return Gets the error output
+     */
+    public String[] getErrorOutput() {
+        return mOutputError;
+    }
+
+    /**
+     * @return Gets the standard output as binary
+     */
+    public byte[] getStandardOutputBinary() {
+        return mOutputStandardBinary;
+    }
+
+    /**
+     * @return Gets whether the command was executed without errors, even without error outputs from the command.
+     */
+    public boolean commandWasSuccessful() {
+        return (!mSuperUserFailed && mOutputError.length == 0);
+    }
+
+    /**
+     * @return Gets whether the command was granted superuser permissions, but maybe has some error outputs.
+     */
+    public boolean superuserWasSuccessful() {
+        return (!mSuperUserFailed);
+    }
+
+    /**
+     * The async execution thread
+     */
+    private SuperUserCommandThread mThread;
+
+    /**
+     * The async callback
+     */
+    private SuperUserCommandCallback mCallback;
+
+    /**
+     * Creates a command with one command line
+     * @param command The command
+     */
+    public SuperUserCommand(String command) {
+        this(new String[] {command});
+    }
+
+    /**
+     * Creates a command with multiple command lines
+     * @param commands The command lines
+     */
+    public SuperUserCommand(String[] commands) {
+        mCommands = commands;
+
+        // Default timeout
+        mTimeout = DEFAULT_COMMAND_TIMEOUT;
+    }
+
+    /**
+     * Execute the command asynchronously.
+     * Please notice that the commands will only executed one after another.
+     * The command will wait until the su process is free.
+     * @param callback The callback instance
+     */
+    public void executeAsync(SuperUserCommandCallback callback) {
+        mCallback = callback;
+
+        // Thread is running
+        if (mThread != null) return;
+
+        // Create a new thread
+        mThread = new SuperUserCommandThread();
+
+        // Starts a thread
+        mThread.start();
+    }
+
+    /**
+     * Execute the command and return whether the command was executed.
+     * It will only return false if the app wasn't granted superuser permissions, like {@link #superuserWasSuccessful()}.
+     * It will also return true if the command itself returns error outputs. To check this case you should use {@link #commandWasSuccessful()} instead.
+     * Please consider to use {@link #executeAsync} instead of this and execute the command asynchronously.
+     * @return Gets whether the execution was successful.
+     */
+    public boolean execute() {
+        String tmpLine;
+        List<String> tmpList = new ArrayList<>();
+
+        mSuperUserFailed = false;
+
+        // Opps, we don't have superuser permissions
+        // Did you run SuperUser.askForPermissions()?
+        if (!SuperUser.hasPermissions()) {
+            mSuperUserFailed = true;
+            return false;
+        }
+
+        // Thread safe
+        synchronized (SuperUser.getProcess()) {
+            try {
+                // Gets the streams
+                DataOutputStream dataOutputStream = new DataOutputStream(SuperUser.getProcess().getOutputStream());
+                BufferedReader bufferedInputReader = new BufferedReader(new InputStreamReader(SuperUser.getProcess().getInputStream()));
+                BufferedReader bufferedErrorReader = new BufferedReader(new InputStreamReader(SuperUser.getProcess().getErrorStream()));
+
+                // Sends the command
+                for (String command : mCommands) {
+                    dataOutputStream.writeBytes(command + "\n");
+                }
+                dataOutputStream.flush();
+
+                // TODO: This class cannot execute commands without any output (standard and error). These commands will run until the timeout will kill them!
+
+                // Start waiting
+                long timeStarted = System.currentTimeMillis();
+
+                // Wait for first data
+                while (!bufferedInputReader.ready() && !bufferedErrorReader.ready()) {
+                    try {
+                        // Waiting
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+
+                    long timeNow = System.currentTimeMillis();
+
+                    // TimeOut
+                    if (timeNow - timeStarted >= mTimeout) break;
+                }
+
+                // We want to read the data as binary
+                if (mBinaryStandardOutput) {
+                    int len;
+                    byte[] buffer = new byte[1024];
+
+                    // Byte buffer
+                    ByteBuffer byteBuffer = new ByteBuffer();
+
+                    // Need the direct input stream
+                    InputStream inputStream = SuperUser.getProcess().getInputStream();
+
+                    do {
+                        while (bufferedInputReader.ready()) {
+                            // Read to buffer
+                            len = inputStream.read(buffer);
+
+                            // Write to buffer
+                            byteBuffer.append(buffer, 0, len);
+                        }
+
+                        // Fix: Wait for the buffer and try again
+                        try {
+                            // Sometimes cat is to slow.
+                            // If there is no data anymore we will wait 100ms and check again.
+                            Thread.sleep(100);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    } while (bufferedInputReader.ready());
+
+                    mOutputStandardBinary = byteBuffer.toByteArray();
+                } else {
+                    // Reads the standard output as text
+                    tmpList.clear();
+                    while (bufferedInputReader.ready()) {
+                        tmpLine = bufferedInputReader.readLine();
+
+                        // End of data
+                        if (tmpLine == null) break;
+
+                        tmpList.add(tmpLine);
+                    }
+                    // Convert list to array
+                    mOutputStandard = tmpList.toArray(new String[tmpList.size()]);
+                }
+
+                // Reads the error output
+                tmpList.clear();
+                while (bufferedErrorReader.ready()) {
+                    tmpLine = bufferedErrorReader.readLine();
+
+                    // End of data
+                    if (tmpLine == null) break;
+
+                    tmpList.add(tmpLine);
+                }
+                // Convert list to array
+                mOutputError = tmpList.toArray(new String[tmpList.size()]);
+
+                // Done
+                return true;
+            } catch (IOException e) {
+                e.printStackTrace();
+
+                mSuperUserFailed = true;
+
+                // Command failed
+                return false;
+            }
+        }
+    }
+
+
+    /**
+     * Thread to executes the command asynchronously
+     */
+    private class SuperUserCommandThread extends Thread {
+        @Override
+        public void run() {
+
+            super.run();
+
+            // Executes the command
+            execute();
+
+            if (mCallback != null)
+                mCallback.onFinished(SuperUserCommand.this);
+        }
+    }
+}
diff --git a/framework/src/main/java/de/arcus/framework/superuser/SuperUserCommandCallback.java b/superuser/src/main/java/rc/jcg/superuser/SuperUserCommandCallback.java
similarity index 97%
rename from framework/src/main/java/de/arcus/framework/superuser/SuperUserCommandCallback.java
rename to superuser/src/main/java/rc/jcg/superuser/SuperUserCommandCallback.java
index 1bfa2e6..aa99e22 100644
--- a/framework/src/main/java/de/arcus/framework/superuser/SuperUserCommandCallback.java
+++ b/superuser/src/main/java/rc/jcg/superuser/SuperUserCommandCallback.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package de.arcus.framework.superuser;
+package rc.jcg.superuser;
 
 /**
  * Callback class if the async execution is finish
diff --git a/framework/src/main/java/de/arcus/framework/superuser/SuperUserPermissionRequestListener.java b/superuser/src/main/java/rc/jcg/superuser/SuperUserPermissionRequestListener.java
similarity index 72%
rename from framework/src/main/java/de/arcus/framework/superuser/SuperUserPermissionRequestListener.java
rename to superuser/src/main/java/rc/jcg/superuser/SuperUserPermissionRequestListener.java
index 8d0331c..1290191 100644
--- a/framework/src/main/java/de/arcus/framework/superuser/SuperUserPermissionRequestListener.java
+++ b/superuser/src/main/java/rc/jcg/superuser/SuperUserPermissionRequestListener.java
@@ -1,4 +1,4 @@
-package de.arcus.framework.superuser;
+package rc.jcg.superuser;
 
 public interface SuperUserPermissionRequestListener {
     void superUserGranted(boolean granted);
diff --git a/framework/src/main/java/de/arcus/framework/superuser/SuperUserTools.java b/superuser/src/main/java/rc/jcg/superuser/SuperUserTools.java
similarity index 99%
rename from framework/src/main/java/de/arcus/framework/superuser/SuperUserTools.java
rename to superuser/src/main/java/rc/jcg/superuser/SuperUserTools.java
index fa519d8..1844979 100644
--- a/framework/src/main/java/de/arcus/framework/superuser/SuperUserTools.java
+++ b/superuser/src/main/java/rc/jcg/superuser/SuperUserTools.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package de.arcus.framework.superuser;
+package rc.jcg.superuser;
 
 /**
  * Tools for the superuser