diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index f6bf73dad8..2ac947973a 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -15,28 +15,28 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:hasCode="true">
-        <activity android:name="org.retroarch.browser.RetroArch">
+        <activity android:name=".browser.RetroArch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         
-        <activity android:name="org.retroarch.browser.DisplayRefreshRateTest"></activity>
-        <activity android:name="org.retroarch.browser.RefreshRateSetOS"></activity>
-        <activity android:name="org.retroarch.browser.SettingsActivity"></activity>
-        <activity android:name="org.retroarch.browser.HelpActivity"></activity>
-        <activity android:name="org.retroarch.browser.DirectoryActivity"></activity>
-        <activity android:name="org.retroarch.browser.ROMActivity"></activity>
+        <activity android:name=".browser.DisplayRefreshRateTest"></activity>
+        <activity android:name=".browser.RefreshRateSetOS"></activity>
+        <activity android:name=".browser.SettingsActivity"></activity>
+        <activity android:name=".browser.HelpActivity"></activity>
+        <activity android:name=".browser.DirectoryActivity"></activity>
+        <activity android:name=".browser.ROMActivity"></activity>
         
-        <activity android:name="org.retroarch.browser.ShaderActivity"></activity>
-        <activity android:name="org.retroarch.browser.OverlayActivity"></activity>
-        <activity android:name="org.retroarch.browser.ROMDirActivity"></activity>
-        <activity android:name="org.retroarch.browser.SRMDirActivity"></activity>
-        <activity android:name="org.retroarch.browser.StateDirActivity"></activity>
-        <activity android:name="org.retroarch.browser.SystemDirActivity"></activity>
+        <activity android:name=".browser.ShaderActivity"></activity>
+        <activity android:name=".browser.OverlayActivity"></activity>
+        <activity android:name=".browser.ROMDirActivity"></activity>
+        <activity android:name=".browser.SRMDirActivity"></activity>
+        <activity android:name=".browser.StateDirActivity"></activity>
+        <activity android:name=".browser.SystemDirActivity"></activity>
         
-        <activity android:name="org.retroarch.browser.RetroActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        <activity android:name=".browser.RetroActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
         	<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>
diff --git a/android/phoenix/src/org/retroarch/browser/RetroActivity.java b/android/phoenix/src/org/retroarch/browser/RetroActivity.java
index 177b438459..38a3fb1cbd 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroActivity.java
@@ -3,25 +3,21 @@ package org.retroarch.browser;
 import android.app.NativeActivity;
 import android.os.Bundle;
 
-public class RetroActivity extends NativeActivity
-{
-	public RetroActivity()
-	{
+public class RetroActivity extends NativeActivity {
+	public RetroActivity() {
 		super();
 	}
-	
+
 	@Override
-	public void onCreate(Bundle savedInstance)
-	{
+	public void onCreate(Bundle savedInstance) {
 		super.onCreate(savedInstance);
 	}
-	
+
 	@Override
-	public void onLowMemory()
-	{
+	public void onLowMemory() {
+	}
+
+	@Override
+	public void onTrimMemory(int level) {
 	}
-	
-    @Override
-    public void onTrimMemory(int level) {
-    }
 }