diff --git a/.gitignore b/.gitignore
index 525d50ce..deb7f6da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 local.properties
-.gradle
-.idea
-out
+.gradle/
+.idea/
+out/
+build/
+target/
+classes/
\ No newline at end of file
diff --git a/KdeConnect/KdeConnect.iml b/KdeConnect.iml
similarity index 89%
rename from KdeConnect/KdeConnect.iml
rename to KdeConnect.iml
index 22a89c1c..57035bfd 100644
--- a/KdeConnect/KdeConnect.iml
+++ b/KdeConnect.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
@@ -17,13 +17,13 @@
     </facet>
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":KdeConnect" />
+        <option name="GRADLE_PROJECT_PATH" value=":" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <output url="file://$MODULE_DIR$/build/classes/debug" />
-    <exclude-output />
+    <output-test url="file://$MODULE_DIR$/classes/test/kdeconnect-android" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
@@ -56,6 +56,9 @@
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.git" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/build/apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
@@ -67,13 +70,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.3 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="android-support-v4" level="project" />
     <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
     <orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71800.aar" level="project" />
     <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
     <orderEntry type="library" exported="" name="mina-core-2.0.7" level="project" />
   </component>
 </module>
-
diff --git a/KdeConnect/.gitignore b/KdeConnect/.gitignore
deleted file mode 100644
index 567609b1..00000000
--- a/KdeConnect/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/KdeConnect/build.gradle b/KdeConnect/build.gradle
deleted file mode 100644
index 8eac437a..00000000
--- a/KdeConnect/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-apply plugin: 'android'
-
-dependencies {
-    compile "com.android.support:appcompat-v7:18.0.+"
-    compile files('libs/android-support-v4.jar')
-    compile files('libs/mina-core-2.0.7.jar')
-    compile files('libs/slf4j-api-1.6.6.jar')
-}
-
-android {
-    compileSdkVersion 18
-    buildToolsVersion "18.0.1"
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 18
-    }
-}
diff --git a/KdeConnect/libs/android-support-v7-appcompat.jar b/KdeConnect/libs/android-support-v7-appcompat.jar
deleted file mode 100644
index b5f52924..00000000
Binary files a/KdeConnect/libs/android-support-v7-appcompat.jar and /dev/null differ
diff --git a/StaticMessages.sh b/StaticMessages.sh
index df7e27e4..e9d93d20 100644
--- a/StaticMessages.sh
+++ b/StaticMessages.sh
@@ -7,7 +7,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 {
 	potfile=$1
 	mkdir outdir
-	a2po export --android KdeConnect/src/main/res/ --gettext outdir
+	a2po export --android src/main/res/ --gettext outdir
 	mv outdir/template.pot $potfile
 	rm -rf outdir
 }
@@ -15,7 +15,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
 {
 	podir=$1
-	a2po import --android KdeConnect/src/main/res/ --gettext $podir
+	a2po import --android src/main/res/ --gettext $podir
 }
 
 
diff --git a/build.gradle b/build.gradle
index f82180e3..efaa2bc8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,2 +1,27 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
 
+apply plugin: 'android'
+
+dependencies {
+    compile "com.android.support:support-v4:18.0.+"
+    compile "com.android.support:appcompat-v7:18.0.+"
+    compile files('libs/mina-core-2.0.7.jar')
+    compile files('libs/slf4j-api-1.6.6.jar')
+}
+
+android {
+    compileSdkVersion 18
+    buildToolsVersion "18.1"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 18
+    }
+}
diff --git a/kdeconnect-android.iml b/kdeconnect-android.iml
deleted file mode 100644
index 94f1c61c..00000000
--- a/kdeconnect-android.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/KdeConnect/libs/mina-core-2.0.7.jar b/libs/mina-core-2.0.7.jar
similarity index 100%
rename from KdeConnect/libs/mina-core-2.0.7.jar
rename to libs/mina-core-2.0.7.jar
diff --git a/KdeConnect/libs/slf4j-api-1.6.6.jar b/libs/slf4j-api-1.6.6.jar
similarity index 100%
rename from KdeConnect/libs/slf4j-api-1.6.6.jar
rename to libs/slf4j-api-1.6.6.jar
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 7ae9e3da..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':KdeConnect'
diff --git a/KdeConnect/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
similarity index 99%
rename from KdeConnect/src/main/AndroidManifest.xml
rename to src/main/AndroidManifest.xml
index 7ae3554f..64b3233a 100644
--- a/KdeConnect/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -44,7 +44,6 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -57,8 +56,7 @@
                 >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
                        android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-
-                </activity>
+        </activity>
 
         <activity
             android:theme="@style/Theme.AppCompat"
@@ -68,7 +66,6 @@
             >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-
         </activity>
 
         <activity
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java b/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
rename to src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
rename to src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
rename to src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
rename to src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java b/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
rename to src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java b/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
rename to src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java b/src/main/java/org/kde/kdeconnect/BackgroundService.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/BackgroundService.java
rename to src/main/java/org/kde/kdeconnect/BackgroundService.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Device.java b/src/main/java/org/kde/kdeconnect/Device.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Device.java
rename to src/main/java/org/kde/kdeconnect/Device.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java b/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java
rename to src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java b/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java
rename to src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java b/src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java
rename to src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/HumanDeviceNames.java b/src/main/java/org/kde/kdeconnect/HumanDeviceNames.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/HumanDeviceNames.java
rename to src/main/java/org/kde/kdeconnect/HumanDeviceNames.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java b/src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
rename to src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/src/main/java/org/kde/kdeconnect/NetworkPackage.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
rename to src/main/java/org/kde/kdeconnect/NetworkPackage.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java b/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
rename to src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
rename to src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java b/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
rename to src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/Plugin.java b/src/main/java/org/kde/kdeconnect/Plugins/Plugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/Plugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/Plugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java
rename to src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
rename to src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
similarity index 99%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
index 7e0124b8..0c3256ad 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
+++ b/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
@@ -10,7 +10,7 @@ public class SectionItem implements ListAdapter.Item {
 
 	private final String title;
     public boolean isEmpty;
-	
+
 	public SectionItem(String title) {
 		this.title = title;
         this.isEmpty = false;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java b/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java b/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
similarity index 100%
rename from KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
rename to src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
diff --git a/KdeConnect/src/main/res/drawable/action_settings.png b/src/main/res/drawable/action_settings.png
similarity index 100%
rename from KdeConnect/src/main/res/drawable/action_settings.png
rename to src/main/res/drawable/action_settings.png
diff --git a/KdeConnect/src/main/res/drawable/icon.png b/src/main/res/drawable/icon.png
similarity index 100%
rename from KdeConnect/src/main/res/drawable/icon.png
rename to src/main/res/drawable/icon.png
diff --git a/KdeConnect/src/main/res/drawable/navigation_refresh.png b/src/main/res/drawable/navigation_refresh.png
similarity index 100%
rename from KdeConnect/src/main/res/drawable/navigation_refresh.png
rename to src/main/res/drawable/navigation_refresh.png
diff --git a/KdeConnect/src/main/res/drawable/volume.png b/src/main/res/drawable/volume.png
similarity index 100%
rename from KdeConnect/src/main/res/drawable/volume.png
rename to src/main/res/drawable/volume.png
diff --git a/KdeConnect/src/main/res/layout/activity_device.xml b/src/main/res/layout/activity_device.xml
similarity index 100%
rename from KdeConnect/src/main/res/layout/activity_device.xml
rename to src/main/res/layout/activity_device.xml
diff --git a/KdeConnect/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml
similarity index 100%
rename from KdeConnect/src/main/res/layout/activity_main.xml
rename to src/main/res/layout/activity_main.xml
diff --git a/KdeConnect/src/main/res/layout/activity_pair.xml b/src/main/res/layout/activity_pair.xml
similarity index 100%
rename from KdeConnect/src/main/res/layout/activity_pair.xml
rename to src/main/res/layout/activity_pair.xml
diff --git a/KdeConnect/src/main/res/layout/list_item_category.xml b/src/main/res/layout/list_item_category.xml
similarity index 100%
rename from KdeConnect/src/main/res/layout/list_item_category.xml
rename to src/main/res/layout/list_item_category.xml
diff --git a/KdeConnect/src/main/res/layout/list_item_entry.xml b/src/main/res/layout/list_item_entry.xml
similarity index 98%
rename from KdeConnect/src/main/res/layout/list_item_entry.xml
rename to src/main/res/layout/list_item_entry.xml
index fd4fd3ba..095ec14a 100644
--- a/KdeConnect/src/main/res/layout/list_item_entry.xml
+++ b/src/main/res/layout/list_item_entry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-  
-  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:baselineAligned="false"
     android:layout_height="wrap_content"
diff --git a/KdeConnect/src/main/res/layout/mpris_control.xml b/src/main/res/layout/mpris_control.xml
similarity index 100%
rename from KdeConnect/src/main/res/layout/mpris_control.xml
rename to src/main/res/layout/mpris_control.xml
diff --git a/KdeConnect/src/main/res/menu/main.xml b/src/main/res/menu/main.xml
similarity index 88%
rename from KdeConnect/src/main/res/menu/main.xml
rename to src/main/res/menu/main.xml
index f5e6bb3f..6301ab47 100644
--- a/KdeConnect/src/main/res/menu/main.xml
+++ b/src/main/res/menu/main.xml
@@ -1,5 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
 
     <item
             android:id="@+id/menu_refresh"
diff --git a/KdeConnect/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-cs/strings.xml
rename to src/main/res/values-cs/strings.xml
diff --git a/KdeConnect/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-de/strings.xml
rename to src/main/res/values-de/strings.xml
diff --git a/KdeConnect/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-hu/strings.xml
rename to src/main/res/values-hu/strings.xml
diff --git a/KdeConnect/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-nl/strings.xml
rename to src/main/res/values-nl/strings.xml
diff --git a/KdeConnect/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-pt-rBR/strings.xml
rename to src/main/res/values-pt-rBR/strings.xml
diff --git a/KdeConnect/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-pt/strings.xml
rename to src/main/res/values-pt/strings.xml
diff --git a/KdeConnect/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-sk/strings.xml
rename to src/main/res/values-sk/strings.xml
diff --git a/KdeConnect/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-sv/strings.xml
rename to src/main/res/values-sv/strings.xml
diff --git a/KdeConnect/src/main/res/values-sw600dp/dimens.xml b/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-sw600dp/dimens.xml
rename to src/main/res/values-sw600dp/dimens.xml
diff --git a/KdeConnect/src/main/res/values-sw720dp-land/dimens.xml b/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-sw720dp-land/dimens.xml
rename to src/main/res/values-sw720dp-land/dimens.xml
diff --git a/KdeConnect/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-uk/strings.xml
rename to src/main/res/values-uk/strings.xml
diff --git a/KdeConnect/src/main/res/values-v11/styles.xml b/src/main/res/values-v11/styles.xml
similarity index 100%
rename from KdeConnect/src/main/res/values-v11/styles.xml
rename to src/main/res/values-v11/styles.xml
diff --git a/KdeConnect/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
similarity index 100%
rename from KdeConnect/src/main/res/values/dimens.xml
rename to src/main/res/values/dimens.xml
diff --git a/KdeConnect/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
similarity index 100%
rename from KdeConnect/src/main/res/values/strings.xml
rename to src/main/res/values/strings.xml
diff --git a/KdeConnect/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
similarity index 100%
rename from KdeConnect/src/main/res/values/styles.xml
rename to src/main/res/values/styles.xml