diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index d3a0ddaf5a..9039d9d89f 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -35,7 +35,7 @@
 
         <activity android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity" />
 
-        <activity android:name="org.dolphinemu.dolphinemu.EmulationActivity"
+        <activity android:name="org.dolphinemu.dolphinemu.emulation.EmulationActivity"
                   android:screenOrientation="landscape" />
 
         <activity
diff --git a/Source/Android/res/layout/emulation_view.xml b/Source/Android/res/layout/emulation_view.xml
index 9dcdf11166..62cbbe703e 100644
--- a/Source/Android/res/layout/emulation_view.xml
+++ b/Source/Android/res/layout/emulation_view.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent">
 
     <!-- This is what everything is rendered to during emulation -->
-    <org.dolphinemu.dolphinemu.NativeGLSurfaceView 
+    <org.dolphinemu.dolphinemu.emulation.NativeGLSurfaceView 
         android:id="@+id/emulationView"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
similarity index 98%
rename from Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
index 96d22184bf..0b3331455b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu;
+package org.dolphinemu.dolphinemu.emulation;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -13,6 +13,9 @@ import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.view.*;
 import android.view.WindowManager.LayoutParams;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.settings.InputConfigFragment;
 import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java
similarity index 93%
rename from Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java
index 8013856705..31f23385ce 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/NativeGLSurfaceView.java
@@ -4,7 +4,9 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu;
+package org.dolphinemu.dolphinemu.emulation;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
index c4665e0556..bd168ec94a 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
@@ -25,9 +25,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.dolphinemu.dolphinemu.EmulationActivity;
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.emulation.EmulationActivity;
 
 
 /**