diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh
index d63543834..d1ec82abc 100755
--- a/ChangeAppSettings.sh
+++ b/ChangeAppSettings.sh
@@ -13,9 +13,6 @@ if [ "$CHANGE_APP_SETTINGS_VERSION" != "$AppSettingVersion" ]; then
 	AUTO=
 fi
 
-LibSdlVersionOld=`readlink project/jni/sdl | grep -o '[0-9][.][0-9]'`
-CompiledLibrariesOld=$CompiledLibraries
-
 var=""
 
 if [ -z "$AUTO" ]; then
@@ -305,7 +302,7 @@ if [ "$MultiABI" = "y" ] ; then
 else
 	MultiABI="armeabi"
 fi
-LibrariesToLoad="System.loadLibrary(\\\"sdl\\\");"
+LibrariesToLoad="System.loadLibrary(\\\"sdl-$LibSdlVersion\\\");"
 for lib in $CompiledLibraries; do
 	LibrariesToLoad="$LibrariesToLoad System.loadLibrary(\\\"$lib\\\");"
 done
@@ -316,12 +313,6 @@ fi
 
 ReadmeText="`echo $ReadmeText | sed 's/\"/\\\\\\\\\"/g' | sed 's/[&%]//g'`"
 
-echo Creating symlink to libSDL
-if [ "`readlink project/jni/sdl`" '!=' "../sdl/sdl-$LibSdlVersion" ]; then
-	rm -f project/jni/sdl
-	ln -s ../sdl/sdl-$LibSdlVersion project/jni/sdl
-fi
-
 echo Patching project/AndroidManifest.xml
 cat project/AndroidManifest.xml | \
 	sed "s/package=.*/package=\"$AppFullName\"/" | \
@@ -367,7 +358,8 @@ cat project/jni/Android.mk | \
 	sed "s^APPLICATION_ADDITIONAL_LDFLAGS :=.*^APPLICATION_ADDITIONAL_LDFLAGS := $AppLdflags^" | \
 	sed "s^SDL_ADDITIONAL_CFLAGS :=.*^SDL_ADDITIONAL_CFLAGS := $RedefinedKeycodes^" | \
 	sed "s^APPLICATION_SUBDIRS_BUILD :=.*^APPLICATION_SUBDIRS_BUILD := $AppSubdirsBuild^" | \
-	sed "s^APPLICATION_CUSTOM_BUILD_SCRIPT :=.*^APPLICATION_CUSTOM_BUILD_SCRIPT := $CustomBuildScript^" > \
+	sed "s^APPLICATION_CUSTOM_BUILD_SCRIPT :=.*^APPLICATION_CUSTOM_BUILD_SCRIPT := $CustomBuildScript^" | \
+	sed "s^SDL_VERSION :=.*^SDL_VERSION := $LibSdlVersion^"  > \
 	project/jni/Android.mk.1
 if [ -n "`diff -w project/jni/Android.mk.1 project/jni/Android.mk`" ] ; then
 	mv -f project/jni/Android.mk.1 project/jni/Android.mk
@@ -377,7 +369,7 @@ fi
 
 echo Patching project/jni/Application.mk
 cat project/jni/Application.mk | \
-	sed "s/APP_MODULES := .*/APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype $CompiledLibraries/" | \
+	sed "s/APP_MODULES := .*/APP_MODULES := application sdl-$LibSdlVersion sdl_main stlport tremor png jpeg freetype $CompiledLibraries/" | \
 	sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" > \
 	project/jni/Application.mk.1
 if [ -n "`diff -w project/jni/Application.mk.1 project/jni/Application.mk`" ] ; then
@@ -392,22 +384,14 @@ cat project/res/values/strings.xml | \
 	project/res/values/strings.xml.1
 mv -f project/res/values/strings.xml.1 project/res/values/strings.xml
 
-echo Forcing rebuild of specific files
+echo If you change libSDL version you have to clean all files in project/libs/obj
 rm -rf project/libs/*
 for OUT in obj; do
 rm -rf project/$OUT/local/*/objs/sdl_main/* project/$OUT/local/*/libsdl_main.so
-rm -rf project/$OUT/local/*/libsdl.so
-rm -rf project/$OUT/local/*/libstlport.a # Should be re-linked if you're changing toolchain
-rm -rf project/$OUT/local/*/objs/sdl/src/*/android
-rm -rf project/$OUT/local/*/objs/sdl/src/video/SDL_video.o
-rm -rf project/$OUT/local/*/objs/sdl/SDL_renderer_gles.o
-if [ "$LibSdlVersionOld" '!=' "$LibSdlVersion" ]; then
-	# Internal types are different in SDL 1.2 and 1.3, namely SDL_Rect, so all libs using it have to be recompiled
-	rm -rf project/$OUT/local/*/objs/sdl* project/$OUT/local/*/libsdl*
-	rm -rf project/$OUT/local/*/objs/application project/$OUT/local/*/libapplication.so
-fi
-# Do not rebuild libraries that do not need that
-# find project/$OUT/local -name "*.[oa]" -exec touch '{}' \;
+rm -rf project/$OUT/local/*/libsdl-*.so
+rm -rf project/$OUT/local/*/objs/sdl-*/src/*/android
+rm -rf project/$OUT/local/*/objs/sdl-*/src/video/SDL_video.o
+rm -rf project/$OUT/local/*/objs/sdl-*/SDL_renderer_gles.o
 done
 
 echo Done
diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 667b9983f..88cb4c9ff 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -35,6 +35,8 @@ APPLICATION_CUSTOM_BUILD_SCRIPT :=
 
 SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=LCTRL -DSDL_ANDROID_KEYCODE_2=PAGEUP -DSDL_ANDROID_KEYCODE_3=PAGEDOWN -DSDL_ANDROID_KEYCODE_4=LCTRL
 
+SDL_VERSION := 1.3
+
 # If SDL_Mixer should link to libMAD
 SDL_MIXER_USE_LIBMAD :=
 ifneq ($(strip $(filter mad, $(COMPILED_LIBRARIES))),)
diff --git a/project/jni/Application.mk b/project/jni/Application.mk
index 259b137fd..f947b8721 100644
--- a/project/jni/Application.mk
+++ b/project/jni/Application.mk
@@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/..
 # sdl_image depends on png and jpeg
 # sdl_ttf depends on freetype
 
-APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image
+APP_MODULES := application sdl-1.3 sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image
 
 APP_ABI := armeabi
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index b9b051bd8..8278f6401 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -20,7 +20,7 @@ endif
 # Paths should be on newline so launchConfigure.sh will work properly
 LOCAL_CFLAGS += \
 				$(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/../sdl/include \
+				-I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
 				-I$(LOCAL_PATH)/../sdl_mixer \
 				-I$(LOCAL_PATH)/../sdl_image \
 				-I$(LOCAL_PATH)/../sdl_ttf \
@@ -47,7 +47,7 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
 LOCAL_SRC_FILES := dummy.c
 endif
 
-LOCAL_SHARED_LIBRARIES := sdl $(COMPILED_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(COMPILED_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES := stlport
 
diff --git a/project/jni/application/launchConfigure.sh b/project/jni/application/launchConfigure.sh
index f806e8159..be44b64fc 100755
--- a/project/jni/application/launchConfigure.sh
+++ b/project/jni/application/launchConfigure.sh
@@ -32,7 +32,7 @@ CFLAGS="-I$NDK/build/platforms/$PLATFORMVER/arch-arm/usr/include \
 -Wno-psabi -march=armv5te -mtune=xscale -msoft-float -fno-exceptions -fno-rtti -mthumb -Os \
 -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
 -Wa,--noexecstack -O2 -DNDEBUG -g \
-`grep '[-]I[$][(]LOCAL_PATH[)]/[.][.]/' $LOCAL_PATH/Android.mk | tr '\n' ' ' | sed 's/[\\]//g' | sed \"s@[\$][(]LOCAL_PATH[)]/@$LOCAL_PATH/@g\" | sed 's/[	 ][	 ]*/ /g'`"
+`grep '[-]I[$][(]LOCAL_PATH[)]/[.][.]/' $LOCAL_PATH/Android.mk | tr '\n' ' ' | sed 's/[\\]//g' | sed \"s@[\$][(]LOCAL_PATH[)]/@$LOCAL_PATH/@g\" | sed 's/[	 ][	 ]*/ /g'` | sed 's@[$][(]SDL_VERSION[)]@1.2@'"
 
 LDFLAGS="-nostdlib -Wl,-soname,libapplication.so -Wl,-shared,-Bsymbolic \
 -Wl,--whole-archive  -Wl,--no-whole-archive \
diff --git a/project/jni/application/sdl-config b/project/jni/application/sdl-config
index 07c945a75..f906b7475 100755
--- a/project/jni/application/sdl-config
+++ b/project/jni/application/sdl-config
@@ -47,11 +47,11 @@ while test $# -gt 0; do
       echo -I${prefix}/include -D_GNU_SOURCE=1 -D_REENTRANT
       ;;
     --libs)
-      echo -L${exec_prefix} -lsdl
+      echo -L${exec_prefix} -lsdl-1.2
       ;;
     --static-libs)
 #    --libs|--static-libs)
-      echo -L${exec_prefix} -lsdl
+      echo -L${exec_prefix} -lsdl-1.2
       ;;
     *)
       echo "${usage}" 1>&2
diff --git a/project/sdl/fonteditor/.gitignore b/project/jni/fonteditor/.gitignore
similarity index 100%
rename from project/sdl/fonteditor/.gitignore
rename to project/jni/fonteditor/.gitignore
diff --git a/project/sdl/fonteditor/Makefile b/project/jni/fonteditor/Makefile
similarity index 100%
rename from project/sdl/fonteditor/Makefile
rename to project/jni/fonteditor/Makefile
diff --git a/project/sdl/fonteditor/SDL.dll b/project/jni/fonteditor/SDL.dll
similarity index 100%
rename from project/sdl/fonteditor/SDL.dll
rename to project/jni/fonteditor/SDL.dll
diff --git a/project/sdl/fonteditor/editor.cpp b/project/jni/fonteditor/editor.cpp
similarity index 100%
rename from project/sdl/fonteditor/editor.cpp
rename to project/jni/fonteditor/editor.cpp
diff --git a/project/sdl/fonteditor/editor.exe b/project/jni/fonteditor/editor.exe
similarity index 100%
rename from project/sdl/fonteditor/editor.exe
rename to project/jni/fonteditor/editor.exe
diff --git a/project/sdl/fonteditor/libSDL.dll.a b/project/jni/fonteditor/libSDL.dll.a
similarity index 100%
rename from project/sdl/fonteditor/libSDL.dll.a
rename to project/jni/fonteditor/libSDL.dll.a
diff --git a/project/sdl/fonteditor/libSDL.la b/project/jni/fonteditor/libSDL.la
similarity index 100%
rename from project/sdl/fonteditor/libSDL.la
rename to project/jni/fonteditor/libSDL.la
diff --git a/project/sdl/fonteditor/readme.txt b/project/jni/fonteditor/readme.txt
similarity index 100%
rename from project/sdl/fonteditor/readme.txt
rename to project/jni/fonteditor/readme.txt
diff --git a/project/sdl/fonteditor/touchscreenfont.h b/project/jni/fonteditor/touchscreenfont.h
similarity index 100%
rename from project/sdl/fonteditor/touchscreenfont.h
rename to project/jni/fonteditor/touchscreenfont.h
diff --git a/project/jni/sdl b/project/jni/sdl
deleted file mode 120000
index d92c7931b..000000000
--- a/project/jni/sdl
+++ /dev/null
@@ -1 +0,0 @@
-../sdl/sdl-1.3
\ No newline at end of file
diff --git a/project/sdl/sdl-1.2/Android.mk b/project/jni/sdl-1.2/Android.mk
similarity index 100%
rename from project/sdl/sdl-1.2/Android.mk
rename to project/jni/sdl-1.2/Android.mk
diff --git a/project/sdl/sdl-1.2/BUGS b/project/jni/sdl-1.2/BUGS
similarity index 100%
rename from project/sdl/sdl-1.2/BUGS
rename to project/jni/sdl-1.2/BUGS
diff --git a/project/sdl/sdl-1.2/COPYING b/project/jni/sdl-1.2/COPYING
similarity index 100%
rename from project/sdl/sdl-1.2/COPYING
rename to project/jni/sdl-1.2/COPYING
diff --git a/project/sdl/sdl-1.2/CREDITS b/project/jni/sdl-1.2/CREDITS
similarity index 100%
rename from project/sdl/sdl-1.2/CREDITS
rename to project/jni/sdl-1.2/CREDITS
diff --git a/project/sdl/sdl-1.2/INSTALL b/project/jni/sdl-1.2/INSTALL
similarity index 100%
rename from project/sdl/sdl-1.2/INSTALL
rename to project/jni/sdl-1.2/INSTALL
diff --git a/project/sdl/sdl-1.2/README b/project/jni/sdl-1.2/README
similarity index 100%
rename from project/sdl/sdl-1.2/README
rename to project/jni/sdl-1.2/README
diff --git a/project/sdl/sdl-1.2/README-SDL.txt b/project/jni/sdl-1.2/README-SDL.txt
similarity index 100%
rename from project/sdl/sdl-1.2/README-SDL.txt
rename to project/jni/sdl-1.2/README-SDL.txt
diff --git a/project/sdl/sdl-1.2/README.HG b/project/jni/sdl-1.2/README.HG
similarity index 100%
rename from project/sdl/sdl-1.2/README.HG
rename to project/jni/sdl-1.2/README.HG
diff --git a/project/sdl/sdl-1.2/README.Porting b/project/jni/sdl-1.2/README.Porting
similarity index 100%
rename from project/sdl/sdl-1.2/README.Porting
rename to project/jni/sdl-1.2/README.Porting
diff --git a/project/sdl/sdl-1.2/TODO b/project/jni/sdl-1.2/TODO
similarity index 100%
rename from project/sdl/sdl-1.2/TODO
rename to project/jni/sdl-1.2/TODO
diff --git a/project/sdl/sdl-1.2/WhatsNew b/project/jni/sdl-1.2/WhatsNew
similarity index 100%
rename from project/sdl/sdl-1.2/WhatsNew
rename to project/jni/sdl-1.2/WhatsNew
diff --git a/project/sdl/sdl-1.2/include/SDL.h b/project/jni/sdl-1.2/include/SDL.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL.h
rename to project/jni/sdl-1.2/include/SDL.h
diff --git a/project/sdl/sdl-1.2/include/SDL_active.h b/project/jni/sdl-1.2/include/SDL_active.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_active.h
rename to project/jni/sdl-1.2/include/SDL_active.h
diff --git a/project/sdl/sdl-1.2/include/SDL_audio.h b/project/jni/sdl-1.2/include/SDL_audio.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_audio.h
rename to project/jni/sdl-1.2/include/SDL_audio.h
diff --git a/project/sdl/sdl-1.2/include/SDL_byteorder.h b/project/jni/sdl-1.2/include/SDL_byteorder.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_byteorder.h
rename to project/jni/sdl-1.2/include/SDL_byteorder.h
diff --git a/project/sdl/sdl-1.2/include/SDL_cdrom.h b/project/jni/sdl-1.2/include/SDL_cdrom.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_cdrom.h
rename to project/jni/sdl-1.2/include/SDL_cdrom.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config.h b/project/jni/sdl-1.2/include/SDL_config.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config.h
rename to project/jni/sdl-1.2/include/SDL_config.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config.h.default b/project/jni/sdl-1.2/include/SDL_config.h.default
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config.h.default
rename to project/jni/sdl-1.2/include/SDL_config.h.default
diff --git a/project/sdl/sdl-1.2/include/SDL_config.h.in b/project/jni/sdl-1.2/include/SDL_config.h.in
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config.h.in
rename to project/jni/sdl-1.2/include/SDL_config.h.in
diff --git a/project/sdl/sdl-1.2/include/SDL_config_android.h b/project/jni/sdl-1.2/include/SDL_config_android.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_android.h
rename to project/jni/sdl-1.2/include/SDL_config_android.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_dreamcast.h b/project/jni/sdl-1.2/include/SDL_config_dreamcast.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_dreamcast.h
rename to project/jni/sdl-1.2/include/SDL_config_dreamcast.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_macos.h b/project/jni/sdl-1.2/include/SDL_config_macos.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_macos.h
rename to project/jni/sdl-1.2/include/SDL_config_macos.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_macosx.h b/project/jni/sdl-1.2/include/SDL_config_macosx.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_macosx.h
rename to project/jni/sdl-1.2/include/SDL_config_macosx.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_minimal.h b/project/jni/sdl-1.2/include/SDL_config_minimal.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_minimal.h
rename to project/jni/sdl-1.2/include/SDL_config_minimal.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_nds.h b/project/jni/sdl-1.2/include/SDL_config_nds.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_nds.h
rename to project/jni/sdl-1.2/include/SDL_config_nds.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_os2.h b/project/jni/sdl-1.2/include/SDL_config_os2.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_os2.h
rename to project/jni/sdl-1.2/include/SDL_config_os2.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_symbian.h b/project/jni/sdl-1.2/include/SDL_config_symbian.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_symbian.h
rename to project/jni/sdl-1.2/include/SDL_config_symbian.h
diff --git a/project/sdl/sdl-1.2/include/SDL_config_win32.h b/project/jni/sdl-1.2/include/SDL_config_win32.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_config_win32.h
rename to project/jni/sdl-1.2/include/SDL_config_win32.h
diff --git a/project/sdl/sdl-1.2/include/SDL_copying.h b/project/jni/sdl-1.2/include/SDL_copying.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_copying.h
rename to project/jni/sdl-1.2/include/SDL_copying.h
diff --git a/project/sdl/sdl-1.2/include/SDL_cpuinfo.h b/project/jni/sdl-1.2/include/SDL_cpuinfo.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_cpuinfo.h
rename to project/jni/sdl-1.2/include/SDL_cpuinfo.h
diff --git a/project/sdl/sdl-1.2/include/SDL_endian.h b/project/jni/sdl-1.2/include/SDL_endian.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_endian.h
rename to project/jni/sdl-1.2/include/SDL_endian.h
diff --git a/project/sdl/sdl-1.2/include/SDL_error.h b/project/jni/sdl-1.2/include/SDL_error.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_error.h
rename to project/jni/sdl-1.2/include/SDL_error.h
diff --git a/project/sdl/sdl-1.2/include/SDL_events.h b/project/jni/sdl-1.2/include/SDL_events.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_events.h
rename to project/jni/sdl-1.2/include/SDL_events.h
diff --git a/project/sdl/sdl-1.2/include/SDL_getenv.h b/project/jni/sdl-1.2/include/SDL_getenv.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_getenv.h
rename to project/jni/sdl-1.2/include/SDL_getenv.h
diff --git a/project/sdl/sdl-1.2/include/SDL_joystick.h b/project/jni/sdl-1.2/include/SDL_joystick.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_joystick.h
rename to project/jni/sdl-1.2/include/SDL_joystick.h
diff --git a/project/sdl/sdl-1.2/include/SDL_keyboard.h b/project/jni/sdl-1.2/include/SDL_keyboard.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_keyboard.h
rename to project/jni/sdl-1.2/include/SDL_keyboard.h
diff --git a/project/sdl/sdl-1.2/include/SDL_keysym.h b/project/jni/sdl-1.2/include/SDL_keysym.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_keysym.h
rename to project/jni/sdl-1.2/include/SDL_keysym.h
diff --git a/project/sdl/sdl-1.2/include/SDL_loadso.h b/project/jni/sdl-1.2/include/SDL_loadso.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_loadso.h
rename to project/jni/sdl-1.2/include/SDL_loadso.h
diff --git a/project/sdl/sdl-1.2/include/SDL_main.h b/project/jni/sdl-1.2/include/SDL_main.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_main.h
rename to project/jni/sdl-1.2/include/SDL_main.h
diff --git a/project/sdl/sdl-1.2/include/SDL_mouse.h b/project/jni/sdl-1.2/include/SDL_mouse.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_mouse.h
rename to project/jni/sdl-1.2/include/SDL_mouse.h
diff --git a/project/sdl/sdl-1.2/include/SDL_mutex.h b/project/jni/sdl-1.2/include/SDL_mutex.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_mutex.h
rename to project/jni/sdl-1.2/include/SDL_mutex.h
diff --git a/project/sdl/sdl-1.2/include/SDL_name.h b/project/jni/sdl-1.2/include/SDL_name.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_name.h
rename to project/jni/sdl-1.2/include/SDL_name.h
diff --git a/project/sdl/sdl-1.2/include/SDL_opengl.h b/project/jni/sdl-1.2/include/SDL_opengl.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_opengl.h
rename to project/jni/sdl-1.2/include/SDL_opengl.h
diff --git a/project/sdl/sdl-1.2/include/SDL_platform.h b/project/jni/sdl-1.2/include/SDL_platform.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_platform.h
rename to project/jni/sdl-1.2/include/SDL_platform.h
diff --git a/project/sdl/sdl-1.2/include/SDL_quit.h b/project/jni/sdl-1.2/include/SDL_quit.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_quit.h
rename to project/jni/sdl-1.2/include/SDL_quit.h
diff --git a/project/sdl/sdl-1.2/include/SDL_rwops.h b/project/jni/sdl-1.2/include/SDL_rwops.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_rwops.h
rename to project/jni/sdl-1.2/include/SDL_rwops.h
diff --git a/project/sdl/sdl-1.2/include/SDL_screenkeyboard.h b/project/jni/sdl-1.2/include/SDL_screenkeyboard.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_screenkeyboard.h
rename to project/jni/sdl-1.2/include/SDL_screenkeyboard.h
diff --git a/project/sdl/sdl-1.2/include/SDL_stdinc.h b/project/jni/sdl-1.2/include/SDL_stdinc.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_stdinc.h
rename to project/jni/sdl-1.2/include/SDL_stdinc.h
diff --git a/project/sdl/sdl-1.2/include/SDL_syswm.h b/project/jni/sdl-1.2/include/SDL_syswm.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_syswm.h
rename to project/jni/sdl-1.2/include/SDL_syswm.h
diff --git a/project/sdl/sdl-1.2/include/SDL_thread.h b/project/jni/sdl-1.2/include/SDL_thread.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_thread.h
rename to project/jni/sdl-1.2/include/SDL_thread.h
diff --git a/project/sdl/sdl-1.2/include/SDL_timer.h b/project/jni/sdl-1.2/include/SDL_timer.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_timer.h
rename to project/jni/sdl-1.2/include/SDL_timer.h
diff --git a/project/sdl/sdl-1.2/include/SDL_types.h b/project/jni/sdl-1.2/include/SDL_types.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_types.h
rename to project/jni/sdl-1.2/include/SDL_types.h
diff --git a/project/sdl/sdl-1.2/include/SDL_version.h b/project/jni/sdl-1.2/include/SDL_version.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_version.h
rename to project/jni/sdl-1.2/include/SDL_version.h
diff --git a/project/sdl/sdl-1.2/include/SDL_video.h b/project/jni/sdl-1.2/include/SDL_video.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/SDL_video.h
rename to project/jni/sdl-1.2/include/SDL_video.h
diff --git a/project/sdl/sdl-1.2/include/begin_code.h b/project/jni/sdl-1.2/include/begin_code.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/begin_code.h
rename to project/jni/sdl-1.2/include/begin_code.h
diff --git a/project/sdl/sdl-1.2/include/close_code.h b/project/jni/sdl-1.2/include/close_code.h
similarity index 100%
rename from project/sdl/sdl-1.2/include/close_code.h
rename to project/jni/sdl-1.2/include/close_code.h
diff --git a/project/sdl/sdl-1.2/include/doxyfile b/project/jni/sdl-1.2/include/doxyfile
similarity index 100%
rename from project/sdl/sdl-1.2/include/doxyfile
rename to project/jni/sdl-1.2/include/doxyfile
diff --git a/project/sdl/sdl-1.2/src/SDL.c b/project/jni/sdl-1.2/src/SDL.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/SDL.c
rename to project/jni/sdl-1.2/src/SDL.c
diff --git a/project/sdl/sdl-1.2/src/SDL_error.c b/project/jni/sdl-1.2/src/SDL_error.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/SDL_error.c
rename to project/jni/sdl-1.2/src/SDL_error.c
diff --git a/project/sdl/sdl-1.2/src/SDL_error_c.h b/project/jni/sdl-1.2/src/SDL_error_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/SDL_error_c.h
rename to project/jni/sdl-1.2/src/SDL_error_c.h
diff --git a/project/sdl/sdl-1.2/src/SDL_fatal.c b/project/jni/sdl-1.2/src/SDL_fatal.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/SDL_fatal.c
rename to project/jni/sdl-1.2/src/SDL_fatal.c
diff --git a/project/sdl/sdl-1.2/src/SDL_fatal.h b/project/jni/sdl-1.2/src/SDL_fatal.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/SDL_fatal.h
rename to project/jni/sdl-1.2/src/SDL_fatal.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_audio.c b/project/jni/sdl-1.2/src/audio/SDL_audio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_audio.c
rename to project/jni/sdl-1.2/src/audio/SDL_audio.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_audio_c.h b/project/jni/sdl-1.2/src/audio/SDL_audio_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_audio_c.h
rename to project/jni/sdl-1.2/src/audio/SDL_audio_c.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_audiocvt.c b/project/jni/sdl-1.2/src/audio/SDL_audiocvt.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_audiocvt.c
rename to project/jni/sdl-1.2/src/audio/SDL_audiocvt.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_audiodev.c b/project/jni/sdl-1.2/src/audio/SDL_audiodev.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_audiodev.c
rename to project/jni/sdl-1.2/src/audio/SDL_audiodev.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_audiodev_c.h b/project/jni/sdl-1.2/src/audio/SDL_audiodev_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_audiodev_c.h
rename to project/jni/sdl-1.2/src/audio/SDL_audiodev_c.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_audiomem.h b/project/jni/sdl-1.2/src/audio/SDL_audiomem.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_audiomem.h
rename to project/jni/sdl-1.2/src/audio/SDL_audiomem.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer.c b/project/jni/sdl-1.2/src/audio/SDL_mixer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer.c
rename to project/jni/sdl-1.2/src/audio/SDL_mixer.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX.c b/project/jni/sdl-1.2/src/audio/SDL_mixer_MMX.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX.c
rename to project/jni/sdl-1.2/src/audio/SDL_mixer_MMX.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX.h b/project/jni/sdl-1.2/src/audio/SDL_mixer_MMX.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX.h
rename to project/jni/sdl-1.2/src/audio/SDL_mixer_MMX.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX_VC.c b/project/jni/sdl-1.2/src/audio/SDL_mixer_MMX_VC.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX_VC.c
rename to project/jni/sdl-1.2/src/audio/SDL_mixer_MMX_VC.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX_VC.h b/project/jni/sdl-1.2/src/audio/SDL_mixer_MMX_VC.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer_MMX_VC.h
rename to project/jni/sdl-1.2/src/audio/SDL_mixer_MMX_VC.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer_m68k.c b/project/jni/sdl-1.2/src/audio/SDL_mixer_m68k.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer_m68k.c
rename to project/jni/sdl-1.2/src/audio/SDL_mixer_m68k.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_mixer_m68k.h b/project/jni/sdl-1.2/src/audio/SDL_mixer_m68k.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_mixer_m68k.h
rename to project/jni/sdl-1.2/src/audio/SDL_mixer_m68k.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_sysaudio.h b/project/jni/sdl-1.2/src/audio/SDL_sysaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_sysaudio.h
rename to project/jni/sdl-1.2/src/audio/SDL_sysaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_wave.c b/project/jni/sdl-1.2/src/audio/SDL_wave.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_wave.c
rename to project/jni/sdl-1.2/src/audio/SDL_wave.c
diff --git a/project/sdl/sdl-1.2/src/audio/SDL_wave.h b/project/jni/sdl-1.2/src/audio/SDL_wave.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/SDL_wave.h
rename to project/jni/sdl-1.2/src/audio/SDL_wave.h
diff --git a/project/sdl/sdl-1.2/src/audio/alsa/SDL_alsa_audio.c b/project/jni/sdl-1.2/src/audio/alsa/SDL_alsa_audio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/alsa/SDL_alsa_audio.c
rename to project/jni/sdl-1.2/src/audio/alsa/SDL_alsa_audio.c
diff --git a/project/sdl/sdl-1.2/src/audio/alsa/SDL_alsa_audio.h b/project/jni/sdl-1.2/src/audio/alsa/SDL_alsa_audio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/alsa/SDL_alsa_audio.h
rename to project/jni/sdl-1.2/src/audio/alsa/SDL_alsa_audio.h
diff --git a/project/sdl/sdl-1.2/src/audio/android/SDL_androidaudio.c b/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/android/SDL_androidaudio.c
rename to project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/android/SDL_androidaudio.h b/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/android/SDL_androidaudio.h
rename to project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/arts/SDL_artsaudio.c b/project/jni/sdl-1.2/src/audio/arts/SDL_artsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/arts/SDL_artsaudio.c
rename to project/jni/sdl-1.2/src/audio/arts/SDL_artsaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/arts/SDL_artsaudio.h b/project/jni/sdl-1.2/src/audio/arts/SDL_artsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/arts/SDL_artsaudio.h
rename to project/jni/sdl-1.2/src/audio/arts/SDL_artsaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/baudio/SDL_beaudio.cc b/project/jni/sdl-1.2/src/audio/baudio/SDL_beaudio.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/baudio/SDL_beaudio.cc
rename to project/jni/sdl-1.2/src/audio/baudio/SDL_beaudio.cc
diff --git a/project/sdl/sdl-1.2/src/audio/baudio/SDL_beaudio.h b/project/jni/sdl-1.2/src/audio/baudio/SDL_beaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/baudio/SDL_beaudio.h
rename to project/jni/sdl-1.2/src/audio/baudio/SDL_beaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/bsd/SDL_bsdaudio.c b/project/jni/sdl-1.2/src/audio/bsd/SDL_bsdaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/bsd/SDL_bsdaudio.c
rename to project/jni/sdl-1.2/src/audio/bsd/SDL_bsdaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/bsd/SDL_bsdaudio.h b/project/jni/sdl-1.2/src/audio/bsd/SDL_bsdaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/bsd/SDL_bsdaudio.h
rename to project/jni/sdl-1.2/src/audio/bsd/SDL_bsdaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/dart/SDL_dart.c b/project/jni/sdl-1.2/src/audio/dart/SDL_dart.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dart/SDL_dart.c
rename to project/jni/sdl-1.2/src/audio/dart/SDL_dart.c
diff --git a/project/sdl/sdl-1.2/src/audio/dart/SDL_dart.h b/project/jni/sdl-1.2/src/audio/dart/SDL_dart.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dart/SDL_dart.h
rename to project/jni/sdl-1.2/src/audio/dart/SDL_dart.h
diff --git a/project/sdl/sdl-1.2/src/audio/dc/SDL_dcaudio.c b/project/jni/sdl-1.2/src/audio/dc/SDL_dcaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dc/SDL_dcaudio.c
rename to project/jni/sdl-1.2/src/audio/dc/SDL_dcaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/dc/SDL_dcaudio.h b/project/jni/sdl-1.2/src/audio/dc/SDL_dcaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dc/SDL_dcaudio.h
rename to project/jni/sdl-1.2/src/audio/dc/SDL_dcaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/dc/aica.c b/project/jni/sdl-1.2/src/audio/dc/aica.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dc/aica.c
rename to project/jni/sdl-1.2/src/audio/dc/aica.c
diff --git a/project/sdl/sdl-1.2/src/audio/dc/aica.h b/project/jni/sdl-1.2/src/audio/dc/aica.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dc/aica.h
rename to project/jni/sdl-1.2/src/audio/dc/aica.h
diff --git a/project/sdl/sdl-1.2/src/audio/disk/SDL_diskaudio.c b/project/jni/sdl-1.2/src/audio/disk/SDL_diskaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/disk/SDL_diskaudio.c
rename to project/jni/sdl-1.2/src/audio/disk/SDL_diskaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/disk/SDL_diskaudio.h b/project/jni/sdl-1.2/src/audio/disk/SDL_diskaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/disk/SDL_diskaudio.h
rename to project/jni/sdl-1.2/src/audio/disk/SDL_diskaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/dma/SDL_dmaaudio.c b/project/jni/sdl-1.2/src/audio/dma/SDL_dmaaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dma/SDL_dmaaudio.c
rename to project/jni/sdl-1.2/src/audio/dma/SDL_dmaaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/dma/SDL_dmaaudio.h b/project/jni/sdl-1.2/src/audio/dma/SDL_dmaaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dma/SDL_dmaaudio.h
rename to project/jni/sdl-1.2/src/audio/dma/SDL_dmaaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/dmedia/SDL_irixaudio.c b/project/jni/sdl-1.2/src/audio/dmedia/SDL_irixaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dmedia/SDL_irixaudio.c
rename to project/jni/sdl-1.2/src/audio/dmedia/SDL_irixaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/dmedia/SDL_irixaudio.h b/project/jni/sdl-1.2/src/audio/dmedia/SDL_irixaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dmedia/SDL_irixaudio.h
rename to project/jni/sdl-1.2/src/audio/dmedia/SDL_irixaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/dsp/SDL_dspaudio.c b/project/jni/sdl-1.2/src/audio/dsp/SDL_dspaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dsp/SDL_dspaudio.c
rename to project/jni/sdl-1.2/src/audio/dsp/SDL_dspaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/dsp/SDL_dspaudio.h b/project/jni/sdl-1.2/src/audio/dsp/SDL_dspaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dsp/SDL_dspaudio.h
rename to project/jni/sdl-1.2/src/audio/dsp/SDL_dspaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/dummy/SDL_dummyaudio.c b/project/jni/sdl-1.2/src/audio/dummy/SDL_dummyaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dummy/SDL_dummyaudio.c
rename to project/jni/sdl-1.2/src/audio/dummy/SDL_dummyaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/dummy/SDL_dummyaudio.h b/project/jni/sdl-1.2/src/audio/dummy/SDL_dummyaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/dummy/SDL_dummyaudio.h
rename to project/jni/sdl-1.2/src/audio/dummy/SDL_dummyaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/esd/SDL_esdaudio.c b/project/jni/sdl-1.2/src/audio/esd/SDL_esdaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/esd/SDL_esdaudio.c
rename to project/jni/sdl-1.2/src/audio/esd/SDL_esdaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/esd/SDL_esdaudio.h b/project/jni/sdl-1.2/src/audio/esd/SDL_esdaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/esd/SDL_esdaudio.h
rename to project/jni/sdl-1.2/src/audio/esd/SDL_esdaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/macosx/SDL_coreaudio.c b/project/jni/sdl-1.2/src/audio/macosx/SDL_coreaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/macosx/SDL_coreaudio.c
rename to project/jni/sdl-1.2/src/audio/macosx/SDL_coreaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/macosx/SDL_coreaudio.h b/project/jni/sdl-1.2/src/audio/macosx/SDL_coreaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/macosx/SDL_coreaudio.h
rename to project/jni/sdl-1.2/src/audio/macosx/SDL_coreaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/macrom/SDL_romaudio.c b/project/jni/sdl-1.2/src/audio/macrom/SDL_romaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/macrom/SDL_romaudio.c
rename to project/jni/sdl-1.2/src/audio/macrom/SDL_romaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/macrom/SDL_romaudio.h b/project/jni/sdl-1.2/src/audio/macrom/SDL_romaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/macrom/SDL_romaudio.h
rename to project/jni/sdl-1.2/src/audio/macrom/SDL_romaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio.c b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio.c
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio.h b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio.h
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.c b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.c
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.c
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.h b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.h
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_dma8.h
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.c b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.c
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.c
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.h b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.h
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_gsxb.h
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_it.S b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_it.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_it.S
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_it.S
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.c b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.c
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.c
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.h b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.h
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_mcsn.h
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.c b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.c
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.c
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.h b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.h
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_stfa.h
diff --git a/project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_xbios.c b/project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_xbios.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mint/SDL_mintaudio_xbios.c
rename to project/jni/sdl-1.2/src/audio/mint/SDL_mintaudio_xbios.c
diff --git a/project/sdl/sdl-1.2/src/audio/mme/SDL_mmeaudio.c b/project/jni/sdl-1.2/src/audio/mme/SDL_mmeaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mme/SDL_mmeaudio.c
rename to project/jni/sdl-1.2/src/audio/mme/SDL_mmeaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/mme/SDL_mmeaudio.h b/project/jni/sdl-1.2/src/audio/mme/SDL_mmeaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/mme/SDL_mmeaudio.h
rename to project/jni/sdl-1.2/src/audio/mme/SDL_mmeaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/nas/SDL_nasaudio.c b/project/jni/sdl-1.2/src/audio/nas/SDL_nasaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nas/SDL_nasaudio.c
rename to project/jni/sdl-1.2/src/audio/nas/SDL_nasaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/nas/SDL_nasaudio.h b/project/jni/sdl-1.2/src/audio/nas/SDL_nasaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nas/SDL_nasaudio.h
rename to project/jni/sdl-1.2/src/audio/nas/SDL_nasaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/nds/SDL_ndsaudio.c b/project/jni/sdl-1.2/src/audio/nds/SDL_ndsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nds/SDL_ndsaudio.c
rename to project/jni/sdl-1.2/src/audio/nds/SDL_ndsaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/nds/SDL_ndsaudio.h b/project/jni/sdl-1.2/src/audio/nds/SDL_ndsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nds/SDL_ndsaudio.h
rename to project/jni/sdl-1.2/src/audio/nds/SDL_ndsaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/nds/sound9.c b/project/jni/sdl-1.2/src/audio/nds/sound9.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nds/sound9.c
rename to project/jni/sdl-1.2/src/audio/nds/sound9.c
diff --git a/project/sdl/sdl-1.2/src/audio/nds/soundcommon.h b/project/jni/sdl-1.2/src/audio/nds/soundcommon.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nds/soundcommon.h
rename to project/jni/sdl-1.2/src/audio/nds/soundcommon.h
diff --git a/project/sdl/sdl-1.2/src/audio/nto/SDL_nto_audio.c b/project/jni/sdl-1.2/src/audio/nto/SDL_nto_audio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nto/SDL_nto_audio.c
rename to project/jni/sdl-1.2/src/audio/nto/SDL_nto_audio.c
diff --git a/project/sdl/sdl-1.2/src/audio/nto/SDL_nto_audio.h b/project/jni/sdl-1.2/src/audio/nto/SDL_nto_audio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/nto/SDL_nto_audio.h
rename to project/jni/sdl-1.2/src/audio/nto/SDL_nto_audio.h
diff --git a/project/sdl/sdl-1.2/src/audio/paudio/SDL_paudio.c b/project/jni/sdl-1.2/src/audio/paudio/SDL_paudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/paudio/SDL_paudio.c
rename to project/jni/sdl-1.2/src/audio/paudio/SDL_paudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/paudio/SDL_paudio.h b/project/jni/sdl-1.2/src/audio/paudio/SDL_paudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/paudio/SDL_paudio.h
rename to project/jni/sdl-1.2/src/audio/paudio/SDL_paudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/pulse/SDL_pulseaudio.c b/project/jni/sdl-1.2/src/audio/pulse/SDL_pulseaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/pulse/SDL_pulseaudio.c
rename to project/jni/sdl-1.2/src/audio/pulse/SDL_pulseaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/pulse/SDL_pulseaudio.h b/project/jni/sdl-1.2/src/audio/pulse/SDL_pulseaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/pulse/SDL_pulseaudio.h
rename to project/jni/sdl-1.2/src/audio/pulse/SDL_pulseaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/sun/SDL_sunaudio.c b/project/jni/sdl-1.2/src/audio/sun/SDL_sunaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/sun/SDL_sunaudio.c
rename to project/jni/sdl-1.2/src/audio/sun/SDL_sunaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/sun/SDL_sunaudio.h b/project/jni/sdl-1.2/src/audio/sun/SDL_sunaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/sun/SDL_sunaudio.h
rename to project/jni/sdl-1.2/src/audio/sun/SDL_sunaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/symbian/SDL_epocaudio.cpp b/project/jni/sdl-1.2/src/audio/symbian/SDL_epocaudio.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/symbian/SDL_epocaudio.cpp
rename to project/jni/sdl-1.2/src/audio/symbian/SDL_epocaudio.cpp
diff --git a/project/sdl/sdl-1.2/src/audio/symbian/SDL_epocaudio.h b/project/jni/sdl-1.2/src/audio/symbian/SDL_epocaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/symbian/SDL_epocaudio.h
rename to project/jni/sdl-1.2/src/audio/symbian/SDL_epocaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/symbian/streamplayer.cpp b/project/jni/sdl-1.2/src/audio/symbian/streamplayer.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/symbian/streamplayer.cpp
rename to project/jni/sdl-1.2/src/audio/symbian/streamplayer.cpp
diff --git a/project/sdl/sdl-1.2/src/audio/symbian/streamplayer.h b/project/jni/sdl-1.2/src/audio/symbian/streamplayer.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/symbian/streamplayer.h
rename to project/jni/sdl-1.2/src/audio/symbian/streamplayer.h
diff --git a/project/sdl/sdl-1.2/src/audio/ums/SDL_umsaudio.c b/project/jni/sdl-1.2/src/audio/ums/SDL_umsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/ums/SDL_umsaudio.c
rename to project/jni/sdl-1.2/src/audio/ums/SDL_umsaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/ums/SDL_umsaudio.h b/project/jni/sdl-1.2/src/audio/ums/SDL_umsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/ums/SDL_umsaudio.h
rename to project/jni/sdl-1.2/src/audio/ums/SDL_umsaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/windib/SDL_dibaudio.c b/project/jni/sdl-1.2/src/audio/windib/SDL_dibaudio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/windib/SDL_dibaudio.c
rename to project/jni/sdl-1.2/src/audio/windib/SDL_dibaudio.c
diff --git a/project/sdl/sdl-1.2/src/audio/windib/SDL_dibaudio.h b/project/jni/sdl-1.2/src/audio/windib/SDL_dibaudio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/windib/SDL_dibaudio.h
rename to project/jni/sdl-1.2/src/audio/windib/SDL_dibaudio.h
diff --git a/project/sdl/sdl-1.2/src/audio/windx5/SDL_dx5audio.c b/project/jni/sdl-1.2/src/audio/windx5/SDL_dx5audio.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/windx5/SDL_dx5audio.c
rename to project/jni/sdl-1.2/src/audio/windx5/SDL_dx5audio.c
diff --git a/project/sdl/sdl-1.2/src/audio/windx5/SDL_dx5audio.h b/project/jni/sdl-1.2/src/audio/windx5/SDL_dx5audio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/windx5/SDL_dx5audio.h
rename to project/jni/sdl-1.2/src/audio/windx5/SDL_dx5audio.h
diff --git a/project/sdl/sdl-1.2/src/audio/windx5/directx.h b/project/jni/sdl-1.2/src/audio/windx5/directx.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/audio/windx5/directx.h
rename to project/jni/sdl-1.2/src/audio/windx5/directx.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/SDL_cdrom.c b/project/jni/sdl-1.2/src/cdrom/SDL_cdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/SDL_cdrom.c
rename to project/jni/sdl-1.2/src/cdrom/SDL_cdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/SDL_syscdrom.h b/project/jni/sdl-1.2/src/cdrom/SDL_syscdrom.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/SDL_syscdrom.h
rename to project/jni/sdl-1.2/src/cdrom/SDL_syscdrom.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/aix/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/aix/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/aix/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/aix/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/beos/SDL_syscdrom.cc b/project/jni/sdl-1.2/src/cdrom/beos/SDL_syscdrom.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/beos/SDL_syscdrom.cc
rename to project/jni/sdl-1.2/src/cdrom/beos/SDL_syscdrom.cc
diff --git a/project/sdl/sdl-1.2/src/cdrom/bsdi/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/bsdi/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/bsdi/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/bsdi/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/dc/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/dc/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/dc/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/dc/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/dummy/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/dummy/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/dummy/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/dummy/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/freebsd/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/freebsd/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/freebsd/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/freebsd/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/linux/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/linux/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/linux/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/linux/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macos/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/macos/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macos/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/macos/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macos/SDL_syscdrom_c.h b/project/jni/sdl-1.2/src/cdrom/macos/SDL_syscdrom_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macos/SDL_syscdrom_c.h
rename to project/jni/sdl-1.2/src/cdrom/macos/SDL_syscdrom_c.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.c b/project/jni/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.c
rename to project/jni/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.h b/project/jni/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.h
rename to project/jni/sdl-1.2/src/cdrom/macosx/AudioFilePlayer.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/AudioFileReaderThread.c b/project/jni/sdl-1.2/src/cdrom/macosx/AudioFileReaderThread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/AudioFileReaderThread.c
rename to project/jni/sdl-1.2/src/cdrom/macosx/AudioFileReaderThread.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/CDPlayer.c b/project/jni/sdl-1.2/src/cdrom/macosx/CDPlayer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/CDPlayer.c
rename to project/jni/sdl-1.2/src/cdrom/macosx/CDPlayer.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/CDPlayer.h b/project/jni/sdl-1.2/src/cdrom/macosx/CDPlayer.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/CDPlayer.h
rename to project/jni/sdl-1.2/src/cdrom/macosx/CDPlayer.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.c b/project/jni/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.c
rename to project/jni/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.h b/project/jni/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.h
rename to project/jni/sdl-1.2/src/cdrom/macosx/SDLOSXCAGuard.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/macosx/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/macosx/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/macosx/SDL_syscdrom_c.h b/project/jni/sdl-1.2/src/cdrom/macosx/SDL_syscdrom_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/macosx/SDL_syscdrom_c.h
rename to project/jni/sdl-1.2/src/cdrom/macosx/SDL_syscdrom_c.h
diff --git a/project/sdl/sdl-1.2/src/cdrom/mint/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/mint/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/mint/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/mint/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/openbsd/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/openbsd/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/openbsd/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/openbsd/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/os2/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/os2/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/os2/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/os2/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/osf/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/osf/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/osf/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/osf/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/qnx/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/qnx/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/qnx/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/qnx/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cdrom/win32/SDL_syscdrom.c b/project/jni/sdl-1.2/src/cdrom/win32/SDL_syscdrom.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cdrom/win32/SDL_syscdrom.c
rename to project/jni/sdl-1.2/src/cdrom/win32/SDL_syscdrom.c
diff --git a/project/sdl/sdl-1.2/src/cpuinfo/SDL_cpuinfo.c b/project/jni/sdl-1.2/src/cpuinfo/SDL_cpuinfo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/cpuinfo/SDL_cpuinfo.c
rename to project/jni/sdl-1.2/src/cpuinfo/SDL_cpuinfo.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_active.c b/project/jni/sdl-1.2/src/events/SDL_active.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_active.c
rename to project/jni/sdl-1.2/src/events/SDL_active.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_events.c b/project/jni/sdl-1.2/src/events/SDL_events.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_events.c
rename to project/jni/sdl-1.2/src/events/SDL_events.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_events_c.h b/project/jni/sdl-1.2/src/events/SDL_events_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_events_c.h
rename to project/jni/sdl-1.2/src/events/SDL_events_c.h
diff --git a/project/sdl/sdl-1.2/src/events/SDL_expose.c b/project/jni/sdl-1.2/src/events/SDL_expose.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_expose.c
rename to project/jni/sdl-1.2/src/events/SDL_expose.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_keyboard.c b/project/jni/sdl-1.2/src/events/SDL_keyboard.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_keyboard.c
rename to project/jni/sdl-1.2/src/events/SDL_keyboard.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_mouse.c b/project/jni/sdl-1.2/src/events/SDL_mouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_mouse.c
rename to project/jni/sdl-1.2/src/events/SDL_mouse.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_quit.c b/project/jni/sdl-1.2/src/events/SDL_quit.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_quit.c
rename to project/jni/sdl-1.2/src/events/SDL_quit.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_resize.c b/project/jni/sdl-1.2/src/events/SDL_resize.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_resize.c
rename to project/jni/sdl-1.2/src/events/SDL_resize.c
diff --git a/project/sdl/sdl-1.2/src/events/SDL_sysevents.h b/project/jni/sdl-1.2/src/events/SDL_sysevents.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/events/SDL_sysevents.h
rename to project/jni/sdl-1.2/src/events/SDL_sysevents.h
diff --git a/project/sdl/sdl-1.2/src/file/SDL_rwops.c b/project/jni/sdl-1.2/src/file/SDL_rwops.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/file/SDL_rwops.c
rename to project/jni/sdl-1.2/src/file/SDL_rwops.c
diff --git a/project/sdl/sdl-1.2/src/hermes/COPYING.LIB b/project/jni/sdl-1.2/src/hermes/COPYING.LIB
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/COPYING.LIB
rename to project/jni/sdl-1.2/src/hermes/COPYING.LIB
diff --git a/project/sdl/sdl-1.2/src/hermes/HeadMMX.h b/project/jni/sdl-1.2/src/hermes/HeadMMX.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/HeadMMX.h
rename to project/jni/sdl-1.2/src/hermes/HeadMMX.h
diff --git a/project/sdl/sdl-1.2/src/hermes/HeadX86.h b/project/jni/sdl-1.2/src/hermes/HeadX86.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/HeadX86.h
rename to project/jni/sdl-1.2/src/hermes/HeadX86.h
diff --git a/project/sdl/sdl-1.2/src/hermes/README b/project/jni/sdl-1.2/src/hermes/README
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/README
rename to project/jni/sdl-1.2/src/hermes/README
diff --git a/project/sdl/sdl-1.2/src/hermes/common.inc b/project/jni/sdl-1.2/src/hermes/common.inc
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/common.inc
rename to project/jni/sdl-1.2/src/hermes/common.inc
diff --git a/project/sdl/sdl-1.2/src/hermes/mmx_main.asm b/project/jni/sdl-1.2/src/hermes/mmx_main.asm
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/mmx_main.asm
rename to project/jni/sdl-1.2/src/hermes/mmx_main.asm
diff --git a/project/sdl/sdl-1.2/src/hermes/mmxp2_32.asm b/project/jni/sdl-1.2/src/hermes/mmxp2_32.asm
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/mmxp2_32.asm
rename to project/jni/sdl-1.2/src/hermes/mmxp2_32.asm
diff --git a/project/sdl/sdl-1.2/src/hermes/x86_main.asm b/project/jni/sdl-1.2/src/hermes/x86_main.asm
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/x86_main.asm
rename to project/jni/sdl-1.2/src/hermes/x86_main.asm
diff --git a/project/sdl/sdl-1.2/src/hermes/x86p_16.asm b/project/jni/sdl-1.2/src/hermes/x86p_16.asm
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/x86p_16.asm
rename to project/jni/sdl-1.2/src/hermes/x86p_16.asm
diff --git a/project/sdl/sdl-1.2/src/hermes/x86p_32.asm b/project/jni/sdl-1.2/src/hermes/x86p_32.asm
similarity index 100%
rename from project/sdl/sdl-1.2/src/hermes/x86p_32.asm
rename to project/jni/sdl-1.2/src/hermes/x86p_32.asm
diff --git a/project/sdl/sdl-1.2/src/joystick/SDL_joystick.c b/project/jni/sdl-1.2/src/joystick/SDL_joystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/SDL_joystick.c
rename to project/jni/sdl-1.2/src/joystick/SDL_joystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/SDL_joystick_c.h b/project/jni/sdl-1.2/src/joystick/SDL_joystick_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/SDL_joystick_c.h
rename to project/jni/sdl-1.2/src/joystick/SDL_joystick_c.h
diff --git a/project/sdl/sdl-1.2/src/joystick/SDL_sysjoystick.h b/project/jni/sdl-1.2/src/joystick/SDL_sysjoystick.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/SDL_sysjoystick.h
rename to project/jni/sdl-1.2/src/joystick/SDL_sysjoystick.h
diff --git a/project/sdl/sdl-1.2/src/joystick/beos/SDL_bejoystick.cc b/project/jni/sdl-1.2/src/joystick/beos/SDL_bejoystick.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/beos/SDL_bejoystick.cc
rename to project/jni/sdl-1.2/src/joystick/beos/SDL_bejoystick.cc
diff --git a/project/sdl/sdl-1.2/src/joystick/bsd/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/bsd/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/bsd/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/bsd/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h b/project/jni/sdl-1.2/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
rename to project/jni/sdl-1.2/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
diff --git a/project/sdl/sdl-1.2/src/joystick/darwin/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/darwin/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/darwin/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/darwin/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/dc/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/dc/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/dc/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/dc/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/dummy/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/dummy/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/dummy/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/dummy/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/linux/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/linux/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/linux/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/linux/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/macos/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/macos/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/macos/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/macos/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/mint/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/mint/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/mint/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/mint/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/nds/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/nds/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/nds/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/nds/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/riscos/SDL_sysjoystick.c b/project/jni/sdl-1.2/src/joystick/riscos/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/riscos/SDL_sysjoystick.c
rename to project/jni/sdl-1.2/src/joystick/riscos/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.2/src/joystick/win32/SDL_mmjoystick.c b/project/jni/sdl-1.2/src/joystick/win32/SDL_mmjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/joystick/win32/SDL_mmjoystick.c
rename to project/jni/sdl-1.2/src/joystick/win32/SDL_mmjoystick.c
diff --git a/project/sdl/sdl-1.2/src/loadso/beos/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/beos/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/beos/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/beos/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/loadso/dlopen/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/dlopen/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/dlopen/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/dlopen/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/loadso/dummy/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/dummy/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/dummy/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/dummy/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/loadso/macos/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/macos/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/macos/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/macos/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/loadso/macosx/SDL_dlcompat.c b/project/jni/sdl-1.2/src/loadso/macosx/SDL_dlcompat.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/macosx/SDL_dlcompat.c
rename to project/jni/sdl-1.2/src/loadso/macosx/SDL_dlcompat.c
diff --git a/project/sdl/sdl-1.2/src/loadso/mint/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/mint/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/mint/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/mint/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/loadso/os2/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/os2/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/os2/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/os2/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/loadso/win32/SDL_sysloadso.c b/project/jni/sdl-1.2/src/loadso/win32/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/loadso/win32/SDL_sysloadso.c
rename to project/jni/sdl-1.2/src/loadso/win32/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.2/src/main/beos/SDL_BeApp.cc b/project/jni/sdl-1.2/src/main/beos/SDL_BeApp.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/beos/SDL_BeApp.cc
rename to project/jni/sdl-1.2/src/main/beos/SDL_BeApp.cc
diff --git a/project/sdl/sdl-1.2/src/main/beos/SDL_BeApp.h b/project/jni/sdl-1.2/src/main/beos/SDL_BeApp.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/beos/SDL_BeApp.h
rename to project/jni/sdl-1.2/src/main/beos/SDL_BeApp.h
diff --git a/project/sdl/sdl-1.2/src/main/dummy/SDL_dummy_main.c b/project/jni/sdl-1.2/src/main/dummy/SDL_dummy_main.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/dummy/SDL_dummy_main.c
rename to project/jni/sdl-1.2/src/main/dummy/SDL_dummy_main.c
diff --git a/project/sdl/sdl-1.2/src/main/macos/SDL.r b/project/jni/sdl-1.2/src/main/macos/SDL.r
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/SDL.r
rename to project/jni/sdl-1.2/src/main/macos/SDL.r
diff --git a/project/sdl/sdl-1.2/src/main/macos/SDL.shlib.r b/project/jni/sdl-1.2/src/main/macos/SDL.shlib.r
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/SDL.shlib.r
rename to project/jni/sdl-1.2/src/main/macos/SDL.shlib.r
diff --git a/project/sdl/sdl-1.2/src/main/macos/SDL_main.c b/project/jni/sdl-1.2/src/main/macos/SDL_main.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/SDL_main.c
rename to project/jni/sdl-1.2/src/main/macos/SDL_main.c
diff --git a/project/sdl/sdl-1.2/src/main/macos/SIZE.r b/project/jni/sdl-1.2/src/main/macos/SIZE.r
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/SIZE.r
rename to project/jni/sdl-1.2/src/main/macos/SIZE.r
diff --git a/project/sdl/sdl-1.2/src/main/macos/exports/Makefile b/project/jni/sdl-1.2/src/main/macos/exports/Makefile
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/exports/Makefile
rename to project/jni/sdl-1.2/src/main/macos/exports/Makefile
diff --git a/project/sdl/sdl-1.2/src/main/macos/exports/SDL.x b/project/jni/sdl-1.2/src/main/macos/exports/SDL.x
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/exports/SDL.x
rename to project/jni/sdl-1.2/src/main/macos/exports/SDL.x
diff --git a/project/sdl/sdl-1.2/src/main/macos/exports/gendef.pl b/project/jni/sdl-1.2/src/main/macos/exports/gendef.pl
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macos/exports/gendef.pl
rename to project/jni/sdl-1.2/src/main/macos/exports/gendef.pl
diff --git a/project/sdl/sdl-1.2/src/main/macosx/Info.plist.in b/project/jni/sdl-1.2/src/main/macosx/Info.plist.in
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/Info.plist.in
rename to project/jni/sdl-1.2/src/main/macosx/Info.plist.in
diff --git a/project/sdl/sdl-1.2/src/main/macosx/SDLMain.h b/project/jni/sdl-1.2/src/main/macosx/SDLMain.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/SDLMain.h
rename to project/jni/sdl-1.2/src/main/macosx/SDLMain.h
diff --git a/project/sdl/sdl-1.2/src/main/macosx/SDLMain.m b/project/jni/sdl-1.2/src/main/macosx/SDLMain.m
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/SDLMain.m
rename to project/jni/sdl-1.2/src/main/macosx/SDLMain.m
diff --git a/project/sdl/sdl-1.2/src/main/macosx/SDLMain.nib/classes.nib b/project/jni/sdl-1.2/src/main/macosx/SDLMain.nib/classes.nib
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/SDLMain.nib/classes.nib
rename to project/jni/sdl-1.2/src/main/macosx/SDLMain.nib/classes.nib
diff --git a/project/sdl/sdl-1.2/src/main/macosx/SDLMain.nib/info.nib b/project/jni/sdl-1.2/src/main/macosx/SDLMain.nib/info.nib
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/SDLMain.nib/info.nib
rename to project/jni/sdl-1.2/src/main/macosx/SDLMain.nib/info.nib
diff --git a/project/sdl/sdl-1.2/src/main/macosx/SDLMain.nib/objects.nib b/project/jni/sdl-1.2/src/main/macosx/SDLMain.nib/objects.nib
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/SDLMain.nib/objects.nib
rename to project/jni/sdl-1.2/src/main/macosx/SDLMain.nib/objects.nib
diff --git a/project/sdl/sdl-1.2/src/main/macosx/info.nib b/project/jni/sdl-1.2/src/main/macosx/info.nib
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/macosx/info.nib
rename to project/jni/sdl-1.2/src/main/macosx/info.nib
diff --git a/project/sdl/sdl-1.2/src/main/qtopia/SDL_qtopia_main.cc b/project/jni/sdl-1.2/src/main/qtopia/SDL_qtopia_main.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/qtopia/SDL_qtopia_main.cc
rename to project/jni/sdl-1.2/src/main/qtopia/SDL_qtopia_main.cc
diff --git a/project/sdl/sdl-1.2/src/main/symbian/EKA1/SDL_main.cpp b/project/jni/sdl-1.2/src/main/symbian/EKA1/SDL_main.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/symbian/EKA1/SDL_main.cpp
rename to project/jni/sdl-1.2/src/main/symbian/EKA1/SDL_main.cpp
diff --git a/project/sdl/sdl-1.2/src/main/symbian/EKA2/SDL_main.cpp b/project/jni/sdl-1.2/src/main/symbian/EKA2/SDL_main.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/symbian/EKA2/SDL_main.cpp
rename to project/jni/sdl-1.2/src/main/symbian/EKA2/SDL_main.cpp
diff --git a/project/sdl/sdl-1.2/src/main/symbian/EKA2/sdlexe.cpp b/project/jni/sdl-1.2/src/main/symbian/EKA2/sdlexe.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/symbian/EKA2/sdlexe.cpp
rename to project/jni/sdl-1.2/src/main/symbian/EKA2/sdlexe.cpp
diff --git a/project/sdl/sdl-1.2/src/main/symbian/EKA2/sdllib.cpp b/project/jni/sdl-1.2/src/main/symbian/EKA2/sdllib.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/symbian/EKA2/sdllib.cpp
rename to project/jni/sdl-1.2/src/main/symbian/EKA2/sdllib.cpp
diff --git a/project/sdl/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.cpp b/project/jni/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.cpp
rename to project/jni/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.cpp
diff --git a/project/sdl/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.h b/project/jni/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.h
rename to project/jni/sdl-1.2/src/main/symbian/EKA2/vectorbuffer.h
diff --git a/project/sdl/sdl-1.2/src/main/win32/SDL_win32_main.c b/project/jni/sdl-1.2/src/main/win32/SDL_win32_main.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/win32/SDL_win32_main.c
rename to project/jni/sdl-1.2/src/main/win32/SDL_win32_main.c
diff --git a/project/sdl/sdl-1.2/src/main/win32/version.rc b/project/jni/sdl-1.2/src/main/win32/version.rc
similarity index 100%
rename from project/sdl/sdl-1.2/src/main/win32/version.rc
rename to project/jni/sdl-1.2/src/main/win32/version.rc
diff --git a/project/sdl/sdl-1.2/src/stdlib/SDL_getenv.c b/project/jni/sdl-1.2/src/stdlib/SDL_getenv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/stdlib/SDL_getenv.c
rename to project/jni/sdl-1.2/src/stdlib/SDL_getenv.c
diff --git a/project/sdl/sdl-1.2/src/stdlib/SDL_iconv.c b/project/jni/sdl-1.2/src/stdlib/SDL_iconv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/stdlib/SDL_iconv.c
rename to project/jni/sdl-1.2/src/stdlib/SDL_iconv.c
diff --git a/project/sdl/sdl-1.2/src/stdlib/SDL_malloc.c b/project/jni/sdl-1.2/src/stdlib/SDL_malloc.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/stdlib/SDL_malloc.c
rename to project/jni/sdl-1.2/src/stdlib/SDL_malloc.c
diff --git a/project/sdl/sdl-1.2/src/stdlib/SDL_qsort.c b/project/jni/sdl-1.2/src/stdlib/SDL_qsort.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/stdlib/SDL_qsort.c
rename to project/jni/sdl-1.2/src/stdlib/SDL_qsort.c
diff --git a/project/sdl/sdl-1.2/src/stdlib/SDL_stdlib.c b/project/jni/sdl-1.2/src/stdlib/SDL_stdlib.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/stdlib/SDL_stdlib.c
rename to project/jni/sdl-1.2/src/stdlib/SDL_stdlib.c
diff --git a/project/sdl/sdl-1.2/src/stdlib/SDL_string.c b/project/jni/sdl-1.2/src/stdlib/SDL_string.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/stdlib/SDL_string.c
rename to project/jni/sdl-1.2/src/stdlib/SDL_string.c
diff --git a/project/sdl/sdl-1.2/src/thread/SDL_systhread.h b/project/jni/sdl-1.2/src/thread/SDL_systhread.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/SDL_systhread.h
rename to project/jni/sdl-1.2/src/thread/SDL_systhread.h
diff --git a/project/sdl/sdl-1.2/src/thread/SDL_thread.c b/project/jni/sdl-1.2/src/thread/SDL_thread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/SDL_thread.c
rename to project/jni/sdl-1.2/src/thread/SDL_thread.c
diff --git a/project/sdl/sdl-1.2/src/thread/SDL_thread_c.h b/project/jni/sdl-1.2/src/thread/SDL_thread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/SDL_thread_c.h
rename to project/jni/sdl-1.2/src/thread/SDL_thread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/beos/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/beos/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/beos/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/beos/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/beos/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/beos/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/beos/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/beos/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/beos/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/beos/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/beos/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/beos/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_syscond.c b/project/jni/sdl-1.2/src/thread/dc/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_syscond.c
rename to project/jni/sdl-1.2/src/thread/dc/SDL_syscond.c
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_syscond_c.h b/project/jni/sdl-1.2/src/thread/dc/SDL_syscond_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_syscond_c.h
rename to project/jni/sdl-1.2/src/thread/dc/SDL_syscond_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/dc/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/dc/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_sysmutex_c.h b/project/jni/sdl-1.2/src/thread/dc/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_sysmutex_c.h
rename to project/jni/sdl-1.2/src/thread/dc/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/dc/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/dc/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_syssem_c.h b/project/jni/sdl-1.2/src/thread/dc/SDL_syssem_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_syssem_c.h
rename to project/jni/sdl-1.2/src/thread/dc/SDL_syssem_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/dc/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/dc/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/dc/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/dc/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/dc/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/dc/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/generic/SDL_syscond.c b/project/jni/sdl-1.2/src/thread/generic/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/generic/SDL_syscond.c
rename to project/jni/sdl-1.2/src/thread/generic/SDL_syscond.c
diff --git a/project/sdl/sdl-1.2/src/thread/generic/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/generic/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/generic/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/generic/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/generic/SDL_sysmutex_c.h b/project/jni/sdl-1.2/src/thread/generic/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/generic/SDL_sysmutex_c.h
rename to project/jni/sdl-1.2/src/thread/generic/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/generic/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/generic/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/generic/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/generic/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/generic/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/generic/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/generic/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/generic/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/generic/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/generic/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/generic/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/generic/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/irix/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/irix/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/irix/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/irix/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/irix/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/irix/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/irix/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/irix/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/irix/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/irix/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/irix/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/irix/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/os2/SDL_syscond.c b/project/jni/sdl-1.2/src/thread/os2/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/os2/SDL_syscond.c
rename to project/jni/sdl-1.2/src/thread/os2/SDL_syscond.c
diff --git a/project/sdl/sdl-1.2/src/thread/os2/SDL_syscond_c.h b/project/jni/sdl-1.2/src/thread/os2/SDL_syscond_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/os2/SDL_syscond_c.h
rename to project/jni/sdl-1.2/src/thread/os2/SDL_syscond_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/os2/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/os2/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/os2/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/os2/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/os2/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/os2/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/os2/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/os2/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/os2/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/os2/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/os2/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/os2/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/os2/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/os2/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/os2/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/os2/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/pth/SDL_syscond.c b/project/jni/sdl-1.2/src/thread/pth/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pth/SDL_syscond.c
rename to project/jni/sdl-1.2/src/thread/pth/SDL_syscond.c
diff --git a/project/sdl/sdl-1.2/src/thread/pth/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/pth/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pth/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/pth/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/pth/SDL_sysmutex_c.h b/project/jni/sdl-1.2/src/thread/pth/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pth/SDL_sysmutex_c.h
rename to project/jni/sdl-1.2/src/thread/pth/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/pth/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/pth/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pth/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/pth/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/pth/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/pth/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pth/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/pth/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/pthread/SDL_syscond.c b/project/jni/sdl-1.2/src/thread/pthread/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pthread/SDL_syscond.c
rename to project/jni/sdl-1.2/src/thread/pthread/SDL_syscond.c
diff --git a/project/sdl/sdl-1.2/src/thread/pthread/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/pthread/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pthread/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/pthread/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/pthread/SDL_sysmutex_c.h b/project/jni/sdl-1.2/src/thread/pthread/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pthread/SDL_sysmutex_c.h
rename to project/jni/sdl-1.2/src/thread/pthread/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/pthread/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/pthread/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pthread/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/pthread/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/pthread/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/pthread/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pthread/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/pthread/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/pthread/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/pthread/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/pthread/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/pthread/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/riscos/SDL_syscond.c b/project/jni/sdl-1.2/src/thread/riscos/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/riscos/SDL_syscond.c
rename to project/jni/sdl-1.2/src/thread/riscos/SDL_syscond.c
diff --git a/project/sdl/sdl-1.2/src/thread/riscos/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/riscos/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/riscos/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/riscos/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/riscos/SDL_sysmutex_c.h b/project/jni/sdl-1.2/src/thread/riscos/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/riscos/SDL_sysmutex_c.h
rename to project/jni/sdl-1.2/src/thread/riscos/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/riscos/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/riscos/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/riscos/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/riscos/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/riscos/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/riscos/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/riscos/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/riscos/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/riscos/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/riscos/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/riscos/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/riscos/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/symbian/SDL_sysmutex.cpp b/project/jni/sdl-1.2/src/thread/symbian/SDL_sysmutex.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/symbian/SDL_sysmutex.cpp
rename to project/jni/sdl-1.2/src/thread/symbian/SDL_sysmutex.cpp
diff --git a/project/sdl/sdl-1.2/src/thread/symbian/SDL_syssem.cpp b/project/jni/sdl-1.2/src/thread/symbian/SDL_syssem.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/symbian/SDL_syssem.cpp
rename to project/jni/sdl-1.2/src/thread/symbian/SDL_syssem.cpp
diff --git a/project/sdl/sdl-1.2/src/thread/symbian/SDL_systhread.cpp b/project/jni/sdl-1.2/src/thread/symbian/SDL_systhread.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/symbian/SDL_systhread.cpp
rename to project/jni/sdl-1.2/src/thread/symbian/SDL_systhread.cpp
diff --git a/project/sdl/sdl-1.2/src/thread/symbian/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/symbian/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/symbian/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/symbian/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/win32/SDL_sysmutex.c b/project/jni/sdl-1.2/src/thread/win32/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/win32/SDL_sysmutex.c
rename to project/jni/sdl-1.2/src/thread/win32/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.2/src/thread/win32/SDL_syssem.c b/project/jni/sdl-1.2/src/thread/win32/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/win32/SDL_syssem.c
rename to project/jni/sdl-1.2/src/thread/win32/SDL_syssem.c
diff --git a/project/sdl/sdl-1.2/src/thread/win32/SDL_systhread.c b/project/jni/sdl-1.2/src/thread/win32/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/win32/SDL_systhread.c
rename to project/jni/sdl-1.2/src/thread/win32/SDL_systhread.c
diff --git a/project/sdl/sdl-1.2/src/thread/win32/SDL_systhread_c.h b/project/jni/sdl-1.2/src/thread/win32/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/win32/SDL_systhread_c.h
rename to project/jni/sdl-1.2/src/thread/win32/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.2/src/thread/win32/win_ce_semaphore.c b/project/jni/sdl-1.2/src/thread/win32/win_ce_semaphore.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/win32/win_ce_semaphore.c
rename to project/jni/sdl-1.2/src/thread/win32/win_ce_semaphore.c
diff --git a/project/sdl/sdl-1.2/src/thread/win32/win_ce_semaphore.h b/project/jni/sdl-1.2/src/thread/win32/win_ce_semaphore.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/thread/win32/win_ce_semaphore.h
rename to project/jni/sdl-1.2/src/thread/win32/win_ce_semaphore.h
diff --git a/project/sdl/sdl-1.2/src/timer/SDL_systimer.h b/project/jni/sdl-1.2/src/timer/SDL_systimer.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/SDL_systimer.h
rename to project/jni/sdl-1.2/src/timer/SDL_systimer.h
diff --git a/project/sdl/sdl-1.2/src/timer/SDL_timer.c b/project/jni/sdl-1.2/src/timer/SDL_timer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/SDL_timer.c
rename to project/jni/sdl-1.2/src/timer/SDL_timer.c
diff --git a/project/sdl/sdl-1.2/src/timer/SDL_timer_c.h b/project/jni/sdl-1.2/src/timer/SDL_timer_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/SDL_timer_c.h
rename to project/jni/sdl-1.2/src/timer/SDL_timer_c.h
diff --git a/project/sdl/sdl-1.2/src/timer/beos/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/beos/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/beos/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/beos/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/dc/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/dc/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/dc/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/dc/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/dummy/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/dummy/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/dummy/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/dummy/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/macos/FastTimes.c b/project/jni/sdl-1.2/src/timer/macos/FastTimes.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/macos/FastTimes.c
rename to project/jni/sdl-1.2/src/timer/macos/FastTimes.c
diff --git a/project/sdl/sdl-1.2/src/timer/macos/FastTimes.h b/project/jni/sdl-1.2/src/timer/macos/FastTimes.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/macos/FastTimes.h
rename to project/jni/sdl-1.2/src/timer/macos/FastTimes.h
diff --git a/project/sdl/sdl-1.2/src/timer/macos/SDL_MPWtimer.c b/project/jni/sdl-1.2/src/timer/macos/SDL_MPWtimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/macos/SDL_MPWtimer.c
rename to project/jni/sdl-1.2/src/timer/macos/SDL_MPWtimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/macos/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/macos/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/macos/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/macos/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/mint/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/mint/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/mint/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/mint/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/mint/SDL_vbltimer.S b/project/jni/sdl-1.2/src/timer/mint/SDL_vbltimer.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/mint/SDL_vbltimer.S
rename to project/jni/sdl-1.2/src/timer/mint/SDL_vbltimer.S
diff --git a/project/sdl/sdl-1.2/src/timer/mint/SDL_vbltimer_s.h b/project/jni/sdl-1.2/src/timer/mint/SDL_vbltimer_s.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/mint/SDL_vbltimer_s.h
rename to project/jni/sdl-1.2/src/timer/mint/SDL_vbltimer_s.h
diff --git a/project/sdl/sdl-1.2/src/timer/nds/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/nds/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/nds/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/nds/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/os2/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/os2/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/os2/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/os2/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/riscos/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/riscos/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/riscos/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/riscos/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/symbian/SDL_systimer.cpp b/project/jni/sdl-1.2/src/timer/symbian/SDL_systimer.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/symbian/SDL_systimer.cpp
rename to project/jni/sdl-1.2/src/timer/symbian/SDL_systimer.cpp
diff --git a/project/sdl/sdl-1.2/src/timer/unix/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/unix/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/unix/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/unix/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/win32/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/win32/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/win32/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/win32/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/timer/wince/SDL_systimer.c b/project/jni/sdl-1.2/src/timer/wince/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/timer/wince/SDL_systimer.c
rename to project/jni/sdl-1.2/src/timer/wince/SDL_systimer.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_RLEaccel.c b/project/jni/sdl-1.2/src/video/SDL_RLEaccel.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_RLEaccel.c
rename to project/jni/sdl-1.2/src/video/SDL_RLEaccel.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_RLEaccel_c.h b/project/jni/sdl-1.2/src/video/SDL_RLEaccel_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_RLEaccel_c.h
rename to project/jni/sdl-1.2/src/video/SDL_RLEaccel_c.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_blit.c b/project/jni/sdl-1.2/src/video/SDL_blit.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_blit.c
rename to project/jni/sdl-1.2/src/video/SDL_blit.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_blit.h b/project/jni/sdl-1.2/src/video/SDL_blit.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_blit.h
rename to project/jni/sdl-1.2/src/video/SDL_blit.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_blit_0.c b/project/jni/sdl-1.2/src/video/SDL_blit_0.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_blit_0.c
rename to project/jni/sdl-1.2/src/video/SDL_blit_0.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_blit_1.c b/project/jni/sdl-1.2/src/video/SDL_blit_1.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_blit_1.c
rename to project/jni/sdl-1.2/src/video/SDL_blit_1.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_blit_A.c b/project/jni/sdl-1.2/src/video/SDL_blit_A.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_blit_A.c
rename to project/jni/sdl-1.2/src/video/SDL_blit_A.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_blit_N.c b/project/jni/sdl-1.2/src/video/SDL_blit_N.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_blit_N.c
rename to project/jni/sdl-1.2/src/video/SDL_blit_N.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_bmp.c b/project/jni/sdl-1.2/src/video/SDL_bmp.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_bmp.c
rename to project/jni/sdl-1.2/src/video/SDL_bmp.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_cursor.c b/project/jni/sdl-1.2/src/video/SDL_cursor.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_cursor.c
rename to project/jni/sdl-1.2/src/video/SDL_cursor.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_cursor_c.h b/project/jni/sdl-1.2/src/video/SDL_cursor_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_cursor_c.h
rename to project/jni/sdl-1.2/src/video/SDL_cursor_c.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_gamma.c b/project/jni/sdl-1.2/src/video/SDL_gamma.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_gamma.c
rename to project/jni/sdl-1.2/src/video/SDL_gamma.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_glfuncs.h b/project/jni/sdl-1.2/src/video/SDL_glfuncs.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_glfuncs.h
rename to project/jni/sdl-1.2/src/video/SDL_glfuncs.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_leaks.h b/project/jni/sdl-1.2/src/video/SDL_leaks.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_leaks.h
rename to project/jni/sdl-1.2/src/video/SDL_leaks.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_pixels.c b/project/jni/sdl-1.2/src/video/SDL_pixels.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_pixels.c
rename to project/jni/sdl-1.2/src/video/SDL_pixels.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_pixels_c.h b/project/jni/sdl-1.2/src/video/SDL_pixels_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_pixels_c.h
rename to project/jni/sdl-1.2/src/video/SDL_pixels_c.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_stretch.c b/project/jni/sdl-1.2/src/video/SDL_stretch.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_stretch.c
rename to project/jni/sdl-1.2/src/video/SDL_stretch.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_stretch_c.h b/project/jni/sdl-1.2/src/video/SDL_stretch_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_stretch_c.h
rename to project/jni/sdl-1.2/src/video/SDL_stretch_c.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_surface.c b/project/jni/sdl-1.2/src/video/SDL_surface.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_surface.c
rename to project/jni/sdl-1.2/src/video/SDL_surface.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_sysvideo.h b/project/jni/sdl-1.2/src/video/SDL_sysvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_sysvideo.h
rename to project/jni/sdl-1.2/src/video/SDL_sysvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_video.c b/project/jni/sdl-1.2/src/video/SDL_video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_video.c
rename to project/jni/sdl-1.2/src/video/SDL_video.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_yuv.c b/project/jni/sdl-1.2/src/video/SDL_yuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_yuv.c
rename to project/jni/sdl-1.2/src/video/SDL_yuv.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_yuv_mmx.c b/project/jni/sdl-1.2/src/video/SDL_yuv_mmx.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_yuv_mmx.c
rename to project/jni/sdl-1.2/src/video/SDL_yuv_mmx.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_yuv_sw.c b/project/jni/sdl-1.2/src/video/SDL_yuv_sw.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_yuv_sw.c
rename to project/jni/sdl-1.2/src/video/SDL_yuv_sw.c
diff --git a/project/sdl/sdl-1.2/src/video/SDL_yuv_sw_c.h b/project/jni/sdl-1.2/src/video/SDL_yuv_sw_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_yuv_sw_c.h
rename to project/jni/sdl-1.2/src/video/SDL_yuv_sw_c.h
diff --git a/project/sdl/sdl-1.2/src/video/SDL_yuvfuncs.h b/project/jni/sdl-1.2/src/video/SDL_yuvfuncs.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/SDL_yuvfuncs.h
rename to project/jni/sdl-1.2/src/video/SDL_yuvfuncs.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/README b/project/jni/sdl-1.2/src/video/Xext/README
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/README
rename to project/jni/sdl-1.2/src/video/Xext/README
diff --git a/project/sdl/sdl-1.2/src/video/Xext/XME/xme.c b/project/jni/sdl-1.2/src/video/Xext/XME/xme.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/XME/xme.c
rename to project/jni/sdl-1.2/src/video/Xext/XME/xme.c
diff --git a/project/sdl/sdl-1.2/src/video/Xext/Xinerama/Xinerama.c b/project/jni/sdl-1.2/src/video/Xext/Xinerama/Xinerama.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/Xinerama/Xinerama.c
rename to project/jni/sdl-1.2/src/video/Xext/Xinerama/Xinerama.c
diff --git a/project/sdl/sdl-1.2/src/video/Xext/Xv/Xv.c b/project/jni/sdl-1.2/src/video/Xext/Xv/Xv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/Xv/Xv.c
rename to project/jni/sdl-1.2/src/video/Xext/Xv/Xv.c
diff --git a/project/sdl/sdl-1.2/src/video/Xext/Xv/Xvlibint.h b/project/jni/sdl-1.2/src/video/Xext/Xv/Xvlibint.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/Xv/Xvlibint.h
rename to project/jni/sdl-1.2/src/video/Xext/Xv/Xvlibint.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA.c b/project/jni/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA.c
rename to project/jni/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA.c
diff --git a/project/sdl/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA2.c b/project/jni/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA2.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA2.c
rename to project/jni/sdl-1.2/src/video/Xext/Xxf86dga/XF86DGA2.c
diff --git a/project/sdl/sdl-1.2/src/video/Xext/Xxf86vm/XF86VMode.c b/project/jni/sdl-1.2/src/video/Xext/Xxf86vm/XF86VMode.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/Xxf86vm/XF86VMode.c
rename to project/jni/sdl-1.2/src/video/Xext/Xxf86vm/XF86VMode.c
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/Xext.h b/project/jni/sdl-1.2/src/video/Xext/extensions/Xext.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/Xext.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/Xext.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/Xinerama.h b/project/jni/sdl-1.2/src/video/Xext/extensions/Xinerama.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/Xinerama.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/Xinerama.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/Xv.h b/project/jni/sdl-1.2/src/video/Xext/extensions/Xv.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/Xv.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/Xv.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/Xvlib.h b/project/jni/sdl-1.2/src/video/Xext/extensions/Xvlib.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/Xvlib.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/Xvlib.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/Xvproto.h b/project/jni/sdl-1.2/src/video/Xext/extensions/Xvproto.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/Xvproto.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/Xvproto.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/extutil.h b/project/jni/sdl-1.2/src/video/Xext/extensions/extutil.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/extutil.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/extutil.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/panoramiXext.h b/project/jni/sdl-1.2/src/video/Xext/extensions/panoramiXext.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/panoramiXext.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/panoramiXext.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/panoramiXproto.h b/project/jni/sdl-1.2/src/video/Xext/extensions/panoramiXproto.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/panoramiXproto.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/panoramiXproto.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dga.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xf86dga.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dga.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xf86dga.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dga1.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xf86dga1.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dga1.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xf86dga1.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dga1str.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xf86dga1str.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dga1str.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xf86dga1str.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dgastr.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xf86dgastr.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xf86dgastr.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xf86dgastr.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xf86vmode.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xf86vmode.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xf86vmode.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xf86vmode.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xf86vmstr.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xf86vmstr.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xf86vmstr.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xf86vmstr.h
diff --git a/project/sdl/sdl-1.2/src/video/Xext/extensions/xme.h b/project/jni/sdl-1.2/src/video/Xext/extensions/xme.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/Xext/extensions/xme.h
rename to project/jni/sdl-1.2/src/video/Xext/extensions/xme.h
diff --git a/project/sdl/sdl-1.2/src/video/aalib/SDL_aaevents.c b/project/jni/sdl-1.2/src/video/aalib/SDL_aaevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/aalib/SDL_aaevents.c
rename to project/jni/sdl-1.2/src/video/aalib/SDL_aaevents.c
diff --git a/project/sdl/sdl-1.2/src/video/aalib/SDL_aaevents_c.h b/project/jni/sdl-1.2/src/video/aalib/SDL_aaevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/aalib/SDL_aaevents_c.h
rename to project/jni/sdl-1.2/src/video/aalib/SDL_aaevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/aalib/SDL_aamouse.c b/project/jni/sdl-1.2/src/video/aalib/SDL_aamouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/aalib/SDL_aamouse.c
rename to project/jni/sdl-1.2/src/video/aalib/SDL_aamouse.c
diff --git a/project/sdl/sdl-1.2/src/video/aalib/SDL_aamouse_c.h b/project/jni/sdl-1.2/src/video/aalib/SDL_aamouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/aalib/SDL_aamouse_c.h
rename to project/jni/sdl-1.2/src/video/aalib/SDL_aamouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/aalib/SDL_aavideo.c b/project/jni/sdl-1.2/src/video/aalib/SDL_aavideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/aalib/SDL_aavideo.c
rename to project/jni/sdl-1.2/src/video/aalib/SDL_aavideo.c
diff --git a/project/sdl/sdl-1.2/src/video/aalib/SDL_aavideo.h b/project/jni/sdl-1.2/src/video/aalib/SDL_aavideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/aalib/SDL_aavideo.h
rename to project/jni/sdl-1.2/src/video/aalib/SDL_aavideo.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_androidinput.c
rename to project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_androidinput.h b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_androidinput.h
rename to project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
rename to project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c
rename to project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_androidvideo.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_androidvideo.c
rename to project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_androidvideo.h b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_androidvideo.h
rename to project/jni/sdl-1.2/src/video/android/SDL_androidvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_blit.h b/project/jni/sdl-1.2/src/video/android/SDL_blit.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_blit.h
rename to project/jni/sdl-1.2/src/video/android/SDL_blit.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_glesfuncs.h b/project/jni/sdl-1.2/src/video/android/SDL_glesfuncs.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_glesfuncs.h
rename to project/jni/sdl-1.2/src/video/android/SDL_glesfuncs.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_opengles.h b/project/jni/sdl-1.2/src/video/android/SDL_opengles.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_opengles.h
rename to project/jni/sdl-1.2/src/video/android/SDL_opengles.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_pixels.c b/project/jni/sdl-1.2/src/video/android/SDL_pixels.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_pixels.c
rename to project/jni/sdl-1.2/src/video/android/SDL_pixels.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_pixels.h b/project/jni/sdl-1.2/src/video/android/SDL_pixels.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_pixels.h
rename to project/jni/sdl-1.2/src/video/android/SDL_pixels.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_pixels_c.h b/project/jni/sdl-1.2/src/video/android/SDL_pixels_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_pixels_c.h
rename to project/jni/sdl-1.2/src/video/android/SDL_pixels_c.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_rect.c b/project/jni/sdl-1.2/src/video/android/SDL_rect.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_rect.c
rename to project/jni/sdl-1.2/src/video/android/SDL_rect.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_rect.h b/project/jni/sdl-1.2/src/video/android/SDL_rect.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_rect.h
rename to project/jni/sdl-1.2/src/video/android/SDL_rect.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_rect_c.h b/project/jni/sdl-1.2/src/video/android/SDL_rect_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_rect_c.h
rename to project/jni/sdl-1.2/src/video/android/SDL_rect_c.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_renderer_gl.h b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gl.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_renderer_gl.h
rename to project/jni/sdl-1.2/src/video/android/SDL_renderer_gl.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_renderer_gles.c b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_renderer_gles.c
rename to project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_renderer_gles.h b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_renderer_gles.h
rename to project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_renderer_sw.h b/project/jni/sdl-1.2/src/video/android/SDL_renderer_sw.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_renderer_sw.h
rename to project/jni/sdl-1.2/src/video/android/SDL_renderer_sw.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_surface.h b/project/jni/sdl-1.2/src/video/android/SDL_surface.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_surface.h
rename to project/jni/sdl-1.2/src/video/android/SDL_surface.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h b/project/jni/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h
rename to project/jni/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
rename to project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_video-1.3.h b/project/jni/sdl-1.2/src/video/android/SDL_video-1.3.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_video-1.3.h
rename to project/jni/sdl-1.2/src/video/android/SDL_video-1.3.h
diff --git a/project/sdl/sdl-1.2/src/video/android/SDL_video.c b/project/jni/sdl-1.2/src/video/android/SDL_video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/SDL_video.c
rename to project/jni/sdl-1.2/src/video/android/SDL_video.c
diff --git a/project/sdl/sdl-1.2/src/video/android/javakeycodes.h b/project/jni/sdl-1.2/src/video/android/javakeycodes.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/javakeycodes.h
rename to project/jni/sdl-1.2/src/video/android/javakeycodes.h
diff --git a/project/sdl/sdl-1.2/src/video/android/jniwrapperstuff.h b/project/jni/sdl-1.2/src/video/android/jniwrapperstuff.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/jniwrapperstuff.h
rename to project/jni/sdl-1.2/src/video/android/jniwrapperstuff.h
diff --git a/project/sdl/sdl-1.2/src/video/android/touchscreenfont.h b/project/jni/sdl-1.2/src/video/android/touchscreenfont.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/android/touchscreenfont.h
rename to project/jni/sdl-1.2/src/video/android/touchscreenfont.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataric2p.S b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ataric2p.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataric2p.S
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ataric2p.S
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataric2p_s.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ataric2p_s.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataric2p_s.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ataric2p_s.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ataridevmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarieddi.S b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarieddi.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarieddi.S
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarieddi.S
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarieddi_s.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarieddi_s.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarieddi_s.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarieddi_s.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarievents.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarievents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarievents.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarievents.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarievents_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarievents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarievents_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarievents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarigl.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarigl.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarigl.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarigl.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarigl_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarigl_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarigl_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarigl_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarikeys.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarikeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarikeys.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarikeys.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_atarimxalloc_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_biosevents.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_biosevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_biosevents.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_biosevents.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_biosevents_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_biosevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_biosevents_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_biosevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_gemdosevents.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_gemdosevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_gemdosevents.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_gemdosevents.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_gemdosevents_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_gemdosevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_gemdosevents_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_gemdosevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdevents.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdevents.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdevents.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdevents_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdevents_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt.S b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt.S
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt.S
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt_s.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt_s.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt_s.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_ikbdinterrupt_s.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosevents.c b/project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosevents.c
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosevents.c
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosevents_c.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosevents_c.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt.S b/project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt.S
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt.S
diff --git a/project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt_s.h b/project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt_s.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt_s.h
rename to project/jni/sdl-1.2/src/video/ataricommon/SDL_xbiosinterrupt_s.h
diff --git a/project/sdl/sdl-1.2/src/video/blank_cursor.h b/project/jni/sdl-1.2/src/video/blank_cursor.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/blank_cursor.h
rename to project/jni/sdl-1.2/src/video/blank_cursor.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_BView.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_BView.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_BView.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_BView.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_BWin.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_BWin.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_BWin.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_BWin.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_lowvideo.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_lowvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_lowvideo.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_lowvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysevents.cc b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysevents.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysevents.cc
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysevents.cc
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysevents_c.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysevents_c.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysmouse.cc b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysmouse.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysmouse.cc
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysmouse.cc
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysmouse_c.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysmouse_c.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysvideo.cc b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysvideo.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysvideo.cc
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysvideo.cc
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_syswm.cc b/project/jni/sdl-1.2/src/video/bwindow/SDL_syswm.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_syswm.cc
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_syswm.cc
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_syswm_c.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_syswm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_syswm_c.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_syswm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysyuv.cc b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysyuv.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysyuv.cc
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysyuv.cc
diff --git a/project/sdl/sdl-1.2/src/video/bwindow/SDL_sysyuv.h b/project/jni/sdl-1.2/src/video/bwindow/SDL_sysyuv.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/bwindow/SDL_sysyuv.h
rename to project/jni/sdl-1.2/src/video/bwindow/SDL_sysyuv.h
diff --git a/project/sdl/sdl-1.2/src/video/caca/SDL_cacaevents.c b/project/jni/sdl-1.2/src/video/caca/SDL_cacaevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/caca/SDL_cacaevents.c
rename to project/jni/sdl-1.2/src/video/caca/SDL_cacaevents.c
diff --git a/project/sdl/sdl-1.2/src/video/caca/SDL_cacaevents_c.h b/project/jni/sdl-1.2/src/video/caca/SDL_cacaevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/caca/SDL_cacaevents_c.h
rename to project/jni/sdl-1.2/src/video/caca/SDL_cacaevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/caca/SDL_cacavideo.c b/project/jni/sdl-1.2/src/video/caca/SDL_cacavideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/caca/SDL_cacavideo.c
rename to project/jni/sdl-1.2/src/video/caca/SDL_cacavideo.c
diff --git a/project/sdl/sdl-1.2/src/video/caca/SDL_cacavideo.h b/project/jni/sdl-1.2/src/video/caca/SDL_cacavideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/caca/SDL_cacavideo.h
rename to project/jni/sdl-1.2/src/video/caca/SDL_cacavideo.h
diff --git a/project/sdl/sdl-1.2/src/video/dc/SDL_dcevents.c b/project/jni/sdl-1.2/src/video/dc/SDL_dcevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dc/SDL_dcevents.c
rename to project/jni/sdl-1.2/src/video/dc/SDL_dcevents.c
diff --git a/project/sdl/sdl-1.2/src/video/dc/SDL_dcevents_c.h b/project/jni/sdl-1.2/src/video/dc/SDL_dcevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dc/SDL_dcevents_c.h
rename to project/jni/sdl-1.2/src/video/dc/SDL_dcevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/dc/SDL_dcmouse.c b/project/jni/sdl-1.2/src/video/dc/SDL_dcmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dc/SDL_dcmouse.c
rename to project/jni/sdl-1.2/src/video/dc/SDL_dcmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/dc/SDL_dcmouse_c.h b/project/jni/sdl-1.2/src/video/dc/SDL_dcmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dc/SDL_dcmouse_c.h
rename to project/jni/sdl-1.2/src/video/dc/SDL_dcmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/dc/SDL_dcvideo.c b/project/jni/sdl-1.2/src/video/dc/SDL_dcvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dc/SDL_dcvideo.c
rename to project/jni/sdl-1.2/src/video/dc/SDL_dcvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/dc/SDL_dcvideo.h b/project/jni/sdl-1.2/src/video/dc/SDL_dcvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dc/SDL_dcvideo.h
rename to project/jni/sdl-1.2/src/video/dc/SDL_dcvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/default_cursor.h b/project/jni/sdl-1.2/src/video/default_cursor.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/default_cursor.h
rename to project/jni/sdl-1.2/src/video/default_cursor.h
diff --git a/project/sdl/sdl-1.2/src/video/dga/SDL_dgaevents.c b/project/jni/sdl-1.2/src/video/dga/SDL_dgaevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dga/SDL_dgaevents.c
rename to project/jni/sdl-1.2/src/video/dga/SDL_dgaevents.c
diff --git a/project/sdl/sdl-1.2/src/video/dga/SDL_dgaevents_c.h b/project/jni/sdl-1.2/src/video/dga/SDL_dgaevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dga/SDL_dgaevents_c.h
rename to project/jni/sdl-1.2/src/video/dga/SDL_dgaevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/dga/SDL_dgamouse.c b/project/jni/sdl-1.2/src/video/dga/SDL_dgamouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dga/SDL_dgamouse.c
rename to project/jni/sdl-1.2/src/video/dga/SDL_dgamouse.c
diff --git a/project/sdl/sdl-1.2/src/video/dga/SDL_dgamouse_c.h b/project/jni/sdl-1.2/src/video/dga/SDL_dgamouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dga/SDL_dgamouse_c.h
rename to project/jni/sdl-1.2/src/video/dga/SDL_dgamouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/dga/SDL_dgavideo.c b/project/jni/sdl-1.2/src/video/dga/SDL_dgavideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dga/SDL_dgavideo.c
rename to project/jni/sdl-1.2/src/video/dga/SDL_dgavideo.c
diff --git a/project/sdl/sdl-1.2/src/video/dga/SDL_dgavideo.h b/project/jni/sdl-1.2/src/video/dga/SDL_dgavideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dga/SDL_dgavideo.h
rename to project/jni/sdl-1.2/src/video/dga/SDL_dgavideo.h
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_events.c b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_events.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_events.c
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_events.c
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_events.h b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_events.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_events.h
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_events.h
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_keys.h b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_keys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_keys.h
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_keys.h
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_video.c b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_video.c
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_video.c
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_video.h b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_video.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_video.h
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_video.h
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.c b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.c
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.c
diff --git a/project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.h b/project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.h
rename to project/jni/sdl-1.2/src/video/directfb/SDL_DirectFB_yuv.h
diff --git a/project/sdl/sdl-1.2/src/video/dummy/SDL_nullevents.c b/project/jni/sdl-1.2/src/video/dummy/SDL_nullevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dummy/SDL_nullevents.c
rename to project/jni/sdl-1.2/src/video/dummy/SDL_nullevents.c
diff --git a/project/sdl/sdl-1.2/src/video/dummy/SDL_nullevents_c.h b/project/jni/sdl-1.2/src/video/dummy/SDL_nullevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dummy/SDL_nullevents_c.h
rename to project/jni/sdl-1.2/src/video/dummy/SDL_nullevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/dummy/SDL_nullmouse.c b/project/jni/sdl-1.2/src/video/dummy/SDL_nullmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dummy/SDL_nullmouse.c
rename to project/jni/sdl-1.2/src/video/dummy/SDL_nullmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/dummy/SDL_nullmouse_c.h b/project/jni/sdl-1.2/src/video/dummy/SDL_nullmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dummy/SDL_nullmouse_c.h
rename to project/jni/sdl-1.2/src/video/dummy/SDL_nullmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/dummy/SDL_nullvideo.c b/project/jni/sdl-1.2/src/video/dummy/SDL_nullvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dummy/SDL_nullvideo.c
rename to project/jni/sdl-1.2/src/video/dummy/SDL_nullvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/dummy/SDL_nullvideo.h b/project/jni/sdl-1.2/src/video/dummy/SDL_nullvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/dummy/SDL_nullvideo.h
rename to project/jni/sdl-1.2/src/video/dummy/SDL_nullvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/e_log.h b/project/jni/sdl-1.2/src/video/e_log.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/e_log.h
rename to project/jni/sdl-1.2/src/video/e_log.h
diff --git a/project/sdl/sdl-1.2/src/video/e_pow.h b/project/jni/sdl-1.2/src/video/e_pow.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/e_pow.h
rename to project/jni/sdl-1.2/src/video/e_pow.h
diff --git a/project/sdl/sdl-1.2/src/video/e_sqrt.h b/project/jni/sdl-1.2/src/video/e_sqrt.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/e_sqrt.h
rename to project/jni/sdl-1.2/src/video/e_sqrt.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/3dfx_mmio.h b/project/jni/sdl-1.2/src/video/fbcon/3dfx_mmio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/3dfx_mmio.h
rename to project/jni/sdl-1.2/src/video/fbcon/3dfx_mmio.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/3dfx_regs.h b/project/jni/sdl-1.2/src/video/fbcon/3dfx_regs.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/3dfx_regs.h
rename to project/jni/sdl-1.2/src/video/fbcon/3dfx_regs.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fb3dfx.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fb3dfx.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fb3dfx.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fb3dfx.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fb3dfx.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fb3dfx.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fb3dfx.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fb3dfx.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbelo.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbelo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbelo.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbelo.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbelo.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbelo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbelo.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbelo.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbevents.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbevents.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbevents.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbevents_c.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbevents_c.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbkeys.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbkeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbkeys.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbkeys.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmatrox.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbmatrox.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmatrox.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbmatrox.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmatrox.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbmatrox.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmatrox.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbmatrox.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmouse.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmouse.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmouse_c.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbmouse_c.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbriva.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbriva.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbriva.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbriva.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbriva.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbriva.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbriva.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbriva.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbvideo.c b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbvideo.c
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/SDL_fbvideo.h b/project/jni/sdl-1.2/src/video/fbcon/SDL_fbvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/SDL_fbvideo.h
rename to project/jni/sdl-1.2/src/video/fbcon/SDL_fbvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/matrox_mmio.h b/project/jni/sdl-1.2/src/video/fbcon/matrox_mmio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/matrox_mmio.h
rename to project/jni/sdl-1.2/src/video/fbcon/matrox_mmio.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/matrox_regs.h b/project/jni/sdl-1.2/src/video/fbcon/matrox_regs.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/matrox_regs.h
rename to project/jni/sdl-1.2/src/video/fbcon/matrox_regs.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/riva_mmio.h b/project/jni/sdl-1.2/src/video/fbcon/riva_mmio.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/riva_mmio.h
rename to project/jni/sdl-1.2/src/video/fbcon/riva_mmio.h
diff --git a/project/sdl/sdl-1.2/src/video/fbcon/riva_regs.h b/project/jni/sdl-1.2/src/video/fbcon/riva_regs.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/fbcon/riva_regs.h
rename to project/jni/sdl-1.2/src/video/fbcon/riva_regs.h
diff --git a/project/sdl/sdl-1.2/src/video/gapi/SDL_gapivideo.c b/project/jni/sdl-1.2/src/video/gapi/SDL_gapivideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gapi/SDL_gapivideo.c
rename to project/jni/sdl-1.2/src/video/gapi/SDL_gapivideo.c
diff --git a/project/sdl/sdl-1.2/src/video/gapi/SDL_gapivideo.h b/project/jni/sdl-1.2/src/video/gapi/SDL_gapivideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gapi/SDL_gapivideo.h
rename to project/jni/sdl-1.2/src/video/gapi/SDL_gapivideo.h
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemevents.c b/project/jni/sdl-1.2/src/video/gem/SDL_gemevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemevents.c
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemevents.c
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemevents_c.h b/project/jni/sdl-1.2/src/video/gem/SDL_gemevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemevents_c.h
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemmouse.c b/project/jni/sdl-1.2/src/video/gem/SDL_gemmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemmouse.c
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemmouse_c.h b/project/jni/sdl-1.2/src/video/gem/SDL_gemmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemmouse_c.h
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemvideo.c b/project/jni/sdl-1.2/src/video/gem/SDL_gemvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemvideo.c
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemvideo.h b/project/jni/sdl-1.2/src/video/gem/SDL_gemvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemvideo.h
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemwm.c b/project/jni/sdl-1.2/src/video/gem/SDL_gemwm.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemwm.c
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemwm.c
diff --git a/project/sdl/sdl-1.2/src/video/gem/SDL_gemwm_c.h b/project/jni/sdl-1.2/src/video/gem/SDL_gemwm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/gem/SDL_gemwm_c.h
rename to project/jni/sdl-1.2/src/video/gem/SDL_gemwm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggievents.c b/project/jni/sdl-1.2/src/video/ggi/SDL_ggievents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggievents.c
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggievents.c
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggievents_c.h b/project/jni/sdl-1.2/src/video/ggi/SDL_ggievents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggievents_c.h
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggievents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggikeys.h b/project/jni/sdl-1.2/src/video/ggi/SDL_ggikeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggikeys.h
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggikeys.h
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggimouse.c b/project/jni/sdl-1.2/src/video/ggi/SDL_ggimouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggimouse.c
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggimouse.c
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggimouse_c.h b/project/jni/sdl-1.2/src/video/ggi/SDL_ggimouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggimouse_c.h
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggimouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggivideo.c b/project/jni/sdl-1.2/src/video/ggi/SDL_ggivideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggivideo.c
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggivideo.c
diff --git a/project/sdl/sdl-1.2/src/video/ggi/SDL_ggivideo.h b/project/jni/sdl-1.2/src/video/ggi/SDL_ggivideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ggi/SDL_ggivideo.h
rename to project/jni/sdl-1.2/src/video/ggi/SDL_ggivideo.h
diff --git a/project/sdl/sdl-1.2/src/video/ipod/SDL_ipodvideo.c b/project/jni/sdl-1.2/src/video/ipod/SDL_ipodvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ipod/SDL_ipodvideo.c
rename to project/jni/sdl-1.2/src/video/ipod/SDL_ipodvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/ipod/SDL_ipodvideo.h b/project/jni/sdl-1.2/src/video/ipod/SDL_ipodvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ipod/SDL_ipodvideo.h
rename to project/jni/sdl-1.2/src/video/ipod/SDL_ipodvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_lowvideo.h b/project/jni/sdl-1.2/src/video/maccommon/SDL_lowvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_lowvideo.h
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_lowvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macevents.c b/project/jni/sdl-1.2/src/video/maccommon/SDL_macevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macevents.c
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macevents.c
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macevents_c.h b/project/jni/sdl-1.2/src/video/maccommon/SDL_macevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macevents_c.h
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macgl.c b/project/jni/sdl-1.2/src/video/maccommon/SDL_macgl.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macgl.c
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macgl.c
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macgl_c.h b/project/jni/sdl-1.2/src/video/maccommon/SDL_macgl_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macgl_c.h
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macgl_c.h
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_mackeys.h b/project/jni/sdl-1.2/src/video/maccommon/SDL_mackeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_mackeys.h
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_mackeys.h
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macmouse.c b/project/jni/sdl-1.2/src/video/maccommon/SDL_macmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macmouse.c
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macmouse_c.h b/project/jni/sdl-1.2/src/video/maccommon/SDL_macmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macmouse_c.h
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macwm.c b/project/jni/sdl-1.2/src/video/maccommon/SDL_macwm.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macwm.c
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macwm.c
diff --git a/project/sdl/sdl-1.2/src/video/maccommon/SDL_macwm_c.h b/project/jni/sdl-1.2/src/video/maccommon/SDL_macwm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/maccommon/SDL_macwm_c.h
rename to project/jni/sdl-1.2/src/video/maccommon/SDL_macwm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/macdsp/SDL_dspvideo.c b/project/jni/sdl-1.2/src/video/macdsp/SDL_dspvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/macdsp/SDL_dspvideo.c
rename to project/jni/sdl-1.2/src/video/macdsp/SDL_dspvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/macdsp/SDL_dspvideo.h b/project/jni/sdl-1.2/src/video/macdsp/SDL_dspvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/macdsp/SDL_dspvideo.h
rename to project/jni/sdl-1.2/src/video/macdsp/SDL_dspvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/macrom/SDL_romvideo.c b/project/jni/sdl-1.2/src/video/macrom/SDL_romvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/macrom/SDL_romvideo.c
rename to project/jni/sdl-1.2/src/video/macrom/SDL_romvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/macrom/SDL_romvideo.h b/project/jni/sdl-1.2/src/video/macrom/SDL_romvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/macrom/SDL_romvideo.h
rename to project/jni/sdl-1.2/src/video/macrom/SDL_romvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/math_private.h b/project/jni/sdl-1.2/src/video/math_private.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/math_private.h
rename to project/jni/sdl-1.2/src/video/math_private.h
diff --git a/project/sdl/sdl-1.2/src/video/mmx.h b/project/jni/sdl-1.2/src/video/mmx.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/mmx.h
rename to project/jni/sdl-1.2/src/video/mmx.h
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxevents.c b/project/jni/sdl-1.2/src/video/nanox/SDL_nxevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxevents.c
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxevents.c
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxevents_c.h b/project/jni/sdl-1.2/src/video/nanox/SDL_nxevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxevents_c.h
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nximage.c b/project/jni/sdl-1.2/src/video/nanox/SDL_nximage.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nximage.c
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nximage.c
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nximage_c.h b/project/jni/sdl-1.2/src/video/nanox/SDL_nximage_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nximage_c.h
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nximage_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxmodes.c b/project/jni/sdl-1.2/src/video/nanox/SDL_nxmodes.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxmodes.c
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxmodes.c
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxmodes_c.h b/project/jni/sdl-1.2/src/video/nanox/SDL_nxmodes_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxmodes_c.h
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxmodes_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxmouse.c b/project/jni/sdl-1.2/src/video/nanox/SDL_nxmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxmouse.c
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxmouse_c.h b/project/jni/sdl-1.2/src/video/nanox/SDL_nxmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxmouse_c.h
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxvideo.c b/project/jni/sdl-1.2/src/video/nanox/SDL_nxvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxvideo.c
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxvideo.h b/project/jni/sdl-1.2/src/video/nanox/SDL_nxvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxvideo.h
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxwm.c b/project/jni/sdl-1.2/src/video/nanox/SDL_nxwm.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxwm.c
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxwm.c
diff --git a/project/sdl/sdl-1.2/src/video/nanox/SDL_nxwm_c.h b/project/jni/sdl-1.2/src/video/nanox/SDL_nxwm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nanox/SDL_nxwm_c.h
rename to project/jni/sdl-1.2/src/video/nanox/SDL_nxwm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nds/SDL_ndsevents.c b/project/jni/sdl-1.2/src/video/nds/SDL_ndsevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nds/SDL_ndsevents.c
rename to project/jni/sdl-1.2/src/video/nds/SDL_ndsevents.c
diff --git a/project/sdl/sdl-1.2/src/video/nds/SDL_ndsevents_c.h b/project/jni/sdl-1.2/src/video/nds/SDL_ndsevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nds/SDL_ndsevents_c.h
rename to project/jni/sdl-1.2/src/video/nds/SDL_ndsevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nds/SDL_ndsmouse.c b/project/jni/sdl-1.2/src/video/nds/SDL_ndsmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nds/SDL_ndsmouse.c
rename to project/jni/sdl-1.2/src/video/nds/SDL_ndsmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/nds/SDL_ndsmouse_c.h b/project/jni/sdl-1.2/src/video/nds/SDL_ndsmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nds/SDL_ndsmouse_c.h
rename to project/jni/sdl-1.2/src/video/nds/SDL_ndsmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/nds/SDL_ndsvideo.c b/project/jni/sdl-1.2/src/video/nds/SDL_ndsvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nds/SDL_ndsvideo.c
rename to project/jni/sdl-1.2/src/video/nds/SDL_ndsvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/nds/SDL_ndsvideo.h b/project/jni/sdl-1.2/src/video/nds/SDL_ndsvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/nds/SDL_ndsvideo.h
rename to project/jni/sdl-1.2/src/video/nds/SDL_ndsvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/os2fslib/SDL_os2fslib.c b/project/jni/sdl-1.2/src/video/os2fslib/SDL_os2fslib.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/os2fslib/SDL_os2fslib.c
rename to project/jni/sdl-1.2/src/video/os2fslib/SDL_os2fslib.c
diff --git a/project/sdl/sdl-1.2/src/video/os2fslib/SDL_os2fslib.h b/project/jni/sdl-1.2/src/video/os2fslib/SDL_os2fslib.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/os2fslib/SDL_os2fslib.h
rename to project/jni/sdl-1.2/src/video/os2fslib/SDL_os2fslib.h
diff --git a/project/sdl/sdl-1.2/src/video/os2fslib/SDL_vkeys.h b/project/jni/sdl-1.2/src/video/os2fslib/SDL_vkeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/os2fslib/SDL_vkeys.h
rename to project/jni/sdl-1.2/src/video/os2fslib/SDL_vkeys.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_events.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_events.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_events.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_events.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_events_c.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_events_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_events_c.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_events_c.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_gl.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_gl.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_gl.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_gl.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_gl.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_gl.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_gl.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_gl.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_image.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_image.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_image.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_image.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_image_c.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_image_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_image_c.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_image_c.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_modes.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_modes.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_modes.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_modes.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_modes_c.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_modes_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_modes_c.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_modes_c.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_mouse.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_mouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_mouse.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_mouse.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_mouse_c.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_mouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_mouse_c.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_mouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_video.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_video.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_video.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_video.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_video.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_video.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_video.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_wm.c b/project/jni/sdl-1.2/src/video/photon/SDL_ph_wm.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_wm.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_wm.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_ph_wm_c.h b/project/jni/sdl-1.2/src/video/photon/SDL_ph_wm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_ph_wm_c.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_ph_wm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_phyuv.c b/project/jni/sdl-1.2/src/video/photon/SDL_phyuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_phyuv.c
rename to project/jni/sdl-1.2/src/video/photon/SDL_phyuv.c
diff --git a/project/sdl/sdl-1.2/src/video/photon/SDL_phyuv_c.h b/project/jni/sdl-1.2/src/video/photon/SDL_phyuv_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/photon/SDL_phyuv_c.h
rename to project/jni/sdl-1.2/src/video/photon/SDL_phyuv_c.h
diff --git a/project/sdl/sdl-1.2/src/video/picogui/SDL_pgevents.c b/project/jni/sdl-1.2/src/video/picogui/SDL_pgevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/picogui/SDL_pgevents.c
rename to project/jni/sdl-1.2/src/video/picogui/SDL_pgevents.c
diff --git a/project/sdl/sdl-1.2/src/video/picogui/SDL_pgevents_c.h b/project/jni/sdl-1.2/src/video/picogui/SDL_pgevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/picogui/SDL_pgevents_c.h
rename to project/jni/sdl-1.2/src/video/picogui/SDL_pgevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/picogui/SDL_pgvideo.c b/project/jni/sdl-1.2/src/video/picogui/SDL_pgvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/picogui/SDL_pgvideo.c
rename to project/jni/sdl-1.2/src/video/picogui/SDL_pgvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/picogui/SDL_pgvideo.h b/project/jni/sdl-1.2/src/video/picogui/SDL_pgvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/picogui/SDL_pgvideo.h
rename to project/jni/sdl-1.2/src/video/picogui/SDL_pgvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsevents.c b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsevents.c
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsevents.c
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsevents_c.h b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsevents_c.h
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gskeys.h b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gskeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gskeys.h
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gskeys.h
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsmouse.c b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsmouse.c
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsmouse_c.h b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsmouse_c.h
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsvideo.c b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsvideo.c
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsvideo.h b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsvideo.h
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsyuv.c b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsyuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsyuv.c
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsyuv.c
diff --git a/project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsyuv_c.h b/project/jni/sdl-1.2/src/video/ps2gs/SDL_gsyuv_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps2gs/SDL_gsyuv_c.h
rename to project/jni/sdl-1.2/src/video/ps2gs/SDL_gsyuv_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ps3/SDL_ps3events.c b/project/jni/sdl-1.2/src/video/ps3/SDL_ps3events.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/SDL_ps3events.c
rename to project/jni/sdl-1.2/src/video/ps3/SDL_ps3events.c
diff --git a/project/sdl/sdl-1.2/src/video/ps3/SDL_ps3events_c.h b/project/jni/sdl-1.2/src/video/ps3/SDL_ps3events_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/SDL_ps3events_c.h
rename to project/jni/sdl-1.2/src/video/ps3/SDL_ps3events_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ps3/SDL_ps3video.c b/project/jni/sdl-1.2/src/video/ps3/SDL_ps3video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/SDL_ps3video.c
rename to project/jni/sdl-1.2/src/video/ps3/SDL_ps3video.c
diff --git a/project/sdl/sdl-1.2/src/video/ps3/SDL_ps3video.h b/project/jni/sdl-1.2/src/video/ps3/SDL_ps3video.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/SDL_ps3video.h
rename to project/jni/sdl-1.2/src/video/ps3/SDL_ps3video.h
diff --git a/project/sdl/sdl-1.2/src/video/ps3/SDL_ps3yuv.c b/project/jni/sdl-1.2/src/video/ps3/SDL_ps3yuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/SDL_ps3yuv.c
rename to project/jni/sdl-1.2/src/video/ps3/SDL_ps3yuv.c
diff --git a/project/sdl/sdl-1.2/src/video/ps3/SDL_ps3yuv_c.h b/project/jni/sdl-1.2/src/video/ps3/SDL_ps3yuv_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/SDL_ps3yuv_c.h
rename to project/jni/sdl-1.2/src/video/ps3/SDL_ps3yuv_c.h
diff --git a/project/sdl/sdl-1.2/src/video/ps3/spulibs/Makefile b/project/jni/sdl-1.2/src/video/ps3/spulibs/Makefile
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/spulibs/Makefile
rename to project/jni/sdl-1.2/src/video/ps3/spulibs/Makefile
diff --git a/project/sdl/sdl-1.2/src/video/ps3/spulibs/bilin_scaler.c b/project/jni/sdl-1.2/src/video/ps3/spulibs/bilin_scaler.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/spulibs/bilin_scaler.c
rename to project/jni/sdl-1.2/src/video/ps3/spulibs/bilin_scaler.c
diff --git a/project/sdl/sdl-1.2/src/video/ps3/spulibs/fb_writer.c b/project/jni/sdl-1.2/src/video/ps3/spulibs/fb_writer.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/spulibs/fb_writer.c
rename to project/jni/sdl-1.2/src/video/ps3/spulibs/fb_writer.c
diff --git a/project/sdl/sdl-1.2/src/video/ps3/spulibs/spu_common.h b/project/jni/sdl-1.2/src/video/ps3/spulibs/spu_common.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/spulibs/spu_common.h
rename to project/jni/sdl-1.2/src/video/ps3/spulibs/spu_common.h
diff --git a/project/sdl/sdl-1.2/src/video/ps3/spulibs/yuv2rgb_converter.c b/project/jni/sdl-1.2/src/video/ps3/spulibs/yuv2rgb_converter.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/ps3/spulibs/yuv2rgb_converter.c
rename to project/jni/sdl-1.2/src/video/ps3/spulibs/yuv2rgb_converter.c
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_QPEApp.cc b/project/jni/sdl-1.2/src/video/qtopia/SDL_QPEApp.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_QPEApp.cc
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_QPEApp.cc
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_QPEApp.h b/project/jni/sdl-1.2/src/video/qtopia/SDL_QPEApp.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_QPEApp.h
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_QPEApp.h
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_QWin.cc b/project/jni/sdl-1.2/src/video/qtopia/SDL_QWin.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_QWin.cc
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_QWin.cc
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_QWin.h b/project/jni/sdl-1.2/src/video/qtopia/SDL_QWin.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_QWin.h
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_QWin.h
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_lowvideo.h b/project/jni/sdl-1.2/src/video/qtopia/SDL_lowvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_lowvideo.h
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_lowvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_sysevents.cc b/project/jni/sdl-1.2/src/video/qtopia/SDL_sysevents.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_sysevents.cc
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_sysevents.cc
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_sysevents_c.h b/project/jni/sdl-1.2/src/video/qtopia/SDL_sysevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_sysevents_c.h
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_sysevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_sysmouse.cc b/project/jni/sdl-1.2/src/video/qtopia/SDL_sysmouse.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_sysmouse.cc
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_sysmouse.cc
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_sysmouse_c.h b/project/jni/sdl-1.2/src/video/qtopia/SDL_sysmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_sysmouse_c.h
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_sysmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_sysvideo.cc b/project/jni/sdl-1.2/src/video/qtopia/SDL_sysvideo.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_sysvideo.cc
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_sysvideo.cc
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_syswm.cc b/project/jni/sdl-1.2/src/video/qtopia/SDL_syswm.cc
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_syswm.cc
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_syswm.cc
diff --git a/project/sdl/sdl-1.2/src/video/qtopia/SDL_syswm_c.h b/project/jni/sdl-1.2/src/video/qtopia/SDL_syswm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/qtopia/SDL_syswm_c.h
rename to project/jni/sdl-1.2/src/video/qtopia/SDL_syswm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/quartz/CGS.h b/project/jni/sdl-1.2/src/video/quartz/CGS.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/CGS.h
rename to project/jni/sdl-1.2/src/video/quartz/CGS.h
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzEvents.m b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzEvents.m
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzEvents.m
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzEvents.m
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzGL.m b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzGL.m
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzGL.m
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzGL.m
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzKeys.h b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzKeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzKeys.h
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzKeys.h
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzVideo.h b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzVideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzVideo.h
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzVideo.h
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzVideo.m b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzVideo.m
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzVideo.m
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzVideo.m
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWM.h b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWM.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWM.h
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWM.h
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWM.m b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWM.m
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWM.m
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWM.m
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWindow.h b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWindow.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWindow.h
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWindow.h
diff --git a/project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWindow.m b/project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWindow.m
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/quartz/SDL_QuartzWindow.m
rename to project/jni/sdl-1.2/src/video/quartz/SDL_QuartzWindow.m
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosASM.S b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosASM.S
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosASM.S
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosASM.S
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosFullScreenVideo.c b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosFullScreenVideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosFullScreenVideo.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosFullScreenVideo.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosevents.c b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosevents.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosevents.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosevents_c.h b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosevents_c.h
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosmouse.c b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosmouse.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosmouse_c.h b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosmouse_c.h
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscossprite.c b/project/jni/sdl-1.2/src/video/riscos/SDL_riscossprite.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscossprite.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscossprite.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscostask.c b/project/jni/sdl-1.2/src/video/riscos/SDL_riscostask.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscostask.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscostask.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscostask.h b/project/jni/sdl-1.2/src/video/riscos/SDL_riscostask.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscostask.h
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscostask.h
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosvideo.c b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosvideo.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_riscosvideo.h b/project/jni/sdl-1.2/src/video/riscos/SDL_riscosvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_riscosvideo.h
rename to project/jni/sdl-1.2/src/video/riscos/SDL_riscosvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_wimppoll.c b/project/jni/sdl-1.2/src/video/riscos/SDL_wimppoll.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_wimppoll.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_wimppoll.c
diff --git a/project/sdl/sdl-1.2/src/video/riscos/SDL_wimpvideo.c b/project/jni/sdl-1.2/src/video/riscos/SDL_wimpvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/riscos/SDL_wimpvideo.c
rename to project/jni/sdl-1.2/src/video/riscos/SDL_wimpvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/svga/SDL_svgaevents.c b/project/jni/sdl-1.2/src/video/svga/SDL_svgaevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/svga/SDL_svgaevents.c
rename to project/jni/sdl-1.2/src/video/svga/SDL_svgaevents.c
diff --git a/project/sdl/sdl-1.2/src/video/svga/SDL_svgaevents_c.h b/project/jni/sdl-1.2/src/video/svga/SDL_svgaevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/svga/SDL_svgaevents_c.h
rename to project/jni/sdl-1.2/src/video/svga/SDL_svgaevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/svga/SDL_svgamouse.c b/project/jni/sdl-1.2/src/video/svga/SDL_svgamouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/svga/SDL_svgamouse.c
rename to project/jni/sdl-1.2/src/video/svga/SDL_svgamouse.c
diff --git a/project/sdl/sdl-1.2/src/video/svga/SDL_svgamouse_c.h b/project/jni/sdl-1.2/src/video/svga/SDL_svgamouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/svga/SDL_svgamouse_c.h
rename to project/jni/sdl-1.2/src/video/svga/SDL_svgamouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/svga/SDL_svgavideo.c b/project/jni/sdl-1.2/src/video/svga/SDL_svgavideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/svga/SDL_svgavideo.c
rename to project/jni/sdl-1.2/src/video/svga/SDL_svgavideo.c
diff --git a/project/sdl/sdl-1.2/src/video/svga/SDL_svgavideo.h b/project/jni/sdl-1.2/src/video/svga/SDL_svgavideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/svga/SDL_svgavideo.h
rename to project/jni/sdl-1.2/src/video/svga/SDL_svgavideo.h
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA1/SDL_epocevents.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA1/SDL_epocevents.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA1/SDL_epocevents.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA1/SDL_epocevents.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.h b/project/jni/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.h
rename to project/jni/sdl-1.2/src/video/symbian/EKA1/SDL_epocvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA2/SDL_epocevents.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA2/SDL_epocevents.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA2/SDL_epocevents.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA2/SDL_epocevents.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.h b/project/jni/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.h
rename to project/jni/sdl-1.2/src/video/symbian/EKA2/SDL_epocvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA2/dsa.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA2/dsa.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA2/dsa.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA2/dsa.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA2/dsa_new.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA2/dsa_new.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA2/dsa_new.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA2/dsa_new.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/EKA2/dsa_old.cpp b/project/jni/sdl-1.2/src/video/symbian/EKA2/dsa_old.cpp
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/EKA2/dsa_old.cpp
rename to project/jni/sdl-1.2/src/video/symbian/EKA2/dsa_old.cpp
diff --git a/project/sdl/sdl-1.2/src/video/symbian/SDL_epocevents_c.h b/project/jni/sdl-1.2/src/video/symbian/SDL_epocevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/symbian/SDL_epocevents_c.h
rename to project/jni/sdl-1.2/src/video/symbian/SDL_epocevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/vgl/SDL_vglevents.c b/project/jni/sdl-1.2/src/video/vgl/SDL_vglevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/vgl/SDL_vglevents.c
rename to project/jni/sdl-1.2/src/video/vgl/SDL_vglevents.c
diff --git a/project/sdl/sdl-1.2/src/video/vgl/SDL_vglevents_c.h b/project/jni/sdl-1.2/src/video/vgl/SDL_vglevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/vgl/SDL_vglevents_c.h
rename to project/jni/sdl-1.2/src/video/vgl/SDL_vglevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/vgl/SDL_vglmouse.c b/project/jni/sdl-1.2/src/video/vgl/SDL_vglmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/vgl/SDL_vglmouse.c
rename to project/jni/sdl-1.2/src/video/vgl/SDL_vglmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/vgl/SDL_vglmouse_c.h b/project/jni/sdl-1.2/src/video/vgl/SDL_vglmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/vgl/SDL_vglmouse_c.h
rename to project/jni/sdl-1.2/src/video/vgl/SDL_vglmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/vgl/SDL_vglvideo.c b/project/jni/sdl-1.2/src/video/vgl/SDL_vglvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/vgl/SDL_vglvideo.c
rename to project/jni/sdl-1.2/src/video/vgl/SDL_vglvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/vgl/SDL_vglvideo.h b/project/jni/sdl-1.2/src/video/vgl/SDL_vglvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/vgl/SDL_vglvideo.h
rename to project/jni/sdl-1.2/src/video/vgl/SDL_vglvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_lowvideo.h b/project/jni/sdl-1.2/src/video/wincommon/SDL_lowvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_lowvideo.h
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_lowvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_sysevents.c b/project/jni/sdl-1.2/src/video/wincommon/SDL_sysevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_sysevents.c
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_sysevents.c
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_sysmouse.c b/project/jni/sdl-1.2/src/video/wincommon/SDL_sysmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_sysmouse.c
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_sysmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_sysmouse_c.h b/project/jni/sdl-1.2/src/video/wincommon/SDL_sysmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_sysmouse_c.h
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_sysmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_syswm.c b/project/jni/sdl-1.2/src/video/wincommon/SDL_syswm.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_syswm.c
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_syswm.c
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_syswm_c.h b/project/jni/sdl-1.2/src/video/wincommon/SDL_syswm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_syswm_c.h
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_syswm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_wingl.c b/project/jni/sdl-1.2/src/video/wincommon/SDL_wingl.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_wingl.c
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_wingl.c
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/SDL_wingl_c.h b/project/jni/sdl-1.2/src/video/wincommon/SDL_wingl_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/SDL_wingl_c.h
rename to project/jni/sdl-1.2/src/video/wincommon/SDL_wingl_c.h
diff --git a/project/sdl/sdl-1.2/src/video/wincommon/wmmsg.h b/project/jni/sdl-1.2/src/video/wincommon/wmmsg.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wincommon/wmmsg.h
rename to project/jni/sdl-1.2/src/video/wincommon/wmmsg.h
diff --git a/project/sdl/sdl-1.2/src/video/windib/SDL_dibevents.c b/project/jni/sdl-1.2/src/video/windib/SDL_dibevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windib/SDL_dibevents.c
rename to project/jni/sdl-1.2/src/video/windib/SDL_dibevents.c
diff --git a/project/sdl/sdl-1.2/src/video/windib/SDL_dibevents_c.h b/project/jni/sdl-1.2/src/video/windib/SDL_dibevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windib/SDL_dibevents_c.h
rename to project/jni/sdl-1.2/src/video/windib/SDL_dibevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/windib/SDL_dibvideo.c b/project/jni/sdl-1.2/src/video/windib/SDL_dibvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windib/SDL_dibvideo.c
rename to project/jni/sdl-1.2/src/video/windib/SDL_dibvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/windib/SDL_dibvideo.h b/project/jni/sdl-1.2/src/video/windib/SDL_dibvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windib/SDL_dibvideo.h
rename to project/jni/sdl-1.2/src/video/windib/SDL_dibvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/windib/SDL_gapidibvideo.h b/project/jni/sdl-1.2/src/video/windib/SDL_gapidibvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windib/SDL_gapidibvideo.h
rename to project/jni/sdl-1.2/src/video/windib/SDL_gapidibvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/windib/SDL_vkeys.h b/project/jni/sdl-1.2/src/video/windib/SDL_vkeys.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windib/SDL_vkeys.h
rename to project/jni/sdl-1.2/src/video/windib/SDL_vkeys.h
diff --git a/project/sdl/sdl-1.2/src/video/windx5/SDL_dx5events.c b/project/jni/sdl-1.2/src/video/windx5/SDL_dx5events.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/SDL_dx5events.c
rename to project/jni/sdl-1.2/src/video/windx5/SDL_dx5events.c
diff --git a/project/sdl/sdl-1.2/src/video/windx5/SDL_dx5events_c.h b/project/jni/sdl-1.2/src/video/windx5/SDL_dx5events_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/SDL_dx5events_c.h
rename to project/jni/sdl-1.2/src/video/windx5/SDL_dx5events_c.h
diff --git a/project/sdl/sdl-1.2/src/video/windx5/SDL_dx5video.c b/project/jni/sdl-1.2/src/video/windx5/SDL_dx5video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/SDL_dx5video.c
rename to project/jni/sdl-1.2/src/video/windx5/SDL_dx5video.c
diff --git a/project/sdl/sdl-1.2/src/video/windx5/SDL_dx5video.h b/project/jni/sdl-1.2/src/video/windx5/SDL_dx5video.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/SDL_dx5video.h
rename to project/jni/sdl-1.2/src/video/windx5/SDL_dx5video.h
diff --git a/project/sdl/sdl-1.2/src/video/windx5/SDL_dx5yuv.c b/project/jni/sdl-1.2/src/video/windx5/SDL_dx5yuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/SDL_dx5yuv.c
rename to project/jni/sdl-1.2/src/video/windx5/SDL_dx5yuv.c
diff --git a/project/sdl/sdl-1.2/src/video/windx5/SDL_dx5yuv_c.h b/project/jni/sdl-1.2/src/video/windx5/SDL_dx5yuv_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/SDL_dx5yuv_c.h
rename to project/jni/sdl-1.2/src/video/windx5/SDL_dx5yuv_c.h
diff --git a/project/sdl/sdl-1.2/src/video/windx5/directx.h b/project/jni/sdl-1.2/src/video/windx5/directx.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/windx5/directx.h
rename to project/jni/sdl-1.2/src/video/windx5/directx.h
diff --git a/project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsevents.c b/project/jni/sdl-1.2/src/video/wscons/SDL_wsconsevents.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsevents.c
rename to project/jni/sdl-1.2/src/video/wscons/SDL_wsconsevents.c
diff --git a/project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsevents_c.h b/project/jni/sdl-1.2/src/video/wscons/SDL_wsconsevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsevents_c.h
rename to project/jni/sdl-1.2/src/video/wscons/SDL_wsconsevents_c.h
diff --git a/project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsmouse.c b/project/jni/sdl-1.2/src/video/wscons/SDL_wsconsmouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsmouse.c
rename to project/jni/sdl-1.2/src/video/wscons/SDL_wsconsmouse.c
diff --git a/project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsmouse_c.h b/project/jni/sdl-1.2/src/video/wscons/SDL_wsconsmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsmouse_c.h
rename to project/jni/sdl-1.2/src/video/wscons/SDL_wsconsmouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsvideo.c b/project/jni/sdl-1.2/src/video/wscons/SDL_wsconsvideo.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsvideo.c
rename to project/jni/sdl-1.2/src/video/wscons/SDL_wsconsvideo.c
diff --git a/project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsvideo.h b/project/jni/sdl-1.2/src/video/wscons/SDL_wsconsvideo.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/wscons/SDL_wsconsvideo.h
rename to project/jni/sdl-1.2/src/video/wscons/SDL_wsconsvideo.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11dga.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11dga.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11dga.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11dga.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11dga_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11dga_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11dga_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11dga_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11dyn.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11dyn.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11dyn.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11dyn.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11dyn.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11dyn.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11dyn.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11dyn.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11events.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11events.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11events.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11events.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11events_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11events_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11events_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11events_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11gamma.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11gamma.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11gamma.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11gamma.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11gamma_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11gamma_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11gamma_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11gamma_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11gl.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11gl.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11gl.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11gl.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11gl_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11gl_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11gl_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11gl_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11image.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11image.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11image.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11image.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11image_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11image_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11image_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11image_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11modes.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11modes.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11modes.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11modes.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11modes_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11modes_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11modes_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11modes_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11mouse.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11mouse.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11mouse.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11mouse.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11mouse_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11mouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11mouse_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11mouse_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11sym.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11sym.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11sym.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11sym.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11video.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11video.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11video.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11video.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11video.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11video.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11video.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11video.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11wm.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11wm.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11wm.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11wm.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11wm_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11wm_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11wm_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11wm_c.h
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11yuv.c b/project/jni/sdl-1.2/src/video/x11/SDL_x11yuv.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11yuv.c
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11yuv.c
diff --git a/project/sdl/sdl-1.2/src/video/x11/SDL_x11yuv_c.h b/project/jni/sdl-1.2/src/video/x11/SDL_x11yuv_c.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/x11/SDL_x11yuv_c.h
rename to project/jni/sdl-1.2/src/video/x11/SDL_x11yuv_c.h
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios.c b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios.c
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios.c
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios.h b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios.h
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios.h
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_blowup.c b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_blowup.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_blowup.c
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_blowup.c
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_blowup.h b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_blowup.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_blowup.h
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_blowup.h
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.c b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.c
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.c
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.h b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.h
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_centscreen.h
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_milan.c b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_milan.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_milan.c
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_milan.c
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_milan.h b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_milan.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_milan.h
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_milan.h
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_sb3.c b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_sb3.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_sb3.c
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_sb3.c
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_sb3.h b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_sb3.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_sb3.h
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_sb3.h
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_tveille.c b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_tveille.c
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_tveille.c
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_tveille.c
diff --git a/project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_tveille.h b/project/jni/sdl-1.2/src/video/xbios/SDL_xbios_tveille.h
similarity index 100%
rename from project/sdl/sdl-1.2/src/video/xbios/SDL_xbios_tveille.h
rename to project/jni/sdl-1.2/src/video/xbios/SDL_xbios_tveille.h
diff --git a/project/sdl/sdl-1.3/Android.mk b/project/jni/sdl-1.3/Android.mk
similarity index 96%
rename from project/sdl/sdl-1.3/Android.mk
rename to project/jni/sdl-1.3/Android.mk
index 220cb759d..9a086b973 100644
--- a/project/sdl/sdl-1.3/Android.mk
+++ b/project/jni/sdl-1.3/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := sdl
+LOCAL_MODULE := $(lastword $(subst /, ,$(LOCAL_PATH)))
 
 ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
diff --git a/project/sdl/sdl-1.3/BUGS b/project/jni/sdl-1.3/BUGS
similarity index 100%
rename from project/sdl/sdl-1.3/BUGS
rename to project/jni/sdl-1.3/BUGS
diff --git a/project/sdl/sdl-1.3/COPYING b/project/jni/sdl-1.3/COPYING
similarity index 100%
rename from project/sdl/sdl-1.3/COPYING
rename to project/jni/sdl-1.3/COPYING
diff --git a/project/sdl/sdl-1.3/CREDITS b/project/jni/sdl-1.3/CREDITS
similarity index 100%
rename from project/sdl/sdl-1.3/CREDITS
rename to project/jni/sdl-1.3/CREDITS
diff --git a/project/sdl/sdl-1.3/INSTALL b/project/jni/sdl-1.3/INSTALL
similarity index 100%
rename from project/sdl/sdl-1.3/INSTALL
rename to project/jni/sdl-1.3/INSTALL
diff --git a/project/sdl/sdl-1.3/NOTES b/project/jni/sdl-1.3/NOTES
similarity index 100%
rename from project/sdl/sdl-1.3/NOTES
rename to project/jni/sdl-1.3/NOTES
diff --git a/project/sdl/sdl-1.3/README b/project/jni/sdl-1.3/README
similarity index 100%
rename from project/sdl/sdl-1.3/README
rename to project/jni/sdl-1.3/README
diff --git a/project/sdl/sdl-1.3/README-SDL.txt b/project/jni/sdl-1.3/README-SDL.txt
similarity index 100%
rename from project/sdl/sdl-1.3/README-SDL.txt
rename to project/jni/sdl-1.3/README-SDL.txt
diff --git a/project/sdl/sdl-1.3/README.HG b/project/jni/sdl-1.3/README.HG
similarity index 100%
rename from project/sdl/sdl-1.3/README.HG
rename to project/jni/sdl-1.3/README.HG
diff --git a/project/sdl/sdl-1.3/README.Porting b/project/jni/sdl-1.3/README.Porting
similarity index 100%
rename from project/sdl/sdl-1.3/README.Porting
rename to project/jni/sdl-1.3/README.Porting
diff --git a/project/sdl/sdl-1.3/README.gesture b/project/jni/sdl-1.3/README.gesture
similarity index 100%
rename from project/sdl/sdl-1.3/README.gesture
rename to project/jni/sdl-1.3/README.gesture
diff --git a/project/sdl/sdl-1.3/README.touch b/project/jni/sdl-1.3/README.touch
similarity index 100%
rename from project/sdl/sdl-1.3/README.touch
rename to project/jni/sdl-1.3/README.touch
diff --git a/project/sdl/sdl-1.3/TODO b/project/jni/sdl-1.3/TODO
similarity index 100%
rename from project/sdl/sdl-1.3/TODO
rename to project/jni/sdl-1.3/TODO
diff --git a/project/sdl/sdl-1.3/UNDER_CONSTRUCTION.txt b/project/jni/sdl-1.3/UNDER_CONSTRUCTION.txt
similarity index 100%
rename from project/sdl/sdl-1.3/UNDER_CONSTRUCTION.txt
rename to project/jni/sdl-1.3/UNDER_CONSTRUCTION.txt
diff --git a/project/sdl/sdl-1.3/WhatsNew b/project/jni/sdl-1.3/WhatsNew
similarity index 100%
rename from project/sdl/sdl-1.3/WhatsNew
rename to project/jni/sdl-1.3/WhatsNew
diff --git a/project/sdl/sdl-1.3/include/SDL.h b/project/jni/sdl-1.3/include/SDL.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL.h
rename to project/jni/sdl-1.3/include/SDL.h
diff --git a/project/sdl/sdl-1.3/include/SDL_assert.h b/project/jni/sdl-1.3/include/SDL_assert.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_assert.h
rename to project/jni/sdl-1.3/include/SDL_assert.h
diff --git a/project/sdl/sdl-1.3/include/SDL_atomic.h b/project/jni/sdl-1.3/include/SDL_atomic.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_atomic.h
rename to project/jni/sdl-1.3/include/SDL_atomic.h
diff --git a/project/sdl/sdl-1.3/include/SDL_audio.h b/project/jni/sdl-1.3/include/SDL_audio.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_audio.h
rename to project/jni/sdl-1.3/include/SDL_audio.h
diff --git a/project/sdl/sdl-1.3/include/SDL_clipboard.h b/project/jni/sdl-1.3/include/SDL_clipboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_clipboard.h
rename to project/jni/sdl-1.3/include/SDL_clipboard.h
diff --git a/project/sdl/sdl-1.3/include/SDL_compat.h b/project/jni/sdl-1.3/include/SDL_compat.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_compat.h
rename to project/jni/sdl-1.3/include/SDL_compat.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config.h b/project/jni/sdl-1.3/include/SDL_config.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config.h
rename to project/jni/sdl-1.3/include/SDL_config.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config.h.default b/project/jni/sdl-1.3/include/SDL_config.h.default
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config.h.default
rename to project/jni/sdl-1.3/include/SDL_config.h.default
diff --git a/project/sdl/sdl-1.3/include/SDL_config.h.in b/project/jni/sdl-1.3/include/SDL_config.h.in
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config.h.in
rename to project/jni/sdl-1.3/include/SDL_config.h.in
diff --git a/project/sdl/sdl-1.3/include/SDL_config_android.h b/project/jni/sdl-1.3/include/SDL_config_android.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_android.h
rename to project/jni/sdl-1.3/include/SDL_config_android.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_iphoneos.h b/project/jni/sdl-1.3/include/SDL_config_iphoneos.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_iphoneos.h
rename to project/jni/sdl-1.3/include/SDL_config_iphoneos.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_macosx.h b/project/jni/sdl-1.3/include/SDL_config_macosx.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_macosx.h
rename to project/jni/sdl-1.3/include/SDL_config_macosx.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_minimal.h b/project/jni/sdl-1.3/include/SDL_config_minimal.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_minimal.h
rename to project/jni/sdl-1.3/include/SDL_config_minimal.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_nintendods.h b/project/jni/sdl-1.3/include/SDL_config_nintendods.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_nintendods.h
rename to project/jni/sdl-1.3/include/SDL_config_nintendods.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_pandora.h b/project/jni/sdl-1.3/include/SDL_config_pandora.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_pandora.h
rename to project/jni/sdl-1.3/include/SDL_config_pandora.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_win32.h b/project/jni/sdl-1.3/include/SDL_config_win32.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_win32.h
rename to project/jni/sdl-1.3/include/SDL_config_win32.h
diff --git a/project/sdl/sdl-1.3/include/SDL_config_wiz.h b/project/jni/sdl-1.3/include/SDL_config_wiz.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_config_wiz.h
rename to project/jni/sdl-1.3/include/SDL_config_wiz.h
diff --git a/project/sdl/sdl-1.3/include/SDL_copying.h b/project/jni/sdl-1.3/include/SDL_copying.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_copying.h
rename to project/jni/sdl-1.3/include/SDL_copying.h
diff --git a/project/sdl/sdl-1.3/include/SDL_cpuinfo.h b/project/jni/sdl-1.3/include/SDL_cpuinfo.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_cpuinfo.h
rename to project/jni/sdl-1.3/include/SDL_cpuinfo.h
diff --git a/project/sdl/sdl-1.3/include/SDL_endian.h b/project/jni/sdl-1.3/include/SDL_endian.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_endian.h
rename to project/jni/sdl-1.3/include/SDL_endian.h
diff --git a/project/sdl/sdl-1.3/include/SDL_error.h b/project/jni/sdl-1.3/include/SDL_error.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_error.h
rename to project/jni/sdl-1.3/include/SDL_error.h
diff --git a/project/sdl/sdl-1.3/include/SDL_events.h b/project/jni/sdl-1.3/include/SDL_events.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_events.h
rename to project/jni/sdl-1.3/include/SDL_events.h
diff --git a/project/sdl/sdl-1.3/include/SDL_gesture.h b/project/jni/sdl-1.3/include/SDL_gesture.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_gesture.h
rename to project/jni/sdl-1.3/include/SDL_gesture.h
diff --git a/project/sdl/sdl-1.3/include/SDL_haptic.h b/project/jni/sdl-1.3/include/SDL_haptic.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_haptic.h
rename to project/jni/sdl-1.3/include/SDL_haptic.h
diff --git a/project/sdl/sdl-1.3/include/SDL_input.h b/project/jni/sdl-1.3/include/SDL_input.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_input.h
rename to project/jni/sdl-1.3/include/SDL_input.h
diff --git a/project/sdl/sdl-1.3/include/SDL_joystick.h b/project/jni/sdl-1.3/include/SDL_joystick.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_joystick.h
rename to project/jni/sdl-1.3/include/SDL_joystick.h
diff --git a/project/sdl/sdl-1.3/include/SDL_keyboard.h b/project/jni/sdl-1.3/include/SDL_keyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_keyboard.h
rename to project/jni/sdl-1.3/include/SDL_keyboard.h
diff --git a/project/sdl/sdl-1.3/include/SDL_keysym.h b/project/jni/sdl-1.3/include/SDL_keysym.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_keysym.h
rename to project/jni/sdl-1.3/include/SDL_keysym.h
diff --git a/project/sdl/sdl-1.3/include/SDL_loadso.h b/project/jni/sdl-1.3/include/SDL_loadso.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_loadso.h
rename to project/jni/sdl-1.3/include/SDL_loadso.h
diff --git a/project/sdl/sdl-1.3/include/SDL_main.h b/project/jni/sdl-1.3/include/SDL_main.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_main.h
rename to project/jni/sdl-1.3/include/SDL_main.h
diff --git a/project/sdl/sdl-1.3/include/SDL_mouse.h b/project/jni/sdl-1.3/include/SDL_mouse.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_mouse.h
rename to project/jni/sdl-1.3/include/SDL_mouse.h
diff --git a/project/sdl/sdl-1.3/include/SDL_mutex.h b/project/jni/sdl-1.3/include/SDL_mutex.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_mutex.h
rename to project/jni/sdl-1.3/include/SDL_mutex.h
diff --git a/project/sdl/sdl-1.3/include/SDL_name.h b/project/jni/sdl-1.3/include/SDL_name.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_name.h
rename to project/jni/sdl-1.3/include/SDL_name.h
diff --git a/project/sdl/sdl-1.3/include/SDL_opengl.h b/project/jni/sdl-1.3/include/SDL_opengl.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_opengl.h
rename to project/jni/sdl-1.3/include/SDL_opengl.h
diff --git a/project/sdl/sdl-1.3/include/SDL_opengles.h b/project/jni/sdl-1.3/include/SDL_opengles.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_opengles.h
rename to project/jni/sdl-1.3/include/SDL_opengles.h
diff --git a/project/sdl/sdl-1.3/include/SDL_pixels.h b/project/jni/sdl-1.3/include/SDL_pixels.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_pixels.h
rename to project/jni/sdl-1.3/include/SDL_pixels.h
diff --git a/project/sdl/sdl-1.3/include/SDL_platform.h b/project/jni/sdl-1.3/include/SDL_platform.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_platform.h
rename to project/jni/sdl-1.3/include/SDL_platform.h
diff --git a/project/sdl/sdl-1.3/include/SDL_power.h b/project/jni/sdl-1.3/include/SDL_power.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_power.h
rename to project/jni/sdl-1.3/include/SDL_power.h
diff --git a/project/sdl/sdl-1.3/include/SDL_quit.h b/project/jni/sdl-1.3/include/SDL_quit.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_quit.h
rename to project/jni/sdl-1.3/include/SDL_quit.h
diff --git a/project/sdl/sdl-1.3/include/SDL_rect.h b/project/jni/sdl-1.3/include/SDL_rect.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_rect.h
rename to project/jni/sdl-1.3/include/SDL_rect.h
diff --git a/project/sdl/sdl-1.3/include/SDL_revision.h b/project/jni/sdl-1.3/include/SDL_revision.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_revision.h
rename to project/jni/sdl-1.3/include/SDL_revision.h
diff --git a/project/sdl/sdl-1.3/include/SDL_rwops.h b/project/jni/sdl-1.3/include/SDL_rwops.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_rwops.h
rename to project/jni/sdl-1.3/include/SDL_rwops.h
diff --git a/project/sdl/sdl-1.3/include/SDL_scancode.h b/project/jni/sdl-1.3/include/SDL_scancode.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_scancode.h
rename to project/jni/sdl-1.3/include/SDL_scancode.h
diff --git a/project/sdl/sdl-1.3/include/SDL_screenkeyboard.h b/project/jni/sdl-1.3/include/SDL_screenkeyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_screenkeyboard.h
rename to project/jni/sdl-1.3/include/SDL_screenkeyboard.h
diff --git a/project/sdl/sdl-1.3/include/SDL_shape.h b/project/jni/sdl-1.3/include/SDL_shape.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_shape.h
rename to project/jni/sdl-1.3/include/SDL_shape.h
diff --git a/project/sdl/sdl-1.3/include/SDL_stdinc.h b/project/jni/sdl-1.3/include/SDL_stdinc.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_stdinc.h
rename to project/jni/sdl-1.3/include/SDL_stdinc.h
diff --git a/project/sdl/sdl-1.3/include/SDL_surface.h b/project/jni/sdl-1.3/include/SDL_surface.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_surface.h
rename to project/jni/sdl-1.3/include/SDL_surface.h
diff --git a/project/sdl/sdl-1.3/include/SDL_syswm.h b/project/jni/sdl-1.3/include/SDL_syswm.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_syswm.h
rename to project/jni/sdl-1.3/include/SDL_syswm.h
diff --git a/project/sdl/sdl-1.3/include/SDL_thread.h b/project/jni/sdl-1.3/include/SDL_thread.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_thread.h
rename to project/jni/sdl-1.3/include/SDL_thread.h
diff --git a/project/sdl/sdl-1.3/include/SDL_timer.h b/project/jni/sdl-1.3/include/SDL_timer.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_timer.h
rename to project/jni/sdl-1.3/include/SDL_timer.h
diff --git a/project/sdl/sdl-1.3/include/SDL_touch.h b/project/jni/sdl-1.3/include/SDL_touch.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_touch.h
rename to project/jni/sdl-1.3/include/SDL_touch.h
diff --git a/project/sdl/sdl-1.3/include/SDL_types.h b/project/jni/sdl-1.3/include/SDL_types.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_types.h
rename to project/jni/sdl-1.3/include/SDL_types.h
diff --git a/project/sdl/sdl-1.3/include/SDL_version.h b/project/jni/sdl-1.3/include/SDL_version.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_version.h
rename to project/jni/sdl-1.3/include/SDL_version.h
diff --git a/project/sdl/sdl-1.3/include/SDL_video.h b/project/jni/sdl-1.3/include/SDL_video.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/SDL_video.h
rename to project/jni/sdl-1.3/include/SDL_video.h
diff --git a/project/sdl/sdl-1.3/include/begin_code.h b/project/jni/sdl-1.3/include/begin_code.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/begin_code.h
rename to project/jni/sdl-1.3/include/begin_code.h
diff --git a/project/sdl/sdl-1.3/include/close_code.h b/project/jni/sdl-1.3/include/close_code.h
similarity index 100%
rename from project/sdl/sdl-1.3/include/close_code.h
rename to project/jni/sdl-1.3/include/close_code.h
diff --git a/project/sdl/sdl-1.3/include/doxyfile b/project/jni/sdl-1.3/include/doxyfile
similarity index 100%
rename from project/sdl/sdl-1.3/include/doxyfile
rename to project/jni/sdl-1.3/include/doxyfile
diff --git a/project/sdl/sdl-1.3/src/SDL.c b/project/jni/sdl-1.3/src/SDL.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL.c
rename to project/jni/sdl-1.3/src/SDL.c
diff --git a/project/sdl/sdl-1.3/src/SDL_assert.c b/project/jni/sdl-1.3/src/SDL_assert.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_assert.c
rename to project/jni/sdl-1.3/src/SDL_assert.c
diff --git a/project/sdl/sdl-1.3/src/SDL_assert_c.h b/project/jni/sdl-1.3/src/SDL_assert_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_assert_c.h
rename to project/jni/sdl-1.3/src/SDL_assert_c.h
diff --git a/project/sdl/sdl-1.3/src/SDL_compat.c b/project/jni/sdl-1.3/src/SDL_compat.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_compat.c
rename to project/jni/sdl-1.3/src/SDL_compat.c
diff --git a/project/sdl/sdl-1.3/src/SDL_error.c b/project/jni/sdl-1.3/src/SDL_error.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_error.c
rename to project/jni/sdl-1.3/src/SDL_error.c
diff --git a/project/sdl/sdl-1.3/src/SDL_error_c.h b/project/jni/sdl-1.3/src/SDL_error_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_error_c.h
rename to project/jni/sdl-1.3/src/SDL_error_c.h
diff --git a/project/sdl/sdl-1.3/src/SDL_fatal.c b/project/jni/sdl-1.3/src/SDL_fatal.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_fatal.c
rename to project/jni/sdl-1.3/src/SDL_fatal.c
diff --git a/project/sdl/sdl-1.3/src/SDL_fatal.h b/project/jni/sdl-1.3/src/SDL_fatal.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/SDL_fatal.h
rename to project/jni/sdl-1.3/src/SDL_fatal.h
diff --git a/project/sdl/sdl-1.3/src/atomic/dummy/SDL_atomic.c b/project/jni/sdl-1.3/src/atomic/dummy/SDL_atomic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/atomic/dummy/SDL_atomic.c
rename to project/jni/sdl-1.3/src/atomic/dummy/SDL_atomic.c
diff --git a/project/sdl/sdl-1.3/src/atomic/linux/SDL_atomic.c b/project/jni/sdl-1.3/src/atomic/linux/SDL_atomic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/atomic/linux/SDL_atomic.c
rename to project/jni/sdl-1.3/src/atomic/linux/SDL_atomic.c
diff --git a/project/sdl/sdl-1.3/src/atomic/macosx/SDL_atomic.c b/project/jni/sdl-1.3/src/atomic/macosx/SDL_atomic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/atomic/macosx/SDL_atomic.c
rename to project/jni/sdl-1.3/src/atomic/macosx/SDL_atomic.c
diff --git a/project/sdl/sdl-1.3/src/atomic/qnx/SDL_atomic.c b/project/jni/sdl-1.3/src/atomic/qnx/SDL_atomic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/atomic/qnx/SDL_atomic.c
rename to project/jni/sdl-1.3/src/atomic/qnx/SDL_atomic.c
diff --git a/project/sdl/sdl-1.3/src/atomic/win32/SDL_atomic.c b/project/jni/sdl-1.3/src/atomic/win32/SDL_atomic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/atomic/win32/SDL_atomic.c
rename to project/jni/sdl-1.3/src/atomic/win32/SDL_atomic.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audio.c b/project/jni/sdl-1.3/src/audio/SDL_audio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audio.c
rename to project/jni/sdl-1.3/src/audio/SDL_audio.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audio_c.h b/project/jni/sdl-1.3/src/audio/SDL_audio_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audio_c.h
rename to project/jni/sdl-1.3/src/audio/SDL_audio_c.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audiocvt.c b/project/jni/sdl-1.3/src/audio/SDL_audiocvt.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audiocvt.c
rename to project/jni/sdl-1.3/src/audio/SDL_audiocvt.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audiodev.c b/project/jni/sdl-1.3/src/audio/SDL_audiodev.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audiodev.c
rename to project/jni/sdl-1.3/src/audio/SDL_audiodev.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audiodev_c.h b/project/jni/sdl-1.3/src/audio/SDL_audiodev_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audiodev_c.h
rename to project/jni/sdl-1.3/src/audio/SDL_audiodev_c.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audiomem.h b/project/jni/sdl-1.3/src/audio/SDL_audiomem.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audiomem.h
rename to project/jni/sdl-1.3/src/audio/SDL_audiomem.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_audiotypecvt.c b/project/jni/sdl-1.3/src/audio/SDL_audiotypecvt.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_audiotypecvt.c
rename to project/jni/sdl-1.3/src/audio/SDL_audiotypecvt.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer.c b/project/jni/sdl-1.3/src/audio/SDL_mixer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer.c
rename to project/jni/sdl-1.3/src/audio/SDL_mixer.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX.c b/project/jni/sdl-1.3/src/audio/SDL_mixer_MMX.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX.c
rename to project/jni/sdl-1.3/src/audio/SDL_mixer_MMX.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX.h b/project/jni/sdl-1.3/src/audio/SDL_mixer_MMX.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX.h
rename to project/jni/sdl-1.3/src/audio/SDL_mixer_MMX.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX_VC.c b/project/jni/sdl-1.3/src/audio/SDL_mixer_MMX_VC.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX_VC.c
rename to project/jni/sdl-1.3/src/audio/SDL_mixer_MMX_VC.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX_VC.h b/project/jni/sdl-1.3/src/audio/SDL_mixer_MMX_VC.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer_MMX_VC.h
rename to project/jni/sdl-1.3/src/audio/SDL_mixer_MMX_VC.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer_m68k.c b/project/jni/sdl-1.3/src/audio/SDL_mixer_m68k.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer_m68k.c
rename to project/jni/sdl-1.3/src/audio/SDL_mixer_m68k.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_mixer_m68k.h b/project/jni/sdl-1.3/src/audio/SDL_mixer_m68k.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_mixer_m68k.h
rename to project/jni/sdl-1.3/src/audio/SDL_mixer_m68k.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_sysaudio.h b/project/jni/sdl-1.3/src/audio/SDL_sysaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_sysaudio.h
rename to project/jni/sdl-1.3/src/audio/SDL_sysaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_wave.c b/project/jni/sdl-1.3/src/audio/SDL_wave.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_wave.c
rename to project/jni/sdl-1.3/src/audio/SDL_wave.c
diff --git a/project/sdl/sdl-1.3/src/audio/SDL_wave.h b/project/jni/sdl-1.3/src/audio/SDL_wave.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/SDL_wave.h
rename to project/jni/sdl-1.3/src/audio/SDL_wave.h
diff --git a/project/sdl/sdl-1.3/src/audio/alsa/SDL_alsa_audio.c b/project/jni/sdl-1.3/src/audio/alsa/SDL_alsa_audio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/alsa/SDL_alsa_audio.c
rename to project/jni/sdl-1.3/src/audio/alsa/SDL_alsa_audio.c
diff --git a/project/sdl/sdl-1.3/src/audio/alsa/SDL_alsa_audio.h b/project/jni/sdl-1.3/src/audio/alsa/SDL_alsa_audio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/alsa/SDL_alsa_audio.h
rename to project/jni/sdl-1.3/src/audio/alsa/SDL_alsa_audio.h
diff --git a/project/sdl/sdl-1.3/src/audio/android/SDL_androidaudio.c b/project/jni/sdl-1.3/src/audio/android/SDL_androidaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/android/SDL_androidaudio.c
rename to project/jni/sdl-1.3/src/audio/android/SDL_androidaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/android/SDL_androidaudio.h b/project/jni/sdl-1.3/src/audio/android/SDL_androidaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/android/SDL_androidaudio.h
rename to project/jni/sdl-1.3/src/audio/android/SDL_androidaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/arts/SDL_artsaudio.c b/project/jni/sdl-1.3/src/audio/arts/SDL_artsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/arts/SDL_artsaudio.c
rename to project/jni/sdl-1.3/src/audio/arts/SDL_artsaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/arts/SDL_artsaudio.h b/project/jni/sdl-1.3/src/audio/arts/SDL_artsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/arts/SDL_artsaudio.h
rename to project/jni/sdl-1.3/src/audio/arts/SDL_artsaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/baudio/SDL_beaudio.cc b/project/jni/sdl-1.3/src/audio/baudio/SDL_beaudio.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/baudio/SDL_beaudio.cc
rename to project/jni/sdl-1.3/src/audio/baudio/SDL_beaudio.cc
diff --git a/project/sdl/sdl-1.3/src/audio/baudio/SDL_beaudio.h b/project/jni/sdl-1.3/src/audio/baudio/SDL_beaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/baudio/SDL_beaudio.h
rename to project/jni/sdl-1.3/src/audio/baudio/SDL_beaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/bsd/SDL_bsdaudio.c b/project/jni/sdl-1.3/src/audio/bsd/SDL_bsdaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/bsd/SDL_bsdaudio.c
rename to project/jni/sdl-1.3/src/audio/bsd/SDL_bsdaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/bsd/SDL_bsdaudio.h b/project/jni/sdl-1.3/src/audio/bsd/SDL_bsdaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/bsd/SDL_bsdaudio.h
rename to project/jni/sdl-1.3/src/audio/bsd/SDL_bsdaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/disk/SDL_diskaudio.c b/project/jni/sdl-1.3/src/audio/disk/SDL_diskaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/disk/SDL_diskaudio.c
rename to project/jni/sdl-1.3/src/audio/disk/SDL_diskaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/disk/SDL_diskaudio.h b/project/jni/sdl-1.3/src/audio/disk/SDL_diskaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/disk/SDL_diskaudio.h
rename to project/jni/sdl-1.3/src/audio/disk/SDL_diskaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/dma/SDL_dmaaudio.c b/project/jni/sdl-1.3/src/audio/dma/SDL_dmaaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dma/SDL_dmaaudio.c
rename to project/jni/sdl-1.3/src/audio/dma/SDL_dmaaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/dma/SDL_dmaaudio.h b/project/jni/sdl-1.3/src/audio/dma/SDL_dmaaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dma/SDL_dmaaudio.h
rename to project/jni/sdl-1.3/src/audio/dma/SDL_dmaaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/dmedia/SDL_irixaudio.c b/project/jni/sdl-1.3/src/audio/dmedia/SDL_irixaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dmedia/SDL_irixaudio.c
rename to project/jni/sdl-1.3/src/audio/dmedia/SDL_irixaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/dmedia/SDL_irixaudio.h b/project/jni/sdl-1.3/src/audio/dmedia/SDL_irixaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dmedia/SDL_irixaudio.h
rename to project/jni/sdl-1.3/src/audio/dmedia/SDL_irixaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/dsp/SDL_dspaudio.c b/project/jni/sdl-1.3/src/audio/dsp/SDL_dspaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dsp/SDL_dspaudio.c
rename to project/jni/sdl-1.3/src/audio/dsp/SDL_dspaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/dsp/SDL_dspaudio.h b/project/jni/sdl-1.3/src/audio/dsp/SDL_dspaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dsp/SDL_dspaudio.h
rename to project/jni/sdl-1.3/src/audio/dsp/SDL_dspaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/dummy/SDL_dummyaudio.c b/project/jni/sdl-1.3/src/audio/dummy/SDL_dummyaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dummy/SDL_dummyaudio.c
rename to project/jni/sdl-1.3/src/audio/dummy/SDL_dummyaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/dummy/SDL_dummyaudio.h b/project/jni/sdl-1.3/src/audio/dummy/SDL_dummyaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/dummy/SDL_dummyaudio.h
rename to project/jni/sdl-1.3/src/audio/dummy/SDL_dummyaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/esd/SDL_esdaudio.c b/project/jni/sdl-1.3/src/audio/esd/SDL_esdaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/esd/SDL_esdaudio.c
rename to project/jni/sdl-1.3/src/audio/esd/SDL_esdaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/esd/SDL_esdaudio.h b/project/jni/sdl-1.3/src/audio/esd/SDL_esdaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/esd/SDL_esdaudio.h
rename to project/jni/sdl-1.3/src/audio/esd/SDL_esdaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.c b/project/jni/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.c
rename to project/jni/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.h b/project/jni/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.h
rename to project/jni/sdl-1.3/src/audio/fusionsound/SDL_fsaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c b/project/jni/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c
rename to project/jni/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c
diff --git a/project/sdl/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h b/project/jni/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h
rename to project/jni/sdl-1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h
diff --git a/project/sdl/sdl-1.3/src/audio/macosx/SDL_coreaudio.c b/project/jni/sdl-1.3/src/audio/macosx/SDL_coreaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/macosx/SDL_coreaudio.c
rename to project/jni/sdl-1.3/src/audio/macosx/SDL_coreaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/macosx/SDL_coreaudio.h b/project/jni/sdl-1.3/src/audio/macosx/SDL_coreaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/macosx/SDL_coreaudio.h
rename to project/jni/sdl-1.3/src/audio/macosx/SDL_coreaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/mme/SDL_mmeaudio.c b/project/jni/sdl-1.3/src/audio/mme/SDL_mmeaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/mme/SDL_mmeaudio.c
rename to project/jni/sdl-1.3/src/audio/mme/SDL_mmeaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/mme/SDL_mmeaudio.h b/project/jni/sdl-1.3/src/audio/mme/SDL_mmeaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/mme/SDL_mmeaudio.h
rename to project/jni/sdl-1.3/src/audio/mme/SDL_mmeaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/nas/SDL_nasaudio.c b/project/jni/sdl-1.3/src/audio/nas/SDL_nasaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/nas/SDL_nasaudio.c
rename to project/jni/sdl-1.3/src/audio/nas/SDL_nasaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/nas/SDL_nasaudio.h b/project/jni/sdl-1.3/src/audio/nas/SDL_nasaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/nas/SDL_nasaudio.h
rename to project/jni/sdl-1.3/src/audio/nas/SDL_nasaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/nds/SDL_ndsaudio.c b/project/jni/sdl-1.3/src/audio/nds/SDL_ndsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/nds/SDL_ndsaudio.c
rename to project/jni/sdl-1.3/src/audio/nds/SDL_ndsaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/nds/SDL_ndsaudio.h b/project/jni/sdl-1.3/src/audio/nds/SDL_ndsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/nds/SDL_ndsaudio.h
rename to project/jni/sdl-1.3/src/audio/nds/SDL_ndsaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/paudio/SDL_paudio.c b/project/jni/sdl-1.3/src/audio/paudio/SDL_paudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/paudio/SDL_paudio.c
rename to project/jni/sdl-1.3/src/audio/paudio/SDL_paudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/paudio/SDL_paudio.h b/project/jni/sdl-1.3/src/audio/paudio/SDL_paudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/paudio/SDL_paudio.h
rename to project/jni/sdl-1.3/src/audio/paudio/SDL_paudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.c b/project/jni/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.c
rename to project/jni/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.h b/project/jni/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.h
rename to project/jni/sdl-1.3/src/audio/pulseaudio/SDL_pulseaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/qsa/SDL_qsa_audio.c b/project/jni/sdl-1.3/src/audio/qsa/SDL_qsa_audio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/qsa/SDL_qsa_audio.c
rename to project/jni/sdl-1.3/src/audio/qsa/SDL_qsa_audio.c
diff --git a/project/sdl/sdl-1.3/src/audio/qsa/SDL_qsa_audio.h b/project/jni/sdl-1.3/src/audio/qsa/SDL_qsa_audio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/qsa/SDL_qsa_audio.h
rename to project/jni/sdl-1.3/src/audio/qsa/SDL_qsa_audio.h
diff --git a/project/sdl/sdl-1.3/src/audio/sdlgenaudiocvt.pl b/project/jni/sdl-1.3/src/audio/sdlgenaudiocvt.pl
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/sdlgenaudiocvt.pl
rename to project/jni/sdl-1.3/src/audio/sdlgenaudiocvt.pl
diff --git a/project/sdl/sdl-1.3/src/audio/sun/SDL_sunaudio.c b/project/jni/sdl-1.3/src/audio/sun/SDL_sunaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/sun/SDL_sunaudio.c
rename to project/jni/sdl-1.3/src/audio/sun/SDL_sunaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/sun/SDL_sunaudio.h b/project/jni/sdl-1.3/src/audio/sun/SDL_sunaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/sun/SDL_sunaudio.h
rename to project/jni/sdl-1.3/src/audio/sun/SDL_sunaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/ums/SDL_umsaudio.c b/project/jni/sdl-1.3/src/audio/ums/SDL_umsaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/ums/SDL_umsaudio.c
rename to project/jni/sdl-1.3/src/audio/ums/SDL_umsaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/ums/SDL_umsaudio.h b/project/jni/sdl-1.3/src/audio/ums/SDL_umsaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/ums/SDL_umsaudio.h
rename to project/jni/sdl-1.3/src/audio/ums/SDL_umsaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/windib/SDL_dibaudio.c b/project/jni/sdl-1.3/src/audio/windib/SDL_dibaudio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/windib/SDL_dibaudio.c
rename to project/jni/sdl-1.3/src/audio/windib/SDL_dibaudio.c
diff --git a/project/sdl/sdl-1.3/src/audio/windib/SDL_dibaudio.h b/project/jni/sdl-1.3/src/audio/windib/SDL_dibaudio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/windib/SDL_dibaudio.h
rename to project/jni/sdl-1.3/src/audio/windib/SDL_dibaudio.h
diff --git a/project/sdl/sdl-1.3/src/audio/windx5/SDL_dx5audio.c b/project/jni/sdl-1.3/src/audio/windx5/SDL_dx5audio.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/windx5/SDL_dx5audio.c
rename to project/jni/sdl-1.3/src/audio/windx5/SDL_dx5audio.c
diff --git a/project/sdl/sdl-1.3/src/audio/windx5/SDL_dx5audio.h b/project/jni/sdl-1.3/src/audio/windx5/SDL_dx5audio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/windx5/SDL_dx5audio.h
rename to project/jni/sdl-1.3/src/audio/windx5/SDL_dx5audio.h
diff --git a/project/sdl/sdl-1.3/src/audio/windx5/directx.h b/project/jni/sdl-1.3/src/audio/windx5/directx.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/audio/windx5/directx.h
rename to project/jni/sdl-1.3/src/audio/windx5/directx.h
diff --git a/project/sdl/sdl-1.3/src/cpuinfo/SDL_cpuinfo.c b/project/jni/sdl-1.3/src/cpuinfo/SDL_cpuinfo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/cpuinfo/SDL_cpuinfo.c
rename to project/jni/sdl-1.3/src/cpuinfo/SDL_cpuinfo.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_clipboardevents.c b/project/jni/sdl-1.3/src/events/SDL_clipboardevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_clipboardevents.c
rename to project/jni/sdl-1.3/src/events/SDL_clipboardevents.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_clipboardevents_c.h b/project/jni/sdl-1.3/src/events/SDL_clipboardevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_clipboardevents_c.h
rename to project/jni/sdl-1.3/src/events/SDL_clipboardevents_c.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_events.c b/project/jni/sdl-1.3/src/events/SDL_events.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_events.c
rename to project/jni/sdl-1.3/src/events/SDL_events.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_events_c.h b/project/jni/sdl-1.3/src/events/SDL_events_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_events_c.h
rename to project/jni/sdl-1.3/src/events/SDL_events_c.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_gesture.c b/project/jni/sdl-1.3/src/events/SDL_gesture.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_gesture.c
rename to project/jni/sdl-1.3/src/events/SDL_gesture.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_gesture_c.h b/project/jni/sdl-1.3/src/events/SDL_gesture_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_gesture_c.h
rename to project/jni/sdl-1.3/src/events/SDL_gesture_c.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_keyboard.c b/project/jni/sdl-1.3/src/events/SDL_keyboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_keyboard.c
rename to project/jni/sdl-1.3/src/events/SDL_keyboard.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_keyboard_c.h b/project/jni/sdl-1.3/src/events/SDL_keyboard_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_keyboard_c.h
rename to project/jni/sdl-1.3/src/events/SDL_keyboard_c.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_mouse.c b/project/jni/sdl-1.3/src/events/SDL_mouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_mouse.c
rename to project/jni/sdl-1.3/src/events/SDL_mouse.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_mouse_c.h b/project/jni/sdl-1.3/src/events/SDL_mouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_mouse_c.h
rename to project/jni/sdl-1.3/src/events/SDL_mouse_c.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_quit.c b/project/jni/sdl-1.3/src/events/SDL_quit.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_quit.c
rename to project/jni/sdl-1.3/src/events/SDL_quit.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_sysevents.h b/project/jni/sdl-1.3/src/events/SDL_sysevents.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_sysevents.h
rename to project/jni/sdl-1.3/src/events/SDL_sysevents.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_touch.c b/project/jni/sdl-1.3/src/events/SDL_touch.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_touch.c
rename to project/jni/sdl-1.3/src/events/SDL_touch.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_touch_c.h b/project/jni/sdl-1.3/src/events/SDL_touch_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_touch_c.h
rename to project/jni/sdl-1.3/src/events/SDL_touch_c.h
diff --git a/project/sdl/sdl-1.3/src/events/SDL_windowevents.c b/project/jni/sdl-1.3/src/events/SDL_windowevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_windowevents.c
rename to project/jni/sdl-1.3/src/events/SDL_windowevents.c
diff --git a/project/sdl/sdl-1.3/src/events/SDL_windowevents_c.h b/project/jni/sdl-1.3/src/events/SDL_windowevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/SDL_windowevents_c.h
rename to project/jni/sdl-1.3/src/events/SDL_windowevents_c.h
diff --git a/project/sdl/sdl-1.3/src/events/blank_cursor.h b/project/jni/sdl-1.3/src/events/blank_cursor.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/blank_cursor.h
rename to project/jni/sdl-1.3/src/events/blank_cursor.h
diff --git a/project/sdl/sdl-1.3/src/events/default_cursor.h b/project/jni/sdl-1.3/src/events/default_cursor.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/default_cursor.h
rename to project/jni/sdl-1.3/src/events/default_cursor.h
diff --git a/project/sdl/sdl-1.3/src/events/scancodes_darwin.h b/project/jni/sdl-1.3/src/events/scancodes_darwin.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/scancodes_darwin.h
rename to project/jni/sdl-1.3/src/events/scancodes_darwin.h
diff --git a/project/sdl/sdl-1.3/src/events/scancodes_linux.h b/project/jni/sdl-1.3/src/events/scancodes_linux.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/scancodes_linux.h
rename to project/jni/sdl-1.3/src/events/scancodes_linux.h
diff --git a/project/sdl/sdl-1.3/src/events/scancodes_win32.h b/project/jni/sdl-1.3/src/events/scancodes_win32.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/scancodes_win32.h
rename to project/jni/sdl-1.3/src/events/scancodes_win32.h
diff --git a/project/sdl/sdl-1.3/src/events/scancodes_xfree86.h b/project/jni/sdl-1.3/src/events/scancodes_xfree86.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/events/scancodes_xfree86.h
rename to project/jni/sdl-1.3/src/events/scancodes_xfree86.h
diff --git a/project/sdl/sdl-1.3/src/file/SDL_rwops.c b/project/jni/sdl-1.3/src/file/SDL_rwops.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/file/SDL_rwops.c
rename to project/jni/sdl-1.3/src/file/SDL_rwops.c
diff --git a/project/sdl/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.h b/project/jni/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.h
rename to project/jni/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.h
diff --git a/project/sdl/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.m b/project/jni/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.m
rename to project/jni/sdl-1.3/src/file/cocoa/SDL_rwopsbundlesupport.m
diff --git a/project/sdl/sdl-1.3/src/haptic/SDL_haptic.c b/project/jni/sdl-1.3/src/haptic/SDL_haptic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/SDL_haptic.c
rename to project/jni/sdl-1.3/src/haptic/SDL_haptic.c
diff --git a/project/sdl/sdl-1.3/src/haptic/SDL_haptic_c.h b/project/jni/sdl-1.3/src/haptic/SDL_haptic_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/SDL_haptic_c.h
rename to project/jni/sdl-1.3/src/haptic/SDL_haptic_c.h
diff --git a/project/sdl/sdl-1.3/src/haptic/SDL_syshaptic.h b/project/jni/sdl-1.3/src/haptic/SDL_syshaptic.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/SDL_syshaptic.h
rename to project/jni/sdl-1.3/src/haptic/SDL_syshaptic.h
diff --git a/project/sdl/sdl-1.3/src/haptic/darwin/SDL_syshaptic.c b/project/jni/sdl-1.3/src/haptic/darwin/SDL_syshaptic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/darwin/SDL_syshaptic.c
rename to project/jni/sdl-1.3/src/haptic/darwin/SDL_syshaptic.c
diff --git a/project/sdl/sdl-1.3/src/haptic/dummy/SDL_syshaptic.c b/project/jni/sdl-1.3/src/haptic/dummy/SDL_syshaptic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/dummy/SDL_syshaptic.c
rename to project/jni/sdl-1.3/src/haptic/dummy/SDL_syshaptic.c
diff --git a/project/sdl/sdl-1.3/src/haptic/linux/SDL_syshaptic.c b/project/jni/sdl-1.3/src/haptic/linux/SDL_syshaptic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/linux/SDL_syshaptic.c
rename to project/jni/sdl-1.3/src/haptic/linux/SDL_syshaptic.c
diff --git a/project/sdl/sdl-1.3/src/haptic/nds/SDL_syshaptic.c b/project/jni/sdl-1.3/src/haptic/nds/SDL_syshaptic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/nds/SDL_syshaptic.c
rename to project/jni/sdl-1.3/src/haptic/nds/SDL_syshaptic.c
diff --git a/project/sdl/sdl-1.3/src/haptic/win32/SDL_syshaptic.c b/project/jni/sdl-1.3/src/haptic/win32/SDL_syshaptic.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/haptic/win32/SDL_syshaptic.c
rename to project/jni/sdl-1.3/src/haptic/win32/SDL_syshaptic.c
diff --git a/project/sdl/sdl-1.3/src/joystick/SDL_joystick.c b/project/jni/sdl-1.3/src/joystick/SDL_joystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/SDL_joystick.c
rename to project/jni/sdl-1.3/src/joystick/SDL_joystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/SDL_joystick_c.h b/project/jni/sdl-1.3/src/joystick/SDL_joystick_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/SDL_joystick_c.h
rename to project/jni/sdl-1.3/src/joystick/SDL_joystick_c.h
diff --git a/project/sdl/sdl-1.3/src/joystick/SDL_sysjoystick.h b/project/jni/sdl-1.3/src/joystick/SDL_sysjoystick.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/SDL_sysjoystick.h
rename to project/jni/sdl-1.3/src/joystick/SDL_sysjoystick.h
diff --git a/project/sdl/sdl-1.3/src/joystick/beos/SDL_bejoystick.cc b/project/jni/sdl-1.3/src/joystick/beos/SDL_bejoystick.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/beos/SDL_bejoystick.cc
rename to project/jni/sdl-1.3/src/joystick/beos/SDL_bejoystick.cc
diff --git a/project/sdl/sdl-1.3/src/joystick/bsd/SDL_sysjoystick.c b/project/jni/sdl-1.3/src/joystick/bsd/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/bsd/SDL_sysjoystick.c
rename to project/jni/sdl-1.3/src/joystick/bsd/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h b/project/jni/sdl-1.3/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
rename to project/jni/sdl-1.3/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
diff --git a/project/sdl/sdl-1.3/src/joystick/darwin/SDL_sysjoystick.c b/project/jni/sdl-1.3/src/joystick/darwin/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/darwin/SDL_sysjoystick.c
rename to project/jni/sdl-1.3/src/joystick/darwin/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/darwin/SDL_sysjoystick_c.h b/project/jni/sdl-1.3/src/joystick/darwin/SDL_sysjoystick_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/darwin/SDL_sysjoystick_c.h
rename to project/jni/sdl-1.3/src/joystick/darwin/SDL_sysjoystick_c.h
diff --git a/project/sdl/sdl-1.3/src/joystick/dummy/SDL_sysjoystick.c b/project/jni/sdl-1.3/src/joystick/dummy/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/dummy/SDL_sysjoystick.c
rename to project/jni/sdl-1.3/src/joystick/dummy/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.h b/project/jni/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.h
rename to project/jni/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.h
diff --git a/project/sdl/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.m b/project/jni/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.m
rename to project/jni/sdl-1.3/src/joystick/iphoneos/SDLUIAccelerationDelegate.m
diff --git a/project/sdl/sdl-1.3/src/joystick/iphoneos/SDL_sysjoystick.m b/project/jni/sdl-1.3/src/joystick/iphoneos/SDL_sysjoystick.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/iphoneos/SDL_sysjoystick.m
rename to project/jni/sdl-1.3/src/joystick/iphoneos/SDL_sysjoystick.m
diff --git a/project/sdl/sdl-1.3/src/joystick/linux/SDL_sysjoystick.c b/project/jni/sdl-1.3/src/joystick/linux/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/linux/SDL_sysjoystick.c
rename to project/jni/sdl-1.3/src/joystick/linux/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/linux/SDL_sysjoystick_c.h b/project/jni/sdl-1.3/src/joystick/linux/SDL_sysjoystick_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/linux/SDL_sysjoystick_c.h
rename to project/jni/sdl-1.3/src/joystick/linux/SDL_sysjoystick_c.h
diff --git a/project/sdl/sdl-1.3/src/joystick/nds/SDL_sysjoystick.c b/project/jni/sdl-1.3/src/joystick/nds/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/nds/SDL_sysjoystick.c
rename to project/jni/sdl-1.3/src/joystick/nds/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/riscos/SDL_sysjoystick.c b/project/jni/sdl-1.3/src/joystick/riscos/SDL_sysjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/riscos/SDL_sysjoystick.c
rename to project/jni/sdl-1.3/src/joystick/riscos/SDL_sysjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/win32/SDL_dxjoystick.c b/project/jni/sdl-1.3/src/joystick/win32/SDL_dxjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/win32/SDL_dxjoystick.c
rename to project/jni/sdl-1.3/src/joystick/win32/SDL_dxjoystick.c
diff --git a/project/sdl/sdl-1.3/src/joystick/win32/SDL_dxjoystick_c.h b/project/jni/sdl-1.3/src/joystick/win32/SDL_dxjoystick_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/win32/SDL_dxjoystick_c.h
rename to project/jni/sdl-1.3/src/joystick/win32/SDL_dxjoystick_c.h
diff --git a/project/sdl/sdl-1.3/src/joystick/win32/SDL_mmjoystick.c b/project/jni/sdl-1.3/src/joystick/win32/SDL_mmjoystick.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/joystick/win32/SDL_mmjoystick.c
rename to project/jni/sdl-1.3/src/joystick/win32/SDL_mmjoystick.c
diff --git a/project/sdl/sdl-1.3/src/libm/e_atan2.c b/project/jni/sdl-1.3/src/libm/e_atan2.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/e_atan2.c
rename to project/jni/sdl-1.3/src/libm/e_atan2.c
diff --git a/project/sdl/sdl-1.3/src/libm/e_log.c b/project/jni/sdl-1.3/src/libm/e_log.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/e_log.c
rename to project/jni/sdl-1.3/src/libm/e_log.c
diff --git a/project/sdl/sdl-1.3/src/libm/e_pow.c b/project/jni/sdl-1.3/src/libm/e_pow.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/e_pow.c
rename to project/jni/sdl-1.3/src/libm/e_pow.c
diff --git a/project/sdl/sdl-1.3/src/libm/e_rem_pio2.c b/project/jni/sdl-1.3/src/libm/e_rem_pio2.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/e_rem_pio2.c
rename to project/jni/sdl-1.3/src/libm/e_rem_pio2.c
diff --git a/project/sdl/sdl-1.3/src/libm/e_sqrt.c b/project/jni/sdl-1.3/src/libm/e_sqrt.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/e_sqrt.c
rename to project/jni/sdl-1.3/src/libm/e_sqrt.c
diff --git a/project/sdl/sdl-1.3/src/libm/k_cos.c b/project/jni/sdl-1.3/src/libm/k_cos.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/k_cos.c
rename to project/jni/sdl-1.3/src/libm/k_cos.c
diff --git a/project/sdl/sdl-1.3/src/libm/k_rem_pio2.c b/project/jni/sdl-1.3/src/libm/k_rem_pio2.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/k_rem_pio2.c
rename to project/jni/sdl-1.3/src/libm/k_rem_pio2.c
diff --git a/project/sdl/sdl-1.3/src/libm/k_sin.c b/project/jni/sdl-1.3/src/libm/k_sin.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/k_sin.c
rename to project/jni/sdl-1.3/src/libm/k_sin.c
diff --git a/project/sdl/sdl-1.3/src/libm/math.h b/project/jni/sdl-1.3/src/libm/math.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/math.h
rename to project/jni/sdl-1.3/src/libm/math.h
diff --git a/project/sdl/sdl-1.3/src/libm/math_private.h b/project/jni/sdl-1.3/src/libm/math_private.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/math_private.h
rename to project/jni/sdl-1.3/src/libm/math_private.h
diff --git a/project/sdl/sdl-1.3/src/libm/s_atan.c b/project/jni/sdl-1.3/src/libm/s_atan.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_atan.c
rename to project/jni/sdl-1.3/src/libm/s_atan.c
diff --git a/project/sdl/sdl-1.3/src/libm/s_copysign.c b/project/jni/sdl-1.3/src/libm/s_copysign.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_copysign.c
rename to project/jni/sdl-1.3/src/libm/s_copysign.c
diff --git a/project/sdl/sdl-1.3/src/libm/s_cos.c b/project/jni/sdl-1.3/src/libm/s_cos.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_cos.c
rename to project/jni/sdl-1.3/src/libm/s_cos.c
diff --git a/project/sdl/sdl-1.3/src/libm/s_fabs.c b/project/jni/sdl-1.3/src/libm/s_fabs.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_fabs.c
rename to project/jni/sdl-1.3/src/libm/s_fabs.c
diff --git a/project/sdl/sdl-1.3/src/libm/s_floor.c b/project/jni/sdl-1.3/src/libm/s_floor.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_floor.c
rename to project/jni/sdl-1.3/src/libm/s_floor.c
diff --git a/project/sdl/sdl-1.3/src/libm/s_scalbn.c b/project/jni/sdl-1.3/src/libm/s_scalbn.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_scalbn.c
rename to project/jni/sdl-1.3/src/libm/s_scalbn.c
diff --git a/project/sdl/sdl-1.3/src/libm/s_sin.c b/project/jni/sdl-1.3/src/libm/s_sin.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/libm/s_sin.c
rename to project/jni/sdl-1.3/src/libm/s_sin.c
diff --git a/project/sdl/sdl-1.3/src/loadso/beos/SDL_sysloadso.c b/project/jni/sdl-1.3/src/loadso/beos/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/loadso/beos/SDL_sysloadso.c
rename to project/jni/sdl-1.3/src/loadso/beos/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.3/src/loadso/dlopen/SDL_sysloadso.c b/project/jni/sdl-1.3/src/loadso/dlopen/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/loadso/dlopen/SDL_sysloadso.c
rename to project/jni/sdl-1.3/src/loadso/dlopen/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.3/src/loadso/dummy/SDL_sysloadso.c b/project/jni/sdl-1.3/src/loadso/dummy/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/loadso/dummy/SDL_sysloadso.c
rename to project/jni/sdl-1.3/src/loadso/dummy/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.3/src/loadso/macosx/SDL_dlcompat.c b/project/jni/sdl-1.3/src/loadso/macosx/SDL_dlcompat.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/loadso/macosx/SDL_dlcompat.c
rename to project/jni/sdl-1.3/src/loadso/macosx/SDL_dlcompat.c
diff --git a/project/sdl/sdl-1.3/src/loadso/win32/SDL_sysloadso.c b/project/jni/sdl-1.3/src/loadso/win32/SDL_sysloadso.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/loadso/win32/SDL_sysloadso.c
rename to project/jni/sdl-1.3/src/loadso/win32/SDL_sysloadso.c
diff --git a/project/sdl/sdl-1.3/src/main/beos/SDL_BeApp.cc b/project/jni/sdl-1.3/src/main/beos/SDL_BeApp.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/main/beos/SDL_BeApp.cc
rename to project/jni/sdl-1.3/src/main/beos/SDL_BeApp.cc
diff --git a/project/sdl/sdl-1.3/src/main/beos/SDL_BeApp.h b/project/jni/sdl-1.3/src/main/beos/SDL_BeApp.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/main/beos/SDL_BeApp.h
rename to project/jni/sdl-1.3/src/main/beos/SDL_BeApp.h
diff --git a/project/sdl/sdl-1.3/src/main/dummy/SDL_dummy_main.c b/project/jni/sdl-1.3/src/main/dummy/SDL_dummy_main.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/main/dummy/SDL_dummy_main.c
rename to project/jni/sdl-1.3/src/main/dummy/SDL_dummy_main.c
diff --git a/project/sdl/sdl-1.3/src/main/win32/SDL_win32_main.c b/project/jni/sdl-1.3/src/main/win32/SDL_win32_main.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/main/win32/SDL_win32_main.c
rename to project/jni/sdl-1.3/src/main/win32/SDL_win32_main.c
diff --git a/project/sdl/sdl-1.3/src/main/win32/version.rc b/project/jni/sdl-1.3/src/main/win32/version.rc
similarity index 100%
rename from project/sdl/sdl-1.3/src/main/win32/version.rc
rename to project/jni/sdl-1.3/src/main/win32/version.rc
diff --git a/project/sdl/sdl-1.3/src/power/SDL_power.c b/project/jni/sdl-1.3/src/power/SDL_power.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/SDL_power.c
rename to project/jni/sdl-1.3/src/power/SDL_power.c
diff --git a/project/sdl/sdl-1.3/src/power/beos/SDL_syspower.c b/project/jni/sdl-1.3/src/power/beos/SDL_syspower.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/beos/SDL_syspower.c
rename to project/jni/sdl-1.3/src/power/beos/SDL_syspower.c
diff --git a/project/sdl/sdl-1.3/src/power/linux/SDL_syspower.c b/project/jni/sdl-1.3/src/power/linux/SDL_syspower.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/linux/SDL_syspower.c
rename to project/jni/sdl-1.3/src/power/linux/SDL_syspower.c
diff --git a/project/sdl/sdl-1.3/src/power/macosx/SDL_syspower.c b/project/jni/sdl-1.3/src/power/macosx/SDL_syspower.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/macosx/SDL_syspower.c
rename to project/jni/sdl-1.3/src/power/macosx/SDL_syspower.c
diff --git a/project/sdl/sdl-1.3/src/power/nds/SDL_syspower.c b/project/jni/sdl-1.3/src/power/nds/SDL_syspower.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/nds/SDL_syspower.c
rename to project/jni/sdl-1.3/src/power/nds/SDL_syspower.c
diff --git a/project/sdl/sdl-1.3/src/power/uikit/SDL_syspower.m b/project/jni/sdl-1.3/src/power/uikit/SDL_syspower.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/uikit/SDL_syspower.m
rename to project/jni/sdl-1.3/src/power/uikit/SDL_syspower.m
diff --git a/project/sdl/sdl-1.3/src/power/windows/SDL_syspower.c b/project/jni/sdl-1.3/src/power/windows/SDL_syspower.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/power/windows/SDL_syspower.c
rename to project/jni/sdl-1.3/src/power/windows/SDL_syspower.c
diff --git a/project/sdl/sdl-1.3/src/stdlib/SDL_getenv.c b/project/jni/sdl-1.3/src/stdlib/SDL_getenv.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/stdlib/SDL_getenv.c
rename to project/jni/sdl-1.3/src/stdlib/SDL_getenv.c
diff --git a/project/sdl/sdl-1.3/src/stdlib/SDL_iconv.c b/project/jni/sdl-1.3/src/stdlib/SDL_iconv.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/stdlib/SDL_iconv.c
rename to project/jni/sdl-1.3/src/stdlib/SDL_iconv.c
diff --git a/project/sdl/sdl-1.3/src/stdlib/SDL_malloc.c b/project/jni/sdl-1.3/src/stdlib/SDL_malloc.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/stdlib/SDL_malloc.c
rename to project/jni/sdl-1.3/src/stdlib/SDL_malloc.c
diff --git a/project/sdl/sdl-1.3/src/stdlib/SDL_qsort.c b/project/jni/sdl-1.3/src/stdlib/SDL_qsort.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/stdlib/SDL_qsort.c
rename to project/jni/sdl-1.3/src/stdlib/SDL_qsort.c
diff --git a/project/sdl/sdl-1.3/src/stdlib/SDL_stdlib.c b/project/jni/sdl-1.3/src/stdlib/SDL_stdlib.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/stdlib/SDL_stdlib.c
rename to project/jni/sdl-1.3/src/stdlib/SDL_stdlib.c
diff --git a/project/sdl/sdl-1.3/src/stdlib/SDL_string.c b/project/jni/sdl-1.3/src/stdlib/SDL_string.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/stdlib/SDL_string.c
rename to project/jni/sdl-1.3/src/stdlib/SDL_string.c
diff --git a/project/sdl/sdl-1.3/src/thread/SDL_systhread.h b/project/jni/sdl-1.3/src/thread/SDL_systhread.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/SDL_systhread.h
rename to project/jni/sdl-1.3/src/thread/SDL_systhread.h
diff --git a/project/sdl/sdl-1.3/src/thread/SDL_thread.c b/project/jni/sdl-1.3/src/thread/SDL_thread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/SDL_thread.c
rename to project/jni/sdl-1.3/src/thread/SDL_thread.c
diff --git a/project/sdl/sdl-1.3/src/thread/SDL_thread_c.h b/project/jni/sdl-1.3/src/thread/SDL_thread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/SDL_thread_c.h
rename to project/jni/sdl-1.3/src/thread/SDL_thread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/beos/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/beos/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/beos/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/beos/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/beos/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/beos/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/beos/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/beos/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/beos/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/beos/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/beos/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/beos/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/generic/SDL_syscond.c b/project/jni/sdl-1.3/src/thread/generic/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/generic/SDL_syscond.c
rename to project/jni/sdl-1.3/src/thread/generic/SDL_syscond.c
diff --git a/project/sdl/sdl-1.3/src/thread/generic/SDL_sysmutex.c b/project/jni/sdl-1.3/src/thread/generic/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/generic/SDL_sysmutex.c
rename to project/jni/sdl-1.3/src/thread/generic/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.3/src/thread/generic/SDL_sysmutex_c.h b/project/jni/sdl-1.3/src/thread/generic/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/generic/SDL_sysmutex_c.h
rename to project/jni/sdl-1.3/src/thread/generic/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/generic/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/generic/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/generic/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/generic/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/generic/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/generic/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/generic/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/generic/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/generic/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/generic/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/generic/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/generic/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/irix/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/irix/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/irix/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/irix/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/irix/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/irix/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/irix/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/irix/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/irix/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/irix/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/irix/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/irix/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_syscond.c b/project/jni/sdl-1.3/src/thread/nds/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_syscond.c
rename to project/jni/sdl-1.3/src/thread/nds/SDL_syscond.c
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_syscond_c.h b/project/jni/sdl-1.3/src/thread/nds/SDL_syscond_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_syscond_c.h
rename to project/jni/sdl-1.3/src/thread/nds/SDL_syscond_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_sysmutex.c b/project/jni/sdl-1.3/src/thread/nds/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_sysmutex.c
rename to project/jni/sdl-1.3/src/thread/nds/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_sysmutex_c.h b/project/jni/sdl-1.3/src/thread/nds/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_sysmutex_c.h
rename to project/jni/sdl-1.3/src/thread/nds/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/nds/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/nds/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_syssem_c.h b/project/jni/sdl-1.3/src/thread/nds/SDL_syssem_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_syssem_c.h
rename to project/jni/sdl-1.3/src/thread/nds/SDL_syssem_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/nds/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/nds/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/nds/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/nds/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/nds/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/nds/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/pthread/SDL_syscond.c b/project/jni/sdl-1.3/src/thread/pthread/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/pthread/SDL_syscond.c
rename to project/jni/sdl-1.3/src/thread/pthread/SDL_syscond.c
diff --git a/project/sdl/sdl-1.3/src/thread/pthread/SDL_sysmutex.c b/project/jni/sdl-1.3/src/thread/pthread/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/pthread/SDL_sysmutex.c
rename to project/jni/sdl-1.3/src/thread/pthread/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.3/src/thread/pthread/SDL_sysmutex_c.h b/project/jni/sdl-1.3/src/thread/pthread/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/pthread/SDL_sysmutex_c.h
rename to project/jni/sdl-1.3/src/thread/pthread/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/pthread/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/pthread/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/pthread/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/pthread/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/pthread/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/pthread/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/pthread/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/pthread/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/pthread/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/pthread/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/pthread/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/pthread/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/riscos/SDL_syscond.c b/project/jni/sdl-1.3/src/thread/riscos/SDL_syscond.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/riscos/SDL_syscond.c
rename to project/jni/sdl-1.3/src/thread/riscos/SDL_syscond.c
diff --git a/project/sdl/sdl-1.3/src/thread/riscos/SDL_sysmutex.c b/project/jni/sdl-1.3/src/thread/riscos/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/riscos/SDL_sysmutex.c
rename to project/jni/sdl-1.3/src/thread/riscos/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.3/src/thread/riscos/SDL_sysmutex_c.h b/project/jni/sdl-1.3/src/thread/riscos/SDL_sysmutex_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/riscos/SDL_sysmutex_c.h
rename to project/jni/sdl-1.3/src/thread/riscos/SDL_sysmutex_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/riscos/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/riscos/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/riscos/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/riscos/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/riscos/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/riscos/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/riscos/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/riscos/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/riscos/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/riscos/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/riscos/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/riscos/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/win32/SDL_sysmutex.c b/project/jni/sdl-1.3/src/thread/win32/SDL_sysmutex.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/win32/SDL_sysmutex.c
rename to project/jni/sdl-1.3/src/thread/win32/SDL_sysmutex.c
diff --git a/project/sdl/sdl-1.3/src/thread/win32/SDL_syssem.c b/project/jni/sdl-1.3/src/thread/win32/SDL_syssem.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/win32/SDL_syssem.c
rename to project/jni/sdl-1.3/src/thread/win32/SDL_syssem.c
diff --git a/project/sdl/sdl-1.3/src/thread/win32/SDL_systhread.c b/project/jni/sdl-1.3/src/thread/win32/SDL_systhread.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/win32/SDL_systhread.c
rename to project/jni/sdl-1.3/src/thread/win32/SDL_systhread.c
diff --git a/project/sdl/sdl-1.3/src/thread/win32/SDL_systhread_c.h b/project/jni/sdl-1.3/src/thread/win32/SDL_systhread_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/win32/SDL_systhread_c.h
rename to project/jni/sdl-1.3/src/thread/win32/SDL_systhread_c.h
diff --git a/project/sdl/sdl-1.3/src/thread/win32/win_ce_semaphore.c b/project/jni/sdl-1.3/src/thread/win32/win_ce_semaphore.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/win32/win_ce_semaphore.c
rename to project/jni/sdl-1.3/src/thread/win32/win_ce_semaphore.c
diff --git a/project/sdl/sdl-1.3/src/thread/win32/win_ce_semaphore.h b/project/jni/sdl-1.3/src/thread/win32/win_ce_semaphore.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/thread/win32/win_ce_semaphore.h
rename to project/jni/sdl-1.3/src/thread/win32/win_ce_semaphore.h
diff --git a/project/sdl/sdl-1.3/src/timer/SDL_systimer.h b/project/jni/sdl-1.3/src/timer/SDL_systimer.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/SDL_systimer.h
rename to project/jni/sdl-1.3/src/timer/SDL_systimer.h
diff --git a/project/sdl/sdl-1.3/src/timer/SDL_timer.c b/project/jni/sdl-1.3/src/timer/SDL_timer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/SDL_timer.c
rename to project/jni/sdl-1.3/src/timer/SDL_timer.c
diff --git a/project/sdl/sdl-1.3/src/timer/SDL_timer_c.h b/project/jni/sdl-1.3/src/timer/SDL_timer_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/SDL_timer_c.h
rename to project/jni/sdl-1.3/src/timer/SDL_timer_c.h
diff --git a/project/sdl/sdl-1.3/src/timer/beos/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/beos/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/beos/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/beos/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/timer/dummy/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/dummy/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/dummy/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/dummy/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/timer/nds/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/nds/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/nds/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/nds/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/timer/riscos/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/riscos/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/riscos/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/riscos/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/timer/unix/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/unix/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/unix/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/unix/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/timer/win32/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/win32/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/win32/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/win32/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/timer/wince/SDL_systimer.c b/project/jni/sdl-1.3/src/timer/wince/SDL_systimer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/timer/wince/SDL_systimer.c
rename to project/jni/sdl-1.3/src/timer/wince/SDL_systimer.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_RLEaccel.c b/project/jni/sdl-1.3/src/video/SDL_RLEaccel.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_RLEaccel.c
rename to project/jni/sdl-1.3/src/video/SDL_RLEaccel.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_RLEaccel_c.h b/project/jni/sdl-1.3/src/video/SDL_RLEaccel_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_RLEaccel_c.h
rename to project/jni/sdl-1.3/src/video/SDL_RLEaccel_c.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_alphamult.c b/project/jni/sdl-1.3/src/video/SDL_alphamult.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_alphamult.c
rename to project/jni/sdl-1.3/src/video/SDL_alphamult.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_alphamult.h b/project/jni/sdl-1.3/src/video/SDL_alphamult.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_alphamult.h
rename to project/jni/sdl-1.3/src/video/SDL_alphamult.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blendfillrect.c b/project/jni/sdl-1.3/src/video/SDL_blendfillrect.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blendfillrect.c
rename to project/jni/sdl-1.3/src/video/SDL_blendfillrect.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blendline.c b/project/jni/sdl-1.3/src/video/SDL_blendline.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blendline.c
rename to project/jni/sdl-1.3/src/video/SDL_blendline.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blendpoint.c b/project/jni/sdl-1.3/src/video/SDL_blendpoint.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blendpoint.c
rename to project/jni/sdl-1.3/src/video/SDL_blendpoint.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blendrect.c b/project/jni/sdl-1.3/src/video/SDL_blendrect.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blendrect.c
rename to project/jni/sdl-1.3/src/video/SDL_blendrect.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit.c b/project/jni/sdl-1.3/src/video/SDL_blit.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit.c
rename to project/jni/sdl-1.3/src/video/SDL_blit.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit.h b/project/jni/sdl-1.3/src/video/SDL_blit.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit.h
rename to project/jni/sdl-1.3/src/video/SDL_blit.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_0.c b/project/jni/sdl-1.3/src/video/SDL_blit_0.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_0.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_0.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_1.c b/project/jni/sdl-1.3/src/video/SDL_blit_1.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_1.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_1.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_A.c b/project/jni/sdl-1.3/src/video/SDL_blit_A.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_A.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_A.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_N.c b/project/jni/sdl-1.3/src/video/SDL_blit_N.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_N.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_N.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_auto.c b/project/jni/sdl-1.3/src/video/SDL_blit_auto.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_auto.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_auto.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_auto.h b/project/jni/sdl-1.3/src/video/SDL_blit_auto.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_auto.h
rename to project/jni/sdl-1.3/src/video/SDL_blit_auto.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_copy.c b/project/jni/sdl-1.3/src/video/SDL_blit_copy.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_copy.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_copy.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_copy.h b/project/jni/sdl-1.3/src/video/SDL_blit_copy.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_copy.h
rename to project/jni/sdl-1.3/src/video/SDL_blit_copy.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_slow.c b/project/jni/sdl-1.3/src/video/SDL_blit_slow.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_slow.c
rename to project/jni/sdl-1.3/src/video/SDL_blit_slow.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_blit_slow.h b/project/jni/sdl-1.3/src/video/SDL_blit_slow.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_blit_slow.h
rename to project/jni/sdl-1.3/src/video/SDL_blit_slow.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_bmp.c b/project/jni/sdl-1.3/src/video/SDL_bmp.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_bmp.c
rename to project/jni/sdl-1.3/src/video/SDL_bmp.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_clipboard.c b/project/jni/sdl-1.3/src/video/SDL_clipboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_clipboard.c
rename to project/jni/sdl-1.3/src/video/SDL_clipboard.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_draw.h b/project/jni/sdl-1.3/src/video/SDL_draw.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_draw.h
rename to project/jni/sdl-1.3/src/video/SDL_draw.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_drawline.c b/project/jni/sdl-1.3/src/video/SDL_drawline.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_drawline.c
rename to project/jni/sdl-1.3/src/video/SDL_drawline.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_drawpoint.c b/project/jni/sdl-1.3/src/video/SDL_drawpoint.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_drawpoint.c
rename to project/jni/sdl-1.3/src/video/SDL_drawpoint.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_drawrect.c b/project/jni/sdl-1.3/src/video/SDL_drawrect.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_drawrect.c
rename to project/jni/sdl-1.3/src/video/SDL_drawrect.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_fillrect.c b/project/jni/sdl-1.3/src/video/SDL_fillrect.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_fillrect.c
rename to project/jni/sdl-1.3/src/video/SDL_fillrect.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_gamma.c b/project/jni/sdl-1.3/src/video/SDL_gamma.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_gamma.c
rename to project/jni/sdl-1.3/src/video/SDL_gamma.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_glesfuncs.h b/project/jni/sdl-1.3/src/video/SDL_glesfuncs.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_glesfuncs.h
rename to project/jni/sdl-1.3/src/video/SDL_glesfuncs.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_glfuncs.h b/project/jni/sdl-1.3/src/video/SDL_glfuncs.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_glfuncs.h
rename to project/jni/sdl-1.3/src/video/SDL_glfuncs.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_leaks.h b/project/jni/sdl-1.3/src/video/SDL_leaks.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_leaks.h
rename to project/jni/sdl-1.3/src/video/SDL_leaks.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_pixels.c b/project/jni/sdl-1.3/src/video/SDL_pixels.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_pixels.c
rename to project/jni/sdl-1.3/src/video/SDL_pixels.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_pixels_c.h b/project/jni/sdl-1.3/src/video/SDL_pixels_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_pixels_c.h
rename to project/jni/sdl-1.3/src/video/SDL_pixels_c.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_rect.c b/project/jni/sdl-1.3/src/video/SDL_rect.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_rect.c
rename to project/jni/sdl-1.3/src/video/SDL_rect.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_rect_c.h b/project/jni/sdl-1.3/src/video/SDL_rect_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_rect_c.h
rename to project/jni/sdl-1.3/src/video/SDL_rect_c.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_renderer_gl.c b/project/jni/sdl-1.3/src/video/SDL_renderer_gl.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_renderer_gl.c
rename to project/jni/sdl-1.3/src/video/SDL_renderer_gl.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_renderer_gl.h b/project/jni/sdl-1.3/src/video/SDL_renderer_gl.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_renderer_gl.h
rename to project/jni/sdl-1.3/src/video/SDL_renderer_gl.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_renderer_gles.c b/project/jni/sdl-1.3/src/video/SDL_renderer_gles.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_renderer_gles.c
rename to project/jni/sdl-1.3/src/video/SDL_renderer_gles.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_renderer_gles.h b/project/jni/sdl-1.3/src/video/SDL_renderer_gles.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_renderer_gles.h
rename to project/jni/sdl-1.3/src/video/SDL_renderer_gles.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_renderer_sw.c b/project/jni/sdl-1.3/src/video/SDL_renderer_sw.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_renderer_sw.c
rename to project/jni/sdl-1.3/src/video/SDL_renderer_sw.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_renderer_sw.h b/project/jni/sdl-1.3/src/video/SDL_renderer_sw.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_renderer_sw.h
rename to project/jni/sdl-1.3/src/video/SDL_renderer_sw.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_shape.c b/project/jni/sdl-1.3/src/video/SDL_shape.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_shape.c
rename to project/jni/sdl-1.3/src/video/SDL_shape.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_shape_internals.h b/project/jni/sdl-1.3/src/video/SDL_shape_internals.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_shape_internals.h
rename to project/jni/sdl-1.3/src/video/SDL_shape_internals.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_stretch.c b/project/jni/sdl-1.3/src/video/SDL_stretch.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_stretch.c
rename to project/jni/sdl-1.3/src/video/SDL_stretch.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_surface.c b/project/jni/sdl-1.3/src/video/SDL_surface.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_surface.c
rename to project/jni/sdl-1.3/src/video/SDL_surface.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_sysvideo.h b/project/jni/sdl-1.3/src/video/SDL_sysvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_sysvideo.h
rename to project/jni/sdl-1.3/src/video/SDL_sysvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/SDL_video.c b/project/jni/sdl-1.3/src/video/SDL_video.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_video.c
rename to project/jni/sdl-1.3/src/video/SDL_video.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_yuv_mmx.c b/project/jni/sdl-1.3/src/video/SDL_yuv_mmx.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_yuv_mmx.c
rename to project/jni/sdl-1.3/src/video/SDL_yuv_mmx.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_yuv_sw.c b/project/jni/sdl-1.3/src/video/SDL_yuv_sw.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_yuv_sw.c
rename to project/jni/sdl-1.3/src/video/SDL_yuv_sw.c
diff --git a/project/sdl/sdl-1.3/src/video/SDL_yuv_sw_c.h b/project/jni/sdl-1.3/src/video/SDL_yuv_sw_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/SDL_yuv_sw_c.h
rename to project/jni/sdl-1.3/src/video/SDL_yuv_sw_c.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/README b/project/jni/sdl-1.3/src/video/Xext/README
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/README
rename to project/jni/sdl-1.3/src/video/Xext/README
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XME/xme.c b/project/jni/sdl-1.3/src/video/Xext/XME/xme.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XME/xme.c
rename to project/jni/sdl-1.3/src/video/Xext/XME/xme.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/Xinerama/Xinerama.c b/project/jni/sdl-1.3/src/video/Xext/Xinerama/Xinerama.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/Xinerama/Xinerama.c
rename to project/jni/sdl-1.3/src/video/Xext/Xinerama/Xinerama.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/AllCmap.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/AllCmap.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/AllCmap.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/AllCmap.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/CmapAlloc.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/CmapAlloc.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/CmapAlloc.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/CmapAlloc.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/CrCmap.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/CrCmap.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/CrCmap.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/CrCmap.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/DelCmap.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/DelCmap.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/DelCmap.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/DelCmap.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/Distinct.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/Distinct.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/Distinct.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/Distinct.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/LookupCmap.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/LookupCmap.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/LookupCmap.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/LookupCmap.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/StdCmap.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/StdCmap.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/StdCmap.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/StdCmap.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/VisCmap.c b/project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/VisCmap.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/XmuStdCmap/VisCmap.c
rename to project/jni/sdl-1.3/src/video/Xext/XmuStdCmap/VisCmap.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/Xv/Xv.c b/project/jni/sdl-1.3/src/video/Xext/Xv/Xv.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/Xv/Xv.c
rename to project/jni/sdl-1.3/src/video/Xext/Xv/Xv.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/Xv/Xvlibint.h b/project/jni/sdl-1.3/src/video/Xext/Xv/Xvlibint.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/Xv/Xvlibint.h
rename to project/jni/sdl-1.3/src/video/Xext/Xv/Xvlibint.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/Xxf86vm/XF86VMode.c b/project/jni/sdl-1.3/src/video/Xext/Xxf86vm/XF86VMode.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/Xxf86vm/XF86VMode.c
rename to project/jni/sdl-1.3/src/video/Xext/Xxf86vm/XF86VMode.c
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/StdCmap.h b/project/jni/sdl-1.3/src/video/Xext/extensions/StdCmap.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/StdCmap.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/StdCmap.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/Xext.h b/project/jni/sdl-1.3/src/video/Xext/extensions/Xext.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/Xext.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/Xext.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/Xinerama.h b/project/jni/sdl-1.3/src/video/Xext/extensions/Xinerama.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/Xinerama.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/Xinerama.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/Xv.h b/project/jni/sdl-1.3/src/video/Xext/extensions/Xv.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/Xv.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/Xv.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/Xvlib.h b/project/jni/sdl-1.3/src/video/Xext/extensions/Xvlib.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/Xvlib.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/Xvlib.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/Xvproto.h b/project/jni/sdl-1.3/src/video/Xext/extensions/Xvproto.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/Xvproto.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/Xvproto.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/extutil.h b/project/jni/sdl-1.3/src/video/Xext/extensions/extutil.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/extutil.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/extutil.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/panoramiXext.h b/project/jni/sdl-1.3/src/video/Xext/extensions/panoramiXext.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/panoramiXext.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/panoramiXext.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/panoramiXproto.h b/project/jni/sdl-1.3/src/video/Xext/extensions/panoramiXproto.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/panoramiXproto.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/panoramiXproto.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dga.h b/project/jni/sdl-1.3/src/video/Xext/extensions/xf86dga.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dga.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/xf86dga.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dga1.h b/project/jni/sdl-1.3/src/video/Xext/extensions/xf86dga1.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dga1.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/xf86dga1.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dga1str.h b/project/jni/sdl-1.3/src/video/Xext/extensions/xf86dga1str.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dga1str.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/xf86dga1str.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dgastr.h b/project/jni/sdl-1.3/src/video/Xext/extensions/xf86dgastr.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/xf86dgastr.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/xf86dgastr.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/xf86vmode.h b/project/jni/sdl-1.3/src/video/Xext/extensions/xf86vmode.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/xf86vmode.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/xf86vmode.h
diff --git a/project/sdl/sdl-1.3/src/video/Xext/extensions/xf86vmstr.h b/project/jni/sdl-1.3/src/video/Xext/extensions/xf86vmstr.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/Xext/extensions/xf86vmstr.h
rename to project/jni/sdl-1.3/src/video/Xext/extensions/xf86vmstr.h
diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c
rename to project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.h b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/SDL_androidinput.h
rename to project/jni/sdl-1.3/src/video/android/SDL_androidinput.h
diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c b/project/jni/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c
rename to project/jni/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c
diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_androidvideo.c b/project/jni/sdl-1.3/src/video/android/SDL_androidvideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/SDL_androidvideo.c
rename to project/jni/sdl-1.3/src/video/android/SDL_androidvideo.c
diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_androidvideo.h b/project/jni/sdl-1.3/src/video/android/SDL_androidvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/SDL_androidvideo.h
rename to project/jni/sdl-1.3/src/video/android/SDL_androidvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
rename to project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
diff --git a/project/sdl/sdl-1.3/src/video/android/javakeycodes.h b/project/jni/sdl-1.3/src/video/android/javakeycodes.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/javakeycodes.h
rename to project/jni/sdl-1.3/src/video/android/javakeycodes.h
diff --git a/project/sdl/sdl-1.3/src/video/android/jniwrapperstuff.h b/project/jni/sdl-1.3/src/video/android/jniwrapperstuff.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/jniwrapperstuff.h
rename to project/jni/sdl-1.3/src/video/android/jniwrapperstuff.h
diff --git a/project/sdl/sdl-1.3/src/video/android/touchscreenfont.h b/project/jni/sdl-1.3/src/video/android/touchscreenfont.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/android/touchscreenfont.h
rename to project/jni/sdl-1.3/src/video/android/touchscreenfont.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_BView.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_BView.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_BView.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_BView.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_BWin.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_BWin.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_BWin.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_BWin.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_lowvideo.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_lowvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_lowvideo.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_lowvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysevents.cc b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysevents.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysevents.cc
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysevents.cc
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysevents_c.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysevents_c.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysevents_c.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysmouse.cc b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysmouse.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysmouse.cc
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysmouse.cc
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysmouse_c.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysmouse_c.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysmouse_c.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysvideo.cc b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysvideo.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysvideo.cc
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysvideo.cc
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_syswm.cc b/project/jni/sdl-1.3/src/video/bwindow/SDL_syswm.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_syswm.cc
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_syswm.cc
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_syswm_c.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_syswm_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_syswm_c.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_syswm_c.h
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysyuv.cc b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysyuv.cc
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysyuv.cc
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysyuv.cc
diff --git a/project/sdl/sdl-1.3/src/video/bwindow/SDL_sysyuv.h b/project/jni/sdl-1.3/src/video/bwindow/SDL_sysyuv.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/bwindow/SDL_sysyuv.h
rename to project/jni/sdl-1.3/src/video/bwindow/SDL_sysyuv.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaclipboard.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaevents.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaevents.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaevents.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaevents.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaevents.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaevents.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaevents.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaevents.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoakeyboard.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamodes.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamodes.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamodes.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamodes.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamodes.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamodes.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamodes.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamodes.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamouse.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamouse.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamouse.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamouse.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamouse.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamouse.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoamouse.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoamouse.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoaopengl.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoashape.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoashape.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoashape.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoashape.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoashape.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoashape.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoashape.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoashape.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoavideo.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoavideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoavideo.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoavideo.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoavideo.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoavideo.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoavideo.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoavideo.m
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoawindow.h b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoawindow.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoawindow.h
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoawindow.h
diff --git a/project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoawindow.m b/project/jni/sdl-1.3/src/video/cocoa/SDL_cocoawindow.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/cocoa/SDL_cocoawindow.m
rename to project/jni/sdl-1.3/src/video/cocoa/SDL_cocoawindow.m
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_WM.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_dyn.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_events.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_events.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_events.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_events.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_events.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_events.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_events.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_events.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_modes.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_mouse.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_opengl.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_render.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_render.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_render.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_render.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_render.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_render.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_render.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_render.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_video.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_video.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_video.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_video.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_video.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_video.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_video.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_video.h
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_window.c b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_window.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_window.c
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_window.c
diff --git a/project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_window.h b/project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_window.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/directfb/SDL_DirectFB_window.h
rename to project/jni/sdl-1.3/src/video/directfb/SDL_DirectFB_window.h
diff --git a/project/sdl/sdl-1.3/src/video/dummy/SDL_nullevents.c b/project/jni/sdl-1.3/src/video/dummy/SDL_nullevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/dummy/SDL_nullevents.c
rename to project/jni/sdl-1.3/src/video/dummy/SDL_nullevents.c
diff --git a/project/sdl/sdl-1.3/src/video/dummy/SDL_nullevents_c.h b/project/jni/sdl-1.3/src/video/dummy/SDL_nullevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/dummy/SDL_nullevents_c.h
rename to project/jni/sdl-1.3/src/video/dummy/SDL_nullevents_c.h
diff --git a/project/sdl/sdl-1.3/src/video/dummy/SDL_nullrender.c b/project/jni/sdl-1.3/src/video/dummy/SDL_nullrender.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/dummy/SDL_nullrender.c
rename to project/jni/sdl-1.3/src/video/dummy/SDL_nullrender.c
diff --git a/project/sdl/sdl-1.3/src/video/dummy/SDL_nullrender_c.h b/project/jni/sdl-1.3/src/video/dummy/SDL_nullrender_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/dummy/SDL_nullrender_c.h
rename to project/jni/sdl-1.3/src/video/dummy/SDL_nullrender_c.h
diff --git a/project/sdl/sdl-1.3/src/video/dummy/SDL_nullvideo.c b/project/jni/sdl-1.3/src/video/dummy/SDL_nullvideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/dummy/SDL_nullvideo.c
rename to project/jni/sdl-1.3/src/video/dummy/SDL_nullvideo.c
diff --git a/project/sdl/sdl-1.3/src/video/dummy/SDL_nullvideo.h b/project/jni/sdl-1.3/src/video/dummy/SDL_nullvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/dummy/SDL_nullvideo.h
rename to project/jni/sdl-1.3/src/video/dummy/SDL_nullvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/3dfx_mmio.h b/project/jni/sdl-1.3/src/video/fbcon/3dfx_mmio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/3dfx_mmio.h
rename to project/jni/sdl-1.3/src/video/fbcon/3dfx_mmio.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/3dfx_regs.h b/project/jni/sdl-1.3/src/video/fbcon/3dfx_regs.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/3dfx_regs.h
rename to project/jni/sdl-1.3/src/video/fbcon/3dfx_regs.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fb3dfx.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fb3dfx.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fb3dfx.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fb3dfx.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fb3dfx.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fb3dfx.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fb3dfx.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fb3dfx.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbelo.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbelo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbelo.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbelo.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbelo.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbelo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbelo.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbelo.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbevents.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbevents.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbevents.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbevents_c.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbevents_c.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbevents_c.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbkeys.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbkeys.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbkeys.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbkeys.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmatrox.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbmatrox.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmatrox.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbmatrox.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmatrox.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbmatrox.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmatrox.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbmatrox.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmouse.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbmouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmouse.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbmouse.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmouse_c.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbmouse_c.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbmouse_c.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbriva.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbriva.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbriva.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbriva.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbriva.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbriva.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbriva.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbriva.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbvideo.c b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbvideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbvideo.c
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbvideo.c
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/SDL_fbvideo.h b/project/jni/sdl-1.3/src/video/fbcon/SDL_fbvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/SDL_fbvideo.h
rename to project/jni/sdl-1.3/src/video/fbcon/SDL_fbvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/matrox_mmio.h b/project/jni/sdl-1.3/src/video/fbcon/matrox_mmio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/matrox_mmio.h
rename to project/jni/sdl-1.3/src/video/fbcon/matrox_mmio.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/matrox_regs.h b/project/jni/sdl-1.3/src/video/fbcon/matrox_regs.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/matrox_regs.h
rename to project/jni/sdl-1.3/src/video/fbcon/matrox_regs.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/riva_mmio.h b/project/jni/sdl-1.3/src/video/fbcon/riva_mmio.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/riva_mmio.h
rename to project/jni/sdl-1.3/src/video/fbcon/riva_mmio.h
diff --git a/project/sdl/sdl-1.3/src/video/fbcon/riva_regs.h b/project/jni/sdl-1.3/src/video/fbcon/riva_regs.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/fbcon/riva_regs.h
rename to project/jni/sdl-1.3/src/video/fbcon/riva_regs.h
diff --git a/project/sdl/sdl-1.3/src/video/mmx.h b/project/jni/sdl-1.3/src/video/mmx.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/mmx.h
rename to project/jni/sdl-1.3/src/video/mmx.h
diff --git a/project/sdl/sdl-1.3/src/video/nds/SDL_ndsevents.c b/project/jni/sdl-1.3/src/video/nds/SDL_ndsevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/nds/SDL_ndsevents.c
rename to project/jni/sdl-1.3/src/video/nds/SDL_ndsevents.c
diff --git a/project/sdl/sdl-1.3/src/video/nds/SDL_ndsevents_c.h b/project/jni/sdl-1.3/src/video/nds/SDL_ndsevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/nds/SDL_ndsevents_c.h
rename to project/jni/sdl-1.3/src/video/nds/SDL_ndsevents_c.h
diff --git a/project/sdl/sdl-1.3/src/video/nds/SDL_ndsrender.c b/project/jni/sdl-1.3/src/video/nds/SDL_ndsrender.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/nds/SDL_ndsrender.c
rename to project/jni/sdl-1.3/src/video/nds/SDL_ndsrender.c
diff --git a/project/sdl/sdl-1.3/src/video/nds/SDL_ndsrender_c.h b/project/jni/sdl-1.3/src/video/nds/SDL_ndsrender_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/nds/SDL_ndsrender_c.h
rename to project/jni/sdl-1.3/src/video/nds/SDL_ndsrender_c.h
diff --git a/project/sdl/sdl-1.3/src/video/nds/SDL_ndsvideo.c b/project/jni/sdl-1.3/src/video/nds/SDL_ndsvideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/nds/SDL_ndsvideo.c
rename to project/jni/sdl-1.3/src/video/nds/SDL_ndsvideo.c
diff --git a/project/sdl/sdl-1.3/src/video/nds/SDL_ndsvideo.h b/project/jni/sdl-1.3/src/video/nds/SDL_ndsvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/nds/SDL_ndsvideo.h
rename to project/jni/sdl-1.3/src/video/nds/SDL_ndsvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/pandora/SDL_pandora.c b/project/jni/sdl-1.3/src/video/pandora/SDL_pandora.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/pandora/SDL_pandora.c
rename to project/jni/sdl-1.3/src/video/pandora/SDL_pandora.c
diff --git a/project/sdl/sdl-1.3/src/video/pandora/SDL_pandora.h b/project/jni/sdl-1.3/src/video/pandora/SDL_pandora.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/pandora/SDL_pandora.h
rename to project/jni/sdl-1.3/src/video/pandora/SDL_pandora.h
diff --git a/project/sdl/sdl-1.3/src/video/pandora/SDL_pandora_events.c b/project/jni/sdl-1.3/src/video/pandora/SDL_pandora_events.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/pandora/SDL_pandora_events.c
rename to project/jni/sdl-1.3/src/video/pandora/SDL_pandora_events.c
diff --git a/project/sdl/sdl-1.3/src/video/pandora/SDL_pandora_events.h b/project/jni/sdl-1.3/src/video/pandora/SDL_pandora_events.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/pandora/SDL_pandora_events.h
rename to project/jni/sdl-1.3/src/video/pandora/SDL_pandora_events.h
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon.c b/project/jni/sdl-1.3/src/video/photon/SDL_photon.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon.c
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon.c
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon.h b/project/jni/sdl-1.3/src/video/photon/SDL_photon.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon.h
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon.h
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_input.c b/project/jni/sdl-1.3/src/video/photon/SDL_photon_input.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_input.c
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_input.c
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_input.h b/project/jni/sdl-1.3/src/video/photon/SDL_photon_input.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_input.h
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_input.h
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_keycodes.h b/project/jni/sdl-1.3/src/video/photon/SDL_photon_keycodes.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_keycodes.h
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_keycodes.h
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.c b/project/jni/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.c
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.c
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.h b/project/jni/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.h
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_pixelfmt.h
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_render.c b/project/jni/sdl-1.3/src/video/photon/SDL_photon_render.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_render.c
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_render.c
diff --git a/project/sdl/sdl-1.3/src/video/photon/SDL_photon_render.h b/project/jni/sdl-1.3/src/video/photon/SDL_photon_render.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/photon/SDL_photon_render.h
rename to project/jni/sdl-1.3/src/video/photon/SDL_photon_render.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3events.c b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3events.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3events.c
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3events.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3events_c.h b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3events_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3events_c.h
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3events_c.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3modes.c b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3modes.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3modes.c
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3modes.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3modes_c.h b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3modes_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3modes_c.h
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3modes_c.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3render.c b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3render.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3render.c
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3render.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3render_c.h b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3render_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3render_c.h
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3render_c.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3spe.c b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3spe.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3spe.c
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3spe.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3spe_c.h b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3spe_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3spe_c.h
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3spe_c.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3video.c b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3video.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3video.c
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3video.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/SDL_ps3video.h b/project/jni/sdl-1.3/src/video/ps3/SDL_ps3video.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/SDL_ps3video.h
rename to project/jni/sdl-1.3/src/video/ps3/SDL_ps3video.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/spulibs/Makefile b/project/jni/sdl-1.3/src/video/ps3/spulibs/Makefile
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/spulibs/Makefile
rename to project/jni/sdl-1.3/src/video/ps3/spulibs/Makefile
diff --git a/project/sdl/sdl-1.3/src/video/ps3/spulibs/bilin_scaler.c b/project/jni/sdl-1.3/src/video/ps3/spulibs/bilin_scaler.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/spulibs/bilin_scaler.c
rename to project/jni/sdl-1.3/src/video/ps3/spulibs/bilin_scaler.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/spulibs/fb_writer.c b/project/jni/sdl-1.3/src/video/ps3/spulibs/fb_writer.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/spulibs/fb_writer.c
rename to project/jni/sdl-1.3/src/video/ps3/spulibs/fb_writer.c
diff --git a/project/sdl/sdl-1.3/src/video/ps3/spulibs/spu_common.h b/project/jni/sdl-1.3/src/video/ps3/spulibs/spu_common.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/spulibs/spu_common.h
rename to project/jni/sdl-1.3/src/video/ps3/spulibs/spu_common.h
diff --git a/project/sdl/sdl-1.3/src/video/ps3/spulibs/yuv2rgb.c b/project/jni/sdl-1.3/src/video/ps3/spulibs/yuv2rgb.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/ps3/spulibs/yuv2rgb.c
rename to project/jni/sdl-1.3/src/video/ps3/spulibs/yuv2rgb.c
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_input.c b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_input.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_input.c
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_input.c
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_input.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_input.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_input.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_input.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.c b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.c
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.c
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_opengles.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.c b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.c
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.c
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_pixelfmt.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_render.c b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_render.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_render.c
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_render.c
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_render.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_render.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_gf_render.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_gf_render.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_hiddi_joystick.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_hiddi_joystick.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_hiddi_joystick.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_hiddi_joystick.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_hiddi_keyboard.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_hiddi_keyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_hiddi_keyboard.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_hiddi_keyboard.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_hiddi_mouse.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_hiddi_mouse.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_hiddi_mouse.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_hiddi_mouse.h
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_qnxgf.c b/project/jni/sdl-1.3/src/video/qnxgf/SDL_qnxgf.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_qnxgf.c
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_qnxgf.c
diff --git a/project/sdl/sdl-1.3/src/video/qnxgf/SDL_qnxgf.h b/project/jni/sdl-1.3/src/video/qnxgf/SDL_qnxgf.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/qnxgf/SDL_qnxgf.h
rename to project/jni/sdl-1.3/src/video/qnxgf/SDL_qnxgf.h
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosASM.S b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosASM.S
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosASM.S
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosASM.S
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosFullScreenVideo.c b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosFullScreenVideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosFullScreenVideo.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosFullScreenVideo.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosevents.c b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosevents.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosevents.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosevents_c.h b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosevents_c.h
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosevents_c.h
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosmouse.c b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosmouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosmouse.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosmouse.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosmouse_c.h b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosmouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosmouse_c.h
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosmouse_c.h
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscossprite.c b/project/jni/sdl-1.3/src/video/riscos/SDL_riscossprite.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscossprite.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscossprite.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscostask.c b/project/jni/sdl-1.3/src/video/riscos/SDL_riscostask.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscostask.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscostask.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscostask.h b/project/jni/sdl-1.3/src/video/riscos/SDL_riscostask.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscostask.h
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscostask.h
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosvideo.c b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosvideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosvideo.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosvideo.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_riscosvideo.h b/project/jni/sdl-1.3/src/video/riscos/SDL_riscosvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_riscosvideo.h
rename to project/jni/sdl-1.3/src/video/riscos/SDL_riscosvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_wimppoll.c b/project/jni/sdl-1.3/src/video/riscos/SDL_wimppoll.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_wimppoll.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_wimppoll.c
diff --git a/project/sdl/sdl-1.3/src/video/riscos/SDL_wimpvideo.c b/project/jni/sdl-1.3/src/video/riscos/SDL_wimpvideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/riscos/SDL_wimpvideo.c
rename to project/jni/sdl-1.3/src/video/riscos/SDL_wimpvideo.c
diff --git a/project/sdl/sdl-1.3/src/video/sdlgenblit.pl b/project/jni/sdl-1.3/src/video/sdlgenblit.pl
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/sdlgenblit.pl
rename to project/jni/sdl-1.3/src/video/sdlgenblit.pl
diff --git a/project/sdl/sdl-1.3/src/video/svga/SDL_svgaevents.c b/project/jni/sdl-1.3/src/video/svga/SDL_svgaevents.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/svga/SDL_svgaevents.c
rename to project/jni/sdl-1.3/src/video/svga/SDL_svgaevents.c
diff --git a/project/sdl/sdl-1.3/src/video/svga/SDL_svgaevents_c.h b/project/jni/sdl-1.3/src/video/svga/SDL_svgaevents_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/svga/SDL_svgaevents_c.h
rename to project/jni/sdl-1.3/src/video/svga/SDL_svgaevents_c.h
diff --git a/project/sdl/sdl-1.3/src/video/svga/SDL_svgamouse.c b/project/jni/sdl-1.3/src/video/svga/SDL_svgamouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/svga/SDL_svgamouse.c
rename to project/jni/sdl-1.3/src/video/svga/SDL_svgamouse.c
diff --git a/project/sdl/sdl-1.3/src/video/svga/SDL_svgamouse_c.h b/project/jni/sdl-1.3/src/video/svga/SDL_svgamouse_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/svga/SDL_svgamouse_c.h
rename to project/jni/sdl-1.3/src/video/svga/SDL_svgamouse_c.h
diff --git a/project/sdl/sdl-1.3/src/video/svga/SDL_svgavideo.c b/project/jni/sdl-1.3/src/video/svga/SDL_svgavideo.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/svga/SDL_svgavideo.c
rename to project/jni/sdl-1.3/src/video/svga/SDL_svgavideo.c
diff --git a/project/sdl/sdl-1.3/src/video/svga/SDL_svgavideo.h b/project/jni/sdl-1.3/src/video/svga/SDL_svgavideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/svga/SDL_svgavideo.h
rename to project/jni/sdl-1.3/src/video/svga/SDL_svgavideo.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitappdelegate.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitevents.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitevents.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitevents.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitevents.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitevents.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitevents.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitevents.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitevents.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitkeyboard.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitkeyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitkeyboard.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitkeyboard.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopengles.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitopengles.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopengles.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitopengles.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopengles.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitopengles.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopengles.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitopengles.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopenglview.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitopenglview.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopenglview.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitopenglview.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopenglview.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitopenglview.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitopenglview.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitopenglview.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitvideo.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitvideo.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitvideo.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitvideo.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitvideo.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitvideo.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitvideo.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitvideo.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitview.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitview.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitview.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitview.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitview.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitview.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitview.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitview.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitwindow.h b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitwindow.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitwindow.h
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitwindow.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/SDL_uikitwindow.m b/project/jni/sdl-1.3/src/video/uikit/SDL_uikitwindow.m
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/SDL_uikitwindow.m
rename to project/jni/sdl-1.3/src/video/uikit/SDL_uikitwindow.m
diff --git a/project/sdl/sdl-1.3/src/video/uikit/jumphack.c b/project/jni/sdl-1.3/src/video/uikit/jumphack.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/jumphack.c
rename to project/jni/sdl-1.3/src/video/uikit/jumphack.c
diff --git a/project/sdl/sdl-1.3/src/video/uikit/jumphack.h b/project/jni/sdl-1.3/src/video/uikit/jumphack.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/jumphack.h
rename to project/jni/sdl-1.3/src/video/uikit/jumphack.h
diff --git a/project/sdl/sdl-1.3/src/video/uikit/keyinfotable.h b/project/jni/sdl-1.3/src/video/uikit/keyinfotable.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/uikit/keyinfotable.h
rename to project/jni/sdl-1.3/src/video/uikit/keyinfotable.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_ceddrawrender.c b/project/jni/sdl-1.3/src/video/win32/SDL_ceddrawrender.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_ceddrawrender.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_ceddrawrender.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_ceddrawrender.h b/project/jni/sdl-1.3/src/video/win32/SDL_ceddrawrender.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_ceddrawrender.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_ceddrawrender.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_d3drender.c b/project/jni/sdl-1.3/src/video/win32/SDL_d3drender.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_d3drender.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_d3drender.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_d3drender.h b/project/jni/sdl-1.3/src/video/win32/SDL_d3drender.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_d3drender.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_d3drender.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_gapirender.c b/project/jni/sdl-1.3/src/video/win32/SDL_gapirender.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_gapirender.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_gapirender.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_gapirender.h b/project/jni/sdl-1.3/src/video/win32/SDL_gapirender.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_gapirender.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_gapirender.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_gapirender_c.h b/project/jni/sdl-1.3/src/video/win32/SDL_gapirender_c.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_gapirender_c.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_gapirender_c.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_gdirender.c b/project/jni/sdl-1.3/src/video/win32/SDL_gdirender.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_gdirender.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_gdirender.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_gdirender.h b/project/jni/sdl-1.3/src/video/win32/SDL_gdirender.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_gdirender.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_gdirender.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_msctf.h b/project/jni/sdl-1.3/src/video/win32/SDL_msctf.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_msctf.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_msctf.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_vkeys.h b/project/jni/sdl-1.3/src/video/win32/SDL_vkeys.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_vkeys.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_vkeys.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32clipboard.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32clipboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32clipboard.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32clipboard.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32clipboard.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32clipboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32clipboard.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32clipboard.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32events.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32events.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32events.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32events.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32events.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32events.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32events.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32events.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32gamma.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32gamma.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32gamma.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32gamma.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32gamma.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32gamma.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32gamma.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32gamma.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32keyboard.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32keyboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32keyboard.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32keyboard.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32keyboard.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32keyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32keyboard.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32keyboard.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32modes.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32modes.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32modes.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32modes.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32modes.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32modes.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32modes.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32modes.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32mouse.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32mouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32mouse.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32mouse.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32mouse.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32mouse.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32mouse.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32mouse.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32opengl.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32opengl.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32opengl.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32opengl.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32opengl.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32opengl.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32opengl.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32opengl.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32shape.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32shape.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32shape.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32shape.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32shape.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32shape.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32shape.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32shape.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32video.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32video.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32video.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32video.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32video.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32video.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32video.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32video.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32window.c b/project/jni/sdl-1.3/src/video/win32/SDL_win32window.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32window.c
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32window.c
diff --git a/project/sdl/sdl-1.3/src/video/win32/SDL_win32window.h b/project/jni/sdl-1.3/src/video/win32/SDL_win32window.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/SDL_win32window.h
rename to project/jni/sdl-1.3/src/video/win32/SDL_win32window.h
diff --git a/project/sdl/sdl-1.3/src/video/win32/wmmsg.h b/project/jni/sdl-1.3/src/video/win32/wmmsg.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/win32/wmmsg.h
rename to project/jni/sdl-1.3/src/video/win32/wmmsg.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_eventtouch.c b/project/jni/sdl-1.3/src/video/x11/SDL_eventtouch.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_eventtouch.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_eventtouch.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_eventtouch.h b/project/jni/sdl-1.3/src/video/x11/SDL_eventtouch.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_eventtouch.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_eventtouch.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11clipboard.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11clipboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11clipboard.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11clipboard.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11clipboard.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11clipboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11clipboard.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11clipboard.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11dyn.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11dyn.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11dyn.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11dyn.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11dyn.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11dyn.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11dyn.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11dyn.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11events.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11events.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11events.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11events.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11events.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11events.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11events.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11events.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11gamma.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11gamma.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11gamma.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11gamma.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11gamma.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11gamma.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11gamma.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11gamma.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11keyboard.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11keyboard.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11keyboard.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11keyboard.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11keyboard.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11keyboard.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11keyboard.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11keyboard.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11modes.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11modes.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11modes.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11modes.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11modes.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11modes.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11modes.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11modes.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11mouse.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11mouse.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11mouse.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11mouse.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11mouse.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11mouse.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11mouse.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11mouse.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11opengl.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11opengl.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11opengl.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11opengl.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11opengl.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11opengl.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11opengl.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11opengl.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11opengles.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11opengles.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11opengles.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11opengles.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11opengles.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11opengles.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11opengles.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11opengles.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11render.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11render.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11render.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11render.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11render.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11render.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11render.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11render.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11shape.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11shape.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11shape.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11shape.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11shape.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11shape.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11shape.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11shape.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11sym.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11sym.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11sym.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11sym.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11video.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11video.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11video.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11video.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11video.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11video.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11video.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11video.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11window.c b/project/jni/sdl-1.3/src/video/x11/SDL_x11window.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11window.c
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11window.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/SDL_x11window.h b/project/jni/sdl-1.3/src/video/x11/SDL_x11window.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/SDL_x11window.h
rename to project/jni/sdl-1.3/src/video/x11/SDL_x11window.h
diff --git a/project/sdl/sdl-1.3/src/video/x11/imKStoUCS.c b/project/jni/sdl-1.3/src/video/x11/imKStoUCS.c
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/imKStoUCS.c
rename to project/jni/sdl-1.3/src/video/x11/imKStoUCS.c
diff --git a/project/sdl/sdl-1.3/src/video/x11/imKStoUCS.h b/project/jni/sdl-1.3/src/video/x11/imKStoUCS.h
similarity index 100%
rename from project/sdl/sdl-1.3/src/video/x11/imKStoUCS.h
rename to project/jni/sdl-1.3/src/video/x11/imKStoUCS.h
diff --git a/project/jni/sdl_blitpool/Android.mk b/project/jni/sdl_blitpool/Android.mk
index 1e2e20e18..1147dd970 100644
--- a/project/jni/sdl_blitpool/Android.mk
+++ b/project/jni/sdl_blitpool/Android.mk
@@ -4,13 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_blitpool
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl/include
+LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := SDL_blitpool.c
 
-LOCAL_SHARED_LIBRARIES := sdl
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_LDLIBS :=
 
diff --git a/project/jni/sdl_gfx/Android.mk b/project/jni/sdl_gfx/Android.mk
index edaf20c56..885b7c2e9 100644
--- a/project/jni/sdl_gfx/Android.mk
+++ b/project/jni/sdl_gfx/Android.mk
@@ -5,14 +5,14 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sdl_gfx
 
 LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. \
-                -I$(LOCAL_PATH)/../sdl/include -Os
+                -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -Os
 
 LOCAL_CPP_EXTENSION := .cpp
 
 # Note this simple makefile var substitution, you can find even simpler examples in different Android projects
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_SHARED_LIBRARIES := sdl
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/project/jni/sdl_image/Android.mk b/project/jni/sdl_image/Android.mk
index 9f691baa4..88a959d6e 100644
--- a/project/jni/sdl_image/Android.mk
+++ b/project/jni/sdl_image/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_image
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg -I$(LOCAL_PATH)/../png -I$(LOCAL_PATH)/../sdl/include \
+LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg -I$(LOCAL_PATH)/../png -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
 				-DLOAD_PNG -DLOAD_JPG -DLOAD_GIF -DLOAD_BMP
 
 LOCAL_CPP_EXTENSION := .cpp
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 LOCAL_STATIC_LIBRARIES := png jpeg
 
-LOCAL_SHARED_LIBRARIES := sdl
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 
 LOCAL_LDLIBS := -lz
 
diff --git a/project/jni/sdl_main/Android.mk b/project/jni/sdl_main/Android.mk
index 8f62f6c6f..831418522 100644
--- a/project/jni/sdl_main/Android.mk
+++ b/project/jni/sdl_main/Android.mk
@@ -8,7 +8,7 @@ ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
 endif
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/../sdl/include \
+LOCAL_CFLAGS := -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
 	-DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \
 	-DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\"
 
@@ -16,7 +16,7 @@ LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := sdl_main.c
 
-LOCAL_SHARED_LIBRARIES := sdl application
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) application
 LOCAL_LDLIBS := -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk
index 1d25e157a..1c52c0d2c 100644
--- a/project/jni/sdl_mixer/Android.mk
+++ b/project/jni/sdl_mixer/Android.mk
@@ -4,14 +4,14 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_mixer
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl/include -I$(LOCAL_PATH)/../mad \
+LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../mad \
 					-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_SHARED_LIBRARIES := sdl
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 LOCAL_STATIC_LIBRARIES := tremor
 
 ifneq ($(SDL_MIXER_USE_LIBMAD),)
diff --git a/project/jni/sdl_net/Android.mk b/project/jni/sdl_net/Android.mk
index 5df879b36..0083752fc 100644
--- a/project/jni/sdl_net/Android.mk
+++ b/project/jni/sdl_net/Android.mk
@@ -4,13 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_net
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl/include
+LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_SHARED_LIBRARIES := sdl
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_LDLIBS :=
 
diff --git a/project/jni/sdl_ttf/Android.mk b/project/jni/sdl_ttf/Android.mk
index eb468b99a..f0a11904b 100644
--- a/project/jni/sdl_ttf/Android.mk
+++ b/project/jni/sdl_ttf/Android.mk
@@ -4,13 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_ttf
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl/include -I$(LOCAL_PATH)/../freetype/include
+LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../freetype/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := SDL_ttf.c
 
-LOCAL_SHARED_LIBRARIES := sdl
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 LOCAL_STATIC_LIBRARIES := freetype
 LOCAL_LDLIBS := -lz
 
diff --git a/project/src/Globals.java b/project/src/Globals.java
index 2be5ca925..7b4fb0b18 100644
--- a/project/src/Globals.java
+++ b/project/src/Globals.java
@@ -50,5 +50,5 @@ class Globals {
 }
 
 class LoadLibrary {
-	public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); };
+	public LoadLibrary() { System.loadLibrary("sdl-1.3"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); };
 }