Project refactor because Android Studio was not able to open it

For some reason it was not detecting the directory as an Android project
Android Build Tools version increased from 18.0.1 to 18.1

.gitignore

@@ -1,4 +1,7 @@
 local.properties
-.gradle
-.idea
-out
+.gradle/
+.idea/
+out/
+build/
+target/
+classes/

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>
-

KdeConnect/.gitignore

@@ -1 +0,0 @@
-build/

KdeConnect/build.gradle

@@ -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
-    }
-}

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
 }
 
 

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
+    }
+}

kdeconnect-android.iml

@@ -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>
-

settings.gradle

@@ -1 +0,0 @@
-include ':KdeConnect'

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

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;

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"

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"