diff --git a/.gitmodules b/.gitmodules
index f35ce704..3759c837 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "jni/src/NanoGL/nanogl"]
 	path = jni/src/NanoGL/nanogl
 	url = https://github.com/FWGS/nanogl
-[submodule "jni/src/Xash3D/xash3d"]
-	path = jni/src/Xash3D/xash3d
-	url = https://github.com/FWGS/xash3d
 [submodule "xash-extras"]
 	path = xash-extras
 	url = https://github.com/FWGS/xash-extras
diff --git a/android/gen-config.sh b/android/gen-config.sh
new file mode 100755
index 00000000..9a264411
--- /dev/null
+++ b/android/gen-config.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+git update-index --assume-unchanged $XASH_CONFIG
+PKG_TEST=false
+CHECK_SIGNATURES=false
+RELEASE=false
+GP_VERSION=false
+XASH_CONFIG=$1src/in/celest/xash3d/XashConfig.java
+shift
+case "$*" in
+*test*) export PKG_TEST=true;;
+esac
+case "$*" in
+*sign*) export CHECK_SIGNATURES=true;
+esac
+case "$*" in
+*release*) export RELEASE=true;;
+esac
+case "$*" in
+*gp*) export GP_VERSION=true;;
+esac
+_V="public static final boolean"
+echo package in.celest.xash3d\; >$XASH_CONFIG
+echo public class XashConfig { >>$XASH_CONFIG
+echo $_V PKG_TEST = $PKG_TEST\; >>$XASH_CONFIG
+echo $_V CHECK_SIGNATURES = $CHECK_SIGNATURES\; >>$XASH_CONFIG
+echo $_V RELEASE = $RELEASE\; >>$XASH_CONFIG
+echo $_V GP_VERSION = $GP_VERSION\; >>$XASH_CONFIG
+echo } >>$XASH_CONFIG
+cat $XASH_CONFIG
diff --git a/android/gen-version.sh b/android/gen-version.sh
new file mode 100755
index 00000000..f7bc5541
--- /dev/null
+++ b/android/gen-version.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+GIT_REV_XML=gen/res/values/git-rev.xml
+
+mkdir -p $(dirname $GIT_REV_XML)
+
+echo '<?xml version="1.0" encoding="utf-8"?>' > $GIT_REV_XML
+echo '<resources>' >> $GIT_REV_XML
+echo -n '<string name="git_revisions">' >> $GIT_REV_XML
+echo -n '<b>Version information:</b> ' $*_endl| sed -e s/_endl/'\\n'/ >> $GIT_REV_XML
+git submodule --quiet foreach --recursive 'echo -n \<b\>`basename $name`:\</b\>\ `git log --abbrev-commit --pretty=oneline -1` _endl' | sed -e 's/_endl/\\n/g' >> $GIT_REV_XML
+echo -n $USER@$(hostname) $(date +%H:%M:%S-%d-%m-%y) >> $GIT_REV_XML
+echo '</string>' >> $GIT_REV_XML
+echo '</resources>' >> $GIT_REV_XML
+cat $GIT_REV_XML
diff --git a/gen-config.sh b/gen-config.sh
deleted file mode 100755
index b1145939..00000000
--- a/gen-config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-git update-index --assume-unchanged src/in/celest/xash3d/XashConfig.java
-PKG_TEST=false
-CHECK_SIGNATURES=false
-RELEASE=false
-GP_VERSION=false
-case "$*" in
-*test*) export PKG_TEST=true;;
-esac
-case "$*" in
-*sign*) export CHECK_SIGNATURES=true;
-esac
-case "$*" in
-*release*) export RELEASE=true;;
-esac
-case "$*" in
-*gp*) export GP_VERSION=true;;
-esac
-_V="public static final boolean"
-echo package in.celest.xash3d\; >src/in/celest/xash3d/XashConfig.java
-echo public class XashConfig { >>src/in/celest/xash3d/XashConfig.java
-echo $_V PKG_TEST = $PKG_TEST\; >>src/in/celest/xash3d/XashConfig.java
-echo $_V CHECK_SIGNATURES = $CHECK_SIGNATURES\; >>src/in/celest/xash3d/XashConfig.java
-echo $_V RELEASE = $RELEASE\; >>src/in/celest/xash3d/XashConfig.java
-echo $_V GP_VERSION = $GP_VERSION\; >>src/in/celest/xash3d/XashConfig.java
-echo } >>src/in/celest/xash3d/XashConfig.java
-cat src/in/celest/xash3d/XashConfig.java
-
-
diff --git a/gen-version.sh b/gen-version.sh
deleted file mode 100755
index ad1c184b..00000000
--- a/gen-version.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-git update-index --assume-unchanged res/values/git-rev.xml
-echo '<?xml version="1.0" encoding="utf-8"?>' > res/values/git-rev.xml
-echo '<resources>' >> res/values/git-rev.xml
-echo -n '<string name="git_revisions">' >> res/values/git-rev.xml
-echo -n '<b>Version information:</b> ' $*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml
-echo -n '<b>android:</b>' $(git log --abbrev-commit --pretty=oneline -1) _endl\
-'<b>engine:</b>' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) _endl\
-'<b>hlsdk:</b>' $(cd jni/src/hlsdk-xash3d/;git log --abbrev-commit --pretty=oneline -1) _endl\
-'<b>extras:</b>' $(cd xash-extras/;git log --abbrev-commit --pretty=oneline -1) _endl\
-'<b>nanogl:</b>' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1)_endl\
- | sed -e s/\'//g -e s/_endl/'\\n'/g >> res/values/git-rev.xml
-echo -n $USER@$(hostname) $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml
-echo '</string>' >> res/values/git-rev.xml
-echo '</resources>' >> res/values/git-rev.xml
-cat res/values/git-rev.xml
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
deleted file mode 160000
index 5fc42fbb..00000000
--- a/jni/src/Xash3D/xash3d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5fc42fbb47c3090009f3fb1be9e3cd65b9d86668