diff --git a/Source/Android/.classpath b/Source/Android/.classpath
deleted file mode 100644
index d3bb07b44c..0000000000
--- a/Source/Android/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/Source/Android/.gitignore b/Source/Android/.gitignore
index 22225534d3..78ddc4f68d 100644
--- a/Source/Android/.gitignore
+++ b/Source/Android/.gitignore
@@ -15,7 +15,7 @@
 /obj/
 
 # Copied by cmake
-/assets/
+*/*/*/assets/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -37,3 +37,6 @@ tasks.xml
 .gradle/*
 .idea
 gradle/
+build/
+*.so
+*.iml
\ No newline at end of file
diff --git a/Source/Android/.project b/Source/Android/.project
deleted file mode 100644
index b4a12698bf..0000000000
--- a/Source/Android/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>dolphinemulator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/Source/Android/.settings/org.eclipse.jdt.core.prefs b/Source/Android/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2ddc8..0000000000
--- a/Source/Android/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/Source/Android/app/.gitignore b/Source/Android/app/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/Source/Android/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
new file mode 100644
index 0000000000..03a24f4f19
--- /dev/null
+++ b/Source/Android/app/build.gradle
@@ -0,0 +1,67 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+	buildToolsVersion "20.0.0"
+
+    task nativeLibsToJar(type: Zip, description: 'create a jar archive of the native libs') {
+        destinationDir file("$buildDir/native-libs")
+        baseName 'native-libs'
+        extension 'jar'
+        from fileTree(dir: 'libs', include: '**/*.so')
+        into 'lib/'
+    }
+
+    tasks.withType(JavaCompile) {
+        compileTask -> compileTask.dependsOn(nativeLibsToJar)
+    }
+
+    lintOptions {
+        // This is important as it will run lint but not abort on error
+        // Lint has some overly obnoxious "errors" that should really be warnings
+        abortOnError false
+    }
+
+    defaultConfig {
+        applicationId "org.dolphinemu.dolphinemu"
+        minSdkVersion 18
+        targetSdkVersion 21
+        versionCode 13
+        versionName "0.13"
+    }
+
+
+    signingConfigs {
+        release {
+            if (project.hasProperty('keystore')) {
+                storeFile file(project.property('keystore'))
+                storePassword project.property('storepass')
+                keyAlias project.property('keyalias')
+                keyPassword project.property('keypass')
+            }
+        }
+    }
+
+    buildTypes {
+        // Signed by release key, allowing for upload to Play Store.
+        release {
+            signingConfig signingConfigs.release
+        }
+
+        // Signed by debug key disallowing distribution on Play Store.
+        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
+        debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix '-debug'
+            jniDebuggable true
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+	compile fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
+
+	compile 'com.android.support:support-v4:22.0.0'
+	compile 'com.android.support:support-v13:22.0.0'
+}
diff --git a/Source/Android/app/proguard-rules.pro b/Source/Android/app/proguard-rules.pro
new file mode 100644
index 0000000000..52592ad511
--- /dev/null
+++ b/Source/Android/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/sigma/apps/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
new file mode 100644
index 0000000000..cf1848ddd5
--- /dev/null
+++ b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
@@ -0,0 +1,13 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
similarity index 83%
rename from Source/Android/AndroidManifest.xml
rename to Source/Android/app/src/main/AndroidManifest.xml
index fa314456c7..5187f65691 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.dolphinemu.dolphinemu"
-    android:versionCode="13"
-    android:versionName="0.13"
-    android:installLocation="auto">
-
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="21" />
+          package="org.dolphinemu.dolphinemu">
 
     <uses-feature android:glEsVersion="0x00030000" />
 
-    <uses-feature android:name="android.hardware.screen.landscape" />
-
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -27,7 +17,7 @@
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Holo.Light" >
 
-            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen.-->
+            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -57,3 +47,4 @@
     </application>
 
 </manifest>
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/AssetCopyService.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/AssetCopyService.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/AboutActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/AboutActivity.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/AboutActivity.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/AboutActivity.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/AboutFragmentItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/AboutFragmentItem.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/AboutFragmentItem.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/AboutFragmentItem.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/AboutInfoFragmentAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/AboutInfoFragmentAdapter.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/AboutInfoFragmentAdapter.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/AboutInfoFragmentAdapter.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/CPUInfoFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/CPUInfoFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/CPUInfoFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/CPUInfoFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/DolphinInfoFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/DolphinInfoFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/DolphinInfoFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/DolphinInfoFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/GLES2InfoFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/GLES2InfoFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/GLES2InfoFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/GLES2InfoFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/GLES3InfoFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/GLES3InfoFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/GLES3InfoFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/GLES3InfoFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/GLInfoFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/GLInfoFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/GLInfoFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/GLInfoFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/about/Limit.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/Limit.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/about/Limit.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/about/Limit.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableButton.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableButton.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableButton.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/UserPreferences.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/UserPreferences.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/custom/UpdatingListPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/custom/UpdatingListPreference.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/custom/UpdatingListPreference.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/custom/UpdatingListPreference.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputBindingPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/InputBindingPreference.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputBindingPreference.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/InputBindingPreference.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/MotionAlertDialog.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/input/MotionAlertDialog.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/MotionAlertDialog.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigActivity.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigActivity.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigActivity.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/utils/CPUHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CPUHelper.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/utils/CPUHelper.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CPUHelper.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/utils/EGLHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/utils/EGLHelper.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SliderPreference.java
similarity index 100%
rename from Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SliderPreference.java
diff --git a/Source/Android/res/drawable-hdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_a.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_a.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_a_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_a_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_b.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_b.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_b_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_b_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_c.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_c.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_c_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_c_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_down.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_down.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_down.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downright.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_downright.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downright.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_left.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_left.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_left.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_right.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_right.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_right.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_up.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_up.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_up.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_upright.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_dpad_upright.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_upright.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_joystick.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_joystick_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_range.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_joystick_range.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_range.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_l.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_l.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_l_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_l_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_r.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_r.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_r_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_r_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_start.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_start.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_start_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_start_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_x.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_x.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_x_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_x_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_y.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_y.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_y_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_y_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_z.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_z.png
diff --git a/Source/Android/res/drawable-hdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/gcpad_z_pressed.png
rename to Source/Android/app/src/main/res/drawable-hdpi/gcpad_z_pressed.png
diff --git a/Source/Android/res/drawable-hdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/ic_drawer.png
rename to Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/Source/Android/res/drawable-hdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/ic_launcher.png
rename to Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/ic_menu_file.png
rename to Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png
similarity index 100%
rename from Source/Android/res/drawable-hdpi/ic_menu_folder.png
rename to Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_a.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_a.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_a_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_a_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_b.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_b.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_b_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_b_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_c.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_c.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_c_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_c_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_down.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_down.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_down.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downright.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_downright.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downright.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_left.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_left.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_left.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_right.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_right.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_right.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_up.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_up.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_up.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_upright.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_dpad_upright.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_upright.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_joystick.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_joystick_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_range.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_joystick_range.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_range.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_l.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_l.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_l_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_l_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_r.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_r.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_r_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_r_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_start.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_start.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_start_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_start_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_x.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_x.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_x_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_x_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_y.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_y.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_y_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_y_pressed.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_z.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_z.png
diff --git a/Source/Android/res/drawable-ldpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-ldpi/gcpad_z_pressed.png
rename to Source/Android/app/src/main/res/drawable-ldpi/gcpad_z_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_a.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_a.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_a_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_a_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_b.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_b.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_b_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_b_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_c.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_c.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_c_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_c_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_down.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_down.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_down.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downright.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_downright.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downright.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_left.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_left.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_left.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_right.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_right.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_right.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_up.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_up.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_up.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_upright.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_dpad_upright.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_upright.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_joystick.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_joystick_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_range.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_joystick_range.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_range.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_l.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_l.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_l_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_l_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_r.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_r.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_r_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_r_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_start.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_start.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_start_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_start_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_x.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_x.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_x_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_x_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_y.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_y.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_y_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_y_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_z.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_z.png
diff --git a/Source/Android/res/drawable-mdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/gcpad_z_pressed.png
rename to Source/Android/app/src/main/res/drawable-mdpi/gcpad_z_pressed.png
diff --git a/Source/Android/res/drawable-mdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/ic_drawer.png
rename to Source/Android/app/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/Source/Android/res/drawable-mdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/ic_launcher.png
rename to Source/Android/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_file.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/ic_menu_file.png
rename to Source/Android/app/src/main/res/drawable-mdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_folder.png
similarity index 100%
rename from Source/Android/res/drawable-mdpi/ic_menu_folder.png
rename to Source/Android/app/src/main/res/drawable-mdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_a.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_a_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_b.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_b_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_c.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_c_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_down.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_down.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_down.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_left.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_left.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_left.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_right.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_right.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_right.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_up.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_up.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_up.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_upright.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_dpad_upright.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_upright.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_joystick.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_joystick_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_range.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_joystick_range.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_range.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_l.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_l_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_r.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_r_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_start.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_start_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_x.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_x_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_y.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_y_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_z.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z.png
diff --git a/Source/Android/res/drawable-xhdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/gcpad_z_pressed.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z_pressed.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/ic_drawer.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/ic_launcher.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/ic_menu_file.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png
similarity index 100%
rename from Source/Android/res/drawable-xhdpi/ic_menu_folder.png
rename to Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_a.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_a_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_b.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_b_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_c.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_c_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_upright.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_dpad_upright.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_upright.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_joystick.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_joystick_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_range.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_joystick_range.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_range.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_l.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_l_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_r.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_r_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_start.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_start_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_x.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_x_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_y.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_y_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_z.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z.png
diff --git a/Source/Android/res/drawable-xxhdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/gcpad_z_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z_pressed.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/ic_drawer.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/ic_launcher.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/ic_menu_file.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png
similarity index 100%
rename from Source/Android/res/drawable-xxhdpi/ic_menu_folder.png
rename to Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_a.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_a_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_b.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_b_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_c.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_c_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_upright.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_dpad_upright.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_upright.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_joystick.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_joystick_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_range.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_joystick_range.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_range.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_l.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_l_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_r.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_r_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_start.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_start_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_x.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_x_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_y.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_y_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y_pressed.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_z.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z.png
diff --git a/Source/Android/res/drawable-xxxhdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z_pressed.png
similarity index 100%
rename from Source/Android/res/drawable-xxxhdpi/gcpad_z_pressed.png
rename to Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z_pressed.png
diff --git a/Source/Android/res/drawable/no_banner.png b/Source/Android/app/src/main/res/drawable/no_banner.png
similarity index 100%
rename from Source/Android/res/drawable/no_banner.png
rename to Source/Android/app/src/main/res/drawable/no_banner.png
diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/app/src/main/res/layout/about_layout.xml
similarity index 100%
rename from Source/Android/res/layout/about_layout.xml
rename to Source/Android/app/src/main/res/layout/about_layout.xml
diff --git a/Source/Android/res/layout/emulation_view.xml b/Source/Android/app/src/main/res/layout/emulation_view.xml
similarity index 100%
rename from Source/Android/res/layout/emulation_view.xml
rename to Source/Android/app/src/main/res/layout/emulation_view.xml
diff --git a/Source/Android/res/layout/folderbrowser_list_item.xml b/Source/Android/app/src/main/res/layout/folderbrowser_list_item.xml
similarity index 100%
rename from Source/Android/res/layout/folderbrowser_list_item.xml
rename to Source/Android/app/src/main/res/layout/folderbrowser_list_item.xml
diff --git a/Source/Android/res/layout/folderbrowser_listview.xml b/Source/Android/app/src/main/res/layout/folderbrowser_listview.xml
similarity index 100%
rename from Source/Android/res/layout/folderbrowser_listview.xml
rename to Source/Android/app/src/main/res/layout/folderbrowser_listview.xml
diff --git a/Source/Android/res/layout/gamelist_activity.xml b/Source/Android/app/src/main/res/layout/gamelist_activity.xml
similarity index 100%
rename from Source/Android/res/layout/gamelist_activity.xml
rename to Source/Android/app/src/main/res/layout/gamelist_activity.xml
diff --git a/Source/Android/res/layout/gamelist_list_item.xml b/Source/Android/app/src/main/res/layout/gamelist_list_item.xml
similarity index 100%
rename from Source/Android/res/layout/gamelist_list_item.xml
rename to Source/Android/app/src/main/res/layout/gamelist_list_item.xml
diff --git a/Source/Android/res/layout/gamelist_listview.xml b/Source/Android/app/src/main/res/layout/gamelist_listview.xml
similarity index 100%
rename from Source/Android/res/layout/gamelist_listview.xml
rename to Source/Android/app/src/main/res/layout/gamelist_listview.xml
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/app/src/main/res/layout/sidemenu.xml
similarity index 100%
rename from Source/Android/res/layout/sidemenu.xml
rename to Source/Android/app/src/main/res/layout/sidemenu.xml
diff --git a/Source/Android/res/layout/slider_layout.xml b/Source/Android/app/src/main/res/layout/slider_layout.xml
similarity index 100%
rename from Source/Android/res/layout/slider_layout.xml
rename to Source/Android/app/src/main/res/layout/slider_layout.xml
diff --git a/Source/Android/res/layout/viewpager.xml b/Source/Android/app/src/main/res/layout/viewpager.xml
similarity index 100%
rename from Source/Android/res/layout/viewpager.xml
rename to Source/Android/app/src/main/res/layout/viewpager.xml
diff --git a/Source/Android/res/menu/emuwindow_overlay.xml b/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml
similarity index 100%
rename from Source/Android/res/menu/emuwindow_overlay.xml
rename to Source/Android/app/src/main/res/menu/emuwindow_overlay.xml
diff --git a/Source/Android/res/menu/gamelist_menu.xml b/Source/Android/app/src/main/res/menu/gamelist_menu.xml
similarity index 100%
rename from Source/Android/res/menu/gamelist_menu.xml
rename to Source/Android/app/src/main/res/menu/gamelist_menu.xml
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from Source/Android/res/values-ja/strings.xml
rename to Source/Android/app/src/main/res/values-ja/strings.xml
diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
similarity index 100%
rename from Source/Android/res/values/arrays.xml
rename to Source/Android/app/src/main/res/values/arrays.xml
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
similarity index 100%
rename from Source/Android/res/values/strings.xml
rename to Source/Android/app/src/main/res/values/strings.xml
diff --git a/Source/Android/res/xml/cpu_prefs.xml b/Source/Android/app/src/main/res/xml/cpu_prefs.xml
similarity index 100%
rename from Source/Android/res/xml/cpu_prefs.xml
rename to Source/Android/app/src/main/res/xml/cpu_prefs.xml
diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/app/src/main/res/xml/input_prefs.xml
similarity index 100%
rename from Source/Android/res/xml/input_prefs.xml
rename to Source/Android/app/src/main/res/xml/input_prefs.xml
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/app/src/main/res/xml/video_prefs.xml
similarity index 100%
rename from Source/Android/res/xml/video_prefs.xml
rename to Source/Android/app/src/main/res/xml/video_prefs.xml
diff --git a/Source/Android/assets/GCPadNew.ini b/Source/Android/assets/GCPadNew.ini
deleted file mode 100644
index 41163e087e..0000000000
--- a/Source/Android/assets/GCPadNew.ini
+++ /dev/null
@@ -1,104 +0,0 @@
-[GCPad1]
-Device = Android/0/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-[GCPad2]
-Device = Android/1/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-[GCPad3]
-Device = Android/2/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-[GCPad4]
-Device = Android/3/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle
index 449862aaf8..e553a87d2e 100644
--- a/Source/Android/build.gradle
+++ b/Source/Android/build.gradle
@@ -1,87 +1,19 @@
+// 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:1.0.0+'
-	}
-}
-apply plugin: 'android'
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.0'
 
-dependencies {
-	compile fileTree(dir: 'libs', include: '*.jar')
-	compile fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
 }
 
-android {
-	compileSdkVersion 19
-	buildToolsVersion "20.0.0"
-
-	task nativeLibsToJar(type: Zip, description: 'create a jar archive of the native libs') {
-		destinationDir file("$buildDir/native-libs")
-		baseName 'native-libs'
-		extension 'jar'
-		from fileTree(dir: 'libs', include: '**/*.so')
-		into 'lib/'
-	}
-
-	tasks.withType(JavaCompile) {
-		compileTask -> compileTask.dependsOn(nativeLibsToJar)
-	}
-
-	lintOptions {
-		// This is important as it will run lint but not abort on error
-		// Lint has some overly obnoxious "errors" that should really be warnings
-		abortOnError false
-	}
-
-	sourceSets {
-		main {
-			manifest.srcFile 'AndroidManifest.xml'
-			java.srcDirs = ['src']
-			resources.srcDirs = ['src']
-			aidl.srcDirs = ['src']
-			renderscript.srcDirs = ['src']
-			res.srcDirs = ['res']
-			assets.srcDirs = ['assets']
-		}
-
-		// Move the tests to tests/java, tests/res, etc...
-		instrumentTest.setRoot('tests')
-
-		// Move the build types to build-types/<type>
-		// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
-		// This moves them out of them default location under src/<type>/... which would
-		// conflict with src/ being used by the main source set.
-		// Adding new build types or product flavors should be accompanied
-		// by a similar customization.
-		debug.setRoot('build-types/debug')
-		release.setRoot('build-types/release')
-	}
-
-	signingConfigs {
-		release {
-			if (project.hasProperty('keystore')) {
-				storeFile file(project.property('keystore'))
-				storePassword project.property('storepass')
-				keyAlias project.property('keyalias')
-				keyPassword project.property('keypass')
-			}
-		}
-	}
-
-	buildTypes {
-		// Signed by release key, allowing for upload to Play Store.
-		release {
-			signingConfig signingConfigs.release
-		}
-
-		// Signed by debug key disallowing distribution on Play Store.
-		// Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
-		debug {
-			applicationIdSuffix ".debug"
-			versionNameSuffix '-debug'
-			jniDebuggable true
-		}
-	}
+allprojects {
+    repositories {
+        jcenter()
+    }
 }
diff --git a/Source/Android/build.xml b/Source/Android/build.xml
deleted file mode 100644
index dc36e5c45a..0000000000
--- a/Source/Android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Dolphin Emulator" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/Source/Android/custom_rules.xml b/Source/Android/custom_rules.xml
deleted file mode 100644
index c19d48e25f..0000000000
--- a/Source/Android/custom_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Dolphin" default="help">
-    <property name="ndkbuildopt" value=""/>
-    <target name="-pre-build">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg line="-j4 ${ndkbuildopt}"/>
-        </exec>
-	<copy todir="${jar.libs.dir}/armeabi-v7a">
-		<fileset
-			dir="../../libs/armeabi-v7a"
-			includes="libmain.so" />
-	</copy>
-    </target>
-    <target name="clean" depends="android_rules.clean">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg value="clean"/>
-        </exec>
-    </target>
-</project>
diff --git a/Source/Android/gradle.properties b/Source/Android/gradle.properties
new file mode 100644
index 0000000000..1d3591c8a4
--- /dev/null
+++ b/Source/Android/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/Source/Android/gradlew b/Source/Android/gradlew
new file mode 100755
index 0000000000..91a7e269e1
--- /dev/null
+++ b/Source/Android/gradlew
@@ -0,0 +1,164 @@
+#!/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/Source/Android/gradlew.bat b/Source/Android/gradlew.bat
new file mode 100644
index 0000000000..aec99730b4
--- /dev/null
+++ b/Source/Android/gradlew.bat
@@ -0,0 +1,90 @@
+@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/Source/Android/jni/Android.mk b/Source/Android/jni/Android.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Source/Android/jni/Application.mk b/Source/Android/jni/Application.mk
deleted file mode 100644
index 5941ec944e..0000000000
--- a/Source/Android/jni/Application.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-APP_STL := stlport_static
-APP_ABI := armeabi-v7a 
-
-#APP_ABI := armeabi-v7a
diff --git a/Source/Android/libs/android-support-v13.jar b/Source/Android/libs/android-support-v13.jar
deleted file mode 100644
index e75351a507..0000000000
Binary files a/Source/Android/libs/android-support-v13.jar and /dev/null differ
diff --git a/Source/Android/project.properties b/Source/Android/project.properties
deleted file mode 100644
index ce39f2d0a0..0000000000
--- a/Source/Android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-18
diff --git a/Source/Android/settings.gradle b/Source/Android/settings.gradle
new file mode 100644
index 0000000000..e7b4def49c
--- /dev/null
+++ b/Source/Android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 5e9ea11c96..ab8b5db4cd 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -117,16 +117,19 @@ if(ANDROID)
 	"-Wl,--no-whole-archive"
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/${ANDROID_NDK_ABI_NAME}
+		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/libs/${ANDROID_NDK_ABI_NAME}
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/${ANDROID_NDK_ABI_NAME}/
+		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
+		COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/app/libs/${ANDROID_NDK_ABI_NAME}/
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Shaders ${CMAKE_SOURCE_DIR}/Source/Android/assets/
+		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
+	)
+	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+		COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Shaders ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
 	)
 
 	set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})