diff --git a/src_android/jni/Android.mk b/src/android/jni/Android.mk
similarity index 79%
rename from src_android/jni/Android.mk
rename to src/android/jni/Android.mk
index 20073760..0325d1f5 100644
--- a/src_android/jni/Android.mk
+++ b/src/android/jni/Android.mk
@@ -37,22 +37,22 @@ LOCAL_MODULE     := raylib
 
 # Module source files
 LOCAL_SRC_FILES  :=\
-                    ../../src/core.c \
-                    ../../src/rlgl.c \
-                    ../../src/textures.c \
-                    ../../src/text.c \
-                    ../../src/shapes.c \
-                    ../../src/gestures.c \
-                    ../../src/models.c \
-                    ../../src/utils.c \
-                    ../../src/audio.c \
-                    ../../src/stb_vorbis.c \
+                    ../../core.c \
+                    ../../rlgl.c \
+                    ../../textures.c \
+                    ../../text.c \
+                    ../../shapes.c \
+                    ../../gestures.c \
+                    ../../models.c \
+                    ../../utils.c \
+                    ../../audio.c \
+                    ../../stb_vorbis.c \
 
 # Required includes paths (.h)
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../../src
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../..
 
 # Required flags for compilation: defines PLATFORM_ANDROID and GRAPHICS_API_OPENGL_ES2
-LOCAL_CFLAGS     := -Wall -std=c99 -g -DPLATFORM_ANDROID -DGRAPHICS_API_OPENGL_ES2
+LOCAL_CFLAGS     := -Wall -std=c99 -Wno-missing-braces -g -DPLATFORM_ANDROID -DGRAPHICS_API_OPENGL_ES2
 
 # Build the static library libraylib.a
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src_android/jni/Application.mk b/src/android/jni/Application.mk
similarity index 100%
rename from src_android/jni/Application.mk
rename to src/android/jni/Application.mk
diff --git a/src_android/jni/include/AL/al.h b/src/android/jni/include/AL/al.h
similarity index 100%
rename from src_android/jni/include/AL/al.h
rename to src/android/jni/include/AL/al.h
diff --git a/src_android/jni/include/AL/alc.h b/src/android/jni/include/AL/alc.h
similarity index 100%
rename from src_android/jni/include/AL/alc.h
rename to src/android/jni/include/AL/alc.h
diff --git a/src_android/jni/include/AL/alext.h b/src/android/jni/include/AL/alext.h
similarity index 100%
rename from src_android/jni/include/AL/alext.h
rename to src/android/jni/include/AL/alext.h
diff --git a/src_android/jni/include/AL/efx-creative.h b/src/android/jni/include/AL/efx-creative.h
similarity index 100%
rename from src_android/jni/include/AL/efx-creative.h
rename to src/android/jni/include/AL/efx-creative.h
diff --git a/src_android/jni/include/AL/efx.h b/src/android/jni/include/AL/efx.h
similarity index 100%
rename from src_android/jni/include/AL/efx.h
rename to src/android/jni/include/AL/efx.h
diff --git a/src_android/jni/include/AL/oalMacOSX_OALExtensions.h b/src/android/jni/include/AL/oalMacOSX_OALExtensions.h
similarity index 100%
rename from src_android/jni/include/AL/oalMacOSX_OALExtensions.h
rename to src/android/jni/include/AL/oalMacOSX_OALExtensions.h
diff --git a/src_android/jni/include/AL/oalStaticBufferExtension.h b/src/android/jni/include/AL/oalStaticBufferExtension.h
similarity index 100%
rename from src_android/jni/include/AL/oalStaticBufferExtension.h
rename to src/android/jni/include/AL/oalStaticBufferExtension.h
diff --git a/src_android/jni/include/android_native_app_glue.h b/src/android/jni/include/android_native_app_glue.h
similarity index 100%
rename from src_android/jni/include/android_native_app_glue.h
rename to src/android/jni/include/android_native_app_glue.h
diff --git a/src_android/AndroidManifest.xml b/src_android/AndroidManifest.xml
deleted file mode 100644
index 8a940b24..00000000
--- a/src_android/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*   raylib Android
-*
-*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
-*
-*   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
-*
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-        package="com.raysan5.raylib" 
-        android:versionCode="1" 
-        android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    
-    <application android:label="@string/app_name" android:icon="@drawable/icon" >
-        <activity android:name="raylib" android:label="@string/app_name">
-                <!--android:screenOrientation="landscape" //Set at runtime -->
-            <meta-data android:name="android.app.lib_name" android:value="@string/app_name" />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    
-</manifest>
\ No newline at end of file
diff --git a/src_android/build.xml b/src_android/build.xml
deleted file mode 100644
index 80c17dd9..00000000
--- a/src_android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="raylib" 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/src_android/proguard-project.txt b/src_android/proguard-project.txt
deleted file mode 100644
index f2fe1559..00000000
--- a/src_android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# 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/src_android/project.properties b/src_android/project.properties
deleted file mode 100644
index 4ab12569..00000000
--- a/src_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-19
diff --git a/src_android/res/drawable-hdpi/icon.png b/src_android/res/drawable-hdpi/icon.png
deleted file mode 100644
index 34a6155e..00000000
Binary files a/src_android/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/src_android/res/drawable-ldpi/icon.png b/src_android/res/drawable-ldpi/icon.png
deleted file mode 100644
index cc72255f..00000000
Binary files a/src_android/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/src_android/res/drawable-mdpi/icon.png b/src_android/res/drawable-mdpi/icon.png
deleted file mode 100644
index 72713a97..00000000
Binary files a/src_android/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/src_android/res/values/strings.xml b/src_android/res/values/strings.xml
deleted file mode 100644
index 32fbdda2..00000000
--- a/src_android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">raylib</string>
-</resources>