diff --git a/android/phoenix-legacy/.classpath b/android/phoenix-legacy/.classpath
new file mode 100644
index 0000000000..3f9691c5dd
--- /dev/null
+++ b/android/phoenix-legacy/.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/phoenix-legacy/.project b/android/phoenix-legacy/.project
new file mode 100644
index 0000000000..e2ce45675d
--- /dev/null
+++ b/android/phoenix-legacy/.project
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>RetroArch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<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>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>res/retroarch.cfg</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/retroarch.cfg</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs b/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f77b31c2d2
--- /dev/null
+++ b/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/android/phoenix-legacy/AndroidManifest.xml b/android/phoenix-legacy/AndroidManifest.xml
new file mode 100644
index 0000000000..cbb8bace7d
--- /dev/null
+++ b/android/phoenix-legacy/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.retroarch"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="15" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name">
+        <activity android:name="phoenix" android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <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:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale">
+        	<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
+         <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
+        </activity>
+    </application>
+</manifest>
diff --git a/android/phoenix-legacy/bin/AndroidManifest.xml b/android/phoenix-legacy/bin/AndroidManifest.xml
new file mode 100644
index 0000000000..cbb8bace7d
--- /dev/null
+++ b/android/phoenix-legacy/bin/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.retroarch"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="15" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name">
+        <activity android:name="phoenix" android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <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:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale">
+        	<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
+         <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
+        </activity>
+    </application>
+</manifest>
diff --git a/android/phoenix-legacy/bin/classes.dex b/android/phoenix-legacy/bin/classes.dex
new file mode 100644
index 0000000000..e9a4e6bd21
Binary files /dev/null and b/android/phoenix-legacy/bin/classes.dex differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/BuildConfig.class b/android/phoenix-legacy/bin/classes/com/retroarch/BuildConfig.class
new file mode 100644
index 0000000000..2ecbee69f1
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/BuildConfig.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$attr.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$attr.class
new file mode 100644
index 0000000000..f85362c78b
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$attr.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$drawable.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$drawable.class
new file mode 100644
index 0000000000..b93eebe08b
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$drawable.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$id.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$id.class
new file mode 100644
index 0000000000..aae32a79da
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$id.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$layout.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$layout.class
new file mode 100644
index 0000000000..96e87c3030
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$layout.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$menu.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$menu.class
new file mode 100644
index 0000000000..a4b21a3768
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$menu.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$raw.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$raw.class
new file mode 100644
index 0000000000..fb954f5c0c
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$raw.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R$string.class b/android/phoenix-legacy/bin/classes/com/retroarch/R$string.class
new file mode 100644
index 0000000000..f27217fc85
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R$string.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/R.class b/android/phoenix-legacy/bin/classes/com/retroarch/R.class
new file mode 100644
index 0000000000..2616b4cb55
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/R.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileArrayAdapter.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileArrayAdapter.class
new file mode 100644
index 0000000000..e7c2806d7d
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileArrayAdapter.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$1.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$1.class
new file mode 100644
index 0000000000..09734e9e90
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$1.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$2.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$2.class
new file mode 100644
index 0000000000..80ae290209
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser$2.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser.class
new file mode 100644
index 0000000000..89c613e3fa
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/FileChooser.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/fileio/Option.class b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/Option.class
new file mode 100644
index 0000000000..ec370bac48
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/fileio/Option.class differ
diff --git a/android/phoenix-legacy/bin/classes/com/retroarch/phoenix.class b/android/phoenix-legacy/bin/classes/com/retroarch/phoenix.class
new file mode 100644
index 0000000000..1fa1ef40a7
Binary files /dev/null and b/android/phoenix-legacy/bin/classes/com/retroarch/phoenix.class differ
diff --git a/android/phoenix-legacy/bin/com.retroarch.phoenix.apk b/android/phoenix-legacy/bin/com.retroarch.phoenix.apk
new file mode 100644
index 0000000000..f60ac661b0
Binary files /dev/null and b/android/phoenix-legacy/bin/com.retroarch.phoenix.apk differ
diff --git a/android/phoenix-legacy/bin/jarlist.cache b/android/phoenix-legacy/bin/jarlist.cache
new file mode 100644
index 0000000000..1b5ec3f9c5
--- /dev/null
+++ b/android/phoenix-legacy/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependecy. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_load.png
new file mode 100644
index 0000000000..41ccd3e0c1
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_main.png
new file mode 100644
index 0000000000..b32c0dc547
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_open.png
new file mode 100644
index 0000000000..81ba839115
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_save.png
new file mode 100644
index 0000000000..8ef170b5b2
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000000..0656f268b3
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-hdpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..8f54eb57d7
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_load.png
new file mode 100644
index 0000000000..cf31f645a9
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_main.png
new file mode 100644
index 0000000000..b9807b2a93
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_open.png
new file mode 100644
index 0000000000..c547bb051e
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_save.png
new file mode 100644
index 0000000000..3276f4863f
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 0000000000..1e122e59c4
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-ldpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000..919a51b73d
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-ldpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_load.png
new file mode 100644
index 0000000000..2620aa3cdb
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_main.png
new file mode 100644
index 0000000000..7778606c02
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_open.png
new file mode 100644
index 0000000000..8d40b88107
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_save.png
new file mode 100644
index 0000000000..7860034b31
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000000..2e49322e68
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-mdpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..5ee9ffeeb0
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_load.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_load.png
new file mode 100644
index 0000000000..41ccd3e0c1
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_main.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_main.png
new file mode 100644
index 0000000000..f0af65bd71
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_open.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_open.png
new file mode 100644
index 0000000000..81ba839115
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_save.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_save.png
new file mode 100644
index 0000000000..8ef170b5b2
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_settings.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000000..0656f268b3
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_launcher.png b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..786d296748
Binary files /dev/null and b/android/phoenix-legacy/bin/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/bin/resources.ap_ b/android/phoenix-legacy/bin/resources.ap_
new file mode 100644
index 0000000000..4120a31298
Binary files /dev/null and b/android/phoenix-legacy/bin/resources.ap_ differ
diff --git a/android/phoenix-legacy/gen/com/retroarch/BuildConfig.java b/android/phoenix-legacy/gen/com/retroarch/BuildConfig.java
new file mode 100644
index 0000000000..f7b068bd97
--- /dev/null
+++ b/android/phoenix-legacy/gen/com/retroarch/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.retroarch;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/android/phoenix-legacy/gen/com/retroarch/R.java b/android/phoenix-legacy/gen/com/retroarch/R.java
new file mode 100644
index 0000000000..0712b94a33
--- /dev/null
+++ b/android/phoenix-legacy/gen/com/retroarch/R.java
@@ -0,0 +1,48 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.retroarch;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ic_action_load=0x7f020000;
+        public static final int ic_action_main=0x7f020001;
+        public static final int ic_action_open=0x7f020002;
+        public static final int ic_action_save=0x7f020003;
+        public static final int ic_action_settings=0x7f020004;
+        public static final int ic_launcher=0x7f020005;
+    }
+    public static final class id {
+        public static final int TextView01=0x7f070002;
+        public static final int TextView02=0x7f070003;
+        public static final int fileChooserSubmit=0x7f070000;
+        public static final int fileChooserView=0x7f070001;
+        public static final int libretro=0x7f070007;
+        public static final int main=0x7f070005;
+        public static final int open=0x7f070006;
+        public static final int settings=0x7f070008;
+        public static final int surfaceview=0x7f070004;
+    }
+    public static final class layout {
+        public static final int file_choose=0x7f030000;
+        public static final int file_view=0x7f030001;
+        public static final int main=0x7f030002;
+        public static final int rombrowser=0x7f030003;
+    }
+    public static final class menu {
+        public static final int main_menu=0x7f060000;
+    }
+    public static final class raw {
+        public static final int retroarch=0x7f040000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f050001;
+        public static final int hello=0x7f050000;
+    }
+}
diff --git a/android/phoenix-legacy/project.properties b/android/phoenix-legacy/project.properties
new file mode 100644
index 0000000000..0840b4a059
--- /dev/null
+++ b/android/phoenix-legacy/project.properties
@@ -0,0 +1,14 @@
+# 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-15
diff --git a/android/phoenix-legacy/res/drawable-hdpi/ic_action_load.png b/android/phoenix-legacy/res/drawable-hdpi/ic_action_load.png
new file mode 100644
index 0000000000..3ef03ab59a
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-hdpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/res/drawable-hdpi/ic_action_main.png b/android/phoenix-legacy/res/drawable-hdpi/ic_action_main.png
new file mode 100644
index 0000000000..c659124b9e
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-hdpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/res/drawable-hdpi/ic_action_open.png b/android/phoenix-legacy/res/drawable-hdpi/ic_action_open.png
new file mode 100644
index 0000000000..41233c5e00
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-hdpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/res/drawable-hdpi/ic_action_save.png b/android/phoenix-legacy/res/drawable-hdpi/ic_action_save.png
new file mode 100644
index 0000000000..dbc044c9d8
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-hdpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/res/drawable-hdpi/ic_action_settings.png b/android/phoenix-legacy/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000000..c73c92ec96
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/res/drawable-hdpi/ic_launcher.png b/android/phoenix-legacy/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..ea7613b8c4
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/res/drawable-ldpi/ic_action_load.png b/android/phoenix-legacy/res/drawable-ldpi/ic_action_load.png
new file mode 100644
index 0000000000..92ae2f321e
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-ldpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/res/drawable-ldpi/ic_action_main.png b/android/phoenix-legacy/res/drawable-ldpi/ic_action_main.png
new file mode 100644
index 0000000000..81b838512f
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-ldpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/res/drawable-ldpi/ic_action_open.png b/android/phoenix-legacy/res/drawable-ldpi/ic_action_open.png
new file mode 100644
index 0000000000..a291177360
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-ldpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/res/drawable-ldpi/ic_action_save.png b/android/phoenix-legacy/res/drawable-ldpi/ic_action_save.png
new file mode 100644
index 0000000000..929966cacb
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-ldpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/res/drawable-ldpi/ic_action_settings.png b/android/phoenix-legacy/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 0000000000..7a3dc396bc
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/res/drawable-ldpi/ic_launcher.png b/android/phoenix-legacy/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000..f969b747a2
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-ldpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/res/drawable-mdpi/ic_action_load.png b/android/phoenix-legacy/res/drawable-mdpi/ic_action_load.png
new file mode 100644
index 0000000000..659c27fc84
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-mdpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/res/drawable-mdpi/ic_action_main.png b/android/phoenix-legacy/res/drawable-mdpi/ic_action_main.png
new file mode 100644
index 0000000000..65b5553331
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-mdpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/res/drawable-mdpi/ic_action_open.png b/android/phoenix-legacy/res/drawable-mdpi/ic_action_open.png
new file mode 100644
index 0000000000..9d0c7c070b
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-mdpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/res/drawable-mdpi/ic_action_save.png b/android/phoenix-legacy/res/drawable-mdpi/ic_action_save.png
new file mode 100644
index 0000000000..45c25de467
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-mdpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/res/drawable-mdpi/ic_action_settings.png b/android/phoenix-legacy/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000000..522c8a9cf5
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/res/drawable-mdpi/ic_launcher.png b/android/phoenix-legacy/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..84f2bca830
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/res/drawable-xhdpi/ic_action_load.png b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_load.png
new file mode 100644
index 0000000000..3ef03ab59a
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_load.png differ
diff --git a/android/phoenix-legacy/res/drawable-xhdpi/ic_action_main.png b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_main.png
new file mode 100644
index 0000000000..e5090aa3d9
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_main.png differ
diff --git a/android/phoenix-legacy/res/drawable-xhdpi/ic_action_open.png b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_open.png
new file mode 100644
index 0000000000..41233c5e00
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_open.png differ
diff --git a/android/phoenix-legacy/res/drawable-xhdpi/ic_action_save.png b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_save.png
new file mode 100644
index 0000000000..dbc044c9d8
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_save.png differ
diff --git a/android/phoenix-legacy/res/drawable-xhdpi/ic_action_settings.png b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000000..c73c92ec96
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/android/phoenix-legacy/res/drawable-xhdpi/ic_launcher.png b/android/phoenix-legacy/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..a113106a99
Binary files /dev/null and b/android/phoenix-legacy/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android/phoenix-legacy/res/layout/file_choose.xml b/android/phoenix-legacy/res/layout/file_choose.xml
new file mode 100644
index 0000000000..84efdaaade
--- /dev/null
+++ b/android/phoenix-legacy/res/layout/file_choose.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="wrap_content" android:orientation="vertical" android:layout_width="wrap_content">
+
+        <Button android:id="@+id/fileChooserSubmit"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:text="Submit">
+        </Button>  
+  
+    <ListView android:id="@+id/fileChooserView" 
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:scrollbars="vertical"
+            android:fastScrollEnabled="true"
+            android:padding="2dp"
+            android:layout_above="@id/fileChooserSubmit">
+        </ListView>
+
+</RelativeLayout>
+
diff --git a/android/phoenix-legacy/res/layout/file_view.xml b/android/phoenix-legacy/res/layout/file_view.xml
new file mode 100644
index 0000000000..ff99ca0b62
--- /dev/null
+++ b/android/phoenix-legacy/res/layout/file_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="wrap_content" android:orientation="vertical" android:layout_width="fill_parent">
+<TextView android:text="@+id/TextView01" 
+                        android:id="@+id/TextView01" 
+                        android:layout_width="wrap_content" 
+                        android:layout_height="wrap_content" 
+                        android:singleLine="true" 
+                        android:textStyle="bold" 
+                        android:layout_marginTop="5dip" 
+                        android:layout_marginLeft="5dip">
+                        </TextView>
+<TextView android:text="@+id/TextView02" 
+                        android:id="@+id/TextView02" 
+                        android:layout_width="wrap_content" 
+                        android:layout_height="wrap_content" 
+                        android:layout_marginLeft="10dip">
+                        </TextView>
+</LinearLayout>
diff --git a/android/phoenix-legacy/res/layout/main.xml b/android/phoenix-legacy/res/layout/main.xml
new file mode 100644
index 0000000000..c51a388d09
--- /dev/null
+++ b/android/phoenix-legacy/res/layout/main.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+<SurfaceView
+    android:id="@+id/surfaceview"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    />
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/hello" />
+
+</LinearLayout>
diff --git a/android/phoenix-legacy/res/layout/rombrowser.xml b/android/phoenix-legacy/res/layout/rombrowser.xml
new file mode 100644
index 0000000000..1555563624
--- /dev/null
+++ b/android/phoenix-legacy/res/layout/rombrowser.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Hello world from RomBrowser" />
+
+</LinearLayout>
diff --git a/android/phoenix-legacy/res/menu/main_menu.xml b/android/phoenix-legacy/res/menu/main_menu.xml
new file mode 100644
index 0000000000..05e808b581
--- /dev/null
+++ b/android/phoenix-legacy/res/menu/main_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<item android:id="@+id/main" android:showAsAction="ifRoom|withText" android:title="Main" android:icon="@drawable/ic_action_main"></item>
+<item android:id="@+id/open" android:showAsAction="collapseActionView" android:title="Select ROM" android:icon="@drawable/ic_action_open"></item>
+<item android:id="@+id/libretro" android:showAsAction="collapseActionView" android:title="Select libretro core" android:icon="@drawable/ic_launcher"></item>
+<item android:id="@+id/settings" android:showAsAction="collapseActionView" android:title="Settings" android:icon="@drawable/ic_action_settings"></item>
+
+</menu>
diff --git a/android/phoenix-legacy/res/raw/retroarch.cfg b/android/phoenix-legacy/res/raw/retroarch.cfg
new file mode 100644
index 0000000000..a63fa08c89
--- /dev/null
+++ b/android/phoenix-legacy/res/raw/retroarch.cfg
@@ -0,0 +1,404 @@
+## Skeleton config file for RetroArch
+
+# Save all save files (*.srm) to this directory. This includes related files like .bsv, .rtc, .psrm, etc ...
+# This will be overridden by explicit command line options.
+# savefile_directory =
+
+# Save all save states (*.state) to this directory.
+# This will be overridden by explicit command line options.
+# savestate_directory =
+
+# Automatically saves a savestate at the end of RetroArch's lifetime.
+# The path is $SRAM_PATH.auto.
+# RetroArch will automatically load any savestate with this path on startup.
+# savestate_auto_save = false
+
+# Load libretro from a dynamic location for dynamically built RetroArch.
+# This option is mandatory.
+# libretro_path = "/path/to/libretro.so"
+
+# Environment variables internally in RetroArch.
+# Implementations can tap into this user-specificed information to enable functionality
+# that is deemed too obscure to expose directly.
+# Some variables might be "standardized" at a later time if needed.
+# The string is formatted as key value pairs delimited by a semicolon ';'.
+# Any white space between the delimiter ';' and the '=' is significant.
+# I.e.: "key1=value1;key2=value2;..."
+# environment_variables =
+
+# Sets the "system" directory.
+# Implementations can query for this directory to load BIOSes, system-specific configs, etc.
+# system_directory =
+
+#### Video
+
+# Video driver to use. "gl", "xvideo", "sdl" or "ext" (external API driver)
+# video_driver = "gl"
+
+# Path to external video driver using the RetroArch driver API.
+# video_external_driver =
+
+# Windowed xscale and yscale
+# (Real x res: base_size * xscale * aspect_ratio, real y res: base_size * yscale)
+# video_xscale = 3.0
+# video_yscale = 3.0
+
+# Fullscreen resolution. Resolution of 0 uses the resolution of the desktop.
+# video_fullscreen_x = 0
+# video_fullscreen_y = 0
+
+# Start in fullscreen. Can be changed at runtime.
+# video_fullscreen = false
+
+# If fullscreen, prefer using a windowed fullscreen mode.
+# video_windowed_fullscreen = false
+
+# Forcibly disable composition. Only works in Windows Vista/7 for now.
+# video_disable_composition = false
+
+# Video vsync.
+# video_vsync = true
+
+# Smoothens picture with bilinear filtering. Should be disabled if using pixel shaders.
+# video_smooth = true
+
+# Forces rendering area to stay equal to game aspect ratio or as defined in video_aspect_ratio.
+# video_force_aspect = true
+
+# A floating point value for video aspect ratio (width / height).
+# If this is not set, aspect ratio is assumed to be automatic.
+# Behavior then is defined by video_aspect_ratio_auto.
+# video_aspect_ratio =
+
+# If this is true and video_aspect_ratio is not set,
+# aspect ratio is decided by libretro implementation.
+# If this is false, 1:1 PAR will always be assumed if video_aspect_ratio is not set.
+# video_aspect_ratio_auto = false
+
+# Forces cropping of overscanned frames. Crops away top 7 scanlines and 8 bottom scanlines. (15/15 for interlaced frames).
+# video_crop_overscan = false
+
+# Path to Cg shader.
+# video_cg_shader = "/path/to/cg/shader.cg"
+
+# Path to bSNES XML shader (GLSL only). If both Cg shader path and XML shader path are defined, 
+# Cg shader will take priority unless overridden in video_shader_type.
+# video_bsnes_shader = "/path/to/bsnes/xml/shader.shader"
+
+# Which shader type to use. Valid values are "cg", "bsnes", "none" and "auto"
+# video_shader_type = auto
+
+# Defines a directory where XML shaders are kept.
+# video_shader_dir =
+
+# Render to texture first. Useful when doing multi-pass shaders or control the output of shaders better.
+# video_render_to_texture = false
+
+# Defines the video scale of render-to-texture. 
+# The output FBO size is scaled by these amounts against the input size (typically 256 * 224 for SNES).
+# video_fbo_scale_x = 2.0
+# video_fbo_scale_y = 2.0
+
+# Define shader to use for second pass (needs render-to-texture).
+# video_second_pass_shader = "/path/to/second/shader.{cg,shader}"
+
+# Defines if bilinear filtering is used during second pass (needs render-to-texture).
+# video_second_pass_smooth = true
+
+# CPU-based filter. Path to a bSNES CPU filter (*.filter)
+# video_filter =
+
+# Path to a TTF font used for rendering messages. This path must be defined to enable fonts.
+# Do note that the _full_ path of the font is necessary!
+# video_font_path = 
+
+# Size of the TTF font rendered.
+# video_font_size = 48
+
+# Attempt to scale the font to fit better for multiple window sizes.
+# video_font_scale = true
+
+# Enable usage of OSD messages.
+# video_font_enable = true
+
+# Offset for where messages will be placed on screen. Values are in range 0.0 to 1.0 for both x and y values. 
+# [0.0, 0.0] maps to the lower left corner of the screen.
+# video_message_pos_x = 0.05
+# video_message_pos_y = 0.05
+
+# Color for message. The value is treated as a hexadecimal value.
+# It is a regular RGB hex number, i.e. red is "ff0000".
+# video_message_color = ffffff
+
+# Video refresh rate of your monitor.
+# Used to calculate a suitable audio input rate.
+# video_refresh_rate = 59.95
+
+# Allows libretro cores to set rotation modes.
+# Setting this to false will honor, but ignore this request.
+# This is useful for vertically oriented games where one manually rotates the monitor.
+# video_allow_rotate = true
+
+#### Audio
+
+# Enable audio.
+# audio_enable = true
+
+# Audio output samplerate.
+# audio_out_rate = 48000
+
+# When altering audio_in_rate on-the-fly, define by how much each time.
+# audio_rate_step = 0.25
+
+# Audio driver backend. Depending on configuration possible candidates are: alsa, pulse, oss, jack, rsound, roar, openal, sdl, xaudio and ext (external driver).
+# audio_driver =
+
+# Path to external audio driver using the RetroArch audio driver API.
+# audio_external_driver =
+
+# Override the default audio device the audio_driver uses. This is driver dependant. E.g. ALSA wants a PCM device, OSS wants a path (e.g. /dev/dsp), Jack wants portnames (e.g. system:playback1,system:playback_2), and so on ...
+# audio_device =
+
+# External DSP plugin that processes audio before it's sent to the driver.
+# audio_dsp_plugin =
+
+# Will sync (block) on audio. Recommended.
+# audio_sync = true
+
+# Desired audio latency in milliseconds. Might not be honored if driver can't provide given latency.
+# audio_latency = 64
+
+# Enable experimental audio rate control.
+# audio_rate_control = false
+
+# Controls audio rate control delta. Defines how much input rate can be adjusted dynamically.
+# Input rate = in_rate * (1.0 +/- audio_rate_control_delta)
+# audio_rate_control_delta = 0.005
+
+#### Input
+
+# Input driver. Depending on video driver, it might force a different input driver.
+# input_driver = sdl
+
+# Defines axis threshold. Possible values are [0.0, 1.0]
+# input_axis_threshold = 0.5
+
+# Keyboard input. Will recognize normal keypresses and special keys like "left", "right", and so on.
+# Keyboard input, Joypad and Joyaxis will all obey the "nul" bind, which disables the bind completely, 
+# rather than relying on a default.
+# input_player1_a = x
+# input_player1_b = z
+# input_player1_y = a
+# input_player1_x = s
+# input_player1_start = enter
+# input_player1_select = rshift
+# input_player1_l = q
+# input_player1_r = w
+# input_player1_left = left
+# input_player1_right = right
+# input_player1_up = up
+# input_player1_down = down
+# input_player1_l2 =
+# input_player1_r2 =
+# input_player1_l3 =
+# input_player1_r3 =
+
+# Two analog sticks (DualShock-esque).
+# Bound as usual, however, if a real analog axis is bound,
+# it can be read as a true analog.
+# Positive X axis is right, Positive Y axis is down.
+# input_player1_l_x_plus =
+# input_player1_l_x_minus =
+# input_player1_l_y_plus =
+# input_player1_l_y_minus =
+# input_player1_r_x_plus =
+# input_player1_r_x_minus =
+# input_player1_r_y_plus =
+# input_player1_r_y_minus =
+
+# If desired, it is possible to override which joypads are being used for player 1 through 5. First joypad available is 0.
+# input_player1_joypad_index = 0
+# input_player2_joypad_index = 1
+# input_player3_joypad_index = 2
+# input_player4_joypad_index = 3
+# input_player5_joypad_index = 4
+# Player 6-8 is not directly expected by libretro API, but we'll futureproof it.
+# input_player6_joypad_index = 5
+# input_player7_joypad_index = 6
+# input_player8_joypad_index = 7
+
+# Joypad buttons.
+# Figure these out by using RetroArch-Phoenix or retroarch-joyconfig.
+# You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. 
+# E.g. "h0up"
+# input_player1_a_btn =
+# input_player1_b_btn =
+# input_player1_y_btn =
+# input_player1_x_btn =
+# input_player1_start_btn =
+# input_player1_select_btn =
+# input_player1_l_btn =
+# input_player1_r_btn =
+# input_player1_left_btn =
+# input_player1_right_btn =
+# input_player1_up_btn =
+# input_player1_down_btn =
+# input_player1_l2_btn =
+# input_player1_r2_btn =
+# input_player1_l3_btn =
+# input_player1_r3_btn =
+
+# Axis for RetroArch D-Pad. 
+# Needs to be either '+' or '-' in the first character signaling either positive or negative direction of the axis, then the axis number. 
+# Do note that every other input option has the corresponding _btn and _axis binds as well; they are omitted here for clarity.
+# input_player1_left_axis =
+# input_player1_right_axis =
+# input_player1_up_axis =
+# input_player1_down_axis =
+
+# Holding the turbo while pressing another button will let the button enter a turbo mode
+# where the button state is modulated with a periodic signal.
+# The modulation stops when the button itself (not turbo button) is released.
+# input_player1_turbo =
+
+# Describes the period and how long of that period a turbo-enabled button should behave.
+# Numbers are described in frames.
+# input_turbo_period = 6
+# input_turbo_duty_cycle = 3
+
+# This goes all the way to player 8 (*_player2_*, *_player3_*, etc), but omitted for clarity.
+# All input binds have corresponding binds for keyboard (none), joykeys (_btn) and joyaxes (_axis) as well.
+
+# Toggles fullscreen.
+# input_toggle_fullscreen = f
+
+# Saves state.
+# input_save_state = f2
+# Loads state.
+# input_load_state = f4
+
+# State slots. With slot set to 0, save state name is *.state (or whatever defined on commandline).
+# When slot is != 0, path will be $path%d, where %d is slot number.
+# input_state_slot_increase = f7
+# input_state_slot_decrease = f6
+
+# Toggles between fast-forwarding and normal speed.
+# input_toggle_fast_forward = space
+
+# Hold for fast-forward. Releasing button disables fast-forward.
+# input_hold_fast_forward = l
+
+# Key to exit emulator cleanly. 
+# Killing it in any hard way (SIGTERM, SIGKILL, etc, will terminate emulator without saving RAM, etc.)
+# input_exit_emulator = escape
+
+# Decrease/increase input sample rate on the fly. Amount to decrease/increase is defined by audio_rate_step.
+# input_rate_step_up = kp_plus
+# input_rate_step_down = kp_minus
+
+# Applies next and previous XML/Cg shader in directory.
+# input_shader_next = m
+# input_shader_prev = n
+
+# Hold button down to rewind. Rewinding must be enabled.
+# input_rewind = r
+
+# Toggle between recording and not.
+# input_movie_record_toggle = o
+
+# Toggle between paused and non-paused state
+# input_pause_toggle = p
+
+# Frame advance when game is paused
+# input_frame_advance = k
+
+# Reset the emulated SNES.
+# input_reset = h
+
+# Configures DSP plugin
+# input_dsp_config = c
+
+# Cheats.
+# input_cheat_index_plus = y
+# input_cheat_index_minus = t
+# input_cheat_toggle = u
+
+# Mute/unmute audio
+# input_audio_mute = f9
+
+# Take screenshot
+# input_screenshot = f8
+
+# Netplay flip players.
+# input_netplay_flip_players = i
+
+# Hold for slowmotion.
+# input_slowmotion = e
+
+#### Misc
+
+# Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
+# Do note that rewinding will only work properly when using bSNES libretro core atm.
+# rewind_enable = false
+
+# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.
+# The buffer should be approx. 20MB per minute of buffer time.
+# rewind_buffer_size = 20
+
+# Rewind granularity. When rewinding defined number of frames, you can rewind several frames at a time, increasing the rewinding speed.
+# rewind_granularity = 1
+
+# Pause gameplay when window focus is lost.
+# pause_nonactive = true
+
+# Autosaves the non-volatile SRAM at a regular interval. This is disabled by default unless set otherwise.
+# The interval is measured in seconds. A value of 0 disables autosave.
+# autosave_interval =
+
+# When being client over netplay, use keybinds for player 1.
+# netplay_client_swap_input = false
+
+# Path to XML cheat database (as used by bSNES).
+# cheat_database_path =
+
+# Path to XML cheat config, a file which keeps track of which
+# cheat settings are used for individual games.
+# If the file does not exist, it will be created.
+# cheat_settings_path =
+
+# Directory to dump screenshots to.
+# screenshot_directory =
+
+# Records video assuming video is hi-res.
+# video_hires_record = false
+
+# Enables lossless RGB H.264 recording if possible (if not, FFV1 is used).
+# video_h264_record = true
+
+# Records video after CPU video filter.
+# video_post_filter_record = false
+
+# Records output of GPU shaded material if available.
+# video_gpu_record = false
+
+# Screenshots output of GPU shaded material if available.
+# video_gpu_screenshot = true
+
+# Block SRAM from being overwritten when loading save states.
+# Might potentially lead to buggy games.
+# block_sram_overwrite = false
+
+# When saving a savestate, save state index is automatically increased before
+# it is saved.
+# Also, when loading a ROM, the index will be set to the highest existing index.
+# There is no upper bound on the index.
+# savestate_auto_index = false
+
+# Slowmotion ratio. When slowmotion, game will slow down by factor.
+# slowmotion_ratio = 3.0
+
+# Enable stdin/network command interface.
+# network_cmd_enable = false
+# network_cmd_port = 55355
+# stdin_cmd_enable = false
+
diff --git a/android/phoenix-legacy/res/values/strings.xml b/android/phoenix-legacy/res/values/strings.xml
new file mode 100644
index 0000000000..1e2ffa990e
--- /dev/null
+++ b/android/phoenix-legacy/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="hello">Hello World, MainActivity!</string>
+    <string name="app_name">RetroArch</string>
+
+</resources>
\ No newline at end of file
diff --git a/android/phoenix-legacy/src/com/retroarch/fileio/FileArrayAdapter.java b/android/phoenix-legacy/src/com/retroarch/fileio/FileArrayAdapter.java
new file mode 100644
index 0000000000..c6ee07cd6b
--- /dev/null
+++ b/android/phoenix-legacy/src/com/retroarch/fileio/FileArrayAdapter.java
@@ -0,0 +1,117 @@
+package com.retroarch.fileio;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import com.retroarch.R;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.SectionIndexer;
+import android.widget.TextView;
+
+public class FileArrayAdapter extends ArrayAdapter<Option> implements SectionIndexer 
+{
+     HashMap<String, Integer> alphaIndexer; 
+     String[] sections;
+     
+     private Context c;
+     private int id;
+     private List<Option>items;
+     
+     public FileArrayAdapter(Context context, int textViewResourceId,
+               List<Option> objects) {
+          super(context, textViewResourceId, objects);
+          c = context;
+          id = textViewResourceId;
+          items = objects;    
+          
+          initAlphaIndexer();
+     }
+     
+     private void initAlphaIndexer()
+     {
+          alphaIndexer = new HashMap<String, Integer>();
+          int size = items.size();
+
+          for (int x = 0; x < size; x++) {
+               Option o = items.get(x);
+
+              String ch =  o.name.substring(0, 1);
+              
+              ch = ch.toUpperCase();
+
+              if (!alphaIndexer.containsKey(ch))
+              {
+                   alphaIndexer.put(ch, x);
+              }
+          }
+
+          Set<String> sectionLetters = alphaIndexer.keySet();
+
+          ArrayList<String> sectionList = new ArrayList<String>(sectionLetters); 
+
+          Collections.sort(sectionList);
+
+          sections = new String[sectionList.size()];
+
+          sectionList.toArray(sections);          
+     }
+
+     public Option getItem(int i)
+     {
+          return items.get(i);
+     }
+     @Override
+      public View getView(int position, View convertView, ViewGroup parent) {
+              View v = convertView;
+              if (v == null) {
+                  LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                  v = vi.inflate(id, null);
+              }
+              final Option o = items.get(position);
+              if (o != null) {                   
+                      TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+                      TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+
+                      if(t1!=null)
+                      {
+                        t1.setText(o.name);
+                      }
+                      if(t2!=null)
+                      {
+                        t2.setText(o.data);
+                      }
+                      
+              }
+              return v;
+      }
+
+     public int getPositionForSection(int section)
+     {
+    	 // FIXME
+    	 if (section >= sections.length)
+    	 {
+    		 return 0;
+    	 }
+         return alphaIndexer.get(sections[section]);
+     }
+
+     public int getSectionForPosition(int position)
+     {
+          return 1;
+     }
+
+     public Object[] getSections()
+     {          
+          return sections;
+     }
+     
+     
+}
diff --git a/android/phoenix-legacy/src/com/retroarch/fileio/FileChooser.java b/android/phoenix-legacy/src/com/retroarch/fileio/FileChooser.java
new file mode 100644
index 0000000000..48cdb5519e
--- /dev/null
+++ b/android/phoenix-legacy/src/com/retroarch/fileio/FileChooser.java
@@ -0,0 +1,249 @@
+package com.retroarch.fileio;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Stack;
+
+import com.retroarch.R;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.Toast;
+
+public class FileChooser extends Activity
+{
+     public static final String EXTRA_START_DIR = "StartDir";
+     public static final String EXTRA_EXTENSIONS = "Extensions";
+     public static final String EXTRA_TEMP_DIR = "TempDir";
+     public static final String EXTRA_SELECT_DIR = "SelectDir";
+     public static final String PAYLOAD_FILENAME = "Filename";
+     public static final String PAYLOAD_SELECTED_DIR = "DirSelected";
+     
+     private File currentDir;
+     private FileArrayAdapter adapter;
+     
+     private String _startDir;
+     private String _extensions;
+     private String _tempDir;
+     private String _selectDir;
+     
+     private Stack<String> _dirStack;
+     
+     private ListView _view;
+     
+     @Override
+     public void onCreate(Bundle savedInstanceState)
+     {
+         super.onCreate(savedInstanceState);
+                           
+         setContentView(R.layout.file_choose);
+         _view = (ListView)findViewById(R.id.fileChooserView);
+         
+         _startDir = getIntent().getStringExtra(EXTRA_START_DIR);
+         _extensions = getIntent().getStringExtra(EXTRA_EXTENSIONS);
+         _tempDir = getIntent().getStringExtra(EXTRA_TEMP_DIR);
+         _selectDir = getIntent().getStringExtra(EXTRA_SELECT_DIR);
+         
+         // clamp start dir and remove the /
+         if (_startDir == null)
+         {
+              _startDir = Environment.getExternalStorageDirectory().getAbsolutePath();
+         }
+         else if (_startDir.endsWith("/"))
+         {
+              _startDir = _startDir.substring(0, _startDir.length() - 1);
+         }
+         
+         // push the start dir onto the stack
+         _dirStack = new Stack<String>();
+         _dirStack.push(_startDir);
+         
+         // clamp extentions to all or extra specified
+         if (_extensions == null)
+         {
+              _extensions = ".*";
+         }
+         
+         // clamp temp dir
+         if (_tempDir == null)
+         {
+              _tempDir = Environment.getExternalStorageDirectory().getAbsolutePath();
+         }
+         
+         // regular filesystem dir
+         currentDir = new File(_startDir);
+         fill(currentDir);    
+         
+         // are we dir selecting?, add button
+         if (_selectDir == null)
+         {
+              // hide button
+              Button b = (Button)findViewById(R.id.fileChooserSubmit);
+              b.setVisibility(Button.GONE);
+         }
+         else
+         {
+              // add on click submit
+              Button b = (Button)findViewById(R.id.fileChooserSubmit);
+              b.setOnClickListener(new OnClickListener()
+              {
+                    
+                   public void onClick(View v)
+                   {
+                        String s = _dirStack.peek();
+                        Toast.makeText(FileChooser.this, "Selected: " + s, Toast.LENGTH_SHORT).show();
+                        
+                        Intent intent=new Intent();   
+                        intent.putExtra(FileChooser.PAYLOAD_SELECTED_DIR, s);
+                        setResult(RESULT_OK, intent);
+                        
+                        finish();                       
+                   }
+              });
+         }
+     }
+     
+     public boolean onCreateOptionsMenu(Menu menu)
+     {
+     	MenuInflater inflater = getMenuInflater();
+     	inflater.inflate(R.menu.main_menu, menu);
+     	return true;
+     }
+     
+     public boolean onOptionsItemSelected(MenuItem item)
+     {
+     	switch (item.getItemId())
+     	{
+     	    case R.id.main:
+     	    	this.finish();
+     		    break;
+     	    case R.id.open:
+     	    	//TODO: Return to root dir
+     		    break;
+     		default:
+     	    	Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show();
+     	    	break;
+     	}
+     	
+     	return true;
+     }
+     
+     
+     private void fill(File f)
+     {
+         File[]dirs = f.listFiles();
+          this.setTitle("Path: "+f.getAbsolutePath());
+          List<Option>dir = new ArrayList<Option>();
+          List<Option>fls = new ArrayList<Option>();
+          try
+          {
+              for(File ff: dirs)
+              {
+                 if(ff.isDirectory())
+                 {
+                     dir.add(new Option(ff.getName() + "/","Folder",ff.getAbsolutePath()));
+                 }
+                 else
+                 {
+                      int dotIndex = ff.getName().lastIndexOf('.');
+                      if (dotIndex > 0)
+                      {
+                           String extension = ff.getName().substring(dotIndex+1).toLowerCase();
+                           if (extension.matches(_extensions))
+                           {
+                                fls.add(new Option(ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+                           }
+                      }
+                 }
+              }
+          }
+          catch(Exception e)
+          {
+              
+          }
+          
+          Collections.sort(dir);
+          Collections.sort(fls);
+          dir.addAll(fls);
+          
+	  dir.add(0,new Option("..", "Parent Directory", f.getParent()));
+
+          adapter = new FileArrayAdapter(FileChooser.this,R.layout.file_view,dir);
+          _view.setAdapter(adapter);
+          
+          _view.setOnItemClickListener(new OnItemClickListener()
+          {
+
+               public void onItemClick(AdapterView<?> arg0, View arg1,
+            		   int arg2, long arg3)
+               {
+                    int pos = arg0.getPositionForView(arg1);
+                    Option o = adapter.getItem(pos);
+                    if(o.data.equalsIgnoreCase("folder")|| o.data.equalsIgnoreCase("parent directory"))
+                    {
+                         if (o.path != null)
+                         {
+                            currentDir = new File(o.path);
+                            fill(currentDir);
+                            _dirStack.push(o.path);
+                         }
+                    }
+                    else
+                    {
+                    	onFileClick(o);
+                    }
+               }
+               
+          });
+     }
+     
+     
+     private void onFileClick(Option o)
+     {
+         Intent intent=new Intent();   
+         intent.putExtra("PATH", o.path);
+         intent.putExtra("NAME", o.name);
+         setResult(RESULT_OK, intent);  
+         finish();
+     }
+     
+     @Override
+     public boolean onKeyDown(int keyCode, KeyEvent event)
+     {
+         if (keyCode == KeyEvent.KEYCODE_BACK)
+         {
+              if (_dirStack.size() > 1)
+              {
+            	  _dirStack.pop();
+            	  File file = new File(_dirStack.peek());
+            	  
+                  currentDir = file;
+                  fill(currentDir);                   
+              }
+              else
+              {
+                   Intent intent = new Intent();
+                   setResult(RESULT_OK, intent);
+                   
+                   finish();
+              }
+              
+             return true;
+         }
+         return super.onKeyDown(keyCode, event);
+     }
+ }
diff --git a/android/phoenix-legacy/src/com/retroarch/fileio/Option.java b/android/phoenix-legacy/src/com/retroarch/fileio/Option.java
new file mode 100644
index 0000000000..c917c41531
--- /dev/null
+++ b/android/phoenix-legacy/src/com/retroarch/fileio/Option.java
@@ -0,0 +1,23 @@
+package com.retroarch.fileio;
+
+public class Option implements Comparable<Option>
+{
+     public String name;
+     public String data;
+     public String path;
+     
+     public Option(String n,String d,String p)
+     {
+         name = n;
+         data = d;
+         path = p;
+     }
+     
+     public int compareTo(Option o)
+     {
+         if(this.name != null)
+             return this.name.toLowerCase().compareTo(o.name.toLowerCase()); 
+         else 
+             throw new IllegalArgumentException();
+     }
+}
diff --git a/android/phoenix-legacy/src/com/retroarch/phoenix.java b/android/phoenix-legacy/src/com/retroarch/phoenix.java
new file mode 100644
index 0000000000..762fc421e1
--- /dev/null
+++ b/android/phoenix-legacy/src/com/retroarch/phoenix.java
@@ -0,0 +1,121 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2012 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.retroarch;
+
+import com.retroarch.R;
+import com.retroarch.fileio.FileChooser;
+
+import android.app.Activity;
+import android.app.NativeActivity;
+import android.content.Intent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
+import android.os.Bundle;
+
+public class phoenix extends Activity
+{
+	static private final int ACTIVITY_LOAD_ROM = 0;
+	static private final int ACTIVITY_LOAD_LIBRETRO_CORE = 1;
+	
+	static private String libretro_path;
+	
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        
+        this.setTitle("RetroArch Phoenix");
+    }
+    
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+    	MenuInflater inflater = getMenuInflater();
+    	inflater.inflate(R.menu.main_menu, menu);
+    	return true;
+    }
+    
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+    	Intent myIntent;
+    	switch (item.getItemId())
+    	{
+    	    case R.id.main:
+    	    	this.finish();
+    		    break;
+    	    case R.id.open:
+    	    	Toast.makeText(this, "Select a ROM image from the Filebrowser.", Toast.LENGTH_SHORT).show();
+    	    	myIntent = new Intent(this, FileChooser.class);
+    	    	startActivityForResult(myIntent, ACTIVITY_LOAD_ROM);
+    		    break;
+    	    case R.id.libretro:
+    	    	Toast.makeText(this, "Select a libretro core from the Filebrowser.", Toast.LENGTH_SHORT).show();
+    	    	myIntent = new Intent(this, FileChooser.class);
+    	    	startActivityForResult(myIntent, ACTIVITY_LOAD_LIBRETRO_CORE);
+    		    break;   	    	
+    		default:
+    	    	Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show();
+    	    	break;
+    	}
+    	
+    	return true;
+    }
+    
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+    	Intent myIntent;
+    	
+    	switch(requestCode)
+    	{
+    	   case ACTIVITY_LOAD_ROM:
+    		   if(data.getStringExtra("PATH") != null)
+    		   {
+    			   if(libretro_path != null)
+    			   {
+    			       Toast.makeText(this, "Loading: ["+ data.getStringExtra("PATH") + "]...", Toast.LENGTH_SHORT).show();
+    				   myIntent = new Intent(this, NativeActivity.class);
+    				   myIntent.putExtra("ROM", data.getStringExtra("PATH"));
+    				   myIntent.putExtra("LIBRETRO", libretro_path);
+    				   startActivity(myIntent);
+    			   }
+    			   else
+    	    	    	Toast.makeText(this, "ERROR - No libretro core has been selected, cannot start RetroArch.", Toast.LENGTH_SHORT).show();
+    		   }
+    		   break;
+    	   case ACTIVITY_LOAD_LIBRETRO_CORE:
+    		   if(data.getStringExtra("PATH") != null)
+    		   {
+			       Toast.makeText(this, "Libretro core path set to: ["+ data.getStringExtra("PATH") + "].", Toast.LENGTH_SHORT).show();
+    			   libretro_path = data.getStringExtra("PATH");
+    		   }
+    		   break;
+    	}
+    }
+    
+    @Override
+    protected void onPause()
+    {
+    	super.onPause();
+    }
+    
+    @Override
+    protected void onResume()
+    {
+    	super.onResume();
+    }
+}
diff --git a/android/phoenix/.classpath b/android/phoenix/.classpath
index a4763d1eec..3f9691c5dd 100644
--- a/android/phoenix/.classpath
+++ b/android/phoenix/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<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/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk
index 021fee0ead..a7939bb7cd 100644
--- a/android/phoenix/jni/Android.mk
+++ b/android/phoenix/jni/Android.mk
@@ -20,6 +20,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 
 ifeq ($(HAVE_NEON),1)
 LOCAL_CFLAGS += -DHAVE_NEON
+LOCAL_SRC_FILES += ../../../audio/utils_neon.S.neon
 endif
 
 ifeq ($(HAVE_SINC),1)
diff --git a/audio/opensl.c b/audio/opensl.c
index f672b99e89..7af0ec1452 100644
--- a/audio/opensl.c
+++ b/audio/opensl.c
@@ -136,7 +136,7 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency)
    if(api_level > 15)
    {
       RARCH_LOG("API level 16 and higher has a fast OpenSL mixer - adjust settings for lower audio latency...\n");
-      sl->buf_count = 4;
+      sl->buf_count = 8;
    }
    else
       sl->buf_count = 8;