diff --git a/.gitignore b/.gitignore
index deb7f6da..4ed419a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,13 @@ local.properties
 .gradle/
 .idea/
 out/
+gen/
+bin/
 build/
 target/
-classes/
\ No newline at end of file
+classes/
+gradle
+gradlew
+gradlew.bat
+*.iml
+*.keystore
diff --git a/src/main/AndroidManifest.xml b/AndroidManifest.xml
similarity index 99%
rename from src/main/AndroidManifest.xml
rename to AndroidManifest.xml
index a15a529e..99140b0d 100644
--- a/src/main/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionName="0.7.3.2">
 
     <uses-sdk android:minSdkVersion="9"
-              android:targetSdkVersion="19" />
+              android:targetSdkVersion="21" />
 
     <supports-screens
         android:smallScreens="true"
diff --git a/build.gradle b/build.gradle
index 443f62df..2002d2c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,18 +3,27 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.12.+' //Update to 14 when Studio 0.9 gets to beta
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.1'
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 21
+    }
+	sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['resources']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
     }
     packagingOptions {
         exclude "META-INF/DEPENDENCIES"
@@ -34,11 +43,11 @@ dependencies {
     repositories {
         mavenCentral()
     }
-    compile 'com.android.support:support-v4:19.1.+'
-    compile 'com.android.support:appcompat-v7:19.1.+'
-    compile 'org.apache.mina:mina-core:2.0.+'
-    compile 'org.bouncycastle:bcprov-jdk16:1.45'
+    compile 'com.android.support:support-v4:21.0.2'
+    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'org.apache.mina:mina-core:2.0.9'
     compile 'org.apache.sshd:sshd-core:0.8.0'
-    compile 'tomcat:tomcat-apr:5.5.+'
+    compile 'org.bouncycastle:bcprov-jdk16:1.46'
+
     //compile fileTree(dir: 'libs', include: '*.jar')
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64a..00000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 04a37bf9..00000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Jun 09 09:51:48 CEST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
diff --git a/gradlew b/gradlew
deleted file mode 100755
index 91a7e269..00000000
--- a/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 8a0b282a..00000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/kdeconnect-android.iml b/kdeconnect-android.iml
deleted file mode 100644
index 08636797..00000000
--- a/kdeconnect-android.iml
+++ /dev/null
@@ -1,92 +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" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="sshd-core-0.8.0" level="project" />
-    <orderEntry type="library" exported="" name="bcprov-jdk16-1.45" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="mina-core-2.0.8" level="project" />
-    <orderEntry type="library" exported="" name="tomcat-apr-5.5.15" level="project" />
-    <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
-  </component>
-</module>
-
diff --git a/src/main/res/drawable-hdpi/ic_action_keyboard.png b/res/drawable-hdpi/ic_action_keyboard.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_keyboard.png
rename to res/drawable-hdpi/ic_action_keyboard.png
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh.png b/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_refresh.png
rename to res/drawable-hdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_settings.png
rename to res/drawable-hdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-hdpi/ic_volume.png b/res/drawable-hdpi/ic_volume.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_volume.png
rename to res/drawable-hdpi/ic_volume.png
diff --git a/src/main/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
similarity index 100%
rename from src/main/res/drawable-hdpi/icon.png
rename to res/drawable-hdpi/icon.png
diff --git a/src/main/res/drawable-hdpi/kitkatcompatselector_list_activated_holo.9.png b/res/drawable-hdpi/kitkatcompatselector_list_activated_holo.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/kitkatcompatselector_list_activated_holo.9.png
rename to res/drawable-hdpi/kitkatcompatselector_list_activated_holo.9.png
diff --git a/src/main/res/drawable-hdpi/kitkatcompatselector_list_focused_holo.9.png b/res/drawable-hdpi/kitkatcompatselector_list_focused_holo.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/kitkatcompatselector_list_focused_holo.9.png
rename to res/drawable-hdpi/kitkatcompatselector_list_focused_holo.9.png
diff --git a/src/main/res/drawable-hdpi/kitkatcompatselector_list_longpressed_holo.9.png b/res/drawable-hdpi/kitkatcompatselector_list_longpressed_holo.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/kitkatcompatselector_list_longpressed_holo.9.png
rename to res/drawable-hdpi/kitkatcompatselector_list_longpressed_holo.9.png
diff --git a/src/main/res/drawable-hdpi/kitkatcompatselector_list_pressed_holo_dark.9.png b/res/drawable-hdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
rename to res/drawable-hdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
diff --git a/src/main/res/drawable-hdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png b/res/drawable-hdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
rename to res/drawable-hdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
diff --git a/src/main/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
similarity index 100%
rename from src/main/res/drawable-ldpi/icon.png
rename to res/drawable-ldpi/icon.png
diff --git a/src/main/res/drawable-mdpi/ic_action_keyboard.png b/res/drawable-mdpi/ic_action_keyboard.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_keyboard.png
rename to res/drawable-mdpi/ic_action_keyboard.png
diff --git a/src/main/res/drawable-mdpi/kitkatcompatselector_list_activated_holo.9.png b/res/drawable-mdpi/kitkatcompatselector_list_activated_holo.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/kitkatcompatselector_list_activated_holo.9.png
rename to res/drawable-mdpi/kitkatcompatselector_list_activated_holo.9.png
diff --git a/src/main/res/drawable-mdpi/kitkatcompatselector_list_focused_holo.9.png b/res/drawable-mdpi/kitkatcompatselector_list_focused_holo.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/kitkatcompatselector_list_focused_holo.9.png
rename to res/drawable-mdpi/kitkatcompatselector_list_focused_holo.9.png
diff --git a/src/main/res/drawable-mdpi/kitkatcompatselector_list_longpressed_holo.9.png b/res/drawable-mdpi/kitkatcompatselector_list_longpressed_holo.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/kitkatcompatselector_list_longpressed_holo.9.png
rename to res/drawable-mdpi/kitkatcompatselector_list_longpressed_holo.9.png
diff --git a/src/main/res/drawable-mdpi/kitkatcompatselector_list_pressed_holo_dark.9.png b/res/drawable-mdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
rename to res/drawable-mdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
diff --git a/src/main/res/drawable-mdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png b/res/drawable-mdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
rename to res/drawable-mdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_keyboard.png b/res/drawable-xhdpi/ic_action_keyboard.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_keyboard.png
rename to res/drawable-xhdpi/ic_action_keyboard.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh.png b/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to res/drawable-xhdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_settings.png
rename to res/drawable-xhdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-xhdpi/ic_volume.png b/res/drawable-xhdpi/ic_volume.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_volume.png
rename to res/drawable-xhdpi/ic_volume.png
diff --git a/src/main/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/icon.png
rename to res/drawable-xhdpi/icon.png
diff --git a/src/main/res/drawable-xhdpi/kitkatcompatselector_list_activated_holo.9.png b/res/drawable-xhdpi/kitkatcompatselector_list_activated_holo.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/kitkatcompatselector_list_activated_holo.9.png
rename to res/drawable-xhdpi/kitkatcompatselector_list_activated_holo.9.png
diff --git a/src/main/res/drawable-xhdpi/kitkatcompatselector_list_focused_holo.9.png b/res/drawable-xhdpi/kitkatcompatselector_list_focused_holo.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/kitkatcompatselector_list_focused_holo.9.png
rename to res/drawable-xhdpi/kitkatcompatselector_list_focused_holo.9.png
diff --git a/src/main/res/drawable-xhdpi/kitkatcompatselector_list_longpressed_holo.9.png b/res/drawable-xhdpi/kitkatcompatselector_list_longpressed_holo.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/kitkatcompatselector_list_longpressed_holo.9.png
rename to res/drawable-xhdpi/kitkatcompatselector_list_longpressed_holo.9.png
diff --git a/src/main/res/drawable-xhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png b/res/drawable-xhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
rename to res/drawable-xhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
diff --git a/src/main/res/drawable-xhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png b/res/drawable-xhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
rename to res/drawable-xhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_keyboard.png b/res/drawable-xxhdpi/ic_action_keyboard.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_keyboard.png
rename to res/drawable-xxhdpi/ic_action_keyboard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/res/drawable-xxhdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_refresh.png
rename to res/drawable-xxhdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/res/drawable-xxhdpi/ic_action_settings.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_settings.png
rename to res/drawable-xxhdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-xxhdpi/ic_volume.png b/res/drawable-xxhdpi/ic_volume.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_volume.png
rename to res/drawable-xxhdpi/ic_volume.png
diff --git a/src/main/res/drawable-xxhdpi/icon.png b/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/icon.png
rename to res/drawable-xxhdpi/icon.png
diff --git a/src/main/res/drawable-xxhdpi/kitkatcompatselector_list_activated_holo.9.png b/res/drawable-xxhdpi/kitkatcompatselector_list_activated_holo.9.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/kitkatcompatselector_list_activated_holo.9.png
rename to res/drawable-xxhdpi/kitkatcompatselector_list_activated_holo.9.png
diff --git a/src/main/res/drawable-xxhdpi/kitkatcompatselector_list_focused_holo.9.png b/res/drawable-xxhdpi/kitkatcompatselector_list_focused_holo.9.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/kitkatcompatselector_list_focused_holo.9.png
rename to res/drawable-xxhdpi/kitkatcompatselector_list_focused_holo.9.png
diff --git a/src/main/res/drawable-xxhdpi/kitkatcompatselector_list_longpressed_holo.9.png b/res/drawable-xxhdpi/kitkatcompatselector_list_longpressed_holo.9.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/kitkatcompatselector_list_longpressed_holo.9.png
rename to res/drawable-xxhdpi/kitkatcompatselector_list_longpressed_holo.9.png
diff --git a/src/main/res/drawable-xxhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png b/res/drawable-xxhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
rename to res/drawable-xxhdpi/kitkatcompatselector_list_pressed_holo_dark.9.png
diff --git a/src/main/res/drawable-xxhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png b/res/drawable-xxhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
rename to res/drawable-xxhdpi/kitkatcompatselector_list_selector_disabled_holo_dark.9.png
diff --git a/src/main/res/drawable/ic_action_refresh.png b/res/drawable/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable/ic_action_refresh.png
rename to res/drawable/ic_action_refresh.png
diff --git a/src/main/res/drawable/ic_action_settings.png b/res/drawable/ic_action_settings.png
similarity index 100%
rename from src/main/res/drawable/ic_action_settings.png
rename to res/drawable/ic_action_settings.png
diff --git a/src/main/res/drawable/ic_volume.png b/res/drawable/ic_volume.png
similarity index 100%
rename from src/main/res/drawable/ic_volume.png
rename to res/drawable/ic_volume.png
diff --git a/src/main/res/drawable/icon.png b/res/drawable/icon.png
similarity index 100%
rename from src/main/res/drawable/icon.png
rename to res/drawable/icon.png
diff --git a/src/main/res/drawable/kitkatcompatselector_activated_background_holo_dark.xml b/res/drawable/kitkatcompatselector_activated_background_holo_dark.xml
similarity index 100%
rename from src/main/res/drawable/kitkatcompatselector_activated_background_holo_dark.xml
rename to res/drawable/kitkatcompatselector_activated_background_holo_dark.xml
diff --git a/src/main/res/drawable/kitkatcompatselector_item_background_holo_dark.xml b/res/drawable/kitkatcompatselector_item_background_holo_dark.xml
similarity index 100%
rename from src/main/res/drawable/kitkatcompatselector_item_background_holo_dark.xml
rename to res/drawable/kitkatcompatselector_item_background_holo_dark.xml
diff --git a/src/main/res/drawable/kitkatcompatselector_list_selector_background_transition_holo_dark.xml b/res/drawable/kitkatcompatselector_list_selector_background_transition_holo_dark.xml
similarity index 100%
rename from src/main/res/drawable/kitkatcompatselector_list_selector_background_transition_holo_dark.xml
rename to res/drawable/kitkatcompatselector_list_selector_background_transition_holo_dark.xml
diff --git a/src/main/res/drawable/kitkatcompatselector_list_selector_holo_dark.xml b/res/drawable/kitkatcompatselector_list_selector_holo_dark.xml
similarity index 100%
rename from src/main/res/drawable/kitkatcompatselector_list_selector_holo_dark.xml
rename to res/drawable/kitkatcompatselector_list_selector_holo_dark.xml
diff --git a/src/main/res/layout/activity_device.xml b/res/layout/activity_device.xml
similarity index 100%
rename from src/main/res/layout/activity_device.xml
rename to res/layout/activity_device.xml
diff --git a/src/main/res/layout/activity_main.xml b/res/layout/activity_main.xml
similarity index 100%
rename from src/main/res/layout/activity_main.xml
rename to res/layout/activity_main.xml
diff --git a/src/main/res/layout/activity_mousepad.xml b/res/layout/activity_mousepad.xml
similarity index 100%
rename from src/main/res/layout/activity_mousepad.xml
rename to res/layout/activity_mousepad.xml
diff --git a/src/main/res/layout/activity_pair.xml b/res/layout/activity_pair.xml
similarity index 100%
rename from src/main/res/layout/activity_pair.xml
rename to res/layout/activity_pair.xml
diff --git a/src/main/res/layout/custom_ip_list.xml b/res/layout/custom_ip_list.xml
similarity index 88%
rename from src/main/res/layout/custom_ip_list.xml
rename to res/layout/custom_ip_list.xml
index 65162eb1..88bb71ae 100644
--- a/src/main/res/layout/custom_ip_list.xml
+++ b/res/layout/custom_ip_list.xml
@@ -21,13 +21,13 @@
 
     <EditText
             android:layout_width="fill_parent"
-            android:layout_height="@dimen/abc_action_bar_default_height"
+            android:layout_height="wrap_content"
             android:imeOptions="actionSend"
             android:id="@+id/ip_edittext"/>
 
     <Button
             android:layout_width="fill_parent"
-            android:layout_height="@dimen/abc_action_bar_default_height"
+            android:layout_height="wrap_content"
             android:text="@string/add_host"
             android:onClick="addNewIp"
             android:id="@android:id/button1"/>
diff --git a/src/main/res/layout/list_item_category.xml b/res/layout/list_item_category.xml
similarity index 100%
rename from src/main/res/layout/list_item_category.xml
rename to res/layout/list_item_category.xml
diff --git a/src/main/res/layout/list_item_entry.xml b/res/layout/list_item_entry.xml
similarity index 100%
rename from src/main/res/layout/list_item_entry.xml
rename to res/layout/list_item_entry.xml
diff --git a/src/main/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
similarity index 100%
rename from src/main/res/layout/mpris_control.xml
rename to res/layout/mpris_control.xml
diff --git a/src/main/res/menu/main.xml b/res/menu/main.xml
similarity index 100%
rename from src/main/res/menu/main.xml
rename to res/menu/main.xml
diff --git a/src/main/res/menu/menu_mousepad.xml b/res/menu/menu_mousepad.xml
similarity index 100%
rename from src/main/res/menu/menu_mousepad.xml
rename to res/menu/menu_mousepad.xml
diff --git a/src/main/res/values-bg/strings.xml b/res/values-bg/strings.xml
similarity index 100%
rename from src/main/res/values-bg/strings.xml
rename to res/values-bg/strings.xml
diff --git a/src/main/res/values-bs/strings.xml b/res/values-bs/strings.xml
similarity index 100%
rename from src/main/res/values-bs/strings.xml
rename to res/values-bs/strings.xml
diff --git a/src/main/res/values-ca/strings.xml b/res/values-ca/strings.xml
similarity index 100%
rename from src/main/res/values-ca/strings.xml
rename to res/values-ca/strings.xml
diff --git a/src/main/res/values-cs/strings.xml b/res/values-cs/strings.xml
similarity index 100%
rename from src/main/res/values-cs/strings.xml
rename to res/values-cs/strings.xml
diff --git a/src/main/res/values-da/strings.xml b/res/values-da/strings.xml
similarity index 100%
rename from src/main/res/values-da/strings.xml
rename to res/values-da/strings.xml
diff --git a/src/main/res/values-de/strings.xml b/res/values-de/strings.xml
similarity index 100%
rename from src/main/res/values-de/strings.xml
rename to res/values-de/strings.xml
diff --git a/src/main/res/values-es/strings.xml b/res/values-es/strings.xml
similarity index 100%
rename from src/main/res/values-es/strings.xml
rename to res/values-es/strings.xml
diff --git a/src/main/res/values-fi/strings.xml b/res/values-fi/strings.xml
similarity index 100%
rename from src/main/res/values-fi/strings.xml
rename to res/values-fi/strings.xml
diff --git a/src/main/res/values-fr/strings.xml b/res/values-fr/strings.xml
similarity index 100%
rename from src/main/res/values-fr/strings.xml
rename to res/values-fr/strings.xml
diff --git a/src/main/res/values-hu/strings.xml b/res/values-hu/strings.xml
similarity index 100%
rename from src/main/res/values-hu/strings.xml
rename to res/values-hu/strings.xml
diff --git a/src/main/res/values-it/strings.xml b/res/values-it/strings.xml
similarity index 100%
rename from src/main/res/values-it/strings.xml
rename to res/values-it/strings.xml
diff --git a/src/main/res/values-ja/strings.xml b/res/values-ja/strings.xml
similarity index 100%
rename from src/main/res/values-ja/strings.xml
rename to res/values-ja/strings.xml
diff --git a/src/main/res/values-ko/strings.xml b/res/values-ko/strings.xml
similarity index 100%
rename from src/main/res/values-ko/strings.xml
rename to res/values-ko/strings.xml
diff --git a/src/main/res/values-lt/strings.xml b/res/values-lt/strings.xml
similarity index 100%
rename from src/main/res/values-lt/strings.xml
rename to res/values-lt/strings.xml
diff --git a/src/main/res/values-nl/strings.xml b/res/values-nl/strings.xml
similarity index 100%
rename from src/main/res/values-nl/strings.xml
rename to res/values-nl/strings.xml
diff --git a/src/main/res/values-pl/strings.xml b/res/values-pl/strings.xml
similarity index 100%
rename from src/main/res/values-pl/strings.xml
rename to res/values-pl/strings.xml
diff --git a/src/main/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
similarity index 100%
rename from src/main/res/values-pt-rBR/strings.xml
rename to res/values-pt-rBR/strings.xml
diff --git a/src/main/res/values-pt/strings.xml b/res/values-pt/strings.xml
similarity index 100%
rename from src/main/res/values-pt/strings.xml
rename to res/values-pt/strings.xml
diff --git a/src/main/res/values-ro/strings.xml b/res/values-ro/strings.xml
similarity index 100%
rename from src/main/res/values-ro/strings.xml
rename to res/values-ro/strings.xml
diff --git a/src/main/res/values-ru/strings.xml b/res/values-ru/strings.xml
similarity index 100%
rename from src/main/res/values-ru/strings.xml
rename to res/values-ru/strings.xml
diff --git a/src/main/res/values-sk/strings.xml b/res/values-sk/strings.xml
similarity index 100%
rename from src/main/res/values-sk/strings.xml
rename to res/values-sk/strings.xml
diff --git a/src/main/res/values-sv/strings.xml b/res/values-sv/strings.xml
similarity index 100%
rename from src/main/res/values-sv/strings.xml
rename to res/values-sv/strings.xml
diff --git a/src/main/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
similarity index 100%
rename from src/main/res/values-sw600dp/dimens.xml
rename to res/values-sw600dp/dimens.xml
diff --git a/src/main/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from src/main/res/values-sw720dp-land/dimens.xml
rename to res/values-sw720dp-land/dimens.xml
diff --git a/src/main/res/values-uk/strings.xml b/res/values-uk/strings.xml
similarity index 100%
rename from src/main/res/values-uk/strings.xml
rename to res/values-uk/strings.xml
diff --git a/src/main/res/values-v11/styles.xml b/res/values-v11/styles.xml
similarity index 100%
rename from src/main/res/values-v11/styles.xml
rename to res/values-v11/styles.xml
diff --git a/src/main/res/values-v11/themes_kitkatcompatselector.xml b/res/values-v11/themes_kitkatcompatselector.xml
similarity index 100%
rename from src/main/res/values-v11/themes_kitkatcompatselector.xml
rename to res/values-v11/themes_kitkatcompatselector.xml
diff --git a/src/main/res/values/attrs.xml b/res/values/attrs.xml
similarity index 100%
rename from src/main/res/values/attrs.xml
rename to res/values/attrs.xml
diff --git a/src/main/res/values/colors_kitkatcompatselector.xml b/res/values/colors_kitkatcompatselector.xml
similarity index 100%
rename from src/main/res/values/colors_kitkatcompatselector.xml
rename to res/values/colors_kitkatcompatselector.xml
diff --git a/src/main/res/values/dimens.xml b/res/values/dimens.xml
similarity index 100%
rename from src/main/res/values/dimens.xml
rename to res/values/dimens.xml
diff --git a/src/main/res/values/strings.xml b/res/values/strings.xml
similarity index 100%
rename from src/main/res/values/strings.xml
rename to res/values/strings.xml
diff --git a/src/main/res/values/styles.xml b/res/values/styles.xml
similarity index 100%
rename from src/main/res/values/styles.xml
rename to res/values/styles.xml
diff --git a/src/main/res/values/styles_kitkatcompatselector.xml b/res/values/styles_kitkatcompatselector.xml
similarity index 100%
rename from src/main/res/values/styles_kitkatcompatselector.xml
rename to res/values/styles_kitkatcompatselector.xml
diff --git a/src/main/res/values/themes_kitkatcompatselector.xml b/res/values/themes_kitkatcompatselector.xml
similarity index 100%
rename from src/main/res/values/themes_kitkatcompatselector.xml
rename to res/values/themes_kitkatcompatselector.xml
diff --git a/src/main/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
similarity index 100%
rename from src/main/res/xml/general_preferences.xml
rename to res/xml/general_preferences.xml
diff --git a/src/main/res/xml/plugin_mousepad_preferences.xml b/res/xml/plugin_mousepad_preferences.xml
similarity index 100%
rename from src/main/res/xml/plugin_mousepad_preferences.xml
rename to res/xml/plugin_mousepad_preferences.xml
diff --git a/src/main/res/xml/plugin_mpris_preferences.xml b/res/xml/plugin_mpris_preferences.xml
similarity index 100%
rename from src/main/res/xml/plugin_mpris_preferences.xml
rename to res/xml/plugin_mpris_preferences.xml
diff --git a/src/main/res/xml/plugin_share_preferences.xml b/res/xml/plugin_share_preferences.xml
similarity index 100%
rename from src/main/res/xml/plugin_share_preferences.xml
rename to res/xml/plugin_share_preferences.xml
diff --git a/src/main/java/org/kde/kdeconnect/Backends/BaseLink.java b/src/org/kde/kdeconnect/Backends/BaseLink.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Backends/BaseLink.java
rename to src/org/kde/kdeconnect/Backends/BaseLink.java
diff --git a/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java
rename to src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
diff --git a/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
rename to src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
diff --git a/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
rename to src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
diff --git a/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
rename to src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
diff --git a/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
rename to src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java
diff --git a/src/main/java/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/BackgroundService.java
rename to src/org/kde/kdeconnect/BackgroundService.java
diff --git a/src/main/java/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Device.java
rename to src/org/kde/kdeconnect/Device.java
diff --git a/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java b/src/org/kde/kdeconnect/Helpers/AppsHelper.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java
rename to src/org/kde/kdeconnect/Helpers/AppsHelper.java
diff --git a/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java b/src/org/kde/kdeconnect/Helpers/ContactsHelper.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java
rename to src/org/kde/kdeconnect/Helpers/ContactsHelper.java
diff --git a/src/main/java/org/kde/kdeconnect/Helpers/DeviceHelper.java b/src/org/kde/kdeconnect/Helpers/DeviceHelper.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Helpers/DeviceHelper.java
rename to src/org/kde/kdeconnect/Helpers/DeviceHelper.java
diff --git a/src/main/java/org/kde/kdeconnect/Helpers/FilesHelper.java b/src/org/kde/kdeconnect/Helpers/FilesHelper.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Helpers/FilesHelper.java
rename to src/org/kde/kdeconnect/Helpers/FilesHelper.java
diff --git a/src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java b/src/org/kde/kdeconnect/Helpers/ImagesHelper.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java
rename to src/org/kde/kdeconnect/Helpers/ImagesHelper.java
diff --git a/src/main/java/org/kde/kdeconnect/Helpers/StorageHelper.java b/src/org/kde/kdeconnect/Helpers/StorageHelper.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Helpers/StorageHelper.java
rename to src/org/kde/kdeconnect/Helpers/StorageHelper.java
diff --git a/src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java b/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
rename to src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
diff --git a/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/src/org/kde/kdeconnect/NetworkPackage.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/NetworkPackage.java
rename to src/org/kde/kdeconnect/NetworkPackage.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java b/src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
rename to src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
rename to src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
rename to src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
rename to src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
rename to src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java
rename to src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java
rename to src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
rename to src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
rename to src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
rename to src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
rename to src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java b/src/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
rename to src/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/Plugin.java b/src/org/kde/kdeconnect/Plugins/Plugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/Plugin.java
rename to src/org/kde/kdeconnect/Plugins/Plugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java
rename to src/org/kde/kdeconnect/Plugins/PluginFactory.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/SftpPlugin/SftpImpl.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpImpl.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/SftpPlugin/SftpImpl.java
rename to src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpImpl.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
rename to src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
rename to src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java b/src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
rename to src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
rename to src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java b/src/org/kde/kdeconnect/UserInterface/DeviceActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
rename to src/org/kde/kdeconnect/UserInterface/DeviceActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java b/src/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/ButtonItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/CustomItem.java b/src/org/kde/kdeconnect/UserInterface/List/CustomItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/CustomItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/CustomItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java b/src/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/DeviceItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java b/src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java b/src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
rename to src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java b/src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java b/src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/TextItem.java b/src/org/kde/kdeconnect/UserInterface/List/TextItem.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/List/TextItem.java
rename to src/org/kde/kdeconnect/UserInterface/List/TextItem.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
rename to src/org/kde/kdeconnect/UserInterface/MainActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java b/src/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java
rename to src/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java b/src/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java
rename to src/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java b/src/org/kde/kdeconnect/UserInterface/PairActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java
rename to src/org/kde/kdeconnect/UserInterface/PairActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java
rename to src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java b/src/org/kde/kdeconnect/UserInterface/SettingsActivity.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java
rename to src/org/kde/kdeconnect/UserInterface/SettingsActivity.java
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java b/src/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
similarity index 100%
rename from src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
rename to src/org/kde/kdeconnect/UserInterface/ShareToReceiver.java