diff --git a/android/gen/stub.txt b/android/gen/stub.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
deleted file mode 100644
index acc182a206..0000000000
--- a/android/jni/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-RARCH_VERSION		= "0.9.7"
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-APP_OPTIM := debug
-
-LOCAL_MODULE    := retroarch
-LOCAL_SRC_FILES    =	../../retroarch.c \
-			../../file.c \
-			../../file_path.c \
-			../../hash.c \
-			../../driver.c \
-			../../settings.c \
-			../../dynamic.c \
-			../../message.c \
-			../../rewind.c \
-			../../gfx/gfx_common.c \
-			../../input/input_common.c \
-			../../patch.c \
-			../../fifo_buffer.c \
-			../../compat/compat.c \
-			../../audio/null.c \
-			../../audio/utils.c \
-			../../audio/hermite.c \
-			../../gfx/null.c \
-			../../gfx/gl.c \
-			../../gfx/scaler/scaler.c \
-			../../gfx/scaler/pixconv.c \
-			../../gfx/scaler/scaler_int.c \
-			../../gfx/scaler/filter.c \
-			../../gfx/gfx_context.c \
-			../../gfx/context/androidegl_ctx.c \
-			../../gfx/math/matrix.c \
-			../../gfx/shader_glsl.c \
-			../../gfx/fonts/null_fonts.c \
-			../../gfx/state_tracker.c \
-			../../input/null.c \
-			../../screenshot.c \
-			../../conf/config_file.c \
-			../../autosave.c \
-			../../thread.c \
-			../../console/rzlib/rzlib.c \
-			main.c
-
-LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
-
-LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz
-LOCAL_STATIC_LIBRARIES := android_native_app_glue
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/native_app_glue)
diff --git a/android/.classpath b/android/native/.classpath
similarity index 100%
rename from android/.classpath
rename to android/native/.classpath
diff --git a/android/native/.project b/android/native/.project
new file mode 100644
index 0000000000..eea71ff970
--- /dev/null
+++ b/android/native/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android.app.NativeActivity</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/android/native/AndroidManifest.xml b/android/native/AndroidManifest.xml
new file mode 100644
index 0000000000..2a8e6b51ad
--- /dev/null
+++ b/android/native/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.retroarch.retroarch"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <!-- This is the platform API where NativeActivity was introduced. -->
+    <uses-sdk android:minSdkVersion="9" />
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application android:label="@string/app_name" android:hasCode="false">
+
+        <!-- Our activity is the built-in NativeActivity framework class.
+             This will take care of integrating with our NDK code. -->
+        <activity android:name="android.app.NativeActivity"
+                android:label="@string/app_name"
+                android:configChanges="orientation|keyboardHidden">
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data android:name="android.app.lib_name"
+                    android:value="retroarch" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest> 
+<!-- END_INCLUDE(manifest) -->
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
new file mode 100644
index 0000000000..d6c43fe68a
--- /dev/null
+++ b/android/native/jni/Android.mk
@@ -0,0 +1,54 @@
+RARCH_VERSION		= "0.9.7"
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+APP_OPTIM := debug
+
+LOCAL_MODULE    := retroarch
+
+RARCH_PATH  := ../../..
+LOCAL_SRC_FILES    =	$(RARCH_PATH)/retroarch.c \
+			$(RARCH_PATH)/file.c \
+			$(RARCH_PATH)/file_path.c \
+			$(RARCH_PATH)/hash.c \
+			$(RARCH_PATH)/driver.c \
+			$(RARCH_PATH)/settings.c \
+			$(RARCH_PATH)/dynamic.c \
+			$(RARCH_PATH)/message.c \
+			$(RARCH_PATH)/rewind.c \
+			$(RARCH_PATH)/gfx/gfx_common.c \
+			$(RARCH_PATH)/input/input_common.c \
+			$(RARCH_PATH)/patch.c \
+			$(RARCH_PATH)/fifo_buffer.c \
+			$(RARCH_PATH)/compat/compat.c \
+			$(RARCH_PATH)/audio/null.c \
+			$(RARCH_PATH)/audio/utils.c \
+			$(RARCH_PATH)/audio/hermite.c \
+			$(RARCH_PATH)/gfx/null.c \
+			$(RARCH_PATH)/gfx/gl.c \
+			$(RARCH_PATH)/gfx/scaler/scaler.c \
+			$(RARCH_PATH)/gfx/scaler/pixconv.c \
+			$(RARCH_PATH)/gfx/scaler/scaler_int.c \
+			$(RARCH_PATH)/gfx/scaler/filter.c \
+			$(RARCH_PATH)/gfx/gfx_context.c \
+			$(RARCH_PATH)/gfx/context/androidegl_ctx.c \
+			$(RARCH_PATH)/gfx/math/matrix.c \
+			$(RARCH_PATH)/gfx/shader_glsl.c \
+			$(RARCH_PATH)/gfx/fonts/null_fonts.c \
+			$(RARCH_PATH)/gfx/state_tracker.c \
+			$(RARCH_PATH)/input/null.c \
+			$(RARCH_PATH)/screenshot.c \
+			$(RARCH_PATH)/conf/config_file.c \
+			$(RARCH_PATH)/autosave.c \
+			$(RARCH_PATH)/thread.c \
+			main.c
+
+LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
+
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz
+LOCAL_STATIC_LIBRARIES := android_native_app_glue
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,android/native_app_glue)
diff --git a/android/native/jni/Application.mk b/android/native/jni/Application.mk
new file mode 100644
index 0000000000..22d188e595
--- /dev/null
+++ b/android/native/jni/Application.mk
@@ -0,0 +1 @@
+APP_PLATFORM := android-9
diff --git a/android/jni/main.c b/android/native/jni/main.c
similarity index 99%
rename from android/jni/main.c
rename to android/native/jni/main.c
index 75391de305..1bcbba0077 100644
--- a/android/jni/main.c
+++ b/android/native/jni/main.c
@@ -25,7 +25,7 @@
 #include <android/log.h>
 #include <android_native_app_glue.h>
 
-#include "../../general.h"
+#include "../../../general.h"
 
 JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt)
 {
diff --git a/android/native/res/drawable-hdpi/ic_launcher.png b/android/native/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..d75e77d251
Binary files /dev/null and b/android/native/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android/native/res/drawable-ldpi/ic_launcher.png b/android/native/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000..320c2a408e
Binary files /dev/null and b/android/native/res/drawable-ldpi/ic_launcher.png differ
diff --git a/android/native/res/drawable-mdpi/ic_launcher.png b/android/native/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..c3a2cd0848
Binary files /dev/null and b/android/native/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android/native/res/drawable-xhdpi/ic_launcher.png b/android/native/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..c7009bd2cc
Binary files /dev/null and b/android/native/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android/native/res/values/strings.xml b/android/native/res/values/strings.xml
new file mode 100644
index 0000000000..d8f551374e
--- /dev/null
+++ b/android/native/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NativeActivity</string>
+</resources>
diff --git a/android/phoenix/.classpath b/android/phoenix/.classpath
new file mode 100644
index 0000000000..3f9691c5dd
--- /dev/null
+++ b/android/phoenix/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry 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/android/.project b/android/phoenix/.project
similarity index 100%
rename from android/.project
rename to android/phoenix/.project
diff --git a/android/.settings/org.eclipse.jdt.core.prefs b/android/phoenix/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from android/.settings/org.eclipse.jdt.core.prefs
rename to android/phoenix/.settings/org.eclipse.jdt.core.prefs
diff --git a/android/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
similarity index 73%
rename from android/AndroidManifest.xml
rename to android/phoenix/AndroidManifest.xml
index 425f321e6a..96cd13eff3 100644
--- a/android/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -4,11 +4,11 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="15" />
+    <uses-sdk android:minSdkVersion="9" />
 
     <application
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" android:debuggable="true">
+        android:label="@string/app_name">
         <activity
             android:name=".main"
             android:label="@string/app_name" >
@@ -18,7 +18,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:label="@string/app_name" android:name="rombrowser" />
         <activity android:label="@string/app_name" android:name="com.retroarch.fileio.FileChooser" />
+        <activity android:label="@string/app_name" android:name="rombrowser" />
+<!--
+        <activity android:name="android.app.NativeActivity" android:label="retroarch">
+        	<meta-data android:name="android.app.lib_name" android:value="retroarch" />
+        </activity>
+-->
     </application>
 </manifest>
diff --git a/android/project.properties b/android/phoenix/project.properties
similarity index 100%
rename from android/project.properties
rename to android/phoenix/project.properties
diff --git a/android/res/drawable-hdpi/ic_action_close.png b/android/phoenix/res/drawable-hdpi/ic_action_close.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_close.png
rename to android/phoenix/res/drawable-hdpi/ic_action_close.png
diff --git a/android/res/drawable-hdpi/ic_action_history.png b/android/phoenix/res/drawable-hdpi/ic_action_history.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_history.png
rename to android/phoenix/res/drawable-hdpi/ic_action_history.png
diff --git a/android/res/drawable-hdpi/ic_action_load.png b/android/phoenix/res/drawable-hdpi/ic_action_load.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_load.png
rename to android/phoenix/res/drawable-hdpi/ic_action_load.png
diff --git a/android/res/drawable-hdpi/ic_action_main.png b/android/phoenix/res/drawable-hdpi/ic_action_main.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_main.png
rename to android/phoenix/res/drawable-hdpi/ic_action_main.png
diff --git a/android/res/drawable-hdpi/ic_action_open.png b/android/phoenix/res/drawable-hdpi/ic_action_open.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_open.png
rename to android/phoenix/res/drawable-hdpi/ic_action_open.png
diff --git a/android/res/drawable-hdpi/ic_action_save.png b/android/phoenix/res/drawable-hdpi/ic_action_save.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_save.png
rename to android/phoenix/res/drawable-hdpi/ic_action_save.png
diff --git a/android/res/drawable-hdpi/ic_action_settings.png b/android/phoenix/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_action_settings.png
rename to android/phoenix/res/drawable-hdpi/ic_action_settings.png
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/phoenix/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_launcher.png
rename to android/phoenix/res/drawable-hdpi/ic_launcher.png
diff --git a/android/res/drawable-ldpi/ic_action_close.png b/android/phoenix/res/drawable-ldpi/ic_action_close.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_close.png
rename to android/phoenix/res/drawable-ldpi/ic_action_close.png
diff --git a/android/res/drawable-ldpi/ic_action_history.png b/android/phoenix/res/drawable-ldpi/ic_action_history.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_history.png
rename to android/phoenix/res/drawable-ldpi/ic_action_history.png
diff --git a/android/res/drawable-ldpi/ic_action_load.png b/android/phoenix/res/drawable-ldpi/ic_action_load.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_load.png
rename to android/phoenix/res/drawable-ldpi/ic_action_load.png
diff --git a/android/res/drawable-ldpi/ic_action_main.png b/android/phoenix/res/drawable-ldpi/ic_action_main.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_main.png
rename to android/phoenix/res/drawable-ldpi/ic_action_main.png
diff --git a/android/res/drawable-ldpi/ic_action_open.png b/android/phoenix/res/drawable-ldpi/ic_action_open.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_open.png
rename to android/phoenix/res/drawable-ldpi/ic_action_open.png
diff --git a/android/res/drawable-ldpi/ic_action_save.png b/android/phoenix/res/drawable-ldpi/ic_action_save.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_save.png
rename to android/phoenix/res/drawable-ldpi/ic_action_save.png
diff --git a/android/res/drawable-ldpi/ic_action_settings.png b/android/phoenix/res/drawable-ldpi/ic_action_settings.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_action_settings.png
rename to android/phoenix/res/drawable-ldpi/ic_action_settings.png
diff --git a/android/res/drawable-ldpi/ic_launcher.png b/android/phoenix/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_launcher.png
rename to android/phoenix/res/drawable-ldpi/ic_launcher.png
diff --git a/android/res/drawable-mdpi/ic_action_close.png b/android/phoenix/res/drawable-mdpi/ic_action_close.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_close.png
rename to android/phoenix/res/drawable-mdpi/ic_action_close.png
diff --git a/android/res/drawable-mdpi/ic_action_history.png b/android/phoenix/res/drawable-mdpi/ic_action_history.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_history.png
rename to android/phoenix/res/drawable-mdpi/ic_action_history.png
diff --git a/android/res/drawable-mdpi/ic_action_load.png b/android/phoenix/res/drawable-mdpi/ic_action_load.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_load.png
rename to android/phoenix/res/drawable-mdpi/ic_action_load.png
diff --git a/android/res/drawable-mdpi/ic_action_main.png b/android/phoenix/res/drawable-mdpi/ic_action_main.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_main.png
rename to android/phoenix/res/drawable-mdpi/ic_action_main.png
diff --git a/android/res/drawable-mdpi/ic_action_open.png b/android/phoenix/res/drawable-mdpi/ic_action_open.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_open.png
rename to android/phoenix/res/drawable-mdpi/ic_action_open.png
diff --git a/android/res/drawable-mdpi/ic_action_save.png b/android/phoenix/res/drawable-mdpi/ic_action_save.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_save.png
rename to android/phoenix/res/drawable-mdpi/ic_action_save.png
diff --git a/android/res/drawable-mdpi/ic_action_settings.png b/android/phoenix/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_action_settings.png
rename to android/phoenix/res/drawable-mdpi/ic_action_settings.png
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/phoenix/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_launcher.png
rename to android/phoenix/res/drawable-mdpi/ic_launcher.png
diff --git a/android/res/drawable-xhdpi/ic_action_close.png b/android/phoenix/res/drawable-xhdpi/ic_action_close.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_close.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_close.png
diff --git a/android/res/drawable-xhdpi/ic_action_history.png b/android/phoenix/res/drawable-xhdpi/ic_action_history.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_history.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_history.png
diff --git a/android/res/drawable-xhdpi/ic_action_load.png b/android/phoenix/res/drawable-xhdpi/ic_action_load.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_load.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_load.png
diff --git a/android/res/drawable-xhdpi/ic_action_main.png b/android/phoenix/res/drawable-xhdpi/ic_action_main.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_main.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_main.png
diff --git a/android/res/drawable-xhdpi/ic_action_open.png b/android/phoenix/res/drawable-xhdpi/ic_action_open.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_open.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_open.png
diff --git a/android/res/drawable-xhdpi/ic_action_save.png b/android/phoenix/res/drawable-xhdpi/ic_action_save.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_save.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_save.png
diff --git a/android/res/drawable-xhdpi/ic_action_settings.png b/android/phoenix/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_action_settings.png
rename to android/phoenix/res/drawable-xhdpi/ic_action_settings.png
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/phoenix/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_launcher.png
rename to android/phoenix/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/res/layout/file_choose.xml b/android/phoenix/res/layout/file_choose.xml
similarity index 100%
rename from android/res/layout/file_choose.xml
rename to android/phoenix/res/layout/file_choose.xml
diff --git a/android/res/layout/file_view.xml b/android/phoenix/res/layout/file_view.xml
similarity index 100%
rename from android/res/layout/file_view.xml
rename to android/phoenix/res/layout/file_view.xml
diff --git a/android/res/layout/main.xml b/android/phoenix/res/layout/main.xml
similarity index 100%
rename from android/res/layout/main.xml
rename to android/phoenix/res/layout/main.xml
diff --git a/android/res/layout/rombrowser.xml b/android/phoenix/res/layout/rombrowser.xml
similarity index 100%
rename from android/res/layout/rombrowser.xml
rename to android/phoenix/res/layout/rombrowser.xml
diff --git a/android/res/menu/main_menu.xml b/android/phoenix/res/menu/main_menu.xml
similarity index 100%
rename from android/res/menu/main_menu.xml
rename to android/phoenix/res/menu/main_menu.xml
diff --git a/android/res/raw/retroarch.cfg b/android/phoenix/res/raw/retroarch.cfg
similarity index 100%
rename from android/res/raw/retroarch.cfg
rename to android/phoenix/res/raw/retroarch.cfg
diff --git a/android/res/values/strings.xml b/android/phoenix/res/values/strings.xml
similarity index 100%
rename from android/res/values/strings.xml
rename to android/phoenix/res/values/strings.xml
diff --git a/android/src/com/retroarch/fileio/FileArrayAdapter.java b/android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java
similarity index 100%
rename from android/src/com/retroarch/fileio/FileArrayAdapter.java
rename to android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java
diff --git a/android/src/com/retroarch/fileio/FileChooser.java b/android/phoenix/src/com/retroarch/fileio/FileChooser.java
similarity index 100%
rename from android/src/com/retroarch/fileio/FileChooser.java
rename to android/phoenix/src/com/retroarch/fileio/FileChooser.java
diff --git a/android/src/com/retroarch/fileio/Option.java b/android/phoenix/src/com/retroarch/fileio/Option.java
similarity index 100%
rename from android/src/com/retroarch/fileio/Option.java
rename to android/phoenix/src/com/retroarch/fileio/Option.java
diff --git a/android/src/com/retroarch/main.java b/android/phoenix/src/com/retroarch/main.java
similarity index 96%
rename from android/src/com/retroarch/main.java
rename to android/phoenix/src/com/retroarch/main.java
index 7a8794fa9a..0970810f9a 100644
--- a/android/src/com/retroarch/main.java
+++ b/android/phoenix/src/com/retroarch/main.java
@@ -71,6 +71,10 @@ public class main extends Activity
     	if(requestCode == ACTIVITY_LOAD_ROM)
     	{
     		/*
+	    	Intent myIntent = new Intent(this, NativeActivity.class);
+	    	startActivity(myIntent);
+	    	*/
+    		/*
             rruntime.settings_set_defaults();
             rruntime.load_game(data.getStringExtra("PATH"), 0);
             
diff --git a/android/proguard-project.txt b/android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/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 *;
-#}