diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
deleted file mode 100644
index 89512b54a..000000000
--- a/Privileged-Extension/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-repositories {
-    jcenter()
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'checkstyle'
-
-dependencies {
-    compile project(':privileged-api-lib')
-}
-
-android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.1'
-
-    defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 24
-        versionCode 1050
-        versionName "0.1"
-    }
-
-    compileOptions {
-        compileOptions.encoding = "UTF-8"
-
-        // Use Java 1.7, requires minSdk 8
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    lintOptions {
-        // Do not abort build if lint finds errors
-        abortOnError false
-    }
-
-}
-
-checkstyle {
-    toolVersion = '7.1'
-}
-
-task checkstyle(type: Checkstyle) {
-    configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
-    source 'src/main/java'
-    include '**/*.java'
-
-    classpath = files()
-}
diff --git a/Privileged-Extension/src/main/AndroidManifest.xml b/Privileged-Extension/src/main/AndroidManifest.xml
deleted file mode 100644
index 5602cb3e2..000000000
--- a/Privileged-Extension/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.fdroid.fdroid.privileged">
-
-    <!-- These permissions are only granted when this apk is installed as a privileged app! -->
-    <uses-permission
-        android:name="android.permission.INSTALL_PACKAGES"
-        tools:ignore="ProtectedPermissions" />
-    <uses-permission
-        android:name="android.permission.DELETE_PACKAGES"
-        tools:ignore="ProtectedPermissions" />
-
-    <!--
-        Only apps signed with the same key can use this permission!
-        The permission is automatically granted independent of the install order
-        Never presented to the user due to the protectionLevel.
-     -->
-    <permission
-        android:name="org.fdroid.fdroid.privileged.USE_SERVICE"
-        android:protectionLevel="signature" />
-
-    <application
-        android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name">
-
-        <service
-            android:name=".PrivilegedService"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="org.fdroid.fdroid.privileged.USE_SERVICE"
-            android:process=":fdroid_privileged">
-            <intent-filter>
-                <action android:name="org.fdroid.fdroid.privileged.IPrivilegedService" />
-            </intent-filter>
-        </service>
-
-    </application>
-
-</manifest>
diff --git a/Privileged-Extension/src/main/java/android/content/pm/IPackageDeleteObserver.java b/Privileged-Extension/src/main/java/android/content/pm/IPackageDeleteObserver.java
deleted file mode 100644
index be0d4de81..000000000
--- a/Privileged-Extension/src/main/java/android/content/pm/IPackageDeleteObserver.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package android.content.pm;
-
-import android.os.Binder;
-import android.os.IBinder;
-import android.os.IInterface;
-import android.os.Parcel;
-import android.os.RemoteException;
-
-/**
- * Just a non-working implementation of this Stub to satisfy compiler!
- */
-public interface IPackageDeleteObserver extends IInterface {
-
-    abstract class Stub extends Binder implements android.content.pm.IPackageDeleteObserver {
-
-        public Stub() {
-            throw new RuntimeException("Stub!");
-        }
-
-        public static IPackageDeleteObserver asInterface(IBinder obj) {
-            throw new RuntimeException("Stub!");
-        }
-
-        public IBinder asBinder() {
-            throw new RuntimeException("Stub!");
-        }
-
-        public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
-                throws RemoteException {
-            throw new RuntimeException("Stub!");
-        }
-    }
-
-    void packageDeleted(java.lang.String packageName, int returnCode) throws RemoteException;
-}
diff --git a/Privileged-Extension/src/main/java/android/content/pm/IPackageInstallObserver.java b/Privileged-Extension/src/main/java/android/content/pm/IPackageInstallObserver.java
deleted file mode 100644
index ae5b3ab12..000000000
--- a/Privileged-Extension/src/main/java/android/content/pm/IPackageInstallObserver.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package android.content.pm;
-
-import android.os.Binder;
-import android.os.IBinder;
-import android.os.IInterface;
-import android.os.Parcel;
-import android.os.RemoteException;
-
-/**
- * Just a non-working implementation of this Stub to satisfy compiler!
- */
-public interface IPackageInstallObserver extends IInterface {
-
-    abstract class Stub extends Binder implements android.content.pm.IPackageInstallObserver {
-
-        public Stub() {
-            throw new RuntimeException("Stub!");
-        }
-
-        public static android.content.pm.IPackageInstallObserver asInterface(IBinder obj) {
-            throw new RuntimeException("Stub!");
-        }
-
-        public IBinder asBinder() {
-            throw new RuntimeException("Stub!");
-        }
-
-        public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
-                throws RemoteException {
-            throw new RuntimeException("Stub!");
-        }
-    }
-
-    void packageInstalled(String packageName, int returnCode) throws RemoteException;
-}
\ No newline at end of file
diff --git a/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java b/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java
deleted file mode 100644
index 4b36ff1ef..000000000
--- a/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package org.fdroid.fdroid.privileged;
-
-import android.Manifest;
-import android.app.Service;
-import android.content.Intent;
-import android.content.pm.IPackageDeleteObserver;
-import android.content.pm.IPackageInstallObserver;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-
-import java.lang.reflect.Method;
-
-/**
- * This service provides an API via AIDL IPC for the main F-Droid app to install/delete packages.
- */
-public class PrivilegedService extends Service {
-
-    private static final String TAG = "PrivilegedService";
-
-    private Method mInstallMethod;
-    private Method mDeleteMethod;
-
-    private boolean hasPrivilegedPermissionsImpl() {
-        boolean hasInstallPermission =
-                getPackageManager().checkPermission(Manifest.permission.INSTALL_PACKAGES, getPackageName())
-                        == PackageManager.PERMISSION_GRANTED;
-        boolean hasDeletePermission =
-                getPackageManager().checkPermission(Manifest.permission.DELETE_PACKAGES, getPackageName())
-                        == PackageManager.PERMISSION_GRANTED;
-
-        return hasInstallPermission && hasDeletePermission;
-    }
-
-    private void installPackageImpl(Uri packageURI, int flags, String installerPackageName,
-                                    final IPrivilegedCallback callback) {
-
-        // Internal callback from the system
-        IPackageInstallObserver.Stub installObserver = new IPackageInstallObserver.Stub() {
-            @Override
-            public void packageInstalled(String packageName, int returnCode) throws RemoteException {
-                // forward this internal callback to our callback
-                try {
-                    callback.handleResult(packageName, returnCode);
-                } catch (RemoteException e1) {
-                    Log.e(TAG, "RemoteException", e1);
-                }
-            }
-        };
-
-        // execute internal method
-        try {
-            mInstallMethod.invoke(getPackageManager(), packageURI, installObserver,
-                    flags, installerPackageName);
-        } catch (Exception e) {
-            Log.e(TAG, "Android not compatible!", e);
-            try {
-                callback.handleResult(null, 0);
-            } catch (RemoteException e1) {
-                Log.e(TAG, "RemoteException", e1);
-            }
-        }
-    }
-
-    private void deletePackageImpl(String packageName, int flags, final IPrivilegedCallback callback) {
-
-        // Internal callback from the system
-        IPackageDeleteObserver.Stub deleteObserver = new IPackageDeleteObserver.Stub() {
-            @Override
-            public void packageDeleted(String packageName, int returnCode) throws RemoteException {
-                // forward this internal callback to our callback
-                try {
-                    callback.handleResult(packageName, returnCode);
-                } catch (RemoteException e1) {
-                    Log.e(TAG, "RemoteException", e1);
-                }
-            }
-        };
-
-        // execute internal method
-        try {
-            mDeleteMethod.invoke(getPackageManager(), packageName, deleteObserver, flags);
-        } catch (Exception e) {
-            Log.e(TAG, "Android not compatible!", e);
-            try {
-                callback.handleResult(null, 0);
-            } catch (RemoteException e1) {
-                Log.e(TAG, "RemoteException", e1);
-            }
-        }
-
-    }
-
-    private final IPrivilegedService.Stub mBinder = new IPrivilegedService.Stub() {
-        @Override
-        public boolean hasPrivilegedPermissions() {
-            return hasPrivilegedPermissionsImpl();
-        }
-
-        @Override
-        public void installPackage(Uri packageURI, int flags, String installerPackageName,
-                                   IPrivilegedCallback callback) {
-            installPackageImpl(packageURI, flags, installerPackageName, callback);
-        }
-
-        @Override
-        public void deletePackage(String packageName, int flags, IPrivilegedCallback callback) {
-            deletePackageImpl(packageName, flags, callback);
-        }
-    };
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        // get internal methods via reflection
-        try {
-            Class<?>[] installTypes = {
-                Uri.class, IPackageInstallObserver.class, int.class,
-                String.class,
-            };
-            Class<?>[] deleteTypes = {
-                String.class, IPackageDeleteObserver.class,
-                int.class,
-            };
-
-            PackageManager pm = getPackageManager();
-            mInstallMethod = pm.getClass().getMethod("installPackage", installTypes);
-            mDeleteMethod = pm.getClass().getMethod("deletePackage", deleteTypes);
-        } catch (NoSuchMethodException e) {
-            Log.e(TAG, "Android not compatible!", e);
-            stopSelf();
-        }
-    }
-
-}
diff --git a/Privileged-Extension/src/main/res/mipmap-hdpi/ic_launcher.png b/Privileged-Extension/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 6f7610a97..000000000
Binary files a/Privileged-Extension/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/Privileged-Extension/src/main/res/mipmap-ldpi/ic_launcher.png b/Privileged-Extension/src/main/res/mipmap-ldpi/ic_launcher.png
deleted file mode 100644
index 621a18071..000000000
Binary files a/Privileged-Extension/src/main/res/mipmap-ldpi/ic_launcher.png and /dev/null differ
diff --git a/Privileged-Extension/src/main/res/mipmap-mdpi/ic_launcher.png b/Privileged-Extension/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 2331e598c..000000000
Binary files a/Privileged-Extension/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/Privileged-Extension/src/main/res/mipmap-xhdpi/ic_launcher.png b/Privileged-Extension/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bcb951e3e..000000000
Binary files a/Privileged-Extension/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/Privileged-Extension/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Privileged-Extension/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index f3685733c..000000000
Binary files a/Privileged-Extension/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/Privileged-Extension/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Privileged-Extension/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 452498977..000000000
Binary files a/Privileged-Extension/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/Privileged-Extension/src/main/res/values-ar/strings.xml b/Privileged-Extension/src/main/res/values-ar/strings.xml
deleted file mode 100644
index f13a5e11a..000000000
--- a/Privileged-Extension/src/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">ملحقات أف-درويد المميز</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-ast/strings.xml b/Privileged-Extension/src/main/res/values-ast/strings.xml
deleted file mode 100644
index 854ff937f..000000000
--- a/Privileged-Extension/src/main/res/values-ast/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Estensión de F-Droid privilexáu</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-de/strings.xml b/Privileged-Extension/src/main/res/values-de/strings.xml
deleted file mode 100644
index eed6e7e88..000000000
--- a/Privileged-Extension/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Privilegierte F-Droid-Erweiterung</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-el/strings.xml b/Privileged-Extension/src/main/res/values-el/strings.xml
deleted file mode 100644
index 0c0d9f4ed..000000000
--- a/Privileged-Extension/src/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Επέκταση του F-Droid με δικαιώματα συστήματος</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-eo/strings.xml b/Privileged-Extension/src/main/res/values-eo/strings.xml
deleted file mode 100644
index 1c5a13de6..000000000
--- a/Privileged-Extension/src/main/res/values-eo/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">Privilegia F-Droid-aldonaĵo</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-es/strings.xml b/Privileged-Extension/src/main/res/values-es/strings.xml
deleted file mode 100644
index f6f4e634e..000000000
--- a/Privileged-Extension/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Extensión de F-Droid con permisos de sistema</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-et/strings.xml b/Privileged-Extension/src/main/res/values-et/strings.xml
deleted file mode 100644
index 80e7997d4..000000000
--- a/Privileged-Extension/src/main/res/values-et/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">F-Droid Priviligeeritud Laiendus</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-eu/strings.xml b/Privileged-Extension/src/main/res/values-eu/strings.xml
deleted file mode 100644
index aa0a65861..000000000
--- a/Privileged-Extension/src/main/res/values-eu/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Pribilegiodun F-Droid Luzapena</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-fa/strings.xml b/Privileged-Extension/src/main/res/values-fa/strings.xml
deleted file mode 100644
index b5b3fdad5..000000000
--- a/Privileged-Extension/src/main/res/values-fa/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">افزونهٔ ممتاز اف‌دروید</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-fr/strings.xml b/Privileged-Extension/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 88894ea41..000000000
--- a/Privileged-Extension/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">F-Droid Privileged Extension</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-it/strings.xml b/Privileged-Extension/src/main/res/values-it/strings.xml
deleted file mode 100644
index 0d51aea14..000000000
--- a/Privileged-Extension/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">Estensione F-Droid con Privilegi</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-ja/strings.xml b/Privileged-Extension/src/main/res/values-ja/strings.xml
deleted file mode 100644
index dd9f23c9b..000000000
--- a/Privileged-Extension/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">F-Droid Privileged Extension</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-nb/strings.xml b/Privileged-Extension/src/main/res/values-nb/strings.xml
deleted file mode 100644
index 7a0395043..000000000
--- a/Privileged-Extension/src/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">F-Droid-tillegg med eleverte rettigheter</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-nl/strings.xml b/Privileged-Extension/src/main/res/values-nl/strings.xml
deleted file mode 100644
index e1936c47e..000000000
--- a/Privileged-Extension/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">Geprivilegieerde F-Droid-extensie</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-pl/strings.xml b/Privileged-Extension/src/main/res/values-pl/strings.xml
deleted file mode 100644
index dd9f23c9b..000000000
--- a/Privileged-Extension/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">F-Droid Privileged Extension</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-pt/strings.xml b/Privileged-Extension/src/main/res/values-pt/strings.xml
deleted file mode 100644
index 41ee62952..000000000
--- a/Privileged-Extension/src/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Extensão privilegiada F-Droid</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-ro/strings.xml b/Privileged-Extension/src/main/res/values-ro/strings.xml
deleted file mode 100644
index fd93d9dd1..000000000
--- a/Privileged-Extension/src/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="app_name">Extensie privilegiata F-Droid</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-ru/strings.xml b/Privileged-Extension/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 83c1f3d44..000000000
--- a/Privileged-Extension/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Привилегированное расширение F-Droid</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-sk/strings.xml b/Privileged-Extension/src/main/res/values-sk/strings.xml
deleted file mode 100644
index bb6ff88c3..000000000
--- a/Privileged-Extension/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">F-Droid privilegované rozšírenie</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-sq/strings.xml b/Privileged-Extension/src/main/res/values-sq/strings.xml
deleted file mode 100644
index c919bfb46..000000000
--- a/Privileged-Extension/src/main/res/values-sq/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Prapashtesa e privilegjuar F-Droid</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-sr/strings.xml b/Privileged-Extension/src/main/res/values-sr/strings.xml
deleted file mode 100644
index 27552c417..000000000
--- a/Privileged-Extension/src/main/res/values-sr/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Повлашћено проширење за Ф-дроид</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-tr/strings.xml b/Privileged-Extension/src/main/res/values-tr/strings.xml
deleted file mode 100644
index 25ec4d5c2..000000000
--- a/Privileged-Extension/src/main/res/values-tr/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">F-Droid Ayrıcalıklı Uzantı</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-uk/strings.xml b/Privileged-Extension/src/main/res/values-uk/strings.xml
deleted file mode 100644
index b0ced6caf..000000000
--- a/Privileged-Extension/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Привілейоване розширення F-Droid</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values-vi/strings.xml b/Privileged-Extension/src/main/res/values-vi/strings.xml
deleted file mode 100644
index 2e819e1a6..000000000
--- a/Privileged-Extension/src/main/res/values-vi/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">Phần mở rộng F-Droid được cấp quyền</string>
-
-</resources>
diff --git a/Privileged-Extension/src/main/res/values/strings.xml b/Privileged-Extension/src/main/res/values/strings.xml
deleted file mode 100644
index 50777a72c..000000000
--- a/Privileged-Extension/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">F-Droid Privileged Extension</string>
-
-</resources>
diff --git a/app/build.gradle b/app/build.gradle
index ade10cc24..43c81e303 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,6 @@ repositories {
 }
 
 dependencies {
-    compile project(':privileged-api-lib')
-
     compile 'com.android.support:support-v4:24.1.1'
     compile 'com.android.support:appcompat-v7:24.1.1'
     compile 'com.android.support:support-annotations:24.1.1'
diff --git a/privileged-api-lib/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl b/app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
similarity index 100%
rename from privileged-api-lib/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
rename to app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
diff --git a/privileged-api-lib/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl b/app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
similarity index 100%
rename from privileged-api-lib/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
rename to app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
diff --git a/privileged-api-lib/build.gradle b/privileged-api-lib/build.gradle
deleted file mode 100644
index b87e41d32..000000000
--- a/privileged-api-lib/build.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.1'
-
-    defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 24
-        versionCode 1
-        versionName "1.0"
-    }
-    
-    // Do not abort build if lint finds errors
-    lintOptions {
-        abortOnError false
-    }
-}
diff --git a/privileged-api-lib/src/main/AndroidManifest.xml b/privileged-api-lib/src/main/AndroidManifest.xml
deleted file mode 100644
index d1978ceea..000000000
--- a/privileged-api-lib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.fdroid.fdroid.privileged.api">
-
-    <application />
-
-</manifest>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index e16e5f8e2..e2eec6332 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,4 @@
 include ':app'
-include ':Privileged-Extension'
-include ':privileged-api-lib'
 if (hasProperty('sourceDeps')) {
     include ':extern:support-v4-preferencefragment'
     include ':extern:nanohttpd:core'