diff --git a/src/ui/android/.classpath b/src/ui/android/.classpath
index 48f4f566f..2f27127f0 100644
--- a/src/ui/android/.classpath
+++ b/src/ui/android/.classpath
@@ -3,8 +3,11 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jni"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jpgf"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/src/runtime/android/Android.mk b/src/ui/android/jni/Android.mk
similarity index 62%
rename from src/runtime/android/Android.mk
rename to src/ui/android/jni/Android.mk
index a670f689c..febd57a65 100644
--- a/src/runtime/android/Android.mk
+++ b/src/ui/android/jni/Android.mk
@@ -2,13 +2,15 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-jni_c_files := ../java/jpgf.c
+jni_c_files := jpgf.c
 pgf_c_files := data.c expr.c graphviz.c lexer.c linearizer.c literals.c parser.c parseval.c pgf.c printer.c reader.c reasoner.c
 gu_c_files := assert.c  choice.c  exn.c   fun.c   in.c      list.c  map.c  out.c    str.c     type.c  utf8.c \
 bits.c    defs.c    enum.c  file.c  hash.c  intern.c  log.c   mem.c  prime.c  seq.c   string.c  ucs.c   variant.c
 
 LOCAL_MODULE    := jpgf
-LOCAL_SRC_FILES := $(addprefix ../c/pgf/, $(pgf_c_files)) $(addprefix ../c/gu/, $(gu_c_files))
-LOCAL_C_INCLUDES := ../c
+LOCAL_SRC_FILES := $(addprefix ../../../runtime/java/, $(jni_c_files)) \
+                   $(addprefix ../../../runtime/c/pgf/, $(pgf_c_files)) \
+                   $(addprefix ../../../runtime/c/gu/, $(gu_c_files))
+LOCAL_C_INCLUDES := ../../../runtime/c
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/src/runtime/android/Application.mk b/src/ui/android/jni/Application.mk
similarity index 100%
rename from src/runtime/android/Application.mk
rename to src/ui/android/jni/Application.mk