diff --git a/.gitmodules b/.gitmodules
index 1e3835f3c7a9cba78b88ca2c0ea91d1c5557166a..df27376892d3743af3a07e74814aee9f65c9247a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "libs/mavlink/include/mavlink/v2.0"]
 	path = libs/mavlink/include/mavlink/v2.0
 	url = https://github.com/mavlink/c_library_v2.git
+[submodule "libs/OpenSSL/android_openssl"]
+	path = libs/OpenSSL/android_openssl
+	url = https://github.com/Auterion/android_openssl
diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 9f18fa695f028714d0cc1dd8caa81e54efe8358f..890f514142e4e97589d9d77acc2fdd0c62f278a5 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -2,7 +2,7 @@
 # [REQUIRED] Add support for <inttypes.h> to Windows.
 #
 WindowsBuild {
-    INCLUDEPATH += libs/lib/msinttypes
+    INCLUDEPATH += libs/msinttypes
 }
 
 #
@@ -106,34 +106,26 @@ SOURCES += \
 #
 MacBuild {
     INCLUDEPATH += \
-        $$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers
+        $$BASEDIR/libs/Frameworks/SDL2.framework/Headers
     LIBS += \
-        -F$$BASEDIR/libs/lib/Frameworks \
+        -F$$BASEDIR/libs/Frameworks \
         -framework SDL2
 } else:LinuxBuild {
     PKGCONFIG = sdl2
 } else:WindowsBuild {
-    INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include
+    INCLUDEPATH += $$BASEDIR/libs/sdl2/msvc/include
     INCLUDEPATH += $$BASEDIR/libs/OpenSSL/Windows/x64/include
-    LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x64
+    LIBS += -L$$BASEDIR/libs/sdl2/msvc/lib/x64
     LIBS += -lSDL2
 }
 
-# Include Android OpenSSL libs in order to make Qt OpenSSL support work
-# Temp removal
-#AndroidBuild {
-#    equals(ANDROID_TARGET_ARCH, armeabi-v7a)  {
-#        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libcrypto.so
-#        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libssl.so
-#    } else:equals(ANDROID_TARGET_ARCH, arm64-v8a)  {
-#        # Haven't figured out how to get 64 bit arm OpenSLL yet. This means things like terrain queries will not qork.
-#    } else:equals(ANDROID_TARGET_ARCH, x86)  {
-#        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libcrypto.so
-#        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libssl.so
-#    } else {
-#        error("Unsupported Android architecture: $${ANDROID_TARGET_ARCH}")
-#    }
-#}
+# Include Android OpenSSL libs
+AndroidBuild {
+    include($$BASEDIR/libs/OpenSSL/android_openssl/openssl.pri)
+    message("ANDROID_EXTRA_LIBS")
+    message($$ANDROID_TARGET_ARCH)
+    message($$ANDROID_EXTRA_LIBS)
+}
 
 # Pairing
 contains(DEFINES, QGC_ENABLE_PAIRING) {
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 32298a0112b2032c6657e9d55ef66a0279355672..e24f7ac9ed6f79a945d1a32cf62d2bc7a94a97f0 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -48,7 +48,7 @@ MacBuild {
 
 MacBuild {
     # Copy non-standard frameworks into app package
-    QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
+    QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
     # SDL2 Framework
     QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
     # AirMap
diff --git a/libs/lib/Frameworks/SDL2.framework/Headers b/libs/Frameworks/SDL2.framework/Headers
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Headers
rename to libs/Frameworks/SDL2.framework/Headers
diff --git a/libs/lib/Frameworks/SDL2.framework/Resources b/libs/Frameworks/SDL2.framework/Resources
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Resources
rename to libs/Frameworks/SDL2.framework/Resources
diff --git a/libs/lib/Frameworks/SDL2.framework/SDL2 b/libs/Frameworks/SDL2.framework/SDL2
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/SDL2
rename to libs/Frameworks/SDL2.framework/SDL2
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h b/libs/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h
rename to libs/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist b/libs/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
rename to libs/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/A/SDL2 b/libs/Frameworks/SDL2.framework/Versions/A/SDL2
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/A/SDL2
rename to libs/Frameworks/SDL2.framework/Versions/A/SDL2
diff --git a/libs/lib/Frameworks/SDL2.framework/Versions/Current b/libs/Frameworks/SDL2.framework/Versions/Current
similarity index 100%
rename from libs/lib/Frameworks/SDL2.framework/Versions/Current
rename to libs/Frameworks/SDL2.framework/Versions/Current
diff --git a/libs/OpenSSL/android_openssl b/libs/OpenSSL/android_openssl
new file mode 160000
index 0000000000000000000000000000000000000000..3aaff1bd9e35047abdb363239bb3e3c114d07ea1
--- /dev/null
+++ b/libs/OpenSSL/android_openssl
@@ -0,0 +1 @@
+Subproject commit 3aaff1bd9e35047abdb363239bb3e3c114d07ea1
diff --git a/libs/lib/msinttypes/inttypes.h b/libs/msinttypes/inttypes.h
similarity index 100%
rename from libs/lib/msinttypes/inttypes.h
rename to libs/msinttypes/inttypes.h
diff --git a/libs/lib/msinttypes/stdint.h b/libs/msinttypes/stdint.h
similarity index 100%
rename from libs/lib/msinttypes/stdint.h
rename to libs/msinttypes/stdint.h
diff --git a/libs/lib/sdl2/msvc/BUGS.txt b/libs/sdl2/msvc/BUGS.txt
similarity index 100%
rename from libs/lib/sdl2/msvc/BUGS.txt
rename to libs/sdl2/msvc/BUGS.txt
diff --git a/libs/lib/sdl2/msvc/COPYING.txt b/libs/sdl2/msvc/COPYING.txt
similarity index 100%
rename from libs/lib/sdl2/msvc/COPYING.txt
rename to libs/sdl2/msvc/COPYING.txt
diff --git a/libs/lib/sdl2/msvc/README-SDL.txt b/libs/sdl2/msvc/README-SDL.txt
similarity index 100%
rename from libs/lib/sdl2/msvc/README-SDL.txt
rename to libs/sdl2/msvc/README-SDL.txt
diff --git a/libs/lib/sdl2/msvc/README.txt b/libs/sdl2/msvc/README.txt
similarity index 100%
rename from libs/lib/sdl2/msvc/README.txt
rename to libs/sdl2/msvc/README.txt
diff --git a/libs/lib/sdl2/msvc/WhatsNew.txt b/libs/sdl2/msvc/WhatsNew.txt
similarity index 100%
rename from libs/lib/sdl2/msvc/WhatsNew.txt
rename to libs/sdl2/msvc/WhatsNew.txt
diff --git a/libs/lib/sdl2/msvc/docs/README-android.md b/libs/sdl2/msvc/docs/README-android.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-android.md
rename to libs/sdl2/msvc/docs/README-android.md
diff --git a/libs/lib/sdl2/msvc/docs/README-cmake.md b/libs/sdl2/msvc/docs/README-cmake.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-cmake.md
rename to libs/sdl2/msvc/docs/README-cmake.md
diff --git a/libs/lib/sdl2/msvc/docs/README-directfb.md b/libs/sdl2/msvc/docs/README-directfb.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-directfb.md
rename to libs/sdl2/msvc/docs/README-directfb.md
diff --git a/libs/lib/sdl2/msvc/docs/README-dynapi.md b/libs/sdl2/msvc/docs/README-dynapi.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-dynapi.md
rename to libs/sdl2/msvc/docs/README-dynapi.md
diff --git a/libs/lib/sdl2/msvc/docs/README-emscripten.md b/libs/sdl2/msvc/docs/README-emscripten.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-emscripten.md
rename to libs/sdl2/msvc/docs/README-emscripten.md
diff --git a/libs/lib/sdl2/msvc/docs/README-gesture.md b/libs/sdl2/msvc/docs/README-gesture.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-gesture.md
rename to libs/sdl2/msvc/docs/README-gesture.md
diff --git a/libs/lib/sdl2/msvc/docs/README-hg.md b/libs/sdl2/msvc/docs/README-hg.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-hg.md
rename to libs/sdl2/msvc/docs/README-hg.md
diff --git a/libs/lib/sdl2/msvc/docs/README-ios.md b/libs/sdl2/msvc/docs/README-ios.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-ios.md
rename to libs/sdl2/msvc/docs/README-ios.md
diff --git a/libs/lib/sdl2/msvc/docs/README-linux.md b/libs/sdl2/msvc/docs/README-linux.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-linux.md
rename to libs/sdl2/msvc/docs/README-linux.md
diff --git a/libs/lib/sdl2/msvc/docs/README-macosx.md b/libs/sdl2/msvc/docs/README-macosx.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-macosx.md
rename to libs/sdl2/msvc/docs/README-macosx.md
diff --git a/libs/lib/sdl2/msvc/docs/README-nacl.md b/libs/sdl2/msvc/docs/README-nacl.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-nacl.md
rename to libs/sdl2/msvc/docs/README-nacl.md
diff --git a/libs/lib/sdl2/msvc/docs/README-pandora.md b/libs/sdl2/msvc/docs/README-pandora.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-pandora.md
rename to libs/sdl2/msvc/docs/README-pandora.md
diff --git a/libs/lib/sdl2/msvc/docs/README-platforms.md b/libs/sdl2/msvc/docs/README-platforms.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-platforms.md
rename to libs/sdl2/msvc/docs/README-platforms.md
diff --git a/libs/lib/sdl2/msvc/docs/README-porting.md b/libs/sdl2/msvc/docs/README-porting.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-porting.md
rename to libs/sdl2/msvc/docs/README-porting.md
diff --git a/libs/lib/sdl2/msvc/docs/README-psp.md b/libs/sdl2/msvc/docs/README-psp.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-psp.md
rename to libs/sdl2/msvc/docs/README-psp.md
diff --git a/libs/lib/sdl2/msvc/docs/README-raspberrypi.md b/libs/sdl2/msvc/docs/README-raspberrypi.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-raspberrypi.md
rename to libs/sdl2/msvc/docs/README-raspberrypi.md
diff --git a/libs/lib/sdl2/msvc/docs/README-touch.md b/libs/sdl2/msvc/docs/README-touch.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-touch.md
rename to libs/sdl2/msvc/docs/README-touch.md
diff --git a/libs/lib/sdl2/msvc/docs/README-wince.md b/libs/sdl2/msvc/docs/README-wince.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-wince.md
rename to libs/sdl2/msvc/docs/README-wince.md
diff --git a/libs/lib/sdl2/msvc/docs/README-windows.md b/libs/sdl2/msvc/docs/README-windows.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-windows.md
rename to libs/sdl2/msvc/docs/README-windows.md
diff --git a/libs/lib/sdl2/msvc/docs/README-winrt.md b/libs/sdl2/msvc/docs/README-winrt.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README-winrt.md
rename to libs/sdl2/msvc/docs/README-winrt.md
diff --git a/libs/lib/sdl2/msvc/docs/README.md b/libs/sdl2/msvc/docs/README.md
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/README.md
rename to libs/sdl2/msvc/docs/README.md
diff --git a/libs/lib/sdl2/msvc/docs/doxyfile b/libs/sdl2/msvc/docs/doxyfile
similarity index 100%
rename from libs/lib/sdl2/msvc/docs/doxyfile
rename to libs/sdl2/msvc/docs/doxyfile
diff --git a/libs/lib/sdl2/msvc/include/SDL.h b/libs/sdl2/msvc/include/SDL.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL.h
rename to libs/sdl2/msvc/include/SDL.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_assert.h b/libs/sdl2/msvc/include/SDL_assert.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_assert.h
rename to libs/sdl2/msvc/include/SDL_assert.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_atomic.h b/libs/sdl2/msvc/include/SDL_atomic.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_atomic.h
rename to libs/sdl2/msvc/include/SDL_atomic.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_audio.h b/libs/sdl2/msvc/include/SDL_audio.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_audio.h
rename to libs/sdl2/msvc/include/SDL_audio.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_bits.h b/libs/sdl2/msvc/include/SDL_bits.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_bits.h
rename to libs/sdl2/msvc/include/SDL_bits.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_blendmode.h b/libs/sdl2/msvc/include/SDL_blendmode.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_blendmode.h
rename to libs/sdl2/msvc/include/SDL_blendmode.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_clipboard.h b/libs/sdl2/msvc/include/SDL_clipboard.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_clipboard.h
rename to libs/sdl2/msvc/include/SDL_clipboard.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_config.h b/libs/sdl2/msvc/include/SDL_config.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_config.h
rename to libs/sdl2/msvc/include/SDL_config.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_cpuinfo.h b/libs/sdl2/msvc/include/SDL_cpuinfo.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_cpuinfo.h
rename to libs/sdl2/msvc/include/SDL_cpuinfo.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_egl.h b/libs/sdl2/msvc/include/SDL_egl.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_egl.h
rename to libs/sdl2/msvc/include/SDL_egl.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_endian.h b/libs/sdl2/msvc/include/SDL_endian.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_endian.h
rename to libs/sdl2/msvc/include/SDL_endian.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_error.h b/libs/sdl2/msvc/include/SDL_error.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_error.h
rename to libs/sdl2/msvc/include/SDL_error.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_events.h b/libs/sdl2/msvc/include/SDL_events.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_events.h
rename to libs/sdl2/msvc/include/SDL_events.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_filesystem.h b/libs/sdl2/msvc/include/SDL_filesystem.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_filesystem.h
rename to libs/sdl2/msvc/include/SDL_filesystem.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_gamecontroller.h b/libs/sdl2/msvc/include/SDL_gamecontroller.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_gamecontroller.h
rename to libs/sdl2/msvc/include/SDL_gamecontroller.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_gesture.h b/libs/sdl2/msvc/include/SDL_gesture.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_gesture.h
rename to libs/sdl2/msvc/include/SDL_gesture.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_haptic.h b/libs/sdl2/msvc/include/SDL_haptic.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_haptic.h
rename to libs/sdl2/msvc/include/SDL_haptic.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_hints.h b/libs/sdl2/msvc/include/SDL_hints.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_hints.h
rename to libs/sdl2/msvc/include/SDL_hints.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_joystick.h b/libs/sdl2/msvc/include/SDL_joystick.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_joystick.h
rename to libs/sdl2/msvc/include/SDL_joystick.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_keyboard.h b/libs/sdl2/msvc/include/SDL_keyboard.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_keyboard.h
rename to libs/sdl2/msvc/include/SDL_keyboard.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_keycode.h b/libs/sdl2/msvc/include/SDL_keycode.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_keycode.h
rename to libs/sdl2/msvc/include/SDL_keycode.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_loadso.h b/libs/sdl2/msvc/include/SDL_loadso.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_loadso.h
rename to libs/sdl2/msvc/include/SDL_loadso.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_log.h b/libs/sdl2/msvc/include/SDL_log.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_log.h
rename to libs/sdl2/msvc/include/SDL_log.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_main.h b/libs/sdl2/msvc/include/SDL_main.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_main.h
rename to libs/sdl2/msvc/include/SDL_main.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_messagebox.h b/libs/sdl2/msvc/include/SDL_messagebox.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_messagebox.h
rename to libs/sdl2/msvc/include/SDL_messagebox.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_mouse.h b/libs/sdl2/msvc/include/SDL_mouse.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_mouse.h
rename to libs/sdl2/msvc/include/SDL_mouse.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_mutex.h b/libs/sdl2/msvc/include/SDL_mutex.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_mutex.h
rename to libs/sdl2/msvc/include/SDL_mutex.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_name.h b/libs/sdl2/msvc/include/SDL_name.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_name.h
rename to libs/sdl2/msvc/include/SDL_name.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengl.h b/libs/sdl2/msvc/include/SDL_opengl.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengl.h
rename to libs/sdl2/msvc/include/SDL_opengl.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengl_glext.h b/libs/sdl2/msvc/include/SDL_opengl_glext.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengl_glext.h
rename to libs/sdl2/msvc/include/SDL_opengl_glext.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengles.h b/libs/sdl2/msvc/include/SDL_opengles.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengles.h
rename to libs/sdl2/msvc/include/SDL_opengles.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengles2.h b/libs/sdl2/msvc/include/SDL_opengles2.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengles2.h
rename to libs/sdl2/msvc/include/SDL_opengles2.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengles2_gl2.h b/libs/sdl2/msvc/include/SDL_opengles2_gl2.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengles2_gl2.h
rename to libs/sdl2/msvc/include/SDL_opengles2_gl2.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengles2_gl2ext.h b/libs/sdl2/msvc/include/SDL_opengles2_gl2ext.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengles2_gl2ext.h
rename to libs/sdl2/msvc/include/SDL_opengles2_gl2ext.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengles2_gl2platform.h b/libs/sdl2/msvc/include/SDL_opengles2_gl2platform.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengles2_gl2platform.h
rename to libs/sdl2/msvc/include/SDL_opengles2_gl2platform.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_opengles2_khrplatform.h b/libs/sdl2/msvc/include/SDL_opengles2_khrplatform.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_opengles2_khrplatform.h
rename to libs/sdl2/msvc/include/SDL_opengles2_khrplatform.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_pixels.h b/libs/sdl2/msvc/include/SDL_pixels.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_pixels.h
rename to libs/sdl2/msvc/include/SDL_pixels.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_platform.h b/libs/sdl2/msvc/include/SDL_platform.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_platform.h
rename to libs/sdl2/msvc/include/SDL_platform.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_power.h b/libs/sdl2/msvc/include/SDL_power.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_power.h
rename to libs/sdl2/msvc/include/SDL_power.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_quit.h b/libs/sdl2/msvc/include/SDL_quit.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_quit.h
rename to libs/sdl2/msvc/include/SDL_quit.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_rect.h b/libs/sdl2/msvc/include/SDL_rect.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_rect.h
rename to libs/sdl2/msvc/include/SDL_rect.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_render.h b/libs/sdl2/msvc/include/SDL_render.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_render.h
rename to libs/sdl2/msvc/include/SDL_render.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_revision.h b/libs/sdl2/msvc/include/SDL_revision.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_revision.h
rename to libs/sdl2/msvc/include/SDL_revision.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_rwops.h b/libs/sdl2/msvc/include/SDL_rwops.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_rwops.h
rename to libs/sdl2/msvc/include/SDL_rwops.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_scancode.h b/libs/sdl2/msvc/include/SDL_scancode.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_scancode.h
rename to libs/sdl2/msvc/include/SDL_scancode.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_shape.h b/libs/sdl2/msvc/include/SDL_shape.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_shape.h
rename to libs/sdl2/msvc/include/SDL_shape.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_stdinc.h b/libs/sdl2/msvc/include/SDL_stdinc.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_stdinc.h
rename to libs/sdl2/msvc/include/SDL_stdinc.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_surface.h b/libs/sdl2/msvc/include/SDL_surface.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_surface.h
rename to libs/sdl2/msvc/include/SDL_surface.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_system.h b/libs/sdl2/msvc/include/SDL_system.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_system.h
rename to libs/sdl2/msvc/include/SDL_system.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_syswm.h b/libs/sdl2/msvc/include/SDL_syswm.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_syswm.h
rename to libs/sdl2/msvc/include/SDL_syswm.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test.h b/libs/sdl2/msvc/include/SDL_test.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test.h
rename to libs/sdl2/msvc/include/SDL_test.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_assert.h b/libs/sdl2/msvc/include/SDL_test_assert.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_assert.h
rename to libs/sdl2/msvc/include/SDL_test_assert.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_common.h b/libs/sdl2/msvc/include/SDL_test_common.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_common.h
rename to libs/sdl2/msvc/include/SDL_test_common.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_compare.h b/libs/sdl2/msvc/include/SDL_test_compare.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_compare.h
rename to libs/sdl2/msvc/include/SDL_test_compare.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_crc32.h b/libs/sdl2/msvc/include/SDL_test_crc32.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_crc32.h
rename to libs/sdl2/msvc/include/SDL_test_crc32.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_font.h b/libs/sdl2/msvc/include/SDL_test_font.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_font.h
rename to libs/sdl2/msvc/include/SDL_test_font.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_fuzzer.h b/libs/sdl2/msvc/include/SDL_test_fuzzer.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_fuzzer.h
rename to libs/sdl2/msvc/include/SDL_test_fuzzer.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_harness.h b/libs/sdl2/msvc/include/SDL_test_harness.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_harness.h
rename to libs/sdl2/msvc/include/SDL_test_harness.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_images.h b/libs/sdl2/msvc/include/SDL_test_images.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_images.h
rename to libs/sdl2/msvc/include/SDL_test_images.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_log.h b/libs/sdl2/msvc/include/SDL_test_log.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_log.h
rename to libs/sdl2/msvc/include/SDL_test_log.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_md5.h b/libs/sdl2/msvc/include/SDL_test_md5.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_md5.h
rename to libs/sdl2/msvc/include/SDL_test_md5.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_test_random.h b/libs/sdl2/msvc/include/SDL_test_random.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_test_random.h
rename to libs/sdl2/msvc/include/SDL_test_random.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_thread.h b/libs/sdl2/msvc/include/SDL_thread.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_thread.h
rename to libs/sdl2/msvc/include/SDL_thread.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_timer.h b/libs/sdl2/msvc/include/SDL_timer.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_timer.h
rename to libs/sdl2/msvc/include/SDL_timer.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_touch.h b/libs/sdl2/msvc/include/SDL_touch.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_touch.h
rename to libs/sdl2/msvc/include/SDL_touch.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_types.h b/libs/sdl2/msvc/include/SDL_types.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_types.h
rename to libs/sdl2/msvc/include/SDL_types.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_version.h b/libs/sdl2/msvc/include/SDL_version.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_version.h
rename to libs/sdl2/msvc/include/SDL_version.h
diff --git a/libs/lib/sdl2/msvc/include/SDL_video.h b/libs/sdl2/msvc/include/SDL_video.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/SDL_video.h
rename to libs/sdl2/msvc/include/SDL_video.h
diff --git a/libs/lib/sdl2/msvc/include/begin_code.h b/libs/sdl2/msvc/include/begin_code.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/begin_code.h
rename to libs/sdl2/msvc/include/begin_code.h
diff --git a/libs/lib/sdl2/msvc/include/close_code.h b/libs/sdl2/msvc/include/close_code.h
similarity index 100%
rename from libs/lib/sdl2/msvc/include/close_code.h
rename to libs/sdl2/msvc/include/close_code.h
diff --git a/libs/lib/sdl2/msvc/lib/x64/SDL2.dll b/libs/sdl2/msvc/lib/x64/SDL2.dll
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x64/SDL2.dll
rename to libs/sdl2/msvc/lib/x64/SDL2.dll
diff --git a/libs/lib/sdl2/msvc/lib/x64/SDL2.lib b/libs/sdl2/msvc/lib/x64/SDL2.lib
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x64/SDL2.lib
rename to libs/sdl2/msvc/lib/x64/SDL2.lib
diff --git a/libs/lib/sdl2/msvc/lib/x64/SDL2main.lib b/libs/sdl2/msvc/lib/x64/SDL2main.lib
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x64/SDL2main.lib
rename to libs/sdl2/msvc/lib/x64/SDL2main.lib
diff --git a/libs/lib/sdl2/msvc/lib/x64/SDL2test.lib b/libs/sdl2/msvc/lib/x64/SDL2test.lib
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x64/SDL2test.lib
rename to libs/sdl2/msvc/lib/x64/SDL2test.lib
diff --git a/libs/lib/sdl2/msvc/lib/x86/SDL2.dll b/libs/sdl2/msvc/lib/x86/SDL2.dll
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x86/SDL2.dll
rename to libs/sdl2/msvc/lib/x86/SDL2.dll
diff --git a/libs/lib/sdl2/msvc/lib/x86/SDL2.lib b/libs/sdl2/msvc/lib/x86/SDL2.lib
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x86/SDL2.lib
rename to libs/sdl2/msvc/lib/x86/SDL2.lib
diff --git a/libs/lib/sdl2/msvc/lib/x86/SDL2main.lib b/libs/sdl2/msvc/lib/x86/SDL2main.lib
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x86/SDL2main.lib
rename to libs/sdl2/msvc/lib/x86/SDL2main.lib
diff --git a/libs/lib/sdl2/msvc/lib/x86/SDL2test.lib b/libs/sdl2/msvc/lib/x86/SDL2test.lib
similarity index 100%
rename from libs/lib/sdl2/msvc/lib/x86/SDL2test.lib
rename to libs/sdl2/msvc/lib/x86/SDL2test.lib
diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml
index b46349c8dc2f20097dafa7223eb4919cb93be952..091f522f3a0d05b903b1bca1e9386321ec430e3e 100644
--- a/src/FlightMap/MapScale.qml
+++ b/src/FlightMap/MapScale.qml
@@ -29,13 +29,10 @@ Item {
 
     signal terrainButtonClicked
 
-    property variant _scaleLengthsMeters: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
-    property variant _scaleLengthsFeet: [10, 25, 50, 100, 250, 500, 1000, 2000, 3000, 4000, 5280, 5280*2, 5280*5, 5280*10, 5280*25, 5280*50, 5280*100, 5280*250, 5280*500, 5280*1000]
-
-    property bool _zoomButtonsVisible:      zoomButtonsVisible && !ScreenTools.isMobile
-    property bool _terrainButtonVisible:    terrainButtonVisible && !ScreenTools.isMobile
-
-    property var _color: mapControl.isSatelliteMap ? "white" : "black"
+    property var    _scaleLengthsMeters:    [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
+    property var    _scaleLengthsFeet:      [10, 25, 50, 100, 250, 500, 1000, 2000, 3000, 4000, 5280, 5280*2, 5280*5, 5280*10, 5280*25, 5280*50, 5280*100, 5280*250, 5280*500, 5280*1000]
+    property bool   _zoomButtonsVisible:    zoomButtonsVisible && !ScreenTools.isMobile
+    property var    _color:                 mapControl.isSatelliteMap ? "white" : "black"
 
     function formatDistanceMeters(meters) {
         var dist = Math.round(meters)
@@ -160,8 +157,10 @@ Item {
     Rectangle {
         id:                 leftEnd
         anchors.top:        scaleText.bottom
-        anchors.leftMargin: buttonsOnLeft && _zoomButtonsVisible ? ScreenTools.defaultFontPixelWidth / 2 : 0
-        anchors.left:       buttonsOnLeft && _zoomButtonsVisible ? zoomDownButton.right : parent.left
+        anchors.leftMargin: buttonsOnLeft && (_zoomButtonsVisible || terrainButtonVisible) ? ScreenTools.defaultFontPixelWidth / 2 : 0
+        anchors.left:       buttonsOnLeft ?
+                                (_zoomButtonsVisible ? zoomDownButton.right : (terrainButtonVisible ? terrainButton.right : parent.left)) :
+                                parent.left
         width:              2
         height:             ScreenTools.defaultFontPixelHeight
         color:              _color
@@ -194,7 +193,7 @@ Item {
         text:               qsTr("T")
         width:              height
         opacity:            0.75
-        visible:            _terrainButtonVisible
+        visible:            terrainButtonVisible
         onClicked:          terrainButtonClicked()
     }
 
diff --git a/src/ui/MainRootWindow.qml b/src/ui/MainRootWindow.qml
index 47a3b06fa6f0d3ab73f69ab85be7be4fe94c815a..21b3c87403922322eed5597022ba0808f3f8e476 100644
--- a/src/ui/MainRootWindow.qml
+++ b/src/ui/MainRootWindow.qml
@@ -83,7 +83,7 @@ ApplicationWindow {
     /// Allow view switching
     function popPreventViewSwitch() {
         if (_rgPreventViewSwitch.length == 1) {
-            console.warning("mainWindow.popPreventViewSwitch called when nothing pushed")
+            console.warn("mainWindow.popPreventViewSwitch called when nothing pushed")
             return
         }
         _rgPreventViewSwitch.pop()