diff --git a/Projects/Android/Android.iml b/Projects/Android/Android.iml
index 26fdd4c..7c00c54 100644
--- a/Projects/Android/Android.iml
+++ b/Projects/Android/Android.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":VrSamples:QuakeQuest:Projects:Android" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.1.2" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.1.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
       </configuration>
     </facet>
     <facet type="native-android-gradle" name="Native-Android-Gradle">
@@ -30,27 +30,25 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../.." isTestSource="false" />
-    </content>
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/jni/QuakeQuestSrc" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/jni/darkplaces" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -96,13 +94,11 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.cxx" />
       <excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <content url="file://$MODULE_DIR$/../../Src">
-      <sourceFolder url="file://$MODULE_DIR$/../../Src" isTestSource="false" />
-    </content>
     <content url="file://$MODULE_DIR$/../../assets">
       <sourceFolder url="file://$MODULE_DIR$/../../assets" type="java-resource" />
     </content>
@@ -112,11 +108,11 @@
     <content url="file://$MODULE_DIR$/../../res">
       <sourceFolder url="file://$MODULE_DIR$/../../res" type="java-resource" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:24.2.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:24.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-compat:24.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android-android-24" level="project" />
+    <orderEntry type="library" name="Gradle: android-android-26" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 2849ce5..7539868 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.quakequest"
-		android:versionCode="16"
-		android:versionName="1.4.8" android:installLocation="auto" >
+		android:versionCode="17"
+		android:versionName="1.4.9" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
@@ -30,7 +30,7 @@
 				android:label="@string/quakequest"
 				android:launchMode="singleTask"
 				android:screenOrientation="landscape"
-				android:excludeFromRecents="false"
+				android:excludeFromRecents="true"
 				android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode">
 			<!-- Tell NativeActivity the name of the .so -->
 			<meta-data android:name="android.app.lib_name" android:value="quakequest" />
diff --git a/Projects/Android/android.debug.keystore b/Projects/Android/android.debug.keystore
deleted file mode 100644
index cdc70bf..0000000
Binary files a/Projects/Android/android.debug.keystore and /dev/null differ
diff --git a/Projects/Android/build.gradle b/Projects/Android/build.gradle
index d722b90..a1a3d31 100644
--- a/Projects/Android/build.gradle
+++ b/Projects/Android/build.gradle
@@ -17,10 +17,10 @@ android {
     // override app plugin abiFilters for both 32 and 64-bit support
     externalNativeBuild {
         ndk {
-                abiFilters 'armeabi-v7a','arm64-v8a'
+                abiFilters 'arm64-v8a'
         }
         ndkBuild {
-                abiFilters 'armeabi-v7a','arm64-v8a'
+                abiFilters 'arm64-v8a'
         }
     }
       minSdkVersion 24
@@ -40,7 +40,7 @@ android {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
-    compileSdkVersion = 24
+    compileSdkVersion = 26
     buildToolsVersion = '29.0.1'
 }
 
diff --git a/Projects/Android/jni/Android.mk b/Projects/Android/jni/Android.mk
index 9268fd3..af006b1 100644
--- a/Projects/Android/jni/Android.mk
+++ b/Projects/Android/jni/Android.mk
@@ -8,113 +8,126 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS			:= -std=c99
 LOCAL_MODULE			:= quakequest
-LOCAL_SRC_FILES			:= ../../../Src/QuakeQuest_SurfaceView.c
 LOCAL_LDLIBS			:= -llog -landroid -lGLESv3 -lEGL		# include default libraries
 
+LOCAL_C_INCLUDES := ../QuakeQuestSrc/ ../darkplaces/
+
 LOCAL_SHARED_LIBRARIES	:= vrapi
 
-# CD objects
-SRC_NOCD=cd_null.c
-
-SRC_SND_COMMON=snd_main.c snd_mem.c snd_mix.c snd_ogg.c snd_wav.c snd_modplug.c
-
+SRC_SND_COMMON := \
+	darkplaces/snd_main.c \
+	darkplaces/snd_mem.c \
+	darkplaces/snd_mix.c \
+	darkplaces/snd_ogg.c \
+	darkplaces/snd_wav.c \
+	darkplaces/snd_modplug.c
 
 
 ###### Common objects and flags #####
 
 # Common objects
-SRC_COMMON= \
-	argtable3.c \
-	bih.c \
-	cap_avi.c \
-	cap_ogg.c \
-	cd_shared.c \
-	crypto.c \
-	cl_collision.c \
-	cl_demo.c \
-	cl_dyntexture.c \
-	cl_input.c \
-	cl_main.c \
-	cl_parse.c \
-	cl_particles.c \
-	cl_screen.c \
-	cl_video.c \
-	clvm_cmds.c \
-	cmd.c \
-	collision.c \
-	common.c \
-	console.c \
-	csprogs.c \
-	curves.c \
-	cvar.c \
-	dpsoftrast.c \
-	dpvsimpledecode.c \
-	filematch.c \
-	fractalnoise.c \
-	fs.c \
-	ft2.c \
-	utf8lib.c \
-	gl_backend.c \
-	gl_draw.c \
-	gl_rmain.c \
-	gl_rsurf.c \
-	gl_textures.c \
-	hmac.c \
-	host.c \
-	host_cmd.c \
-	image.c \
-	image_png.c \
-	jpeg.c \
-	keys.c \
-	lhnet.c \
-	libcurl.c \
-	mathlib.c \
-	matrixlib.c \
-	mdfour.c \
-	menu.c \
-	meshqueue.c \
-	mod_skeletal_animatevertices_sse.c \
-	mod_skeletal_animatevertices_generic.c \
-	model_alias.c \
-	model_brush.c \
-	model_shared.c \
-	model_sprite.c \
-	mvm_cmds.c \
-	netconn.c \
-	palette.c \
-	polygon.c \
-	portals.c \
-	protocol.c \
-	prvm_cmds.c \
-	prvm_edict.c \
-	prvm_exec.c \
-	r_explosion.c \
-	r_lerpanim.c \
-	r_lightning.c \
-	r_lasersight.c \
-	r_modules.c \
-	r_shadow.c \
-	r_sky.c \
-	r_sprites.c \
-	sbar.c \
-	snprintf.c \
-	sv_demo.c \
-	sv_main.c \
-	sv_move.c \
-	sv_phys.c \
-	sv_user.c \
-	svbsp.c \
-	svvm_cmds.c \
-	sys_shared.c \
-	vid_shared.c \
-	view.c \
-	wad.c \
-	world.c \
-	zone.c
+SRC_COMMON := \
+	darkplaces/cd_null.c \
+	darkplaces/bih.c \
+	darkplaces/cap_avi.c \
+	darkplaces/cap_ogg.c \
+	darkplaces/cd_shared.c \
+	darkplaces/crypto.c \
+	darkplaces/cl_collision.c \
+	darkplaces/cl_demo.c \
+	darkplaces/cl_dyntexture.c \
+	darkplaces/cl_input.c \
+	darkplaces/cl_main.c \
+	darkplaces/cl_parse.c \
+	darkplaces/cl_particles.c \
+	darkplaces/cl_screen.c \
+	darkplaces/cl_video.c \
+	darkplaces/clvm_cmds.c \
+	darkplaces/cmd.c \
+	darkplaces/collision.c \
+	darkplaces/common.c \
+	darkplaces/console.c \
+	darkplaces/csprogs.c \
+	darkplaces/curves.c \
+	darkplaces/cvar.c \
+	darkplaces/dpsoftrast.c \
+	darkplaces/dpvsimpledecode.c \
+	darkplaces/filematch.c \
+	darkplaces/fractalnoise.c \
+	darkplaces/fs.c \
+	darkplaces/ft2.c \
+	darkplaces/utf8lib.c \
+	darkplaces/gl_backend.c \
+	darkplaces/gl_draw.c \
+	darkplaces/gl_rmain.c \
+	darkplaces/gl_rsurf.c \
+	darkplaces/gl_textures.c \
+	darkplaces/hmac.c \
+	darkplaces/host.c \
+	darkplaces/host_cmd.c \
+	darkplaces/image.c \
+	darkplaces/image_png.c \
+	darkplaces/jpeg.c \
+	darkplaces/keys.c \
+	darkplaces/lhnet.c \
+	darkplaces/libcurl.c \
+	darkplaces/mathlib.c \
+	darkplaces/matrixlib.c \
+	darkplaces/mdfour.c \
+	darkplaces/menu.c \
+	darkplaces/meshqueue.c \
+	darkplaces/mod_skeletal_animatevertices_sse.c \
+	darkplaces/mod_skeletal_animatevertices_generic.c \
+	darkplaces/model_alias.c \
+	darkplaces/model_brush.c \
+	darkplaces/model_shared.c \
+	darkplaces/model_sprite.c \
+	darkplaces/mvm_cmds.c \
+	darkplaces/netconn.c \
+	darkplaces/palette.c \
+	darkplaces/polygon.c \
+	darkplaces/portals.c \
+	darkplaces/protocol.c \
+	darkplaces/prvm_cmds.c \
+	darkplaces/prvm_edict.c \
+	darkplaces/prvm_exec.c \
+	darkplaces/r_explosion.c \
+	darkplaces/r_lerpanim.c \
+	darkplaces/r_lightning.c \
+	darkplaces/r_lasersight.c \
+	darkplaces/r_modules.c \
+	darkplaces/r_shadow.c \
+	darkplaces/r_sky.c \
+	darkplaces/r_sprites.c \
+	darkplaces/sbar.c \
+	darkplaces/snprintf.c \
+	darkplaces/sv_demo.c \
+	darkplaces/sv_main.c \
+	darkplaces/sv_move.c \
+	darkplaces/sv_phys.c \
+	darkplaces/sv_user.c \
+	darkplaces/svbsp.c \
+	darkplaces/svvm_cmds.c \
+	darkplaces/sys_shared.c \
+	darkplaces/vid_shared.c \
+	darkplaces/view.c \
+	darkplaces/wad.c \
+	darkplaces/world.c \
+	darkplaces/zone.c
 
-SRC_ANDROID= builddate.c sys_linux.c vid_android.c thread_pthread.c snd_android.c $(SRC_SND_COMMON) $(SRC_NOCD) $(SRC_COMMON)
+SRC_QUEST := \
+	QuakeQuestSrc/argtable3.c \
+	QuakeQuestSrc/QuakeQuest_SurfaceView.c
 
-LOCAL_SRC_FILES += $(SRC_ANDROID) 
+LOCAL_SRC_FILES := \
+	$(SRC_QUEST) \
+	darkplaces/builddate.c \
+	darkplaces/sys_linux.c \
+	darkplaces/vid_android.c \
+	darkplaces/thread_pthread.c \
+	darkplaces/snd_android.c  \
+	$(SRC_SND_COMMON) \
+	$(SRC_COMMON)
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/Projects/Android/jni/Application.mk b/Projects/Android/jni/Application.mk
index 5104ba4..28cd441 100644
--- a/Projects/Android/jni/Application.mk
+++ b/Projects/Android/jni/Application.mk
@@ -3,7 +3,7 @@
 # Application.mk.
 ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))../../../../..
 
-APP_PLATFORM := android-21
+APP_PLATFORM := android-24
 
 NDK_MODULE_PATH := $(ROOT_DIR)
 
diff --git a/Src/QuakeQuest_SurfaceView.c b/Projects/Android/jni/QuakeQuestSrc/QuakeQuest_SurfaceView.c
similarity index 99%
rename from Src/QuakeQuest_SurfaceView.c
rename to Projects/Android/jni/QuakeQuestSrc/QuakeQuest_SurfaceView.c
index 91ae1fb..46fe162 100644
--- a/Src/QuakeQuest_SurfaceView.c
+++ b/Projects/Android/jni/QuakeQuestSrc/QuakeQuest_SurfaceView.c
@@ -31,9 +31,10 @@ Copyright	:	Copyright 2015 Oculus VR, LLC. All Rights reserved.
 #include <GLES3/gl3.h>
 #include <GLES3/gl3ext.h>
 
-#include <qtypes.h>
-#include <quakedef.h>
-#include <menu.h>
+#include "../darkplaces/qtypes.h"
+#include "../darkplaces/quakedef.h"
+#include "../darkplaces/menu.h"
+
 #include <VrApi_Types.h>
 
 #if !defined( EGL_OPENGL_ES3_BIT_KHR )
diff --git a/Projects/Android/jni/argtable3.c b/Projects/Android/jni/QuakeQuestSrc/argtable3.c
similarity index 100%
rename from Projects/Android/jni/argtable3.c
rename to Projects/Android/jni/QuakeQuestSrc/argtable3.c
diff --git a/Projects/Android/jni/argtable3.h b/Projects/Android/jni/QuakeQuestSrc/argtable3.h
similarity index 100%
rename from Projects/Android/jni/argtable3.h
rename to Projects/Android/jni/QuakeQuestSrc/argtable3.h
diff --git a/Projects/Android/jni/COPYING b/Projects/Android/jni/darkplaces/COPYING
similarity index 100%
rename from Projects/Android/jni/COPYING
rename to Projects/Android/jni/darkplaces/COPYING
diff --git a/Projects/Android/jni/SDLMain.h b/Projects/Android/jni/darkplaces/SDLMain.h
similarity index 100%
rename from Projects/Android/jni/SDLMain.h
rename to Projects/Android/jni/darkplaces/SDLMain.h
diff --git a/Projects/Android/jni/bih.c b/Projects/Android/jni/darkplaces/bih.c
similarity index 100%
rename from Projects/Android/jni/bih.c
rename to Projects/Android/jni/darkplaces/bih.c
diff --git a/Projects/Android/jni/bih.h b/Projects/Android/jni/darkplaces/bih.h
similarity index 100%
rename from Projects/Android/jni/bih.h
rename to Projects/Android/jni/darkplaces/bih.h
diff --git a/Projects/Android/jni/bspfile.h b/Projects/Android/jni/darkplaces/bspfile.h
similarity index 100%
rename from Projects/Android/jni/bspfile.h
rename to Projects/Android/jni/darkplaces/bspfile.h
diff --git a/Projects/Android/jni/builddate.c b/Projects/Android/jni/darkplaces/builddate.c
similarity index 100%
rename from Projects/Android/jni/builddate.c
rename to Projects/Android/jni/darkplaces/builddate.c
diff --git a/Projects/Android/jni/cap_avi.c b/Projects/Android/jni/darkplaces/cap_avi.c
similarity index 100%
rename from Projects/Android/jni/cap_avi.c
rename to Projects/Android/jni/darkplaces/cap_avi.c
diff --git a/Projects/Android/jni/cap_avi.h b/Projects/Android/jni/darkplaces/cap_avi.h
similarity index 100%
rename from Projects/Android/jni/cap_avi.h
rename to Projects/Android/jni/darkplaces/cap_avi.h
diff --git a/Projects/Android/jni/cap_ogg.c b/Projects/Android/jni/darkplaces/cap_ogg.c
similarity index 100%
rename from Projects/Android/jni/cap_ogg.c
rename to Projects/Android/jni/darkplaces/cap_ogg.c
diff --git a/Projects/Android/jni/cap_ogg.h b/Projects/Android/jni/darkplaces/cap_ogg.h
similarity index 100%
rename from Projects/Android/jni/cap_ogg.h
rename to Projects/Android/jni/darkplaces/cap_ogg.h
diff --git a/Projects/Android/jni/cd_null.c b/Projects/Android/jni/darkplaces/cd_null.c
similarity index 100%
rename from Projects/Android/jni/cd_null.c
rename to Projects/Android/jni/darkplaces/cd_null.c
diff --git a/Projects/Android/jni/cd_shared.c b/Projects/Android/jni/darkplaces/cd_shared.c
similarity index 100%
rename from Projects/Android/jni/cd_shared.c
rename to Projects/Android/jni/darkplaces/cd_shared.c
diff --git a/Projects/Android/jni/cdaudio.h b/Projects/Android/jni/darkplaces/cdaudio.h
similarity index 100%
rename from Projects/Android/jni/cdaudio.h
rename to Projects/Android/jni/darkplaces/cdaudio.h
diff --git a/Projects/Android/jni/cl_collision.c b/Projects/Android/jni/darkplaces/cl_collision.c
similarity index 100%
rename from Projects/Android/jni/cl_collision.c
rename to Projects/Android/jni/darkplaces/cl_collision.c
diff --git a/Projects/Android/jni/cl_collision.h b/Projects/Android/jni/darkplaces/cl_collision.h
similarity index 100%
rename from Projects/Android/jni/cl_collision.h
rename to Projects/Android/jni/darkplaces/cl_collision.h
diff --git a/Projects/Android/jni/cl_demo.c b/Projects/Android/jni/darkplaces/cl_demo.c
similarity index 100%
rename from Projects/Android/jni/cl_demo.c
rename to Projects/Android/jni/darkplaces/cl_demo.c
diff --git a/Projects/Android/jni/cl_dyntexture.c b/Projects/Android/jni/darkplaces/cl_dyntexture.c
similarity index 100%
rename from Projects/Android/jni/cl_dyntexture.c
rename to Projects/Android/jni/darkplaces/cl_dyntexture.c
diff --git a/Projects/Android/jni/cl_dyntexture.h b/Projects/Android/jni/darkplaces/cl_dyntexture.h
similarity index 100%
rename from Projects/Android/jni/cl_dyntexture.h
rename to Projects/Android/jni/darkplaces/cl_dyntexture.h
diff --git a/Projects/Android/jni/cl_input.c b/Projects/Android/jni/darkplaces/cl_input.c
similarity index 100%
rename from Projects/Android/jni/cl_input.c
rename to Projects/Android/jni/darkplaces/cl_input.c
diff --git a/Projects/Android/jni/cl_main.c b/Projects/Android/jni/darkplaces/cl_main.c
similarity index 100%
rename from Projects/Android/jni/cl_main.c
rename to Projects/Android/jni/darkplaces/cl_main.c
diff --git a/Projects/Android/jni/cl_parse.c b/Projects/Android/jni/darkplaces/cl_parse.c
similarity index 100%
rename from Projects/Android/jni/cl_parse.c
rename to Projects/Android/jni/darkplaces/cl_parse.c
diff --git a/Projects/Android/jni/cl_particles.c b/Projects/Android/jni/darkplaces/cl_particles.c
similarity index 100%
rename from Projects/Android/jni/cl_particles.c
rename to Projects/Android/jni/darkplaces/cl_particles.c
diff --git a/Projects/Android/jni/cl_screen.c b/Projects/Android/jni/darkplaces/cl_screen.c
similarity index 100%
rename from Projects/Android/jni/cl_screen.c
rename to Projects/Android/jni/darkplaces/cl_screen.c
diff --git a/Projects/Android/jni/cl_screen.h b/Projects/Android/jni/darkplaces/cl_screen.h
similarity index 100%
rename from Projects/Android/jni/cl_screen.h
rename to Projects/Android/jni/darkplaces/cl_screen.h
diff --git a/Projects/Android/jni/cl_video.c b/Projects/Android/jni/darkplaces/cl_video.c
similarity index 100%
rename from Projects/Android/jni/cl_video.c
rename to Projects/Android/jni/darkplaces/cl_video.c
diff --git a/Projects/Android/jni/cl_video.h b/Projects/Android/jni/darkplaces/cl_video.h
similarity index 100%
rename from Projects/Android/jni/cl_video.h
rename to Projects/Android/jni/darkplaces/cl_video.h
diff --git a/Projects/Android/jni/cl_video_libavw.c b/Projects/Android/jni/darkplaces/cl_video_libavw.c
similarity index 100%
rename from Projects/Android/jni/cl_video_libavw.c
rename to Projects/Android/jni/darkplaces/cl_video_libavw.c
diff --git a/Projects/Android/jni/client.h b/Projects/Android/jni/darkplaces/client.h
similarity index 100%
rename from Projects/Android/jni/client.h
rename to Projects/Android/jni/darkplaces/client.h
diff --git a/Projects/Android/jni/clprogdefs.h b/Projects/Android/jni/darkplaces/clprogdefs.h
similarity index 100%
rename from Projects/Android/jni/clprogdefs.h
rename to Projects/Android/jni/darkplaces/clprogdefs.h
diff --git a/Projects/Android/jni/clvm_cmds.c b/Projects/Android/jni/darkplaces/clvm_cmds.c
similarity index 100%
rename from Projects/Android/jni/clvm_cmds.c
rename to Projects/Android/jni/darkplaces/clvm_cmds.c
diff --git a/Projects/Android/jni/clvm_cmds.h b/Projects/Android/jni/darkplaces/clvm_cmds.h
similarity index 100%
rename from Projects/Android/jni/clvm_cmds.h
rename to Projects/Android/jni/darkplaces/clvm_cmds.h
diff --git a/Projects/Android/jni/cmd.c b/Projects/Android/jni/darkplaces/cmd.c
similarity index 100%
rename from Projects/Android/jni/cmd.c
rename to Projects/Android/jni/darkplaces/cmd.c
diff --git a/Projects/Android/jni/cmd.h b/Projects/Android/jni/darkplaces/cmd.h
similarity index 100%
rename from Projects/Android/jni/cmd.h
rename to Projects/Android/jni/darkplaces/cmd.h
diff --git a/Projects/Android/jni/collision.c b/Projects/Android/jni/darkplaces/collision.c
similarity index 100%
rename from Projects/Android/jni/collision.c
rename to Projects/Android/jni/darkplaces/collision.c
diff --git a/Projects/Android/jni/collision.h b/Projects/Android/jni/darkplaces/collision.h
similarity index 100%
rename from Projects/Android/jni/collision.h
rename to Projects/Android/jni/darkplaces/collision.h
diff --git a/Projects/Android/jni/common.c b/Projects/Android/jni/darkplaces/common.c
similarity index 100%
rename from Projects/Android/jni/common.c
rename to Projects/Android/jni/darkplaces/common.c
diff --git a/Projects/Android/jni/common.h b/Projects/Android/jni/darkplaces/common.h
similarity index 100%
rename from Projects/Android/jni/common.h
rename to Projects/Android/jni/darkplaces/common.h
diff --git a/Projects/Android/jni/conproc.c b/Projects/Android/jni/darkplaces/conproc.c
similarity index 100%
rename from Projects/Android/jni/conproc.c
rename to Projects/Android/jni/darkplaces/conproc.c
diff --git a/Projects/Android/jni/conproc.h b/Projects/Android/jni/darkplaces/conproc.h
similarity index 100%
rename from Projects/Android/jni/conproc.h
rename to Projects/Android/jni/darkplaces/conproc.h
diff --git a/Projects/Android/jni/console.c b/Projects/Android/jni/darkplaces/console.c
similarity index 100%
rename from Projects/Android/jni/console.c
rename to Projects/Android/jni/darkplaces/console.c
diff --git a/Projects/Android/jni/console.h b/Projects/Android/jni/darkplaces/console.h
similarity index 100%
rename from Projects/Android/jni/console.h
rename to Projects/Android/jni/darkplaces/console.h
diff --git a/Projects/Android/jni/crypto.c b/Projects/Android/jni/darkplaces/crypto.c
similarity index 100%
rename from Projects/Android/jni/crypto.c
rename to Projects/Android/jni/darkplaces/crypto.c
diff --git a/Projects/Android/jni/crypto.h b/Projects/Android/jni/darkplaces/crypto.h
similarity index 100%
rename from Projects/Android/jni/crypto.h
rename to Projects/Android/jni/darkplaces/crypto.h
diff --git a/Projects/Android/jni/csprogs.c b/Projects/Android/jni/darkplaces/csprogs.c
similarity index 100%
rename from Projects/Android/jni/csprogs.c
rename to Projects/Android/jni/darkplaces/csprogs.c
diff --git a/Projects/Android/jni/csprogs.h b/Projects/Android/jni/darkplaces/csprogs.h
similarity index 100%
rename from Projects/Android/jni/csprogs.h
rename to Projects/Android/jni/darkplaces/csprogs.h
diff --git a/Projects/Android/jni/curves.c b/Projects/Android/jni/darkplaces/curves.c
similarity index 100%
rename from Projects/Android/jni/curves.c
rename to Projects/Android/jni/darkplaces/curves.c
diff --git a/Projects/Android/jni/curves.h b/Projects/Android/jni/darkplaces/curves.h
similarity index 100%
rename from Projects/Android/jni/curves.h
rename to Projects/Android/jni/darkplaces/curves.h
diff --git a/Projects/Android/jni/cvar.c b/Projects/Android/jni/darkplaces/cvar.c
similarity index 100%
rename from Projects/Android/jni/cvar.c
rename to Projects/Android/jni/darkplaces/cvar.c
diff --git a/Projects/Android/jni/cvar.h b/Projects/Android/jni/darkplaces/cvar.h
similarity index 100%
rename from Projects/Android/jni/cvar.h
rename to Projects/Android/jni/darkplaces/cvar.h
diff --git a/Projects/Android/jni/dpsoftrast.c b/Projects/Android/jni/darkplaces/dpsoftrast.c
similarity index 100%
rename from Projects/Android/jni/dpsoftrast.c
rename to Projects/Android/jni/darkplaces/dpsoftrast.c
diff --git a/Projects/Android/jni/dpsoftrast.h b/Projects/Android/jni/darkplaces/dpsoftrast.h
similarity index 100%
rename from Projects/Android/jni/dpsoftrast.h
rename to Projects/Android/jni/darkplaces/dpsoftrast.h
diff --git a/Projects/Android/jni/dpvsimpledecode.c b/Projects/Android/jni/darkplaces/dpvsimpledecode.c
similarity index 100%
rename from Projects/Android/jni/dpvsimpledecode.c
rename to Projects/Android/jni/darkplaces/dpvsimpledecode.c
diff --git a/Projects/Android/jni/dpvsimpledecode.h b/Projects/Android/jni/darkplaces/dpvsimpledecode.h
similarity index 100%
rename from Projects/Android/jni/dpvsimpledecode.h
rename to Projects/Android/jni/darkplaces/dpvsimpledecode.h
diff --git a/Projects/Android/jni/draw.h b/Projects/Android/jni/darkplaces/draw.h
similarity index 100%
rename from Projects/Android/jni/draw.h
rename to Projects/Android/jni/darkplaces/draw.h
diff --git a/Projects/Android/jni/filematch.c b/Projects/Android/jni/darkplaces/filematch.c
similarity index 100%
rename from Projects/Android/jni/filematch.c
rename to Projects/Android/jni/darkplaces/filematch.c
diff --git a/Projects/Android/jni/fractalnoise.c b/Projects/Android/jni/darkplaces/fractalnoise.c
similarity index 100%
rename from Projects/Android/jni/fractalnoise.c
rename to Projects/Android/jni/darkplaces/fractalnoise.c
diff --git a/Projects/Android/jni/fs.c b/Projects/Android/jni/darkplaces/fs.c
similarity index 100%
rename from Projects/Android/jni/fs.c
rename to Projects/Android/jni/darkplaces/fs.c
diff --git a/Projects/Android/jni/fs.h b/Projects/Android/jni/darkplaces/fs.h
similarity index 100%
rename from Projects/Android/jni/fs.h
rename to Projects/Android/jni/darkplaces/fs.h
diff --git a/Projects/Android/jni/ft2.c b/Projects/Android/jni/darkplaces/ft2.c
similarity index 100%
rename from Projects/Android/jni/ft2.c
rename to Projects/Android/jni/darkplaces/ft2.c
diff --git a/Projects/Android/jni/ft2.h b/Projects/Android/jni/darkplaces/ft2.h
similarity index 100%
rename from Projects/Android/jni/ft2.h
rename to Projects/Android/jni/darkplaces/ft2.h
diff --git a/Projects/Android/jni/ft2_defs.h b/Projects/Android/jni/darkplaces/ft2_defs.h
similarity index 100%
rename from Projects/Android/jni/ft2_defs.h
rename to Projects/Android/jni/darkplaces/ft2_defs.h
diff --git a/Projects/Android/jni/ft2_fontdefs.h b/Projects/Android/jni/darkplaces/ft2_fontdefs.h
similarity index 100%
rename from Projects/Android/jni/ft2_fontdefs.h
rename to Projects/Android/jni/darkplaces/ft2_fontdefs.h
diff --git a/Projects/Android/jni/gl_backend.c b/Projects/Android/jni/darkplaces/gl_backend.c
similarity index 100%
rename from Projects/Android/jni/gl_backend.c
rename to Projects/Android/jni/darkplaces/gl_backend.c
diff --git a/Projects/Android/jni/gl_backend.h b/Projects/Android/jni/darkplaces/gl_backend.h
similarity index 100%
rename from Projects/Android/jni/gl_backend.h
rename to Projects/Android/jni/darkplaces/gl_backend.h
diff --git a/Projects/Android/jni/gl_draw.c b/Projects/Android/jni/darkplaces/gl_draw.c
similarity index 100%
rename from Projects/Android/jni/gl_draw.c
rename to Projects/Android/jni/darkplaces/gl_draw.c
diff --git a/Projects/Android/jni/gl_rmain.c b/Projects/Android/jni/darkplaces/gl_rmain.c
similarity index 100%
rename from Projects/Android/jni/gl_rmain.c
rename to Projects/Android/jni/darkplaces/gl_rmain.c
diff --git a/Projects/Android/jni/gl_rsurf.c b/Projects/Android/jni/darkplaces/gl_rsurf.c
similarity index 100%
rename from Projects/Android/jni/gl_rsurf.c
rename to Projects/Android/jni/darkplaces/gl_rsurf.c
diff --git a/Projects/Android/jni/gl_textures.c b/Projects/Android/jni/darkplaces/gl_textures.c
similarity index 100%
rename from Projects/Android/jni/gl_textures.c
rename to Projects/Android/jni/darkplaces/gl_textures.c
diff --git a/Projects/Android/jni/glquake.h b/Projects/Android/jni/darkplaces/glquake.h
similarity index 100%
rename from Projects/Android/jni/glquake.h
rename to Projects/Android/jni/darkplaces/glquake.h
diff --git a/Projects/Android/jni/hmac.c b/Projects/Android/jni/darkplaces/hmac.c
similarity index 100%
rename from Projects/Android/jni/hmac.c
rename to Projects/Android/jni/darkplaces/hmac.c
diff --git a/Projects/Android/jni/hmac.h b/Projects/Android/jni/darkplaces/hmac.h
similarity index 100%
rename from Projects/Android/jni/hmac.h
rename to Projects/Android/jni/darkplaces/hmac.h
diff --git a/Projects/Android/jni/host.c b/Projects/Android/jni/darkplaces/host.c
similarity index 100%
rename from Projects/Android/jni/host.c
rename to Projects/Android/jni/darkplaces/host.c
diff --git a/Projects/Android/jni/host_cmd.c b/Projects/Android/jni/darkplaces/host_cmd.c
similarity index 100%
rename from Projects/Android/jni/host_cmd.c
rename to Projects/Android/jni/darkplaces/host_cmd.c
diff --git a/Projects/Android/jni/image.c b/Projects/Android/jni/darkplaces/image.c
similarity index 100%
rename from Projects/Android/jni/image.c
rename to Projects/Android/jni/darkplaces/image.c
diff --git a/Projects/Android/jni/image.h b/Projects/Android/jni/darkplaces/image.h
similarity index 100%
rename from Projects/Android/jni/image.h
rename to Projects/Android/jni/darkplaces/image.h
diff --git a/Projects/Android/jni/image_png.c b/Projects/Android/jni/darkplaces/image_png.c
similarity index 100%
rename from Projects/Android/jni/image_png.c
rename to Projects/Android/jni/darkplaces/image_png.c
diff --git a/Projects/Android/jni/image_png.h b/Projects/Android/jni/darkplaces/image_png.h
similarity index 100%
rename from Projects/Android/jni/image_png.h
rename to Projects/Android/jni/darkplaces/image_png.h
diff --git a/Projects/Android/jni/input.h b/Projects/Android/jni/darkplaces/input.h
similarity index 100%
rename from Projects/Android/jni/input.h
rename to Projects/Android/jni/darkplaces/input.h
diff --git a/Projects/Android/jni/intoverflow.h b/Projects/Android/jni/darkplaces/intoverflow.h
similarity index 100%
rename from Projects/Android/jni/intoverflow.h
rename to Projects/Android/jni/darkplaces/intoverflow.h
diff --git a/Projects/Android/jni/jpeg.c b/Projects/Android/jni/darkplaces/jpeg.c
similarity index 100%
rename from Projects/Android/jni/jpeg.c
rename to Projects/Android/jni/darkplaces/jpeg.c
diff --git a/Projects/Android/jni/jpeg.h b/Projects/Android/jni/darkplaces/jpeg.h
similarity index 100%
rename from Projects/Android/jni/jpeg.h
rename to Projects/Android/jni/darkplaces/jpeg.h
diff --git a/Projects/Android/jni/keys.c b/Projects/Android/jni/darkplaces/keys.c
similarity index 100%
rename from Projects/Android/jni/keys.c
rename to Projects/Android/jni/darkplaces/keys.c
diff --git a/Projects/Android/jni/keys.h b/Projects/Android/jni/darkplaces/keys.h
similarity index 100%
rename from Projects/Android/jni/keys.h
rename to Projects/Android/jni/darkplaces/keys.h
diff --git a/Projects/Android/jni/lhfont.h b/Projects/Android/jni/darkplaces/lhfont.h
similarity index 100%
rename from Projects/Android/jni/lhfont.h
rename to Projects/Android/jni/darkplaces/lhfont.h
diff --git a/Projects/Android/jni/lhnet.c b/Projects/Android/jni/darkplaces/lhnet.c
similarity index 100%
rename from Projects/Android/jni/lhnet.c
rename to Projects/Android/jni/darkplaces/lhnet.c
diff --git a/Projects/Android/jni/lhnet.h b/Projects/Android/jni/darkplaces/lhnet.h
similarity index 100%
rename from Projects/Android/jni/lhnet.h
rename to Projects/Android/jni/darkplaces/lhnet.h
diff --git a/Projects/Android/jni/libcurl.c b/Projects/Android/jni/darkplaces/libcurl.c
similarity index 100%
rename from Projects/Android/jni/libcurl.c
rename to Projects/Android/jni/darkplaces/libcurl.c
diff --git a/Projects/Android/jni/libcurl.h b/Projects/Android/jni/darkplaces/libcurl.h
similarity index 100%
rename from Projects/Android/jni/libcurl.h
rename to Projects/Android/jni/darkplaces/libcurl.h
diff --git a/Projects/Android/jni/mathlib.c b/Projects/Android/jni/darkplaces/mathlib.c
similarity index 100%
rename from Projects/Android/jni/mathlib.c
rename to Projects/Android/jni/darkplaces/mathlib.c
diff --git a/Projects/Android/jni/mathlib.h b/Projects/Android/jni/darkplaces/mathlib.h
similarity index 100%
rename from Projects/Android/jni/mathlib.h
rename to Projects/Android/jni/darkplaces/mathlib.h
diff --git a/Projects/Android/jni/matrixlib.c b/Projects/Android/jni/darkplaces/matrixlib.c
similarity index 100%
rename from Projects/Android/jni/matrixlib.c
rename to Projects/Android/jni/darkplaces/matrixlib.c
diff --git a/Projects/Android/jni/matrixlib.h b/Projects/Android/jni/darkplaces/matrixlib.h
similarity index 100%
rename from Projects/Android/jni/matrixlib.h
rename to Projects/Android/jni/darkplaces/matrixlib.h
diff --git a/Projects/Android/jni/mdfour.c b/Projects/Android/jni/darkplaces/mdfour.c
similarity index 100%
rename from Projects/Android/jni/mdfour.c
rename to Projects/Android/jni/darkplaces/mdfour.c
diff --git a/Projects/Android/jni/mdfour.h b/Projects/Android/jni/darkplaces/mdfour.h
similarity index 100%
rename from Projects/Android/jni/mdfour.h
rename to Projects/Android/jni/darkplaces/mdfour.h
diff --git a/Projects/Android/jni/menu.c b/Projects/Android/jni/darkplaces/menu.c
similarity index 99%
rename from Projects/Android/jni/menu.c
rename to Projects/Android/jni/darkplaces/menu.c
index facaac1..9d9543a 100644
--- a/Projects/Android/jni/menu.c
+++ b/Projects/Android/jni/darkplaces/menu.c
@@ -3611,7 +3611,7 @@ static void M_Credits_Draw (void)
 			"   QQQQQQQQ           QQQQQQQQ      ",
 			"     QQQ                QQQ         ",
    			"      Q                  Q          ",
-	  		"      Q                  Q   v1.4.8 ");
+	  		"      Q                  Q   v1.4.9 ");
 
 	int i, l, linelength, firstline, lastline, lines;
 	for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_credits_message[i];i++)
diff --git a/Projects/Android/jni/menu.h b/Projects/Android/jni/darkplaces/menu.h
similarity index 100%
rename from Projects/Android/jni/menu.h
rename to Projects/Android/jni/darkplaces/menu.h
diff --git a/Projects/Android/jni/meshqueue.c b/Projects/Android/jni/darkplaces/meshqueue.c
similarity index 100%
rename from Projects/Android/jni/meshqueue.c
rename to Projects/Android/jni/darkplaces/meshqueue.c
diff --git a/Projects/Android/jni/meshqueue.h b/Projects/Android/jni/darkplaces/meshqueue.h
similarity index 100%
rename from Projects/Android/jni/meshqueue.h
rename to Projects/Android/jni/darkplaces/meshqueue.h
diff --git a/Projects/Android/jni/mod_skeletal_animatevertices_generic.c b/Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_generic.c
similarity index 100%
rename from Projects/Android/jni/mod_skeletal_animatevertices_generic.c
rename to Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_generic.c
diff --git a/Projects/Android/jni/mod_skeletal_animatevertices_generic.h b/Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_generic.h
similarity index 100%
rename from Projects/Android/jni/mod_skeletal_animatevertices_generic.h
rename to Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_generic.h
diff --git a/Projects/Android/jni/mod_skeletal_animatevertices_sse.c b/Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_sse.c
similarity index 100%
rename from Projects/Android/jni/mod_skeletal_animatevertices_sse.c
rename to Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_sse.c
diff --git a/Projects/Android/jni/mod_skeletal_animatevertices_sse.h b/Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_sse.h
similarity index 100%
rename from Projects/Android/jni/mod_skeletal_animatevertices_sse.h
rename to Projects/Android/jni/darkplaces/mod_skeletal_animatevertices_sse.h
diff --git a/Projects/Android/jni/model_alias.c b/Projects/Android/jni/darkplaces/model_alias.c
similarity index 100%
rename from Projects/Android/jni/model_alias.c
rename to Projects/Android/jni/darkplaces/model_alias.c
diff --git a/Projects/Android/jni/model_alias.h b/Projects/Android/jni/darkplaces/model_alias.h
similarity index 100%
rename from Projects/Android/jni/model_alias.h
rename to Projects/Android/jni/darkplaces/model_alias.h
diff --git a/Projects/Android/jni/model_brush.c b/Projects/Android/jni/darkplaces/model_brush.c
similarity index 100%
rename from Projects/Android/jni/model_brush.c
rename to Projects/Android/jni/darkplaces/model_brush.c
diff --git a/Projects/Android/jni/model_brush.h b/Projects/Android/jni/darkplaces/model_brush.h
similarity index 100%
rename from Projects/Android/jni/model_brush.h
rename to Projects/Android/jni/darkplaces/model_brush.h
diff --git a/Projects/Android/jni/model_dpmodel.h b/Projects/Android/jni/darkplaces/model_dpmodel.h
similarity index 100%
rename from Projects/Android/jni/model_dpmodel.h
rename to Projects/Android/jni/darkplaces/model_dpmodel.h
diff --git a/Projects/Android/jni/model_iqm.h b/Projects/Android/jni/darkplaces/model_iqm.h
similarity index 100%
rename from Projects/Android/jni/model_iqm.h
rename to Projects/Android/jni/darkplaces/model_iqm.h
diff --git a/Projects/Android/jni/model_psk.h b/Projects/Android/jni/darkplaces/model_psk.h
similarity index 100%
rename from Projects/Android/jni/model_psk.h
rename to Projects/Android/jni/darkplaces/model_psk.h
diff --git a/Projects/Android/jni/model_shared.c b/Projects/Android/jni/darkplaces/model_shared.c
similarity index 100%
rename from Projects/Android/jni/model_shared.c
rename to Projects/Android/jni/darkplaces/model_shared.c
diff --git a/Projects/Android/jni/model_shared.h b/Projects/Android/jni/darkplaces/model_shared.h
similarity index 100%
rename from Projects/Android/jni/model_shared.h
rename to Projects/Android/jni/darkplaces/model_shared.h
diff --git a/Projects/Android/jni/model_sprite.c b/Projects/Android/jni/darkplaces/model_sprite.c
similarity index 100%
rename from Projects/Android/jni/model_sprite.c
rename to Projects/Android/jni/darkplaces/model_sprite.c
diff --git a/Projects/Android/jni/model_sprite.h b/Projects/Android/jni/darkplaces/model_sprite.h
similarity index 100%
rename from Projects/Android/jni/model_sprite.h
rename to Projects/Android/jni/darkplaces/model_sprite.h
diff --git a/Projects/Android/jni/model_zymotic.h b/Projects/Android/jni/darkplaces/model_zymotic.h
similarity index 100%
rename from Projects/Android/jni/model_zymotic.h
rename to Projects/Android/jni/darkplaces/model_zymotic.h
diff --git a/Projects/Android/jni/modelgen.h b/Projects/Android/jni/darkplaces/modelgen.h
similarity index 100%
rename from Projects/Android/jni/modelgen.h
rename to Projects/Android/jni/darkplaces/modelgen.h
diff --git a/Projects/Android/jni/mprogdefs.h b/Projects/Android/jni/darkplaces/mprogdefs.h
similarity index 100%
rename from Projects/Android/jni/mprogdefs.h
rename to Projects/Android/jni/darkplaces/mprogdefs.h
diff --git a/Projects/Android/jni/mvm_cmds.c b/Projects/Android/jni/darkplaces/mvm_cmds.c
similarity index 100%
rename from Projects/Android/jni/mvm_cmds.c
rename to Projects/Android/jni/darkplaces/mvm_cmds.c
diff --git a/Projects/Android/jni/netconn.c b/Projects/Android/jni/darkplaces/netconn.c
similarity index 100%
rename from Projects/Android/jni/netconn.c
rename to Projects/Android/jni/darkplaces/netconn.c
diff --git a/Projects/Android/jni/netconn.h b/Projects/Android/jni/darkplaces/netconn.h
similarity index 100%
rename from Projects/Android/jni/netconn.h
rename to Projects/Android/jni/darkplaces/netconn.h
diff --git a/Projects/Android/jni/palette.c b/Projects/Android/jni/darkplaces/palette.c
similarity index 100%
rename from Projects/Android/jni/palette.c
rename to Projects/Android/jni/darkplaces/palette.c
diff --git a/Projects/Android/jni/palette.h b/Projects/Android/jni/darkplaces/palette.h
similarity index 100%
rename from Projects/Android/jni/palette.h
rename to Projects/Android/jni/darkplaces/palette.h
diff --git a/Projects/Android/jni/polygon.c b/Projects/Android/jni/darkplaces/polygon.c
similarity index 100%
rename from Projects/Android/jni/polygon.c
rename to Projects/Android/jni/darkplaces/polygon.c
diff --git a/Projects/Android/jni/polygon.h b/Projects/Android/jni/darkplaces/polygon.h
similarity index 100%
rename from Projects/Android/jni/polygon.h
rename to Projects/Android/jni/darkplaces/polygon.h
diff --git a/Projects/Android/jni/portals.c b/Projects/Android/jni/darkplaces/portals.c
similarity index 100%
rename from Projects/Android/jni/portals.c
rename to Projects/Android/jni/darkplaces/portals.c
diff --git a/Projects/Android/jni/portals.h b/Projects/Android/jni/darkplaces/portals.h
similarity index 100%
rename from Projects/Android/jni/portals.h
rename to Projects/Android/jni/darkplaces/portals.h
diff --git a/Projects/Android/jni/pr_comp.h b/Projects/Android/jni/darkplaces/pr_comp.h
similarity index 100%
rename from Projects/Android/jni/pr_comp.h
rename to Projects/Android/jni/darkplaces/pr_comp.h
diff --git a/Projects/Android/jni/progdefs.h b/Projects/Android/jni/darkplaces/progdefs.h
similarity index 100%
rename from Projects/Android/jni/progdefs.h
rename to Projects/Android/jni/darkplaces/progdefs.h
diff --git a/Projects/Android/jni/progs.h b/Projects/Android/jni/darkplaces/progs.h
similarity index 100%
rename from Projects/Android/jni/progs.h
rename to Projects/Android/jni/darkplaces/progs.h
diff --git a/Projects/Android/jni/progsvm.h b/Projects/Android/jni/darkplaces/progsvm.h
similarity index 100%
rename from Projects/Android/jni/progsvm.h
rename to Projects/Android/jni/darkplaces/progsvm.h
diff --git a/Projects/Android/jni/protocol.c b/Projects/Android/jni/darkplaces/protocol.c
similarity index 100%
rename from Projects/Android/jni/protocol.c
rename to Projects/Android/jni/darkplaces/protocol.c
diff --git a/Projects/Android/jni/protocol.h b/Projects/Android/jni/darkplaces/protocol.h
similarity index 100%
rename from Projects/Android/jni/protocol.h
rename to Projects/Android/jni/darkplaces/protocol.h
diff --git a/Projects/Android/jni/prvm_cmds.c b/Projects/Android/jni/darkplaces/prvm_cmds.c
similarity index 100%
rename from Projects/Android/jni/prvm_cmds.c
rename to Projects/Android/jni/darkplaces/prvm_cmds.c
diff --git a/Projects/Android/jni/prvm_cmds.h b/Projects/Android/jni/darkplaces/prvm_cmds.h
similarity index 100%
rename from Projects/Android/jni/prvm_cmds.h
rename to Projects/Android/jni/darkplaces/prvm_cmds.h
diff --git a/Projects/Android/jni/prvm_edict.c b/Projects/Android/jni/darkplaces/prvm_edict.c
similarity index 100%
rename from Projects/Android/jni/prvm_edict.c
rename to Projects/Android/jni/darkplaces/prvm_edict.c
diff --git a/Projects/Android/jni/prvm_exec.c b/Projects/Android/jni/darkplaces/prvm_exec.c
similarity index 100%
rename from Projects/Android/jni/prvm_exec.c
rename to Projects/Android/jni/darkplaces/prvm_exec.c
diff --git a/Projects/Android/jni/prvm_execprogram.h b/Projects/Android/jni/darkplaces/prvm_execprogram.h
similarity index 100%
rename from Projects/Android/jni/prvm_execprogram.h
rename to Projects/Android/jni/darkplaces/prvm_execprogram.h
diff --git a/Projects/Android/jni/prvm_offsets.h b/Projects/Android/jni/darkplaces/prvm_offsets.h
similarity index 100%
rename from Projects/Android/jni/prvm_offsets.h
rename to Projects/Android/jni/darkplaces/prvm_offsets.h
diff --git a/Projects/Android/jni/qtypes.h b/Projects/Android/jni/darkplaces/qtypes.h
similarity index 100%
rename from Projects/Android/jni/qtypes.h
rename to Projects/Android/jni/darkplaces/qtypes.h
diff --git a/Projects/Android/jni/quakedef.h b/Projects/Android/jni/darkplaces/quakedef.h
similarity index 100%
rename from Projects/Android/jni/quakedef.h
rename to Projects/Android/jni/darkplaces/quakedef.h
diff --git a/Projects/Android/jni/r_explosion.c b/Projects/Android/jni/darkplaces/r_explosion.c
similarity index 100%
rename from Projects/Android/jni/r_explosion.c
rename to Projects/Android/jni/darkplaces/r_explosion.c
diff --git a/Projects/Android/jni/r_lasersight.c b/Projects/Android/jni/darkplaces/r_lasersight.c
similarity index 100%
rename from Projects/Android/jni/r_lasersight.c
rename to Projects/Android/jni/darkplaces/r_lasersight.c
diff --git a/Projects/Android/jni/r_lerpanim.c b/Projects/Android/jni/darkplaces/r_lerpanim.c
similarity index 100%
rename from Projects/Android/jni/r_lerpanim.c
rename to Projects/Android/jni/darkplaces/r_lerpanim.c
diff --git a/Projects/Android/jni/r_lerpanim.h b/Projects/Android/jni/darkplaces/r_lerpanim.h
similarity index 100%
rename from Projects/Android/jni/r_lerpanim.h
rename to Projects/Android/jni/darkplaces/r_lerpanim.h
diff --git a/Projects/Android/jni/r_lightning.c b/Projects/Android/jni/darkplaces/r_lightning.c
similarity index 100%
rename from Projects/Android/jni/r_lightning.c
rename to Projects/Android/jni/darkplaces/r_lightning.c
diff --git a/Projects/Android/jni/r_modules.c b/Projects/Android/jni/darkplaces/r_modules.c
similarity index 100%
rename from Projects/Android/jni/r_modules.c
rename to Projects/Android/jni/darkplaces/r_modules.c
diff --git a/Projects/Android/jni/r_modules.h b/Projects/Android/jni/darkplaces/r_modules.h
similarity index 100%
rename from Projects/Android/jni/r_modules.h
rename to Projects/Android/jni/darkplaces/r_modules.h
diff --git a/Projects/Android/jni/r_shadow.c b/Projects/Android/jni/darkplaces/r_shadow.c
similarity index 100%
rename from Projects/Android/jni/r_shadow.c
rename to Projects/Android/jni/darkplaces/r_shadow.c
diff --git a/Projects/Android/jni/r_shadow.h b/Projects/Android/jni/darkplaces/r_shadow.h
similarity index 100%
rename from Projects/Android/jni/r_shadow.h
rename to Projects/Android/jni/darkplaces/r_shadow.h
diff --git a/Projects/Android/jni/r_sky.c b/Projects/Android/jni/darkplaces/r_sky.c
similarity index 100%
rename from Projects/Android/jni/r_sky.c
rename to Projects/Android/jni/darkplaces/r_sky.c
diff --git a/Projects/Android/jni/r_sprites.c b/Projects/Android/jni/darkplaces/r_sprites.c
similarity index 100%
rename from Projects/Android/jni/r_sprites.c
rename to Projects/Android/jni/darkplaces/r_sprites.c
diff --git a/Projects/Android/jni/r_textures.h b/Projects/Android/jni/darkplaces/r_textures.h
similarity index 100%
rename from Projects/Android/jni/r_textures.h
rename to Projects/Android/jni/darkplaces/r_textures.h
diff --git a/Projects/Android/jni/render.h b/Projects/Android/jni/darkplaces/render.h
similarity index 100%
rename from Projects/Android/jni/render.h
rename to Projects/Android/jni/darkplaces/render.h
diff --git a/Projects/Android/jni/resource.h b/Projects/Android/jni/darkplaces/resource.h
similarity index 100%
rename from Projects/Android/jni/resource.h
rename to Projects/Android/jni/darkplaces/resource.h
diff --git a/Projects/Android/jni/sbar.c b/Projects/Android/jni/darkplaces/sbar.c
similarity index 100%
rename from Projects/Android/jni/sbar.c
rename to Projects/Android/jni/darkplaces/sbar.c
diff --git a/Projects/Android/jni/sbar.h b/Projects/Android/jni/darkplaces/sbar.h
similarity index 100%
rename from Projects/Android/jni/sbar.h
rename to Projects/Android/jni/darkplaces/sbar.h
diff --git a/Projects/Android/jni/screen.h b/Projects/Android/jni/darkplaces/screen.h
similarity index 100%
rename from Projects/Android/jni/screen.h
rename to Projects/Android/jni/darkplaces/screen.h
diff --git a/Projects/Android/jni/server.h b/Projects/Android/jni/darkplaces/server.h
similarity index 100%
rename from Projects/Android/jni/server.h
rename to Projects/Android/jni/darkplaces/server.h
diff --git a/Projects/Android/jni/shader_glsl.h b/Projects/Android/jni/darkplaces/shader_glsl.h
similarity index 100%
rename from Projects/Android/jni/shader_glsl.h
rename to Projects/Android/jni/darkplaces/shader_glsl.h
diff --git a/Projects/Android/jni/shader_hlsl.h b/Projects/Android/jni/darkplaces/shader_hlsl.h
similarity index 100%
rename from Projects/Android/jni/shader_hlsl.h
rename to Projects/Android/jni/darkplaces/shader_hlsl.h
diff --git a/Projects/Android/jni/snd_android.c b/Projects/Android/jni/darkplaces/snd_android.c
similarity index 97%
rename from Projects/Android/jni/snd_android.c
rename to Projects/Android/jni/darkplaces/snd_android.c
index 4c13763..073ab0c 100644
--- a/Projects/Android/jni/snd_android.c
+++ b/Projects/Android/jni/darkplaces/snd_android.c
@@ -28,8 +28,8 @@ static unsigned int audiopos = 0;
 static unsigned int buffersize;
 //__attribute__((weak)) __dso_handle=0;
 
-extern void jni_initAudio(void *buffer, int size);
-extern void jni_writeAudio(int offset, int length);
+void jni_initAudio(void *buffer, int size);
+void jni_writeAudio(int offset, int length);
 
 void QC_GetAudio()
 {
diff --git a/Projects/Android/jni/snd_main.c b/Projects/Android/jni/darkplaces/snd_main.c
similarity index 100%
rename from Projects/Android/jni/snd_main.c
rename to Projects/Android/jni/darkplaces/snd_main.c
diff --git a/Projects/Android/jni/snd_main.h b/Projects/Android/jni/darkplaces/snd_main.h
similarity index 100%
rename from Projects/Android/jni/snd_main.h
rename to Projects/Android/jni/darkplaces/snd_main.h
diff --git a/Projects/Android/jni/snd_mem.c b/Projects/Android/jni/darkplaces/snd_mem.c
similarity index 100%
rename from Projects/Android/jni/snd_mem.c
rename to Projects/Android/jni/darkplaces/snd_mem.c
diff --git a/Projects/Android/jni/snd_mix.c b/Projects/Android/jni/darkplaces/snd_mix.c
similarity index 100%
rename from Projects/Android/jni/snd_mix.c
rename to Projects/Android/jni/darkplaces/snd_mix.c
diff --git a/Projects/Android/jni/snd_modplug.c b/Projects/Android/jni/darkplaces/snd_modplug.c
similarity index 100%
rename from Projects/Android/jni/snd_modplug.c
rename to Projects/Android/jni/darkplaces/snd_modplug.c
diff --git a/Projects/Android/jni/snd_modplug.h b/Projects/Android/jni/darkplaces/snd_modplug.h
similarity index 100%
rename from Projects/Android/jni/snd_modplug.h
rename to Projects/Android/jni/darkplaces/snd_modplug.h
diff --git a/Projects/Android/jni/snd_ogg.c b/Projects/Android/jni/darkplaces/snd_ogg.c
similarity index 100%
rename from Projects/Android/jni/snd_ogg.c
rename to Projects/Android/jni/darkplaces/snd_ogg.c
diff --git a/Projects/Android/jni/snd_ogg.h b/Projects/Android/jni/darkplaces/snd_ogg.h
similarity index 100%
rename from Projects/Android/jni/snd_ogg.h
rename to Projects/Android/jni/darkplaces/snd_ogg.h
diff --git a/Projects/Android/jni/snd_wav.c b/Projects/Android/jni/darkplaces/snd_wav.c
similarity index 100%
rename from Projects/Android/jni/snd_wav.c
rename to Projects/Android/jni/darkplaces/snd_wav.c
diff --git a/Projects/Android/jni/snd_wav.h b/Projects/Android/jni/darkplaces/snd_wav.h
similarity index 100%
rename from Projects/Android/jni/snd_wav.h
rename to Projects/Android/jni/darkplaces/snd_wav.h
diff --git a/Projects/Android/jni/snprintf.c b/Projects/Android/jni/darkplaces/snprintf.c
similarity index 100%
rename from Projects/Android/jni/snprintf.c
rename to Projects/Android/jni/darkplaces/snprintf.c
diff --git a/Projects/Android/jni/snprintf.h b/Projects/Android/jni/darkplaces/snprintf.h
similarity index 100%
rename from Projects/Android/jni/snprintf.h
rename to Projects/Android/jni/darkplaces/snprintf.h
diff --git a/Projects/Android/jni/sound.h b/Projects/Android/jni/darkplaces/sound.h
similarity index 100%
rename from Projects/Android/jni/sound.h
rename to Projects/Android/jni/darkplaces/sound.h
diff --git a/Projects/Android/jni/spritegn.h b/Projects/Android/jni/darkplaces/spritegn.h
similarity index 100%
rename from Projects/Android/jni/spritegn.h
rename to Projects/Android/jni/darkplaces/spritegn.h
diff --git a/Projects/Android/jni/sv_demo.c b/Projects/Android/jni/darkplaces/sv_demo.c
similarity index 100%
rename from Projects/Android/jni/sv_demo.c
rename to Projects/Android/jni/darkplaces/sv_demo.c
diff --git a/Projects/Android/jni/sv_demo.h b/Projects/Android/jni/darkplaces/sv_demo.h
similarity index 100%
rename from Projects/Android/jni/sv_demo.h
rename to Projects/Android/jni/darkplaces/sv_demo.h
diff --git a/Projects/Android/jni/sv_main.c b/Projects/Android/jni/darkplaces/sv_main.c
similarity index 100%
rename from Projects/Android/jni/sv_main.c
rename to Projects/Android/jni/darkplaces/sv_main.c
diff --git a/Projects/Android/jni/sv_move.c b/Projects/Android/jni/darkplaces/sv_move.c
similarity index 100%
rename from Projects/Android/jni/sv_move.c
rename to Projects/Android/jni/darkplaces/sv_move.c
diff --git a/Projects/Android/jni/sv_phys.c b/Projects/Android/jni/darkplaces/sv_phys.c
similarity index 100%
rename from Projects/Android/jni/sv_phys.c
rename to Projects/Android/jni/darkplaces/sv_phys.c
diff --git a/Projects/Android/jni/sv_user.c b/Projects/Android/jni/darkplaces/sv_user.c
similarity index 100%
rename from Projects/Android/jni/sv_user.c
rename to Projects/Android/jni/darkplaces/sv_user.c
diff --git a/Projects/Android/jni/svbsp.c b/Projects/Android/jni/darkplaces/svbsp.c
similarity index 100%
rename from Projects/Android/jni/svbsp.c
rename to Projects/Android/jni/darkplaces/svbsp.c
diff --git a/Projects/Android/jni/svbsp.h b/Projects/Android/jni/darkplaces/svbsp.h
similarity index 100%
rename from Projects/Android/jni/svbsp.h
rename to Projects/Android/jni/darkplaces/svbsp.h
diff --git a/Projects/Android/jni/svvm_cmds.c b/Projects/Android/jni/darkplaces/svvm_cmds.c
similarity index 100%
rename from Projects/Android/jni/svvm_cmds.c
rename to Projects/Android/jni/darkplaces/svvm_cmds.c
diff --git a/Projects/Android/jni/sys.h b/Projects/Android/jni/darkplaces/sys.h
similarity index 100%
rename from Projects/Android/jni/sys.h
rename to Projects/Android/jni/darkplaces/sys.h
diff --git a/Projects/Android/jni/sys_linux.c b/Projects/Android/jni/darkplaces/sys_linux.c
similarity index 100%
rename from Projects/Android/jni/sys_linux.c
rename to Projects/Android/jni/darkplaces/sys_linux.c
diff --git a/Projects/Android/jni/sys_shared.c b/Projects/Android/jni/darkplaces/sys_shared.c
similarity index 100%
rename from Projects/Android/jni/sys_shared.c
rename to Projects/Android/jni/darkplaces/sys_shared.c
diff --git a/Projects/Android/jni/thread.h b/Projects/Android/jni/darkplaces/thread.h
similarity index 100%
rename from Projects/Android/jni/thread.h
rename to Projects/Android/jni/darkplaces/thread.h
diff --git a/Projects/Android/jni/thread_pthread.c b/Projects/Android/jni/darkplaces/thread_pthread.c
similarity index 100%
rename from Projects/Android/jni/thread_pthread.c
rename to Projects/Android/jni/darkplaces/thread_pthread.c
diff --git a/Projects/Android/jni/timing.h b/Projects/Android/jni/darkplaces/timing.h
similarity index 100%
rename from Projects/Android/jni/timing.h
rename to Projects/Android/jni/darkplaces/timing.h
diff --git a/Projects/Android/jni/utf8lib.c b/Projects/Android/jni/darkplaces/utf8lib.c
similarity index 100%
rename from Projects/Android/jni/utf8lib.c
rename to Projects/Android/jni/darkplaces/utf8lib.c
diff --git a/Projects/Android/jni/utf8lib.h b/Projects/Android/jni/darkplaces/utf8lib.h
similarity index 100%
rename from Projects/Android/jni/utf8lib.h
rename to Projects/Android/jni/darkplaces/utf8lib.h
diff --git a/Projects/Android/jni/vid.h b/Projects/Android/jni/darkplaces/vid.h
similarity index 100%
rename from Projects/Android/jni/vid.h
rename to Projects/Android/jni/darkplaces/vid.h
diff --git a/Projects/Android/jni/vid_android.c b/Projects/Android/jni/darkplaces/vid_android.c
similarity index 100%
rename from Projects/Android/jni/vid_android.c
rename to Projects/Android/jni/darkplaces/vid_android.c
diff --git a/Projects/Android/jni/vid_shared.c b/Projects/Android/jni/darkplaces/vid_shared.c
similarity index 100%
rename from Projects/Android/jni/vid_shared.c
rename to Projects/Android/jni/darkplaces/vid_shared.c
diff --git a/Projects/Android/jni/view.c b/Projects/Android/jni/darkplaces/view.c
similarity index 100%
rename from Projects/Android/jni/view.c
rename to Projects/Android/jni/darkplaces/view.c
diff --git a/Projects/Android/jni/wad.c b/Projects/Android/jni/darkplaces/wad.c
similarity index 100%
rename from Projects/Android/jni/wad.c
rename to Projects/Android/jni/darkplaces/wad.c
diff --git a/Projects/Android/jni/wad.h b/Projects/Android/jni/darkplaces/wad.h
similarity index 100%
rename from Projects/Android/jni/wad.h
rename to Projects/Android/jni/darkplaces/wad.h
diff --git a/Projects/Android/jni/world.c b/Projects/Android/jni/darkplaces/world.c
similarity index 100%
rename from Projects/Android/jni/world.c
rename to Projects/Android/jni/darkplaces/world.c
diff --git a/Projects/Android/jni/world.h b/Projects/Android/jni/darkplaces/world.h
similarity index 100%
rename from Projects/Android/jni/world.h
rename to Projects/Android/jni/darkplaces/world.h
diff --git a/Projects/Android/jni/zone.c b/Projects/Android/jni/darkplaces/zone.c
similarity index 100%
rename from Projects/Android/jni/zone.c
rename to Projects/Android/jni/darkplaces/zone.c
diff --git a/Projects/Android/jni/zone.h b/Projects/Android/jni/darkplaces/zone.h
similarity index 100%
rename from Projects/Android/jni/zone.h
rename to Projects/Android/jni/darkplaces/zone.h
diff --git a/assets/commandline.txt b/assets/commandline.txt
index 378dd36..ae88cd1 100644
--- a/assets/commandline.txt
+++ b/assets/commandline.txt
@@ -1 +1 @@
-quake --supersampling 1.35
\ No newline at end of file
+quake
\ No newline at end of file