diff --git a/xwords4/android/XWords4/build.xml b/xwords4/android/XWords4/build.xml
index 140644958..76c761aa7 100644
--- a/xwords4/android/XWords4/build.xml
+++ b/xwords4/android/XWords4/build.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="XWords4" default="release_svn">
-
-  <target name="release_svn" depends="release">
-    <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt" />
-  </target>
+<project name="XWords4" default="release">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked in in Version
@@ -52,6 +48,10 @@
         classname="com.android.ant.SetupTask"
         classpathref="android.antlibs" />
 
+    <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt" />
+
+
+
     <!-- Execute the Android Setup task that will setup some properties specific to the target,
          and import the build rules files.
 
diff --git a/xwords4/android/Android.mk b/xwords4/android/XWords4/jni/Android.mk
similarity index 52%
rename from xwords4/android/Android.mk
rename to xwords4/android/XWords4/jni/Android.mk
index e78121a66..1b91fb1f2 100644
--- a/xwords4/android/Android.mk
+++ b/xwords4/android/XWords4/jni/Android.mk
@@ -4,14 +4,14 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-local_C_INCLUDES+= 			  \
-	-I$(LOCAL_PATH)/../common \
-	-I$(LOCAL_PATH)/../relay \
+COMMON_PATH=../../../common
+local_C_INCLUDES+= \
+	-I$(LOCAL_PATH)/$(COMMON_PATH) \
+	-I$(LOCAL_PATH)/../../../relay \
 
 local_LDLIBS += -llog
 
 # local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING
-
 local_DEFINES += \
 	$(local_DEBUG) \
 	-DXWFEATURE_TURNCHANGENOTIFY \
@@ -29,25 +29,27 @@ local_SRC_FILES +=         \
 	anddict.c              \
 	andutils.c             \
 
+
+COMMON_PATH=../../../common
 common_SRC_FILES +=        \
-	../common/boarddrw.c   \
-	../common/scorebdp.c   \
-	../common/dragdrpp.c   \
-	../common/pool.c       \
-	../common/tray.c       \
-	../common/dictnry.c    \
-	../common/mscore.c     \
-	../common/vtabmgr.c    \
-	../common/strutils.c   \
-	../common/engine.c     \
-	../common/board.c      \
-	../common/mempool.c    \
-	../common/game.c       \
-	../common/server.c     \
-	../common/model.c      \
-	../common/comms.c      \
-	../common/memstream.c  \
-	../common/movestak.c   \
+	$(COMMON_PATH)/boarddrw.c   \
+	$(COMMON_PATH)/scorebdp.c   \
+	$(COMMON_PATH)/dragdrpp.c   \
+	$(COMMON_PATH)/pool.c       \
+	$(COMMON_PATH)/tray.c       \
+	$(COMMON_PATH)/dictnry.c    \
+	$(COMMON_PATH)/mscore.c     \
+	$(COMMON_PATH)/vtabmgr.c    \
+	$(COMMON_PATH)/strutils.c   \
+	$(COMMON_PATH)/engine.c     \
+	$(COMMON_PATH)/board.c      \
+	$(COMMON_PATH)/mempool.c    \
+	$(COMMON_PATH)/game.c       \
+	$(COMMON_PATH)/server.c     \
+	$(COMMON_PATH)/model.c      \
+	$(COMMON_PATH)/comms.c      \
+	$(COMMON_PATH)/memstream.c  \
+	$(COMMON_PATH)/movestak.c   \
 
 
 LOCAL_CFLAGS+=$(local_C_INCLUDES) $(local_DEFINES)
diff --git a/xwords4/android/LocalizedStrIncludes.h b/xwords4/android/XWords4/jni/LocalizedStrIncludes.h
similarity index 100%
rename from xwords4/android/LocalizedStrIncludes.h
rename to xwords4/android/XWords4/jni/LocalizedStrIncludes.h
diff --git a/xwords4/android/anddict.c b/xwords4/android/XWords4/jni/anddict.c
similarity index 100%
rename from xwords4/android/anddict.c
rename to xwords4/android/XWords4/jni/anddict.c
diff --git a/xwords4/android/anddict.h b/xwords4/android/XWords4/jni/anddict.h
similarity index 100%
rename from xwords4/android/anddict.h
rename to xwords4/android/XWords4/jni/anddict.h
diff --git a/xwords4/android/andglobals.h b/xwords4/android/XWords4/jni/andglobals.h
similarity index 100%
rename from xwords4/android/andglobals.h
rename to xwords4/android/XWords4/jni/andglobals.h
diff --git a/xwords4/android/andutils.c b/xwords4/android/XWords4/jni/andutils.c
similarity index 100%
rename from xwords4/android/andutils.c
rename to xwords4/android/XWords4/jni/andutils.c
diff --git a/xwords4/android/andutils.h b/xwords4/android/XWords4/jni/andutils.h
similarity index 100%
rename from xwords4/android/andutils.h
rename to xwords4/android/XWords4/jni/andutils.h
diff --git a/xwords4/android/drawwrapper.c b/xwords4/android/XWords4/jni/drawwrapper.c
similarity index 100%
rename from xwords4/android/drawwrapper.c
rename to xwords4/android/XWords4/jni/drawwrapper.c
diff --git a/xwords4/android/drawwrapper.h b/xwords4/android/XWords4/jni/drawwrapper.h
similarity index 100%
rename from xwords4/android/drawwrapper.h
rename to xwords4/android/XWords4/jni/drawwrapper.h
diff --git a/xwords4/android/utils.c b/xwords4/android/XWords4/jni/utils.c
similarity index 100%
rename from xwords4/android/utils.c
rename to xwords4/android/XWords4/jni/utils.c
diff --git a/xwords4/android/utilwrapper.c b/xwords4/android/XWords4/jni/utilwrapper.c
similarity index 100%
rename from xwords4/android/utilwrapper.c
rename to xwords4/android/XWords4/jni/utilwrapper.c
diff --git a/xwords4/android/utilwrapper.h b/xwords4/android/XWords4/jni/utilwrapper.h
similarity index 100%
rename from xwords4/android/utilwrapper.h
rename to xwords4/android/XWords4/jni/utilwrapper.h
diff --git a/xwords4/android/xptypes.h b/xwords4/android/XWords4/jni/xptypes.h
similarity index 100%
rename from xwords4/android/xptypes.h
rename to xwords4/android/XWords4/jni/xptypes.h
diff --git a/xwords4/android/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c
similarity index 100%
rename from xwords4/android/xwjni.c
rename to xwords4/android/XWords4/jni/xwjni.c
diff --git a/xwords4/android/XWords4/local.properties b/xwords4/android/XWords4/local.properties
index d88de394b..6d6f3b022 100644
--- a/xwords4/android/XWords4/local.properties
+++ b/xwords4/android/XWords4/local.properties
@@ -7,4 +7,4 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/home/andy/android-sdk-linux
+sdk.dir=/home/andy/android-sdk-linux_86
diff --git a/xwords4/android/scripts/ndkbuild.sh b/xwords4/android/scripts/ndkbuild.sh
index 5c4da980f..985aebec3 100755
--- a/xwords4/android/scripts/ndkbuild.sh
+++ b/xwords4/android/scripts/ndkbuild.sh
@@ -6,7 +6,7 @@ OLDDIR=$(pwd)
 
 if [ -z "$NDK_ROOT" ]; then
     echo -n "NDK_ROOT not set... "
-    NDK_ROOT="$HOME/android-ndk-1.5_r1"
+    NDK_ROOT="$HOME/android-ndk-1.6_r1"
     if [ -d $NDK_ROOT ]; then
         echo "using $NDK_ROOT"
     else
@@ -18,14 +18,6 @@ fi
 cd $(dirname $0)
 cd ../
 
-if [ -h $NDK_ROOT/sources/$APP -a $(readlink $NDK_ROOT/sources/$APP) != $(pwd) ]; then
-    rm $NDK_ROOT/sources/$APP
-fi
-if [ ! -h $NDK_ROOT/sources/$APP ]; then
-    echo "adding symlink to sources"
-    ln -sf $(pwd) $NDK_ROOT/sources/$APP
-fi
-
 if [ -h $NDK_ROOT/apps/$APP -a $(readlink $NDK_ROOT/apps/$APP) != $(pwd) ]; then
     rm $NDK_ROOT/apps/$APP
 fi