diff --git a/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
index 01a5a7fff..585eca6e7 100644
--- a/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
+++ b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
@@ -23,7 +23,7 @@ import com.reicast.emulator.R;
 import com.reicast.emulator.emu.GL2JNIView;
 import com.reicast.emulator.emu.JNIdc;
 import com.reicast.emulator.emu.OnScreenMenu;
-import com.reicast.emulator.emu.VJoy;
+import com.reicast.emulator.periph.VJoy;
 
 @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
 public class EditVJoyActivity extends Activity {
@@ -127,7 +127,11 @@ public class EditVJoyActivity extends Activity {
 		if (keyCode == KeyEvent.KEYCODE_MENU
 				|| keyCode == KeyEvent.KEYCODE_BACK) {
 			if (!popUp.isShowing()) {
-				popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+					popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 60);
+				} else {
+					popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
+				}
 				popUp.update(LayoutParams.WRAP_CONTENT,
 						LayoutParams.WRAP_CONTENT);
 			} else {
diff --git a/shell/android/src/com/reicast/emulator/config/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java
index ca46c0049..f127990d4 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.emu.MOGAInput;
+import com.reicast.emulator.periph.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 902de48b8..c2541f879 100644
--- a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
@@ -28,6 +28,8 @@ import android.widget.Toast;
 
 import com.reicast.emulator.R;
 import com.reicast.emulator.config.ConfigureFragment;
+import com.reicast.emulator.periph.MOGAInput;
+import com.reicast.emulator.periph.SipEmulator;
 
 @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 fa07600ca..48128caba 100644
--- a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
@@ -29,6 +29,7 @@ import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener;
 import android.view.View;
 
 import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.periph.VJoy;
 
 
 /**
diff --git a/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
index c021e6354..5c9cd7670 100644
--- a/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
+++ b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
@@ -19,6 +19,7 @@ import android.widget.PopupWindow;
 import com.reicast.emulator.MainActivity;
 import com.reicast.emulator.R;
 import com.reicast.emulator.config.ConfigureFragment;
+import com.reicast.emulator.periph.VmuLcd;
 
 public class OnScreenMenu {
 
diff --git a/shell/android/src/com/reicast/emulator/emu/MOGAInput.java b/shell/android/src/com/reicast/emulator/periph/MOGAInput.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/emu/MOGAInput.java
rename to shell/android/src/com/reicast/emulator/periph/MOGAInput.java
index c8dc7fb7b..f6abf2c62 100644
--- a/shell/android/src/com/reicast/emulator/emu/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/periph/MOGAInput.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.emu;
+package com.reicast.emulator.periph;
 
 
 /******************************************************************************/
@@ -16,6 +16,9 @@ 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/emu/SipEmulator.java b/shell/android/src/com/reicast/emulator/periph/SipEmulator.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/emu/SipEmulator.java
rename to shell/android/src/com/reicast/emulator/periph/SipEmulator.java
index a20a029cc..491c6bd8a 100644
--- a/shell/android/src/com/reicast/emulator/emu/SipEmulator.java
+++ b/shell/android/src/com/reicast/emulator/periph/SipEmulator.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.emu;
+package com.reicast.emulator.periph;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
diff --git a/shell/android/src/com/reicast/emulator/emu/VJoy.java b/shell/android/src/com/reicast/emulator/periph/VJoy.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/emu/VJoy.java
rename to shell/android/src/com/reicast/emulator/periph/VJoy.java
index fdb60cadf..7756abb7f 100644
--- a/shell/android/src/com/reicast/emulator/emu/VJoy.java
+++ b/shell/android/src/com/reicast/emulator/periph/VJoy.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator.emu;
+package com.reicast.emulator.periph;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/shell/android/src/com/reicast/emulator/emu/VmuLcd.java b/shell/android/src/com/reicast/emulator/periph/VmuLcd.java
similarity index 91%
rename from shell/android/src/com/reicast/emulator/emu/VmuLcd.java
rename to shell/android/src/com/reicast/emulator/periph/VmuLcd.java
index 66027fe5a..57bb79a2a 100644
--- a/shell/android/src/com/reicast/emulator/emu/VmuLcd.java
+++ b/shell/android/src/com/reicast/emulator/periph/VmuLcd.java
@@ -1,4 +1,6 @@
-package com.reicast.emulator.emu;
+package com.reicast.emulator.periph;
+
+import com.reicast.emulator.emu.OnScreenMenu;
 
 import android.content.Context;
 import android.graphics.Bitmap;