diff --git a/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
index e53997057..01a5a7fff 100644
--- a/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
+++ b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
@@ -22,8 +22,8 @@ import com.reicast.emulator.MainActivity;
 import com.reicast.emulator.R;
 import com.reicast.emulator.emu.GL2JNIView;
 import com.reicast.emulator.emu.JNIdc;
-import com.reicast.emulator.input.OnScreenMenu;
-import com.reicast.emulator.input.VJoy;
+import com.reicast.emulator.emu.OnScreenMenu;
+import com.reicast.emulator.emu.VJoy;
 
 @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
 public class EditVJoyActivity extends Activity {
diff --git a/shell/android/src/com/reicast/emulator/config/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java
index e5b33370a..ca46c0049 100644
--- a/shell/android/src/com/reicast/emulator/config/InputFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java
@@ -31,7 +31,7 @@ import com.bda.controller.MotionEvent;
 import com.bda.controller.StateEvent;
 import com.reicast.emulator.MainActivity;
 import com.reicast.emulator.R;
-import com.reicast.emulator.input.MOGAInput;
+import com.reicast.emulator.emu.MOGAInput;
 
 import de.ankri.views.Switch;
 
diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
index be1aa0c85..0c906739b 100644
--- a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
@@ -25,8 +25,6 @@ import android.widget.Toast;
 
 import com.reicast.emulator.R;
 import com.reicast.emulator.config.ConfigureFragment;
-import com.reicast.emulator.input.MOGAInput;
-import com.reicast.emulator.input.OnScreenMenu;
 
 @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
 public class GL2JNIActivity extends Activity {
diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
index 4b982ba4d..c3bfa9833 100644
--- a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
@@ -29,7 +29,6 @@ import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener;
 import android.view.View;
 
 import com.reicast.emulator.MainActivity;
-import com.reicast.emulator.input.VJoy;
 
 
 /**
diff --git a/shell/android/src/com/reicast/emulator/input/MOGAInput.java b/shell/android/src/com/reicast/emulator/emu/MOGAInput.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/input/MOGAInput.java
rename to shell/android/src/com/reicast/emulator/emu/MOGAInput.java
index 8fb4be4c0..c8dc7fb7b 100644
--- a/shell/android/src/com/reicast/emulator/input/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/emu/MOGAInput.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.input;
+package com.reicast.emulator.emu;
 
 
 /******************************************************************************/
@@ -16,9 +16,6 @@ import com.bda.controller.KeyEvent;
 import com.bda.controller.MotionEvent;
 import com.bda.controller.StateEvent;
 import com.reicast.emulator.R;
-import com.reicast.emulator.emu.GL2JNIActivity;
-import com.reicast.emulator.emu.GL2JNIView;
-import com.reicast.emulator.emu.JNIdc;
 
 /******************************************************************************/
 
diff --git a/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/input/OnScreenMenu.java
rename to shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
index 45fa65325..b73fffcb6 100644
--- a/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java
+++ b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.input;
+package com.reicast.emulator.emu;
 
 import java.io.File;
 
@@ -18,8 +18,6 @@ import android.widget.PopupWindow;
 import com.reicast.emulator.MainActivity;
 import com.reicast.emulator.R;
 import com.reicast.emulator.config.ConfigureFragment;
-import com.reicast.emulator.emu.GL2JNIActivity;
-import com.reicast.emulator.emu.JNIdc;
 
 public class OnScreenMenu {
 
diff --git a/shell/android/src/com/reicast/emulator/input/VJoy.java b/shell/android/src/com/reicast/emulator/emu/VJoy.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/input/VJoy.java
rename to shell/android/src/com/reicast/emulator/emu/VJoy.java
index c0b6ab748..fdb60cadf 100644
--- a/shell/android/src/com/reicast/emulator/input/VJoy.java
+++ b/shell/android/src/com/reicast/emulator/emu/VJoy.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.input;
+package com.reicast.emulator.emu;
 
 import android.content.Context;
 import android.content.SharedPreferences;