diff --git a/build/config.mak b/build/config.mak
index 9fa0e4ef8..6e2dc9974 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -24,11 +24,3 @@ include build/toolchain.$(TOOLCHAIN).mak
 SFLAGS += -DDEBUG=$(DEBUG)
 SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT)
 SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)
-
-# Build type (Debug or Release)
-ifeq ($(DEBUG),1)
-  BUILD_TYPE = debug
-else
-  BUILD_TYPE = release
-endif
-BUILD_DIR := $(BUILD_DIR)/$(BUILD_TYPE)
diff --git a/build/defaults.mak b/build/defaults.mak
index af401ecab..e4f889b20 100644
--- a/build/defaults.mak
+++ b/build/defaults.mak
@@ -23,7 +23,12 @@ SFLAGS += -Wall
 SFLAGS += -MD -MP
 
 # Building directory
-BUILD_DIR = output/$(PLATFORM)
+ifeq ($(DEBUG),1)
+  BUILD_TYPE = debug
+else
+  BUILD_TYPE = release
+endif
+BUILD_DIR = output/$(BUILD_TYPE)/$(PLATFORM)
 
 # Define "Q" as an arobase by default to silence-out every command run by make.
 # If V=1 is supplied on the make command line, undefine Q so that every command
diff --git a/build/platform.emscripten.mak b/build/platform.emscripten.mak
deleted file mode 100644
index 168748053..000000000
--- a/build/platform.emscripten.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TOOLCHAIN = emscripten
-USE_LIBA = 0
-ION_KEYBOARD_LAYOUT = layout_B2
-EXE = js
-EPSILON_GETOPT = 1
diff --git a/build/platform.sdl.mak b/build/platform.sdl.mak
deleted file mode 100644
index 082d0f002..000000000
--- a/build/platform.sdl.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-USE_LIBA = 0
-ION_KEYBOARD_LAYOUT = layout_B2
-EPSILON_GETOPT = 1
-
-SFLAGS += -fPIE
-
-TARGET ?= $(HOST)
-
-BUILD_DIR := $(BUILD_DIR)/$(TARGET)
-
-include build/platform.sdl.$(TARGET).mak
diff --git a/build/platform.sdl.android.mak b/build/platform.simulator.android.mak
similarity index 100%
rename from build/platform.sdl.android.mak
rename to build/platform.simulator.android.mak
diff --git a/build/platform.sdl.ios.mak b/build/platform.simulator.ios.mak
similarity index 100%
rename from build/platform.sdl.ios.mak
rename to build/platform.simulator.ios.mak
diff --git a/build/platform.sdl.macos.mak b/build/platform.simulator.macos.mak
similarity index 100%
rename from build/platform.sdl.macos.mak
rename to build/platform.simulator.macos.mak
diff --git a/build/platform.simulator.mak b/build/platform.simulator.mak
index 4bc3f4186..07f1edd9e 100644
--- a/build/platform.simulator.mak
+++ b/build/platform.simulator.mak
@@ -1,9 +1,11 @@
-TOOLCHAIN ?= host-gcc
-ifeq ($(OS),Windows_NT)
-  TOOLCHAIN = mingw
-endif
 USE_LIBA = 0
 ION_KEYBOARD_LAYOUT = layout_B2
-EXE = elf
-EPSILON_ONBOARDING_APP = 0
+EPSILON_GETOPT = 1
+
 SFLAGS += -fPIE
+
+TARGET ?= $(HOST)
+
+BUILD_DIR := $(BUILD_DIR)/$(TARGET)
+
+include build/platform.simulator.$(TARGET).mak
diff --git a/build/platform.simulator.web.mak b/build/platform.simulator.web.mak
new file mode 100644
index 000000000..0a39c53f8
--- /dev/null
+++ b/build/platform.simulator.web.mak
@@ -0,0 +1,2 @@
+TOOLCHAIN = emscripten
+EXE = js
diff --git a/build/platform.sdl.windows.mak b/build/platform.simulator.windows.mak
similarity index 100%
rename from build/platform.sdl.windows.mak
rename to build/platform.simulator.windows.mak
diff --git a/ion/src/emscripten/background.jpg b/ion/src/emscripten/background.jpg
deleted file mode 100644
index 1ab789f85..000000000
Binary files a/ion/src/emscripten/background.jpg and /dev/null differ
diff --git a/ion/src/sdl/windows/Makefile b/ion/src/sdl/windows/Makefile
deleted file mode 100644
index b0bf1a69f..000000000
--- a/ion/src/sdl/windows/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ion_src += $(addprefix ion/src/sdl/windows/, \
-  images.cpp \
-  language.cpp \
-  resources.rc \
-)
-ion_src += $(addprefix ion/src/sdl/shared/, \
-  telemetry_dummy.cpp \
-)
-
-LDFLAGS += -lgdiplus
diff --git a/ion/src/sdl/Makefile b/ion/src/simulator/Makefile
similarity index 75%
rename from ion/src/sdl/Makefile
rename to ion/src/simulator/Makefile
index 1cbe5c06a..84d333a6c 100644
--- a/ion/src/sdl/Makefile
+++ b/ion/src/simulator/Makefile
@@ -17,7 +17,7 @@ ion_src += $(addprefix ion/src/shared/, \
   dummy/usb.cpp \
 )
 
-ion_src += $(addprefix ion/src/sdl/shared/, \
+ion_src += $(addprefix ion/src/simulator/shared/, \
   display.cpp \
   events_keyboard_platform.cpp \
   keyboard.cpp \
@@ -25,5 +25,5 @@ ion_src += $(addprefix ion/src/sdl/shared/, \
   layout.cpp \
 )
 
-include ion/src/sdl/$(TARGET)/Makefile
-include ion/src/sdl/external/Makefile
+include ion/src/simulator/$(TARGET)/Makefile
+include ion/src/simulator/external/Makefile
diff --git a/ion/src/sdl/android/Makefile b/ion/src/simulator/android/Makefile
similarity index 71%
rename from ion/src/sdl/android/Makefile
rename to ion/src/simulator/android/Makefile
index 2a4dc35f2..e00f37d71 100644
--- a/ion/src/sdl/android/Makefile
+++ b/ion/src/simulator/android/Makefile
@@ -1,10 +1,10 @@
-ion_src += $(addprefix ion/src/sdl/android/src/cpp/, \
+ion_src += $(addprefix ion/src/simulator/android/src/cpp/, \
   images.cpp \
   language.cpp \
   telemetry.cpp \
 )
 
-$(call object_for,ion/src/sdl/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1
+$(call object_for,ion/src/simulator/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1
 
 LDFLAGS += -ljnigraphics -llog
 
@@ -12,15 +12,15 @@ LDFLAGS += -ljnigraphics -llog
 # Some android resources needs to be filtered through ImageMagick. Others are
 # simply copied over.
 
-$(BUILD_DIR)/app/res/mipmap/ic_launcher.png: ion/src/sdl/assets/logo.svg | $$(@D)/.
+$(BUILD_DIR)/app/res/mipmap/ic_launcher.png: ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
 	$(Q) convert -background "#FFB734" $< $@
 
-$(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_foreground.png: ion/src/sdl/assets/logo.svg | $$(@D)/.
+$(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_foreground.png: ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
 	$(Q) convert -background none $< -resize 512x512 -gravity center -background none -extent 1024x1024 $@
 
-$(BUILD_DIR)/app/res/%: ion/src/sdl/android/src/res/% $$(@D)/.
+$(BUILD_DIR)/app/res/%: ion/src/simulator/android/src/res/% $$(@D)/.
 	$(call rule_label,COPY)
 	$(Q) cp $< $@
 
@@ -44,13 +44,13 @@ ifndef NDK_ABI
 NDK_ABIS = armeabi-v7a arm64-v8a x86 x86_64
 
 epsilon_apk_deps = $(patsubst %,$(BUILD_DIR)/app/libs/%/libepsilon.so,$(NDK_ABIS))
-epsilon_apk_deps += $(subst ion/src/sdl/android/src/res,$(BUILD_DIR)/app/res,$(wildcard ion/src/sdl/android/src/res/*/*))
+epsilon_apk_deps += $(subst ion/src/simulator/android/src/res,$(BUILD_DIR)/app/res,$(wildcard ion/src/simulator/android/src/res/*/*))
 epsilon_apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/ic_launcher_foreground.png)
 
 .PHONY: gradle_%
 gradle_%: $(epsilon_apk_deps)
-	@echo "GRADLE ion/src/sdl/android/build.gradle"
-	$(Q) ANDROID_HOME=/usr/local/android EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) gradle -b ion/src/sdl/android/build.gradle $*
+	@echo "GRADLE ion/src/simulator/android/build.gradle"
+	$(Q) ANDROID_HOME=/usr/local/android EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) gradle -b ion/src/simulator/android/build.gradle $*
 
 DEFAULT = epsilon.apk
 
diff --git a/ion/src/sdl/android/build.gradle b/ion/src/simulator/android/build.gradle
similarity index 100%
rename from ion/src/sdl/android/build.gradle
rename to ion/src/simulator/android/build.gradle
diff --git a/ion/src/sdl/android/gradle.properties b/ion/src/simulator/android/gradle.properties
similarity index 100%
rename from ion/src/sdl/android/gradle.properties
rename to ion/src/simulator/android/gradle.properties
diff --git a/ion/src/sdl/android/src/AndroidManifest.xml b/ion/src/simulator/android/src/AndroidManifest.xml
similarity index 100%
rename from ion/src/sdl/android/src/AndroidManifest.xml
rename to ion/src/simulator/android/src/AndroidManifest.xml
diff --git a/ion/src/sdl/android/src/cpp/images.cpp b/ion/src/simulator/android/src/cpp/images.cpp
similarity index 100%
rename from ion/src/sdl/android/src/cpp/images.cpp
rename to ion/src/simulator/android/src/cpp/images.cpp
diff --git a/ion/src/sdl/android/src/cpp/language.cpp b/ion/src/simulator/android/src/cpp/language.cpp
similarity index 100%
rename from ion/src/sdl/android/src/cpp/language.cpp
rename to ion/src/simulator/android/src/cpp/language.cpp
diff --git a/ion/src/sdl/android/src/cpp/telemetry.cpp b/ion/src/simulator/android/src/cpp/telemetry.cpp
similarity index 100%
rename from ion/src/sdl/android/src/cpp/telemetry.cpp
rename to ion/src/simulator/android/src/cpp/telemetry.cpp
diff --git a/ion/src/sdl/android/src/java/com/numworks/calculator/EpsilonActivity.java b/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
similarity index 100%
rename from ion/src/sdl/android/src/java/com/numworks/calculator/EpsilonActivity.java
rename to ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/HIDDevice.java b/ion/src/simulator/android/src/java/org/libsdl/app/HIDDevice.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/HIDDevice.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/HIDDevice.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/HIDDeviceBLESteamController.java b/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceBLESteamController.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/HIDDeviceBLESteamController.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceBLESteamController.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/HIDDeviceManager.java b/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceManager.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/HIDDeviceManager.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceManager.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/HIDDeviceUSB.java b/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceUSB.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/HIDDeviceUSB.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceUSB.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/SDL.java b/ion/src/simulator/android/src/java/org/libsdl/app/SDL.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/SDL.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/SDL.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/SDLActivity.java b/ion/src/simulator/android/src/java/org/libsdl/app/SDLActivity.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/SDLActivity.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/SDLActivity.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/SDLAudioManager.java b/ion/src/simulator/android/src/java/org/libsdl/app/SDLAudioManager.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/SDLAudioManager.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/SDLAudioManager.java
diff --git a/ion/src/sdl/android/src/java/org/libsdl/app/SDLControllerManager.java b/ion/src/simulator/android/src/java/org/libsdl/app/SDLControllerManager.java
similarity index 100%
rename from ion/src/sdl/android/src/java/org/libsdl/app/SDLControllerManager.java
rename to ion/src/simulator/android/src/java/org/libsdl/app/SDLControllerManager.java
diff --git a/ion/src/sdl/android/src/res/mipmap-v26/ic_launcher.xml b/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml
similarity index 100%
rename from ion/src/sdl/android/src/res/mipmap-v26/ic_launcher.xml
rename to ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml
diff --git a/ion/src/sdl/android/src/res/values/colors.xml b/ion/src/simulator/android/src/res/values/colors.xml
similarity index 100%
rename from ion/src/sdl/android/src/res/values/colors.xml
rename to ion/src/simulator/android/src/res/values/colors.xml
diff --git a/ion/src/sdl/android/src/res/values/strings.xml b/ion/src/simulator/android/src/res/values/strings.xml
similarity index 100%
rename from ion/src/sdl/android/src/res/values/strings.xml
rename to ion/src/simulator/android/src/res/values/strings.xml
diff --git a/ion/src/sdl/android/src/res/values/styles.xml b/ion/src/simulator/android/src/res/values/styles.xml
similarity index 100%
rename from ion/src/sdl/android/src/res/values/styles.xml
rename to ion/src/simulator/android/src/res/values/styles.xml
diff --git a/ion/src/sdl/assets/background.jpg b/ion/src/simulator/assets/background.jpg
similarity index 100%
rename from ion/src/sdl/assets/background.jpg
rename to ion/src/simulator/assets/background.jpg
diff --git a/ion/src/sdl/assets/logo.svg b/ion/src/simulator/assets/logo.svg
similarity index 100%
rename from ion/src/sdl/assets/logo.svg
rename to ion/src/simulator/assets/logo.svg
diff --git a/ion/src/sdl/external/Makefile b/ion/src/simulator/external/Makefile
similarity index 93%
rename from ion/src/sdl/external/Makefile
rename to ion/src/simulator/external/Makefile
index 5bd0d2a58..cf7744bf4 100644
--- a/ion/src/sdl/external/Makefile
+++ b/ion/src/simulator/external/Makefile
@@ -1,6 +1,6 @@
-SFLAGS += -Iion/src/sdl/external/sdl/include
+SFLAGS += -Iion/src/simulator/external/sdl/include
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   SDL.c \
   SDL_assert.c \
   SDL_dataqueue.c \
@@ -99,7 +99,7 @@ endif
 # Ignore warnings from external sources
 SDL_SFLAGS += -w
 
-include ion/src/sdl/external/config.$(TARGET).mak
+include ion/src/simulator/external/config.$(TARGET).mak
 
 $(call object_for,$(sdl_src)): SFLAGS += $(SDL_SFLAGS)
 
diff --git a/ion/src/sdl/external/README.md b/ion/src/simulator/external/README.md
similarity index 100%
rename from ion/src/sdl/external/README.md
rename to ion/src/simulator/external/README.md
diff --git a/ion/src/sdl/external/config.android.mak b/ion/src/simulator/external/config.android.mak
similarity index 91%
rename from ion/src/sdl/external/config.android.mak
rename to ion/src/simulator/external/config.android.mak
index 359bb4857..d32d92be2 100644
--- a/ion/src/sdl/external/config.android.mak
+++ b/ion/src/simulator/external/config.android.mak
@@ -1,6 +1,6 @@
 SDL_SFLAGS += -DGL_GLEXT_PROTOTYPES
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/android/SDL_androidaudio.c \
   audio/openslES/SDL_openslES.c \
   core/android/SDL_android.c \
@@ -28,7 +28,7 @@ sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
   video/android/SDL_androidwindow.c \
 )
 
-sdl_src += ion/src/sdl/external/sdl/src/hidapi/android/hid.c
+sdl_src += ion/src/simulator/external/sdl/src/hidapi/android/hid.c
 
 # Build the android native library cpufeatures
 SDL_SFLAGS += -I$(NDK_PATH)/sources/android/cpufeatures
diff --git a/ion/src/sdl/external/config.ios.mak b/ion/src/simulator/external/config.ios.mak
similarity index 95%
rename from ion/src/sdl/external/config.ios.mak
rename to ion/src/simulator/external/config.ios.mak
index afc27a151..1c2ca54ca 100644
--- a/ion/src/sdl/external/config.ios.mak
+++ b/ion/src/simulator/external/config.ios.mak
@@ -2,7 +2,7 @@
 
 SDL_SFLAGS += -fasm-blocks -fstrict-aliasing -fobjc-arc
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/coreaudio/SDL_coreaudio.m \
   file/cocoa/SDL_rwopsbundlesupport.m \
   filesystem/cocoa/SDL_sysfilesystem.m \
diff --git a/ion/src/sdl/external/config.macos.mak b/ion/src/simulator/external/config.macos.mak
similarity index 91%
rename from ion/src/sdl/external/config.macos.mak
rename to ion/src/simulator/external/config.macos.mak
index 3a18db2fb..4be994121 100644
--- a/ion/src/sdl/external/config.macos.mak
+++ b/ion/src/simulator/external/config.macos.mak
@@ -1,10 +1,10 @@
 # This file is built manually by mimic-ing SDL's Xcode project
 
 SDL_SFLAGS += -fasm-blocks -fstrict-aliasing
-SDL_SFLAGS += -Iion/src/sdl/external/sdl/src/video/khronos
-SDL_SFLAGS += -Iion/src/sdl/external/sdl/src/hidapi/hidapi
+SDL_SFLAGS += -Iion/src/simulator/external/sdl/src/video/khronos
+SDL_SFLAGS += -Iion/src/simulator/external/sdl/src/hidapi/hidapi
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/coreaudio/SDL_coreaudio.m \
   audio/disk/SDL_diskaudio.c \
   file/cocoa/SDL_rwopsbundlesupport.m \
diff --git a/ion/src/sdl/external/config.windows.mak b/ion/src/simulator/external/config.windows.mak
similarity index 93%
rename from ion/src/sdl/external/config.windows.mak
rename to ion/src/simulator/external/config.windows.mak
index e80c55f60..f06d6111f 100644
--- a/ion/src/sdl/external/config.windows.mak
+++ b/ion/src/simulator/external/config.windows.mak
@@ -1,7 +1,7 @@
-SDL_SFLAGS += -Iion/src/sdl/external/sdl/src/video/khronos
+SDL_SFLAGS += -Iion/src/simulator/external/sdl/src/video/khronos
 SDL_SFLAGS += -DHAVE_LIBC
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/directsound/SDL_directsound.c \
   audio/disk/SDL_diskaudio.c \
   audio/wasapi/SDL_wasapi.c \
diff --git a/ion/src/sdl/external/sdl/include/SDL.h b/ion/src/simulator/external/sdl/include/SDL.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL.h
rename to ion/src/simulator/external/sdl/include/SDL.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_assert.h b/ion/src/simulator/external/sdl/include/SDL_assert.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_assert.h
rename to ion/src/simulator/external/sdl/include/SDL_assert.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_atomic.h b/ion/src/simulator/external/sdl/include/SDL_atomic.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_atomic.h
rename to ion/src/simulator/external/sdl/include/SDL_atomic.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_audio.h b/ion/src/simulator/external/sdl/include/SDL_audio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_audio.h
rename to ion/src/simulator/external/sdl/include/SDL_audio.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_bits.h b/ion/src/simulator/external/sdl/include/SDL_bits.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_bits.h
rename to ion/src/simulator/external/sdl/include/SDL_bits.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_blendmode.h b/ion/src/simulator/external/sdl/include/SDL_blendmode.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_blendmode.h
rename to ion/src/simulator/external/sdl/include/SDL_blendmode.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_clipboard.h b/ion/src/simulator/external/sdl/include/SDL_clipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_clipboard.h
rename to ion/src/simulator/external/sdl/include/SDL_clipboard.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_config.h b/ion/src/simulator/external/sdl/include/SDL_config.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_config.h
rename to ion/src/simulator/external/sdl/include/SDL_config.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_config_android.h b/ion/src/simulator/external/sdl/include/SDL_config_android.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_config_android.h
rename to ion/src/simulator/external/sdl/include/SDL_config_android.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_config_iphoneos.h b/ion/src/simulator/external/sdl/include/SDL_config_iphoneos.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_config_iphoneos.h
rename to ion/src/simulator/external/sdl/include/SDL_config_iphoneos.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_config_macosx.h b/ion/src/simulator/external/sdl/include/SDL_config_macosx.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_config_macosx.h
rename to ion/src/simulator/external/sdl/include/SDL_config_macosx.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_config_windows.h b/ion/src/simulator/external/sdl/include/SDL_config_windows.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_config_windows.h
rename to ion/src/simulator/external/sdl/include/SDL_config_windows.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_cpuinfo.h b/ion/src/simulator/external/sdl/include/SDL_cpuinfo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_cpuinfo.h
rename to ion/src/simulator/external/sdl/include/SDL_cpuinfo.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_egl.h b/ion/src/simulator/external/sdl/include/SDL_egl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_egl.h
rename to ion/src/simulator/external/sdl/include/SDL_egl.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_endian.h b/ion/src/simulator/external/sdl/include/SDL_endian.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_endian.h
rename to ion/src/simulator/external/sdl/include/SDL_endian.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_error.h b/ion/src/simulator/external/sdl/include/SDL_error.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_error.h
rename to ion/src/simulator/external/sdl/include/SDL_error.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_events.h b/ion/src/simulator/external/sdl/include/SDL_events.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_events.h
rename to ion/src/simulator/external/sdl/include/SDL_events.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_filesystem.h b/ion/src/simulator/external/sdl/include/SDL_filesystem.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_filesystem.h
rename to ion/src/simulator/external/sdl/include/SDL_filesystem.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_gamecontroller.h b/ion/src/simulator/external/sdl/include/SDL_gamecontroller.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_gamecontroller.h
rename to ion/src/simulator/external/sdl/include/SDL_gamecontroller.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_gesture.h b/ion/src/simulator/external/sdl/include/SDL_gesture.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_gesture.h
rename to ion/src/simulator/external/sdl/include/SDL_gesture.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_haptic.h b/ion/src/simulator/external/sdl/include/SDL_haptic.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_haptic.h
rename to ion/src/simulator/external/sdl/include/SDL_haptic.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_hints.h b/ion/src/simulator/external/sdl/include/SDL_hints.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_hints.h
rename to ion/src/simulator/external/sdl/include/SDL_hints.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_joystick.h b/ion/src/simulator/external/sdl/include/SDL_joystick.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_joystick.h
rename to ion/src/simulator/external/sdl/include/SDL_joystick.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_keyboard.h b/ion/src/simulator/external/sdl/include/SDL_keyboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_keyboard.h
rename to ion/src/simulator/external/sdl/include/SDL_keyboard.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_keycode.h b/ion/src/simulator/external/sdl/include/SDL_keycode.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_keycode.h
rename to ion/src/simulator/external/sdl/include/SDL_keycode.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_loadso.h b/ion/src/simulator/external/sdl/include/SDL_loadso.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_loadso.h
rename to ion/src/simulator/external/sdl/include/SDL_loadso.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_log.h b/ion/src/simulator/external/sdl/include/SDL_log.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_log.h
rename to ion/src/simulator/external/sdl/include/SDL_log.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_main.h b/ion/src/simulator/external/sdl/include/SDL_main.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_main.h
rename to ion/src/simulator/external/sdl/include/SDL_main.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_messagebox.h b/ion/src/simulator/external/sdl/include/SDL_messagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_messagebox.h
rename to ion/src/simulator/external/sdl/include/SDL_messagebox.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_mouse.h b/ion/src/simulator/external/sdl/include/SDL_mouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_mouse.h
rename to ion/src/simulator/external/sdl/include/SDL_mouse.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_mutex.h b/ion/src/simulator/external/sdl/include/SDL_mutex.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_mutex.h
rename to ion/src/simulator/external/sdl/include/SDL_mutex.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_name.h b/ion/src/simulator/external/sdl/include/SDL_name.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_name.h
rename to ion/src/simulator/external/sdl/include/SDL_name.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengl.h b/ion/src/simulator/external/sdl/include/SDL_opengl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengl.h
rename to ion/src/simulator/external/sdl/include/SDL_opengl.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengl_glext.h b/ion/src/simulator/external/sdl/include/SDL_opengl_glext.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengl_glext.h
rename to ion/src/simulator/external/sdl/include/SDL_opengl_glext.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengles.h b/ion/src/simulator/external/sdl/include/SDL_opengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengles.h
rename to ion/src/simulator/external/sdl/include/SDL_opengles.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengles2.h b/ion/src/simulator/external/sdl/include/SDL_opengles2.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengles2.h
rename to ion/src/simulator/external/sdl/include/SDL_opengles2.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengles2_gl2.h b/ion/src/simulator/external/sdl/include/SDL_opengles2_gl2.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengles2_gl2.h
rename to ion/src/simulator/external/sdl/include/SDL_opengles2_gl2.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengles2_gl2ext.h b/ion/src/simulator/external/sdl/include/SDL_opengles2_gl2ext.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengles2_gl2ext.h
rename to ion/src/simulator/external/sdl/include/SDL_opengles2_gl2ext.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengles2_gl2platform.h b/ion/src/simulator/external/sdl/include/SDL_opengles2_gl2platform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengles2_gl2platform.h
rename to ion/src/simulator/external/sdl/include/SDL_opengles2_gl2platform.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_opengles2_khrplatform.h b/ion/src/simulator/external/sdl/include/SDL_opengles2_khrplatform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_opengles2_khrplatform.h
rename to ion/src/simulator/external/sdl/include/SDL_opengles2_khrplatform.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_pixels.h b/ion/src/simulator/external/sdl/include/SDL_pixels.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_pixels.h
rename to ion/src/simulator/external/sdl/include/SDL_pixels.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_platform.h b/ion/src/simulator/external/sdl/include/SDL_platform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_platform.h
rename to ion/src/simulator/external/sdl/include/SDL_platform.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_power.h b/ion/src/simulator/external/sdl/include/SDL_power.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_power.h
rename to ion/src/simulator/external/sdl/include/SDL_power.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_quit.h b/ion/src/simulator/external/sdl/include/SDL_quit.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_quit.h
rename to ion/src/simulator/external/sdl/include/SDL_quit.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_rect.h b/ion/src/simulator/external/sdl/include/SDL_rect.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_rect.h
rename to ion/src/simulator/external/sdl/include/SDL_rect.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_render.h b/ion/src/simulator/external/sdl/include/SDL_render.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_render.h
rename to ion/src/simulator/external/sdl/include/SDL_render.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_revision.h b/ion/src/simulator/external/sdl/include/SDL_revision.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_revision.h
rename to ion/src/simulator/external/sdl/include/SDL_revision.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_rwops.h b/ion/src/simulator/external/sdl/include/SDL_rwops.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_rwops.h
rename to ion/src/simulator/external/sdl/include/SDL_rwops.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_scancode.h b/ion/src/simulator/external/sdl/include/SDL_scancode.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_scancode.h
rename to ion/src/simulator/external/sdl/include/SDL_scancode.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_sensor.h b/ion/src/simulator/external/sdl/include/SDL_sensor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_sensor.h
rename to ion/src/simulator/external/sdl/include/SDL_sensor.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_shape.h b/ion/src/simulator/external/sdl/include/SDL_shape.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_shape.h
rename to ion/src/simulator/external/sdl/include/SDL_shape.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_stdinc.h b/ion/src/simulator/external/sdl/include/SDL_stdinc.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_stdinc.h
rename to ion/src/simulator/external/sdl/include/SDL_stdinc.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_surface.h b/ion/src/simulator/external/sdl/include/SDL_surface.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_surface.h
rename to ion/src/simulator/external/sdl/include/SDL_surface.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_system.h b/ion/src/simulator/external/sdl/include/SDL_system.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_system.h
rename to ion/src/simulator/external/sdl/include/SDL_system.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_syswm.h b/ion/src/simulator/external/sdl/include/SDL_syswm.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_syswm.h
rename to ion/src/simulator/external/sdl/include/SDL_syswm.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_thread.h b/ion/src/simulator/external/sdl/include/SDL_thread.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_thread.h
rename to ion/src/simulator/external/sdl/include/SDL_thread.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_timer.h b/ion/src/simulator/external/sdl/include/SDL_timer.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_timer.h
rename to ion/src/simulator/external/sdl/include/SDL_timer.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_touch.h b/ion/src/simulator/external/sdl/include/SDL_touch.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_touch.h
rename to ion/src/simulator/external/sdl/include/SDL_touch.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_types.h b/ion/src/simulator/external/sdl/include/SDL_types.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_types.h
rename to ion/src/simulator/external/sdl/include/SDL_types.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_version.h b/ion/src/simulator/external/sdl/include/SDL_version.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_version.h
rename to ion/src/simulator/external/sdl/include/SDL_version.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_video.h b/ion/src/simulator/external/sdl/include/SDL_video.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_video.h
rename to ion/src/simulator/external/sdl/include/SDL_video.h
diff --git a/ion/src/sdl/external/sdl/include/SDL_vulkan.h b/ion/src/simulator/external/sdl/include/SDL_vulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/SDL_vulkan.h
rename to ion/src/simulator/external/sdl/include/SDL_vulkan.h
diff --git a/ion/src/sdl/external/sdl/include/begin_code.h b/ion/src/simulator/external/sdl/include/begin_code.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/begin_code.h
rename to ion/src/simulator/external/sdl/include/begin_code.h
diff --git a/ion/src/sdl/external/sdl/include/close_code.h b/ion/src/simulator/external/sdl/include/close_code.h
similarity index 100%
rename from ion/src/sdl/external/sdl/include/close_code.h
rename to ion/src/simulator/external/sdl/include/close_code.h
diff --git a/ion/src/sdl/external/sdl/src/SDL.c b/ion/src/simulator/external/sdl/src/SDL.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL.c
rename to ion/src/simulator/external/sdl/src/SDL.c
diff --git a/ion/src/sdl/external/sdl/src/SDL_assert.c b/ion/src/simulator/external/sdl/src/SDL_assert.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_assert.c
rename to ion/src/simulator/external/sdl/src/SDL_assert.c
diff --git a/ion/src/sdl/external/sdl/src/SDL_assert_c.h b/ion/src/simulator/external/sdl/src/SDL_assert_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_assert_c.h
rename to ion/src/simulator/external/sdl/src/SDL_assert_c.h
diff --git a/ion/src/sdl/external/sdl/src/SDL_dataqueue.c b/ion/src/simulator/external/sdl/src/SDL_dataqueue.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_dataqueue.c
rename to ion/src/simulator/external/sdl/src/SDL_dataqueue.c
diff --git a/ion/src/sdl/external/sdl/src/SDL_dataqueue.h b/ion/src/simulator/external/sdl/src/SDL_dataqueue.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_dataqueue.h
rename to ion/src/simulator/external/sdl/src/SDL_dataqueue.h
diff --git a/ion/src/sdl/external/sdl/src/SDL_error.c b/ion/src/simulator/external/sdl/src/SDL_error.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_error.c
rename to ion/src/simulator/external/sdl/src/SDL_error.c
diff --git a/ion/src/sdl/external/sdl/src/SDL_error_c.h b/ion/src/simulator/external/sdl/src/SDL_error_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_error_c.h
rename to ion/src/simulator/external/sdl/src/SDL_error_c.h
diff --git a/ion/src/sdl/external/sdl/src/SDL_hints.c b/ion/src/simulator/external/sdl/src/SDL_hints.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_hints.c
rename to ion/src/simulator/external/sdl/src/SDL_hints.c
diff --git a/ion/src/sdl/external/sdl/src/SDL_internal.h b/ion/src/simulator/external/sdl/src/SDL_internal.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_internal.h
rename to ion/src/simulator/external/sdl/src/SDL_internal.h
diff --git a/ion/src/sdl/external/sdl/src/SDL_log.c b/ion/src/simulator/external/sdl/src/SDL_log.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/SDL_log.c
rename to ion/src/simulator/external/sdl/src/SDL_log.c
diff --git a/ion/src/sdl/external/sdl/src/atomic/SDL_atomic.c b/ion/src/simulator/external/sdl/src/atomic/SDL_atomic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/atomic/SDL_atomic.c
rename to ion/src/simulator/external/sdl/src/atomic/SDL_atomic.c
diff --git a/ion/src/sdl/external/sdl/src/atomic/SDL_spinlock.c b/ion/src/simulator/external/sdl/src/atomic/SDL_spinlock.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/atomic/SDL_spinlock.c
rename to ion/src/simulator/external/sdl/src/atomic/SDL_spinlock.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_audio.c b/ion/src/simulator/external/sdl/src/audio/SDL_audio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_audio.c
rename to ion/src/simulator/external/sdl/src/audio/SDL_audio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_audio_c.h b/ion/src/simulator/external/sdl/src/audio/SDL_audio_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_audio_c.h
rename to ion/src/simulator/external/sdl/src/audio/SDL_audio_c.h
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_audiocvt.c b/ion/src/simulator/external/sdl/src/audio/SDL_audiocvt.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_audiocvt.c
rename to ion/src/simulator/external/sdl/src/audio/SDL_audiocvt.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_audiodev.c b/ion/src/simulator/external/sdl/src/audio/SDL_audiodev.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_audiodev.c
rename to ion/src/simulator/external/sdl/src/audio/SDL_audiodev.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_audiodev_c.h b/ion/src/simulator/external/sdl/src/audio/SDL_audiodev_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_audiodev_c.h
rename to ion/src/simulator/external/sdl/src/audio/SDL_audiodev_c.h
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_audiotypecvt.c b/ion/src/simulator/external/sdl/src/audio/SDL_audiotypecvt.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_audiotypecvt.c
rename to ion/src/simulator/external/sdl/src/audio/SDL_audiotypecvt.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_mixer.c b/ion/src/simulator/external/sdl/src/audio/SDL_mixer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_mixer.c
rename to ion/src/simulator/external/sdl/src/audio/SDL_mixer.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_sysaudio.h b/ion/src/simulator/external/sdl/src/audio/SDL_sysaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_sysaudio.h
rename to ion/src/simulator/external/sdl/src/audio/SDL_sysaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_wave.c b/ion/src/simulator/external/sdl/src/audio/SDL_wave.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_wave.c
rename to ion/src/simulator/external/sdl/src/audio/SDL_wave.c
diff --git a/ion/src/sdl/external/sdl/src/audio/SDL_wave.h b/ion/src/simulator/external/sdl/src/audio/SDL_wave.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/SDL_wave.h
rename to ion/src/simulator/external/sdl/src/audio/SDL_wave.h
diff --git a/ion/src/sdl/external/sdl/src/audio/alsa/SDL_alsa_audio.c b/ion/src/simulator/external/sdl/src/audio/alsa/SDL_alsa_audio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/alsa/SDL_alsa_audio.c
rename to ion/src/simulator/external/sdl/src/audio/alsa/SDL_alsa_audio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/alsa/SDL_alsa_audio.h b/ion/src/simulator/external/sdl/src/audio/alsa/SDL_alsa_audio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/alsa/SDL_alsa_audio.h
rename to ion/src/simulator/external/sdl/src/audio/alsa/SDL_alsa_audio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/android/SDL_androidaudio.c b/ion/src/simulator/external/sdl/src/audio/android/SDL_androidaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/android/SDL_androidaudio.c
rename to ion/src/simulator/external/sdl/src/audio/android/SDL_androidaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/android/SDL_androidaudio.h b/ion/src/simulator/external/sdl/src/audio/android/SDL_androidaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/android/SDL_androidaudio.h
rename to ion/src/simulator/external/sdl/src/audio/android/SDL_androidaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/arts/SDL_artsaudio.c b/ion/src/simulator/external/sdl/src/audio/arts/SDL_artsaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/arts/SDL_artsaudio.c
rename to ion/src/simulator/external/sdl/src/audio/arts/SDL_artsaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/arts/SDL_artsaudio.h b/ion/src/simulator/external/sdl/src/audio/arts/SDL_artsaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/arts/SDL_artsaudio.h
rename to ion/src/simulator/external/sdl/src/audio/arts/SDL_artsaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/coreaudio/SDL_coreaudio.h b/ion/src/simulator/external/sdl/src/audio/coreaudio/SDL_coreaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/coreaudio/SDL_coreaudio.h
rename to ion/src/simulator/external/sdl/src/audio/coreaudio/SDL_coreaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/coreaudio/SDL_coreaudio.m b/ion/src/simulator/external/sdl/src/audio/coreaudio/SDL_coreaudio.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/coreaudio/SDL_coreaudio.m
rename to ion/src/simulator/external/sdl/src/audio/coreaudio/SDL_coreaudio.m
diff --git a/ion/src/sdl/external/sdl/src/audio/directsound/SDL_directsound.c b/ion/src/simulator/external/sdl/src/audio/directsound/SDL_directsound.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/directsound/SDL_directsound.c
rename to ion/src/simulator/external/sdl/src/audio/directsound/SDL_directsound.c
diff --git a/ion/src/sdl/external/sdl/src/audio/directsound/SDL_directsound.h b/ion/src/simulator/external/sdl/src/audio/directsound/SDL_directsound.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/directsound/SDL_directsound.h
rename to ion/src/simulator/external/sdl/src/audio/directsound/SDL_directsound.h
diff --git a/ion/src/sdl/external/sdl/src/audio/disk/SDL_diskaudio.c b/ion/src/simulator/external/sdl/src/audio/disk/SDL_diskaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/disk/SDL_diskaudio.c
rename to ion/src/simulator/external/sdl/src/audio/disk/SDL_diskaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/disk/SDL_diskaudio.h b/ion/src/simulator/external/sdl/src/audio/disk/SDL_diskaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/disk/SDL_diskaudio.h
rename to ion/src/simulator/external/sdl/src/audio/disk/SDL_diskaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/dsp/SDL_dspaudio.c b/ion/src/simulator/external/sdl/src/audio/dsp/SDL_dspaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/dsp/SDL_dspaudio.c
rename to ion/src/simulator/external/sdl/src/audio/dsp/SDL_dspaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/dsp/SDL_dspaudio.h b/ion/src/simulator/external/sdl/src/audio/dsp/SDL_dspaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/dsp/SDL_dspaudio.h
rename to ion/src/simulator/external/sdl/src/audio/dsp/SDL_dspaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/dummy/SDL_dummyaudio.c b/ion/src/simulator/external/sdl/src/audio/dummy/SDL_dummyaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/dummy/SDL_dummyaudio.c
rename to ion/src/simulator/external/sdl/src/audio/dummy/SDL_dummyaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/dummy/SDL_dummyaudio.h b/ion/src/simulator/external/sdl/src/audio/dummy/SDL_dummyaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/dummy/SDL_dummyaudio.h
rename to ion/src/simulator/external/sdl/src/audio/dummy/SDL_dummyaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.c b/ion/src/simulator/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.c
rename to ion/src/simulator/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.h b/ion/src/simulator/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.h
rename to ion/src/simulator/external/sdl/src/audio/emscripten/SDL_emscriptenaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/esd/SDL_esdaudio.c b/ion/src/simulator/external/sdl/src/audio/esd/SDL_esdaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/esd/SDL_esdaudio.c
rename to ion/src/simulator/external/sdl/src/audio/esd/SDL_esdaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/esd/SDL_esdaudio.h b/ion/src/simulator/external/sdl/src/audio/esd/SDL_esdaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/esd/SDL_esdaudio.h
rename to ion/src/simulator/external/sdl/src/audio/esd/SDL_esdaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/fusionsound/SDL_fsaudio.c b/ion/src/simulator/external/sdl/src/audio/fusionsound/SDL_fsaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/fusionsound/SDL_fsaudio.c
rename to ion/src/simulator/external/sdl/src/audio/fusionsound/SDL_fsaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/fusionsound/SDL_fsaudio.h b/ion/src/simulator/external/sdl/src/audio/fusionsound/SDL_fsaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/fusionsound/SDL_fsaudio.h
rename to ion/src/simulator/external/sdl/src/audio/fusionsound/SDL_fsaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/haiku/SDL_haikuaudio.cc b/ion/src/simulator/external/sdl/src/audio/haiku/SDL_haikuaudio.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/haiku/SDL_haikuaudio.cc
rename to ion/src/simulator/external/sdl/src/audio/haiku/SDL_haikuaudio.cc
diff --git a/ion/src/sdl/external/sdl/src/audio/haiku/SDL_haikuaudio.h b/ion/src/simulator/external/sdl/src/audio/haiku/SDL_haikuaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/haiku/SDL_haikuaudio.h
rename to ion/src/simulator/external/sdl/src/audio/haiku/SDL_haikuaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/jack/SDL_jackaudio.c b/ion/src/simulator/external/sdl/src/audio/jack/SDL_jackaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/jack/SDL_jackaudio.c
rename to ion/src/simulator/external/sdl/src/audio/jack/SDL_jackaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/jack/SDL_jackaudio.h b/ion/src/simulator/external/sdl/src/audio/jack/SDL_jackaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/jack/SDL_jackaudio.h
rename to ion/src/simulator/external/sdl/src/audio/jack/SDL_jackaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/nacl/SDL_naclaudio.c b/ion/src/simulator/external/sdl/src/audio/nacl/SDL_naclaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/nacl/SDL_naclaudio.c
rename to ion/src/simulator/external/sdl/src/audio/nacl/SDL_naclaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/nacl/SDL_naclaudio.h b/ion/src/simulator/external/sdl/src/audio/nacl/SDL_naclaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/nacl/SDL_naclaudio.h
rename to ion/src/simulator/external/sdl/src/audio/nacl/SDL_naclaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/nas/SDL_nasaudio.c b/ion/src/simulator/external/sdl/src/audio/nas/SDL_nasaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/nas/SDL_nasaudio.c
rename to ion/src/simulator/external/sdl/src/audio/nas/SDL_nasaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/nas/SDL_nasaudio.h b/ion/src/simulator/external/sdl/src/audio/nas/SDL_nasaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/nas/SDL_nasaudio.h
rename to ion/src/simulator/external/sdl/src/audio/nas/SDL_nasaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/netbsd/SDL_netbsdaudio.c b/ion/src/simulator/external/sdl/src/audio/netbsd/SDL_netbsdaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/netbsd/SDL_netbsdaudio.c
rename to ion/src/simulator/external/sdl/src/audio/netbsd/SDL_netbsdaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/netbsd/SDL_netbsdaudio.h b/ion/src/simulator/external/sdl/src/audio/netbsd/SDL_netbsdaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/netbsd/SDL_netbsdaudio.h
rename to ion/src/simulator/external/sdl/src/audio/netbsd/SDL_netbsdaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/openslES/SDL_openslES.c b/ion/src/simulator/external/sdl/src/audio/openslES/SDL_openslES.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/openslES/SDL_openslES.c
rename to ion/src/simulator/external/sdl/src/audio/openslES/SDL_openslES.c
diff --git a/ion/src/sdl/external/sdl/src/audio/openslES/SDL_openslES.h b/ion/src/simulator/external/sdl/src/audio/openslES/SDL_openslES.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/openslES/SDL_openslES.h
rename to ion/src/simulator/external/sdl/src/audio/openslES/SDL_openslES.h
diff --git a/ion/src/sdl/external/sdl/src/audio/paudio/SDL_paudio.c b/ion/src/simulator/external/sdl/src/audio/paudio/SDL_paudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/paudio/SDL_paudio.c
rename to ion/src/simulator/external/sdl/src/audio/paudio/SDL_paudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/paudio/SDL_paudio.h b/ion/src/simulator/external/sdl/src/audio/paudio/SDL_paudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/paudio/SDL_paudio.h
rename to ion/src/simulator/external/sdl/src/audio/paudio/SDL_paudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/psp/SDL_pspaudio.c b/ion/src/simulator/external/sdl/src/audio/psp/SDL_pspaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/psp/SDL_pspaudio.c
rename to ion/src/simulator/external/sdl/src/audio/psp/SDL_pspaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/psp/SDL_pspaudio.h b/ion/src/simulator/external/sdl/src/audio/psp/SDL_pspaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/psp/SDL_pspaudio.h
rename to ion/src/simulator/external/sdl/src/audio/psp/SDL_pspaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.c b/ion/src/simulator/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
rename to ion/src/simulator/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.h b/ion/src/simulator/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
rename to ion/src/simulator/external/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/qsa/SDL_qsa_audio.c b/ion/src/simulator/external/sdl/src/audio/qsa/SDL_qsa_audio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/qsa/SDL_qsa_audio.c
rename to ion/src/simulator/external/sdl/src/audio/qsa/SDL_qsa_audio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/qsa/SDL_qsa_audio.h b/ion/src/simulator/external/sdl/src/audio/qsa/SDL_qsa_audio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/qsa/SDL_qsa_audio.h
rename to ion/src/simulator/external/sdl/src/audio/qsa/SDL_qsa_audio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/sndio/SDL_sndioaudio.c b/ion/src/simulator/external/sdl/src/audio/sndio/SDL_sndioaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/sndio/SDL_sndioaudio.c
rename to ion/src/simulator/external/sdl/src/audio/sndio/SDL_sndioaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/sndio/SDL_sndioaudio.h b/ion/src/simulator/external/sdl/src/audio/sndio/SDL_sndioaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/sndio/SDL_sndioaudio.h
rename to ion/src/simulator/external/sdl/src/audio/sndio/SDL_sndioaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/sun/SDL_sunaudio.c b/ion/src/simulator/external/sdl/src/audio/sun/SDL_sunaudio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/sun/SDL_sunaudio.c
rename to ion/src/simulator/external/sdl/src/audio/sun/SDL_sunaudio.c
diff --git a/ion/src/sdl/external/sdl/src/audio/sun/SDL_sunaudio.h b/ion/src/simulator/external/sdl/src/audio/sun/SDL_sunaudio.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/sun/SDL_sunaudio.h
rename to ion/src/simulator/external/sdl/src/audio/sun/SDL_sunaudio.h
diff --git a/ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi.c b/ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi.c
rename to ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi.c
diff --git a/ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi.h b/ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi.h
rename to ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi.h
diff --git a/ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi_win32.c b/ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi_win32.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi_win32.c
rename to ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi_win32.c
diff --git a/ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp b/ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp
rename to ion/src/simulator/external/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp
diff --git a/ion/src/sdl/external/sdl/src/audio/winmm/SDL_winmm.c b/ion/src/simulator/external/sdl/src/audio/winmm/SDL_winmm.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/winmm/SDL_winmm.c
rename to ion/src/simulator/external/sdl/src/audio/winmm/SDL_winmm.c
diff --git a/ion/src/sdl/external/sdl/src/audio/winmm/SDL_winmm.h b/ion/src/simulator/external/sdl/src/audio/winmm/SDL_winmm.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/audio/winmm/SDL_winmm.h
rename to ion/src/simulator/external/sdl/src/audio/winmm/SDL_winmm.h
diff --git a/ion/src/sdl/external/sdl/src/core/android/SDL_android.c b/ion/src/simulator/external/sdl/src/core/android/SDL_android.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/android/SDL_android.c
rename to ion/src/simulator/external/sdl/src/core/android/SDL_android.c
diff --git a/ion/src/sdl/external/sdl/src/core/android/SDL_android.h b/ion/src/simulator/external/sdl/src/core/android/SDL_android.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/android/SDL_android.h
rename to ion/src/simulator/external/sdl/src/core/android/SDL_android.h
diff --git a/ion/src/sdl/external/sdl/src/core/android/keyinfotable.h b/ion/src/simulator/external/sdl/src/core/android/keyinfotable.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/android/keyinfotable.h
rename to ion/src/simulator/external/sdl/src/core/android/keyinfotable.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_dbus.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_dbus.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_dbus.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_dbus.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_dbus.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_dbus.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_dbus.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_dbus.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_evdev.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_evdev.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_evdev.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_evdev.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_evdev.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_evdev.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_evdev.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_evdev.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_fcitx.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_fcitx.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_fcitx.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_fcitx.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_fcitx.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_fcitx.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_fcitx.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_fcitx.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_ibus.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_ibus.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_ibus.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_ibus.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_ibus.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_ibus.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_ibus.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_ibus.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_ime.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_ime.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_ime.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_ime.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_ime.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_ime.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_ime.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_ime.h
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_threadprio.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_threadprio.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_threadprio.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_threadprio.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_udev.c b/ion/src/simulator/external/sdl/src/core/linux/SDL_udev.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_udev.c
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_udev.c
diff --git a/ion/src/sdl/external/sdl/src/core/linux/SDL_udev.h b/ion/src/simulator/external/sdl/src/core/linux/SDL_udev.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/linux/SDL_udev.h
rename to ion/src/simulator/external/sdl/src/core/linux/SDL_udev.h
diff --git a/ion/src/sdl/external/sdl/src/core/unix/SDL_poll.c b/ion/src/simulator/external/sdl/src/core/unix/SDL_poll.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/unix/SDL_poll.c
rename to ion/src/simulator/external/sdl/src/core/unix/SDL_poll.c
diff --git a/ion/src/sdl/external/sdl/src/core/unix/SDL_poll.h b/ion/src/simulator/external/sdl/src/core/unix/SDL_poll.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/unix/SDL_poll.h
rename to ion/src/simulator/external/sdl/src/core/unix/SDL_poll.h
diff --git a/ion/src/sdl/external/sdl/src/core/windows/SDL_directx.h b/ion/src/simulator/external/sdl/src/core/windows/SDL_directx.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/windows/SDL_directx.h
rename to ion/src/simulator/external/sdl/src/core/windows/SDL_directx.h
diff --git a/ion/src/sdl/external/sdl/src/core/windows/SDL_windows.c b/ion/src/simulator/external/sdl/src/core/windows/SDL_windows.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/windows/SDL_windows.c
rename to ion/src/simulator/external/sdl/src/core/windows/SDL_windows.c
diff --git a/ion/src/sdl/external/sdl/src/core/windows/SDL_windows.h b/ion/src/simulator/external/sdl/src/core/windows/SDL_windows.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/windows/SDL_windows.h
rename to ion/src/simulator/external/sdl/src/core/windows/SDL_windows.h
diff --git a/ion/src/sdl/external/sdl/src/core/windows/SDL_xinput.c b/ion/src/simulator/external/sdl/src/core/windows/SDL_xinput.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/windows/SDL_xinput.c
rename to ion/src/simulator/external/sdl/src/core/windows/SDL_xinput.c
diff --git a/ion/src/sdl/external/sdl/src/core/windows/SDL_xinput.h b/ion/src/simulator/external/sdl/src/core/windows/SDL_xinput.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/windows/SDL_xinput.h
rename to ion/src/simulator/external/sdl/src/core/windows/SDL_xinput.h
diff --git a/ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_common.cpp b/ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_common.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_common.cpp
rename to ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_common.cpp
diff --git a/ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_common.h b/ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_common.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_common.h
rename to ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_common.h
diff --git a/ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp b/ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
rename to ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
diff --git a/ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.h b/ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
rename to ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
diff --git a/ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp b/ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
rename to ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
diff --git a/ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_xaml.h b/ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_xaml.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/core/winrt/SDL_winrtapp_xaml.h
rename to ion/src/simulator/external/sdl/src/core/winrt/SDL_winrtapp_xaml.h
diff --git a/ion/src/sdl/external/sdl/src/cpuinfo/SDL_cpuinfo.c b/ion/src/simulator/external/sdl/src/cpuinfo/SDL_cpuinfo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/cpuinfo/SDL_cpuinfo.c
rename to ion/src/simulator/external/sdl/src/cpuinfo/SDL_cpuinfo.c
diff --git a/ion/src/sdl/external/sdl/src/cpuinfo/SDL_simd.h b/ion/src/simulator/external/sdl/src/cpuinfo/SDL_simd.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/cpuinfo/SDL_simd.h
rename to ion/src/simulator/external/sdl/src/cpuinfo/SDL_simd.h
diff --git a/ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi.c b/ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi.c
rename to ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi.c
diff --git a/ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi.h b/ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi.h
rename to ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi.h
diff --git a/ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi_overrides.h b/ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi_overrides.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi_overrides.h
rename to ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi_overrides.h
diff --git a/ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi_procs.h b/ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi_procs.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/dynapi/SDL_dynapi_procs.h
rename to ion/src/simulator/external/sdl/src/dynapi/SDL_dynapi_procs.h
diff --git a/ion/src/sdl/external/sdl/src/dynapi/gendynapi.pl b/ion/src/simulator/external/sdl/src/dynapi/gendynapi.pl
similarity index 100%
rename from ion/src/sdl/external/sdl/src/dynapi/gendynapi.pl
rename to ion/src/simulator/external/sdl/src/dynapi/gendynapi.pl
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_clipboardevents.c b/ion/src/simulator/external/sdl/src/events/SDL_clipboardevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_clipboardevents.c
rename to ion/src/simulator/external/sdl/src/events/SDL_clipboardevents.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_clipboardevents_c.h b/ion/src/simulator/external/sdl/src/events/SDL_clipboardevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_clipboardevents_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_clipboardevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_displayevents.c b/ion/src/simulator/external/sdl/src/events/SDL_displayevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_displayevents.c
rename to ion/src/simulator/external/sdl/src/events/SDL_displayevents.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_displayevents_c.h b/ion/src/simulator/external/sdl/src/events/SDL_displayevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_displayevents_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_displayevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_dropevents.c b/ion/src/simulator/external/sdl/src/events/SDL_dropevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_dropevents.c
rename to ion/src/simulator/external/sdl/src/events/SDL_dropevents.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_dropevents_c.h b/ion/src/simulator/external/sdl/src/events/SDL_dropevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_dropevents_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_dropevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_events.c b/ion/src/simulator/external/sdl/src/events/SDL_events.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_events.c
rename to ion/src/simulator/external/sdl/src/events/SDL_events.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_events_c.h b/ion/src/simulator/external/sdl/src/events/SDL_events_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_events_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_events_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_gesture.c b/ion/src/simulator/external/sdl/src/events/SDL_gesture.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_gesture.c
rename to ion/src/simulator/external/sdl/src/events/SDL_gesture.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_gesture_c.h b/ion/src/simulator/external/sdl/src/events/SDL_gesture_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_gesture_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_gesture_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_keyboard.c b/ion/src/simulator/external/sdl/src/events/SDL_keyboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_keyboard.c
rename to ion/src/simulator/external/sdl/src/events/SDL_keyboard.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_keyboard_c.h b/ion/src/simulator/external/sdl/src/events/SDL_keyboard_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_keyboard_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_keyboard_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_mouse.c b/ion/src/simulator/external/sdl/src/events/SDL_mouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_mouse.c
rename to ion/src/simulator/external/sdl/src/events/SDL_mouse.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_mouse_c.h b/ion/src/simulator/external/sdl/src/events/SDL_mouse_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_mouse_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_mouse_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_quit.c b/ion/src/simulator/external/sdl/src/events/SDL_quit.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_quit.c
rename to ion/src/simulator/external/sdl/src/events/SDL_quit.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_sysevents.h b/ion/src/simulator/external/sdl/src/events/SDL_sysevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_sysevents.h
rename to ion/src/simulator/external/sdl/src/events/SDL_sysevents.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_touch.c b/ion/src/simulator/external/sdl/src/events/SDL_touch.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_touch.c
rename to ion/src/simulator/external/sdl/src/events/SDL_touch.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_touch_c.h b/ion/src/simulator/external/sdl/src/events/SDL_touch_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_touch_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_touch_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_windowevents.c b/ion/src/simulator/external/sdl/src/events/SDL_windowevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_windowevents.c
rename to ion/src/simulator/external/sdl/src/events/SDL_windowevents.c
diff --git a/ion/src/sdl/external/sdl/src/events/SDL_windowevents_c.h b/ion/src/simulator/external/sdl/src/events/SDL_windowevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/SDL_windowevents_c.h
rename to ion/src/simulator/external/sdl/src/events/SDL_windowevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/events/blank_cursor.h b/ion/src/simulator/external/sdl/src/events/blank_cursor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/blank_cursor.h
rename to ion/src/simulator/external/sdl/src/events/blank_cursor.h
diff --git a/ion/src/sdl/external/sdl/src/events/default_cursor.h b/ion/src/simulator/external/sdl/src/events/default_cursor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/default_cursor.h
rename to ion/src/simulator/external/sdl/src/events/default_cursor.h
diff --git a/ion/src/sdl/external/sdl/src/events/scancodes_darwin.h b/ion/src/simulator/external/sdl/src/events/scancodes_darwin.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/scancodes_darwin.h
rename to ion/src/simulator/external/sdl/src/events/scancodes_darwin.h
diff --git a/ion/src/sdl/external/sdl/src/events/scancodes_linux.h b/ion/src/simulator/external/sdl/src/events/scancodes_linux.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/scancodes_linux.h
rename to ion/src/simulator/external/sdl/src/events/scancodes_linux.h
diff --git a/ion/src/sdl/external/sdl/src/events/scancodes_windows.h b/ion/src/simulator/external/sdl/src/events/scancodes_windows.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/scancodes_windows.h
rename to ion/src/simulator/external/sdl/src/events/scancodes_windows.h
diff --git a/ion/src/sdl/external/sdl/src/events/scancodes_xfree86.h b/ion/src/simulator/external/sdl/src/events/scancodes_xfree86.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/events/scancodes_xfree86.h
rename to ion/src/simulator/external/sdl/src/events/scancodes_xfree86.h
diff --git a/ion/src/sdl/external/sdl/src/file/SDL_rwops.c b/ion/src/simulator/external/sdl/src/file/SDL_rwops.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/file/SDL_rwops.c
rename to ion/src/simulator/external/sdl/src/file/SDL_rwops.c
diff --git a/ion/src/sdl/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h b/ion/src/simulator/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
rename to ion/src/simulator/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
diff --git a/ion/src/sdl/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m b/ion/src/simulator/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
rename to ion/src/simulator/external/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
diff --git a/ion/src/sdl/external/sdl/src/filesystem/android/SDL_sysfilesystem.c b/ion/src/simulator/external/sdl/src/filesystem/android/SDL_sysfilesystem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/android/SDL_sysfilesystem.c
rename to ion/src/simulator/external/sdl/src/filesystem/android/SDL_sysfilesystem.c
diff --git a/ion/src/sdl/external/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m b/ion/src/simulator/external/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
rename to ion/src/simulator/external/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
diff --git a/ion/src/sdl/external/sdl/src/filesystem/dummy/SDL_sysfilesystem.c b/ion/src/simulator/external/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
rename to ion/src/simulator/external/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
diff --git a/ion/src/sdl/external/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c b/ion/src/simulator/external/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c
rename to ion/src/simulator/external/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c
diff --git a/ion/src/sdl/external/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc b/ion/src/simulator/external/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
rename to ion/src/simulator/external/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
diff --git a/ion/src/sdl/external/sdl/src/filesystem/nacl/SDL_sysfilesystem.c b/ion/src/simulator/external/sdl/src/filesystem/nacl/SDL_sysfilesystem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/nacl/SDL_sysfilesystem.c
rename to ion/src/simulator/external/sdl/src/filesystem/nacl/SDL_sysfilesystem.c
diff --git a/ion/src/sdl/external/sdl/src/filesystem/unix/SDL_sysfilesystem.c b/ion/src/simulator/external/sdl/src/filesystem/unix/SDL_sysfilesystem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/unix/SDL_sysfilesystem.c
rename to ion/src/simulator/external/sdl/src/filesystem/unix/SDL_sysfilesystem.c
diff --git a/ion/src/sdl/external/sdl/src/filesystem/windows/SDL_sysfilesystem.c b/ion/src/simulator/external/sdl/src/filesystem/windows/SDL_sysfilesystem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/windows/SDL_sysfilesystem.c
rename to ion/src/simulator/external/sdl/src/filesystem/windows/SDL_sysfilesystem.c
diff --git a/ion/src/sdl/external/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp b/ion/src/simulator/external/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
rename to ion/src/simulator/external/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
diff --git a/ion/src/sdl/external/sdl/src/haptic/SDL_haptic.c b/ion/src/simulator/external/sdl/src/haptic/SDL_haptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/SDL_haptic.c
rename to ion/src/simulator/external/sdl/src/haptic/SDL_haptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/SDL_haptic_c.h b/ion/src/simulator/external/sdl/src/haptic/SDL_haptic_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/SDL_haptic_c.h
rename to ion/src/simulator/external/sdl/src/haptic/SDL_haptic_c.h
diff --git a/ion/src/sdl/external/sdl/src/haptic/SDL_syshaptic.h b/ion/src/simulator/external/sdl/src/haptic/SDL_syshaptic.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/SDL_syshaptic.h
rename to ion/src/simulator/external/sdl/src/haptic/SDL_syshaptic.h
diff --git a/ion/src/sdl/external/sdl/src/haptic/android/SDL_syshaptic.c b/ion/src/simulator/external/sdl/src/haptic/android/SDL_syshaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/android/SDL_syshaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/android/SDL_syshaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/android/SDL_syshaptic_c.h b/ion/src/simulator/external/sdl/src/haptic/android/SDL_syshaptic_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/android/SDL_syshaptic_c.h
rename to ion/src/simulator/external/sdl/src/haptic/android/SDL_syshaptic_c.h
diff --git a/ion/src/sdl/external/sdl/src/haptic/darwin/SDL_syshaptic.c b/ion/src/simulator/external/sdl/src/haptic/darwin/SDL_syshaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/darwin/SDL_syshaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/darwin/SDL_syshaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/darwin/SDL_syshaptic_c.h b/ion/src/simulator/external/sdl/src/haptic/darwin/SDL_syshaptic_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/darwin/SDL_syshaptic_c.h
rename to ion/src/simulator/external/sdl/src/haptic/darwin/SDL_syshaptic_c.h
diff --git a/ion/src/sdl/external/sdl/src/haptic/dummy/SDL_syshaptic.c b/ion/src/simulator/external/sdl/src/haptic/dummy/SDL_syshaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/dummy/SDL_syshaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/dummy/SDL_syshaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/linux/SDL_syshaptic.c b/ion/src/simulator/external/sdl/src/haptic/linux/SDL_syshaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/linux/SDL_syshaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/linux/SDL_syshaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/windows/SDL_dinputhaptic.c b/ion/src/simulator/external/sdl/src/haptic/windows/SDL_dinputhaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/windows/SDL_dinputhaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/windows/SDL_dinputhaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/windows/SDL_dinputhaptic_c.h b/ion/src/simulator/external/sdl/src/haptic/windows/SDL_dinputhaptic_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/windows/SDL_dinputhaptic_c.h
rename to ion/src/simulator/external/sdl/src/haptic/windows/SDL_dinputhaptic_c.h
diff --git a/ion/src/sdl/external/sdl/src/haptic/windows/SDL_windowshaptic.c b/ion/src/simulator/external/sdl/src/haptic/windows/SDL_windowshaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/windows/SDL_windowshaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/windows/SDL_windowshaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/windows/SDL_windowshaptic_c.h b/ion/src/simulator/external/sdl/src/haptic/windows/SDL_windowshaptic_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/windows/SDL_windowshaptic_c.h
rename to ion/src/simulator/external/sdl/src/haptic/windows/SDL_windowshaptic_c.h
diff --git a/ion/src/sdl/external/sdl/src/haptic/windows/SDL_xinputhaptic.c b/ion/src/simulator/external/sdl/src/haptic/windows/SDL_xinputhaptic.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/windows/SDL_xinputhaptic.c
rename to ion/src/simulator/external/sdl/src/haptic/windows/SDL_xinputhaptic.c
diff --git a/ion/src/sdl/external/sdl/src/haptic/windows/SDL_xinputhaptic_c.h b/ion/src/simulator/external/sdl/src/haptic/windows/SDL_xinputhaptic_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/haptic/windows/SDL_xinputhaptic_c.h
rename to ion/src/simulator/external/sdl/src/haptic/windows/SDL_xinputhaptic_c.h
diff --git a/ion/src/sdl/external/sdl/src/hidapi/LICENSE-bsd.txt b/ion/src/simulator/external/sdl/src/hidapi/LICENSE-bsd.txt
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/LICENSE-bsd.txt
rename to ion/src/simulator/external/sdl/src/hidapi/LICENSE-bsd.txt
diff --git a/ion/src/sdl/external/sdl/src/hidapi/LICENSE-gpl3.txt b/ion/src/simulator/external/sdl/src/hidapi/LICENSE-gpl3.txt
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/LICENSE-gpl3.txt
rename to ion/src/simulator/external/sdl/src/hidapi/LICENSE-gpl3.txt
diff --git a/ion/src/sdl/external/sdl/src/hidapi/LICENSE-orig.txt b/ion/src/simulator/external/sdl/src/hidapi/LICENSE-orig.txt
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/LICENSE-orig.txt
rename to ion/src/simulator/external/sdl/src/hidapi/LICENSE-orig.txt
diff --git a/ion/src/sdl/external/sdl/src/hidapi/LICENSE.txt b/ion/src/simulator/external/sdl/src/hidapi/LICENSE.txt
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/LICENSE.txt
rename to ion/src/simulator/external/sdl/src/hidapi/LICENSE.txt
diff --git a/ion/src/sdl/external/sdl/src/hidapi/android/hid.cpp b/ion/src/simulator/external/sdl/src/hidapi/android/hid.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/android/hid.cpp
rename to ion/src/simulator/external/sdl/src/hidapi/android/hid.cpp
diff --git a/ion/src/sdl/external/sdl/src/hidapi/hidapi/hidapi.h b/ion/src/simulator/external/sdl/src/hidapi/hidapi/hidapi.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/hidapi/hidapi.h
rename to ion/src/simulator/external/sdl/src/hidapi/hidapi/hidapi.h
diff --git a/ion/src/sdl/external/sdl/src/hidapi/ios/hid.m b/ion/src/simulator/external/sdl/src/hidapi/ios/hid.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/ios/hid.m
rename to ion/src/simulator/external/sdl/src/hidapi/ios/hid.m
diff --git a/ion/src/sdl/external/sdl/src/hidapi/libusb/hid.c b/ion/src/simulator/external/sdl/src/hidapi/libusb/hid.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/libusb/hid.c
rename to ion/src/simulator/external/sdl/src/hidapi/libusb/hid.c
diff --git a/ion/src/sdl/external/sdl/src/hidapi/libusb/hidusb.cpp b/ion/src/simulator/external/sdl/src/hidapi/libusb/hidusb.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/libusb/hidusb.cpp
rename to ion/src/simulator/external/sdl/src/hidapi/libusb/hidusb.cpp
diff --git a/ion/src/sdl/external/sdl/src/hidapi/linux/hid.c b/ion/src/simulator/external/sdl/src/hidapi/linux/hid.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/linux/hid.c
rename to ion/src/simulator/external/sdl/src/hidapi/linux/hid.c
diff --git a/ion/src/sdl/external/sdl/src/hidapi/linux/hid.cpp b/ion/src/simulator/external/sdl/src/hidapi/linux/hid.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/linux/hid.cpp
rename to ion/src/simulator/external/sdl/src/hidapi/linux/hid.cpp
diff --git a/ion/src/sdl/external/sdl/src/hidapi/linux/hidraw.cpp b/ion/src/simulator/external/sdl/src/hidapi/linux/hidraw.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/linux/hidraw.cpp
rename to ion/src/simulator/external/sdl/src/hidapi/linux/hidraw.cpp
diff --git a/ion/src/sdl/external/sdl/src/hidapi/mac/hid.c b/ion/src/simulator/external/sdl/src/hidapi/mac/hid.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/mac/hid.c
rename to ion/src/simulator/external/sdl/src/hidapi/mac/hid.c
diff --git a/ion/src/sdl/external/sdl/src/hidapi/windows/hid.c b/ion/src/simulator/external/sdl/src/hidapi/windows/hid.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/hidapi/windows/hid.c
rename to ion/src/simulator/external/sdl/src/hidapi/windows/hid.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/SDL_gamecontroller.c b/ion/src/simulator/external/sdl/src/joystick/SDL_gamecontroller.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/SDL_gamecontroller.c
rename to ion/src/simulator/external/sdl/src/joystick/SDL_gamecontroller.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/SDL_gamecontrollerdb.h b/ion/src/simulator/external/sdl/src/joystick/SDL_gamecontrollerdb.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/SDL_gamecontrollerdb.h
rename to ion/src/simulator/external/sdl/src/joystick/SDL_gamecontrollerdb.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/SDL_joystick.c b/ion/src/simulator/external/sdl/src/joystick/SDL_joystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/SDL_joystick.c
rename to ion/src/simulator/external/sdl/src/joystick/SDL_joystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/SDL_joystick_c.h b/ion/src/simulator/external/sdl/src/joystick/SDL_joystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/SDL_joystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/SDL_joystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/SDL_sysjoystick.h b/ion/src/simulator/external/sdl/src/joystick/SDL_sysjoystick.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/SDL_sysjoystick.h
rename to ion/src/simulator/external/sdl/src/joystick/SDL_sysjoystick.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/android/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/android/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/android/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/android/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/android/SDL_sysjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/android/SDL_sysjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/android/SDL_sysjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/android/SDL_sysjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/bsd/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/bsd/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/bsd/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/bsd/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/controller_type.h b/ion/src/simulator/external/sdl/src/joystick/controller_type.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/controller_type.h
rename to ion/src/simulator/external/sdl/src/joystick/controller_type.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/darwin/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/darwin/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/darwin/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/darwin/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/darwin/SDL_sysjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/darwin/SDL_sysjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/darwin/SDL_sysjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/darwin/SDL_sysjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/dummy/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/dummy/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/dummy/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/dummy/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/emscripten/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/emscripten/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/emscripten/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/emscripten/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/haiku/SDL_haikujoystick.cc b/ion/src/simulator/external/sdl/src/joystick/haiku/SDL_haikujoystick.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/haiku/SDL_haikujoystick.cc
rename to ion/src/simulator/external/sdl/src/joystick/haiku/SDL_haikujoystick.cc
diff --git a/ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c b/ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c
rename to ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_switch.c b/ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_switch.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_switch.c
rename to ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_switch.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c b/ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c
rename to ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c b/ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c
rename to ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapijoystick.c b/ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapijoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapijoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapijoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/iphoneos/SDL_sysjoystick.m b/ion/src/simulator/external/sdl/src/joystick/iphoneos/SDL_sysjoystick.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/iphoneos/SDL_sysjoystick.m
rename to ion/src/simulator/external/sdl/src/joystick/iphoneos/SDL_sysjoystick.m
diff --git a/ion/src/sdl/external/sdl/src/joystick/iphoneos/SDL_sysjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/iphoneos/SDL_sysjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/iphoneos/SDL_sysjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/iphoneos/SDL_sysjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/linux/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/linux/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/linux/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/linux/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/linux/SDL_sysjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/linux/SDL_sysjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/linux/SDL_sysjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/linux/SDL_sysjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/psp/SDL_sysjoystick.c b/ion/src/simulator/external/sdl/src/joystick/psp/SDL_sysjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/psp/SDL_sysjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/psp/SDL_sysjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/sort_controllers.py b/ion/src/simulator/external/sdl/src/joystick/sort_controllers.py
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/sort_controllers.py
rename to ion/src/simulator/external/sdl/src/joystick/sort_controllers.py
diff --git a/ion/src/sdl/external/sdl/src/joystick/steam/SDL_steamcontroller.c b/ion/src/simulator/external/sdl/src/joystick/steam/SDL_steamcontroller.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/steam/SDL_steamcontroller.c
rename to ion/src/simulator/external/sdl/src/joystick/steam/SDL_steamcontroller.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/steam/SDL_steamcontroller.h b/ion/src/simulator/external/sdl/src/joystick/steam/SDL_steamcontroller.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/steam/SDL_steamcontroller.h
rename to ion/src/simulator/external/sdl/src/joystick/steam/SDL_steamcontroller.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_dinputjoystick.c b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_dinputjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_dinputjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_dinputjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_dinputjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_dinputjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_dinputjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_dinputjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_mmjoystick.c b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_mmjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_mmjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_mmjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_windowsjoystick.c b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_windowsjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_windowsjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_windowsjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_windowsjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_windowsjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_windowsjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_windowsjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_xinputjoystick.c b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_xinputjoystick.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_xinputjoystick.c
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_xinputjoystick.c
diff --git a/ion/src/sdl/external/sdl/src/joystick/windows/SDL_xinputjoystick_c.h b/ion/src/simulator/external/sdl/src/joystick/windows/SDL_xinputjoystick_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/joystick/windows/SDL_xinputjoystick_c.h
rename to ion/src/simulator/external/sdl/src/joystick/windows/SDL_xinputjoystick_c.h
diff --git a/ion/src/sdl/external/sdl/src/libm/e_atan2.c b/ion/src/simulator/external/sdl/src/libm/e_atan2.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_atan2.c
rename to ion/src/simulator/external/sdl/src/libm/e_atan2.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_exp.c b/ion/src/simulator/external/sdl/src/libm/e_exp.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_exp.c
rename to ion/src/simulator/external/sdl/src/libm/e_exp.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_fmod.c b/ion/src/simulator/external/sdl/src/libm/e_fmod.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_fmod.c
rename to ion/src/simulator/external/sdl/src/libm/e_fmod.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_log.c b/ion/src/simulator/external/sdl/src/libm/e_log.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_log.c
rename to ion/src/simulator/external/sdl/src/libm/e_log.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_log10.c b/ion/src/simulator/external/sdl/src/libm/e_log10.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_log10.c
rename to ion/src/simulator/external/sdl/src/libm/e_log10.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_pow.c b/ion/src/simulator/external/sdl/src/libm/e_pow.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_pow.c
rename to ion/src/simulator/external/sdl/src/libm/e_pow.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_rem_pio2.c b/ion/src/simulator/external/sdl/src/libm/e_rem_pio2.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_rem_pio2.c
rename to ion/src/simulator/external/sdl/src/libm/e_rem_pio2.c
diff --git a/ion/src/sdl/external/sdl/src/libm/e_sqrt.c b/ion/src/simulator/external/sdl/src/libm/e_sqrt.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/e_sqrt.c
rename to ion/src/simulator/external/sdl/src/libm/e_sqrt.c
diff --git a/ion/src/sdl/external/sdl/src/libm/k_cos.c b/ion/src/simulator/external/sdl/src/libm/k_cos.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/k_cos.c
rename to ion/src/simulator/external/sdl/src/libm/k_cos.c
diff --git a/ion/src/sdl/external/sdl/src/libm/k_rem_pio2.c b/ion/src/simulator/external/sdl/src/libm/k_rem_pio2.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/k_rem_pio2.c
rename to ion/src/simulator/external/sdl/src/libm/k_rem_pio2.c
diff --git a/ion/src/sdl/external/sdl/src/libm/k_sin.c b/ion/src/simulator/external/sdl/src/libm/k_sin.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/k_sin.c
rename to ion/src/simulator/external/sdl/src/libm/k_sin.c
diff --git a/ion/src/sdl/external/sdl/src/libm/k_tan.c b/ion/src/simulator/external/sdl/src/libm/k_tan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/k_tan.c
rename to ion/src/simulator/external/sdl/src/libm/k_tan.c
diff --git a/ion/src/sdl/external/sdl/src/libm/math_libm.h b/ion/src/simulator/external/sdl/src/libm/math_libm.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/math_libm.h
rename to ion/src/simulator/external/sdl/src/libm/math_libm.h
diff --git a/ion/src/sdl/external/sdl/src/libm/math_private.h b/ion/src/simulator/external/sdl/src/libm/math_private.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/math_private.h
rename to ion/src/simulator/external/sdl/src/libm/math_private.h
diff --git a/ion/src/sdl/external/sdl/src/libm/s_atan.c b/ion/src/simulator/external/sdl/src/libm/s_atan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_atan.c
rename to ion/src/simulator/external/sdl/src/libm/s_atan.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_copysign.c b/ion/src/simulator/external/sdl/src/libm/s_copysign.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_copysign.c
rename to ion/src/simulator/external/sdl/src/libm/s_copysign.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_cos.c b/ion/src/simulator/external/sdl/src/libm/s_cos.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_cos.c
rename to ion/src/simulator/external/sdl/src/libm/s_cos.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_fabs.c b/ion/src/simulator/external/sdl/src/libm/s_fabs.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_fabs.c
rename to ion/src/simulator/external/sdl/src/libm/s_fabs.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_floor.c b/ion/src/simulator/external/sdl/src/libm/s_floor.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_floor.c
rename to ion/src/simulator/external/sdl/src/libm/s_floor.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_scalbn.c b/ion/src/simulator/external/sdl/src/libm/s_scalbn.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_scalbn.c
rename to ion/src/simulator/external/sdl/src/libm/s_scalbn.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_sin.c b/ion/src/simulator/external/sdl/src/libm/s_sin.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_sin.c
rename to ion/src/simulator/external/sdl/src/libm/s_sin.c
diff --git a/ion/src/sdl/external/sdl/src/libm/s_tan.c b/ion/src/simulator/external/sdl/src/libm/s_tan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/libm/s_tan.c
rename to ion/src/simulator/external/sdl/src/libm/s_tan.c
diff --git a/ion/src/sdl/external/sdl/src/loadso/dlopen/SDL_sysloadso.c b/ion/src/simulator/external/sdl/src/loadso/dlopen/SDL_sysloadso.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/loadso/dlopen/SDL_sysloadso.c
rename to ion/src/simulator/external/sdl/src/loadso/dlopen/SDL_sysloadso.c
diff --git a/ion/src/sdl/external/sdl/src/loadso/dummy/SDL_sysloadso.c b/ion/src/simulator/external/sdl/src/loadso/dummy/SDL_sysloadso.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/loadso/dummy/SDL_sysloadso.c
rename to ion/src/simulator/external/sdl/src/loadso/dummy/SDL_sysloadso.c
diff --git a/ion/src/sdl/external/sdl/src/loadso/windows/SDL_sysloadso.c b/ion/src/simulator/external/sdl/src/loadso/windows/SDL_sysloadso.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/loadso/windows/SDL_sysloadso.c
rename to ion/src/simulator/external/sdl/src/loadso/windows/SDL_sysloadso.c
diff --git a/ion/src/sdl/external/sdl/src/main/android/SDL_android_main.c b/ion/src/simulator/external/sdl/src/main/android/SDL_android_main.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/android/SDL_android_main.c
rename to ion/src/simulator/external/sdl/src/main/android/SDL_android_main.c
diff --git a/ion/src/sdl/external/sdl/src/main/dummy/SDL_dummy_main.c b/ion/src/simulator/external/sdl/src/main/dummy/SDL_dummy_main.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/dummy/SDL_dummy_main.c
rename to ion/src/simulator/external/sdl/src/main/dummy/SDL_dummy_main.c
diff --git a/ion/src/sdl/external/sdl/src/main/haiku/SDL_BApp.h b/ion/src/simulator/external/sdl/src/main/haiku/SDL_BApp.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/haiku/SDL_BApp.h
rename to ion/src/simulator/external/sdl/src/main/haiku/SDL_BApp.h
diff --git a/ion/src/sdl/external/sdl/src/main/haiku/SDL_BeApp.cc b/ion/src/simulator/external/sdl/src/main/haiku/SDL_BeApp.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/haiku/SDL_BeApp.cc
rename to ion/src/simulator/external/sdl/src/main/haiku/SDL_BeApp.cc
diff --git a/ion/src/sdl/external/sdl/src/main/haiku/SDL_BeApp.h b/ion/src/simulator/external/sdl/src/main/haiku/SDL_BeApp.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/haiku/SDL_BeApp.h
rename to ion/src/simulator/external/sdl/src/main/haiku/SDL_BeApp.h
diff --git a/ion/src/sdl/external/sdl/src/main/nacl/SDL_nacl_main.c b/ion/src/simulator/external/sdl/src/main/nacl/SDL_nacl_main.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/nacl/SDL_nacl_main.c
rename to ion/src/simulator/external/sdl/src/main/nacl/SDL_nacl_main.c
diff --git a/ion/src/sdl/external/sdl/src/main/psp/SDL_psp_main.c b/ion/src/simulator/external/sdl/src/main/psp/SDL_psp_main.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/psp/SDL_psp_main.c
rename to ion/src/simulator/external/sdl/src/main/psp/SDL_psp_main.c
diff --git a/ion/src/sdl/external/sdl/src/main/windows/SDL_windows_main.c b/ion/src/simulator/external/sdl/src/main/windows/SDL_windows_main.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/windows/SDL_windows_main.c
rename to ion/src/simulator/external/sdl/src/main/windows/SDL_windows_main.c
diff --git a/ion/src/sdl/external/sdl/src/main/windows/version.rc b/ion/src/simulator/external/sdl/src/main/windows/version.rc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/windows/version.rc
rename to ion/src/simulator/external/sdl/src/main/windows/version.rc
diff --git a/ion/src/sdl/external/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur b/ion/src/simulator/external/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur
rename to ion/src/simulator/external/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur
diff --git a/ion/src/sdl/external/sdl/src/main/winrt/SDL2-WinRTResources.rc b/ion/src/simulator/external/sdl/src/main/winrt/SDL2-WinRTResources.rc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/winrt/SDL2-WinRTResources.rc
rename to ion/src/simulator/external/sdl/src/main/winrt/SDL2-WinRTResources.rc
diff --git a/ion/src/sdl/external/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp b/ion/src/simulator/external/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
rename to ion/src/simulator/external/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
diff --git a/ion/src/sdl/external/sdl/src/power/SDL_power.c b/ion/src/simulator/external/sdl/src/power/SDL_power.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/SDL_power.c
rename to ion/src/simulator/external/sdl/src/power/SDL_power.c
diff --git a/ion/src/sdl/external/sdl/src/power/SDL_syspower.h b/ion/src/simulator/external/sdl/src/power/SDL_syspower.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/SDL_syspower.h
rename to ion/src/simulator/external/sdl/src/power/SDL_syspower.h
diff --git a/ion/src/sdl/external/sdl/src/power/android/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/android/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/android/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/android/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/emscripten/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/emscripten/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/emscripten/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/emscripten/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/haiku/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/haiku/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/haiku/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/haiku/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/linux/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/linux/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/linux/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/linux/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/macosx/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/macosx/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/macosx/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/macosx/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/psp/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/psp/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/psp/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/psp/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/uikit/SDL_syspower.h b/ion/src/simulator/external/sdl/src/power/uikit/SDL_syspower.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/uikit/SDL_syspower.h
rename to ion/src/simulator/external/sdl/src/power/uikit/SDL_syspower.h
diff --git a/ion/src/sdl/external/sdl/src/power/uikit/SDL_syspower.m b/ion/src/simulator/external/sdl/src/power/uikit/SDL_syspower.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/uikit/SDL_syspower.m
rename to ion/src/simulator/external/sdl/src/power/uikit/SDL_syspower.m
diff --git a/ion/src/sdl/external/sdl/src/power/windows/SDL_syspower.c b/ion/src/simulator/external/sdl/src/power/windows/SDL_syspower.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/windows/SDL_syspower.c
rename to ion/src/simulator/external/sdl/src/power/windows/SDL_syspower.c
diff --git a/ion/src/sdl/external/sdl/src/power/winrt/SDL_syspower.cpp b/ion/src/simulator/external/sdl/src/power/winrt/SDL_syspower.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/power/winrt/SDL_syspower.cpp
rename to ion/src/simulator/external/sdl/src/power/winrt/SDL_syspower.cpp
diff --git a/ion/src/sdl/external/sdl/src/render/SDL_d3dmath.c b/ion/src/simulator/external/sdl/src/render/SDL_d3dmath.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/SDL_d3dmath.c
rename to ion/src/simulator/external/sdl/src/render/SDL_d3dmath.c
diff --git a/ion/src/sdl/external/sdl/src/render/SDL_d3dmath.h b/ion/src/simulator/external/sdl/src/render/SDL_d3dmath.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/SDL_d3dmath.h
rename to ion/src/simulator/external/sdl/src/render/SDL_d3dmath.h
diff --git a/ion/src/sdl/external/sdl/src/render/SDL_render.c b/ion/src/simulator/external/sdl/src/render/SDL_render.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/SDL_render.c
rename to ion/src/simulator/external/sdl/src/render/SDL_render.c
diff --git a/ion/src/sdl/external/sdl/src/render/SDL_sysrender.h b/ion/src/simulator/external/sdl/src/render/SDL_sysrender.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/SDL_sysrender.h
rename to ion/src/simulator/external/sdl/src/render/SDL_sysrender.h
diff --git a/ion/src/sdl/external/sdl/src/render/SDL_yuv_sw.c b/ion/src/simulator/external/sdl/src/render/SDL_yuv_sw.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/SDL_yuv_sw.c
rename to ion/src/simulator/external/sdl/src/render/SDL_yuv_sw.c
diff --git a/ion/src/sdl/external/sdl/src/render/SDL_yuv_sw_c.h b/ion/src/simulator/external/sdl/src/render/SDL_yuv_sw_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/SDL_yuv_sw_c.h
rename to ion/src/simulator/external/sdl/src/render/SDL_yuv_sw_c.h
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d/SDL_render_d3d.c b/ion/src/simulator/external/sdl/src/render/direct3d/SDL_render_d3d.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d/SDL_render_d3d.c
rename to ion/src/simulator/external/sdl/src/render/direct3d/SDL_render_d3d.c
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d/SDL_shaders_d3d.c b/ion/src/simulator/external/sdl/src/render/direct3d/SDL_shaders_d3d.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d/SDL_shaders_d3d.c
rename to ion/src/simulator/external/sdl/src/render/direct3d/SDL_shaders_d3d.c
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d/SDL_shaders_d3d.h b/ion/src/simulator/external/sdl/src/render/direct3d/SDL_shaders_d3d.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d/SDL_shaders_d3d.h
rename to ion/src/simulator/external/sdl/src/render/direct3d/SDL_shaders_d3d.h
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d11/SDL_render_d3d11.c b/ion/src/simulator/external/sdl/src/render/direct3d11/SDL_render_d3d11.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d11/SDL_render_d3d11.c
rename to ion/src/simulator/external/sdl/src/render/direct3d11/SDL_render_d3d11.c
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d11/SDL_render_winrt.cpp b/ion/src/simulator/external/sdl/src/render/direct3d11/SDL_render_winrt.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d11/SDL_render_winrt.cpp
rename to ion/src/simulator/external/sdl/src/render/direct3d11/SDL_render_winrt.cpp
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d11/SDL_render_winrt.h b/ion/src/simulator/external/sdl/src/render/direct3d11/SDL_render_winrt.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d11/SDL_render_winrt.h
rename to ion/src/simulator/external/sdl/src/render/direct3d11/SDL_render_winrt.h
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.c b/ion/src/simulator/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.c
rename to ion/src/simulator/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.c
diff --git a/ion/src/sdl/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.h b/ion/src/simulator/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.h
rename to ion/src/simulator/external/sdl/src/render/direct3d11/SDL_shaders_d3d11.h
diff --git a/ion/src/sdl/external/sdl/src/render/metal/SDL_render_metal.m b/ion/src/simulator/external/sdl/src/render/metal/SDL_render_metal.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/metal/SDL_render_metal.m
rename to ion/src/simulator/external/sdl/src/render/metal/SDL_render_metal.m
diff --git a/ion/src/sdl/external/sdl/src/render/metal/SDL_shaders_metal.metal b/ion/src/simulator/external/sdl/src/render/metal/SDL_shaders_metal.metal
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/metal/SDL_shaders_metal.metal
rename to ion/src/simulator/external/sdl/src/render/metal/SDL_shaders_metal.metal
diff --git a/ion/src/sdl/external/sdl/src/render/metal/SDL_shaders_metal_ios.h b/ion/src/simulator/external/sdl/src/render/metal/SDL_shaders_metal_ios.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/metal/SDL_shaders_metal_ios.h
rename to ion/src/simulator/external/sdl/src/render/metal/SDL_shaders_metal_ios.h
diff --git a/ion/src/sdl/external/sdl/src/render/metal/SDL_shaders_metal_osx.h b/ion/src/simulator/external/sdl/src/render/metal/SDL_shaders_metal_osx.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/metal/SDL_shaders_metal_osx.h
rename to ion/src/simulator/external/sdl/src/render/metal/SDL_shaders_metal_osx.h
diff --git a/ion/src/sdl/external/sdl/src/render/metal/build-metal-shaders.sh b/ion/src/simulator/external/sdl/src/render/metal/build-metal-shaders.sh
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/metal/build-metal-shaders.sh
rename to ion/src/simulator/external/sdl/src/render/metal/build-metal-shaders.sh
diff --git a/ion/src/sdl/external/sdl/src/render/opengl/SDL_glfuncs.h b/ion/src/simulator/external/sdl/src/render/opengl/SDL_glfuncs.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengl/SDL_glfuncs.h
rename to ion/src/simulator/external/sdl/src/render/opengl/SDL_glfuncs.h
diff --git a/ion/src/sdl/external/sdl/src/render/opengl/SDL_render_gl.c b/ion/src/simulator/external/sdl/src/render/opengl/SDL_render_gl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengl/SDL_render_gl.c
rename to ion/src/simulator/external/sdl/src/render/opengl/SDL_render_gl.c
diff --git a/ion/src/sdl/external/sdl/src/render/opengl/SDL_shaders_gl.c b/ion/src/simulator/external/sdl/src/render/opengl/SDL_shaders_gl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengl/SDL_shaders_gl.c
rename to ion/src/simulator/external/sdl/src/render/opengl/SDL_shaders_gl.c
diff --git a/ion/src/sdl/external/sdl/src/render/opengl/SDL_shaders_gl.h b/ion/src/simulator/external/sdl/src/render/opengl/SDL_shaders_gl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengl/SDL_shaders_gl.h
rename to ion/src/simulator/external/sdl/src/render/opengl/SDL_shaders_gl.h
diff --git a/ion/src/sdl/external/sdl/src/render/opengles/SDL_glesfuncs.h b/ion/src/simulator/external/sdl/src/render/opengles/SDL_glesfuncs.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengles/SDL_glesfuncs.h
rename to ion/src/simulator/external/sdl/src/render/opengles/SDL_glesfuncs.h
diff --git a/ion/src/sdl/external/sdl/src/render/opengles/SDL_render_gles.c b/ion/src/simulator/external/sdl/src/render/opengles/SDL_render_gles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengles/SDL_render_gles.c
rename to ion/src/simulator/external/sdl/src/render/opengles/SDL_render_gles.c
diff --git a/ion/src/sdl/external/sdl/src/render/opengles2/SDL_gles2funcs.h b/ion/src/simulator/external/sdl/src/render/opengles2/SDL_gles2funcs.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengles2/SDL_gles2funcs.h
rename to ion/src/simulator/external/sdl/src/render/opengles2/SDL_gles2funcs.h
diff --git a/ion/src/sdl/external/sdl/src/render/opengles2/SDL_render_gles2.c b/ion/src/simulator/external/sdl/src/render/opengles2/SDL_render_gles2.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengles2/SDL_render_gles2.c
rename to ion/src/simulator/external/sdl/src/render/opengles2/SDL_render_gles2.c
diff --git a/ion/src/sdl/external/sdl/src/render/opengles2/SDL_shaders_gles2.c b/ion/src/simulator/external/sdl/src/render/opengles2/SDL_shaders_gles2.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengles2/SDL_shaders_gles2.c
rename to ion/src/simulator/external/sdl/src/render/opengles2/SDL_shaders_gles2.c
diff --git a/ion/src/sdl/external/sdl/src/render/opengles2/SDL_shaders_gles2.h b/ion/src/simulator/external/sdl/src/render/opengles2/SDL_shaders_gles2.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/opengles2/SDL_shaders_gles2.h
rename to ion/src/simulator/external/sdl/src/render/opengles2/SDL_shaders_gles2.h
diff --git a/ion/src/sdl/external/sdl/src/render/psp/SDL_render_psp.c b/ion/src/simulator/external/sdl/src/render/psp/SDL_render_psp.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/psp/SDL_render_psp.c
rename to ion/src/simulator/external/sdl/src/render/psp/SDL_render_psp.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_blendfillrect.c b/ion/src/simulator/external/sdl/src/render/software/SDL_blendfillrect.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_blendfillrect.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_blendfillrect.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_blendfillrect.h b/ion/src/simulator/external/sdl/src/render/software/SDL_blendfillrect.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_blendfillrect.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_blendfillrect.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_blendline.c b/ion/src/simulator/external/sdl/src/render/software/SDL_blendline.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_blendline.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_blendline.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_blendline.h b/ion/src/simulator/external/sdl/src/render/software/SDL_blendline.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_blendline.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_blendline.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_blendpoint.c b/ion/src/simulator/external/sdl/src/render/software/SDL_blendpoint.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_blendpoint.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_blendpoint.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_blendpoint.h b/ion/src/simulator/external/sdl/src/render/software/SDL_blendpoint.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_blendpoint.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_blendpoint.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_draw.h b/ion/src/simulator/external/sdl/src/render/software/SDL_draw.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_draw.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_draw.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_drawline.c b/ion/src/simulator/external/sdl/src/render/software/SDL_drawline.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_drawline.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_drawline.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_drawline.h b/ion/src/simulator/external/sdl/src/render/software/SDL_drawline.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_drawline.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_drawline.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_drawpoint.c b/ion/src/simulator/external/sdl/src/render/software/SDL_drawpoint.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_drawpoint.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_drawpoint.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_drawpoint.h b/ion/src/simulator/external/sdl/src/render/software/SDL_drawpoint.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_drawpoint.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_drawpoint.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_render_sw.c b/ion/src/simulator/external/sdl/src/render/software/SDL_render_sw.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_render_sw.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_render_sw.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_render_sw_c.h b/ion/src/simulator/external/sdl/src/render/software/SDL_render_sw_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_render_sw_c.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_render_sw_c.h
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_rotate.c b/ion/src/simulator/external/sdl/src/render/software/SDL_rotate.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_rotate.c
rename to ion/src/simulator/external/sdl/src/render/software/SDL_rotate.c
diff --git a/ion/src/sdl/external/sdl/src/render/software/SDL_rotate.h b/ion/src/simulator/external/sdl/src/render/software/SDL_rotate.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/render/software/SDL_rotate.h
rename to ion/src/simulator/external/sdl/src/render/software/SDL_rotate.h
diff --git a/ion/src/sdl/external/sdl/src/sensor/SDL_sensor.c b/ion/src/simulator/external/sdl/src/sensor/SDL_sensor.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/SDL_sensor.c
rename to ion/src/simulator/external/sdl/src/sensor/SDL_sensor.c
diff --git a/ion/src/sdl/external/sdl/src/sensor/SDL_sensor_c.h b/ion/src/simulator/external/sdl/src/sensor/SDL_sensor_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/SDL_sensor_c.h
rename to ion/src/simulator/external/sdl/src/sensor/SDL_sensor_c.h
diff --git a/ion/src/sdl/external/sdl/src/sensor/SDL_syssensor.h b/ion/src/simulator/external/sdl/src/sensor/SDL_syssensor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/SDL_syssensor.h
rename to ion/src/simulator/external/sdl/src/sensor/SDL_syssensor.h
diff --git a/ion/src/sdl/external/sdl/src/sensor/android/SDL_androidsensor.c b/ion/src/simulator/external/sdl/src/sensor/android/SDL_androidsensor.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/android/SDL_androidsensor.c
rename to ion/src/simulator/external/sdl/src/sensor/android/SDL_androidsensor.c
diff --git a/ion/src/sdl/external/sdl/src/sensor/android/SDL_androidsensor.h b/ion/src/simulator/external/sdl/src/sensor/android/SDL_androidsensor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/android/SDL_androidsensor.h
rename to ion/src/simulator/external/sdl/src/sensor/android/SDL_androidsensor.h
diff --git a/ion/src/sdl/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.h b/ion/src/simulator/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.h
rename to ion/src/simulator/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.h
diff --git a/ion/src/sdl/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.m b/ion/src/simulator/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.m
rename to ion/src/simulator/external/sdl/src/sensor/coremotion/SDL_coremotionsensor.m
diff --git a/ion/src/sdl/external/sdl/src/sensor/dummy/SDL_dummysensor.c b/ion/src/simulator/external/sdl/src/sensor/dummy/SDL_dummysensor.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/dummy/SDL_dummysensor.c
rename to ion/src/simulator/external/sdl/src/sensor/dummy/SDL_dummysensor.c
diff --git a/ion/src/sdl/external/sdl/src/sensor/dummy/SDL_dummysensor.h b/ion/src/simulator/external/sdl/src/sensor/dummy/SDL_dummysensor.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/sensor/dummy/SDL_dummysensor.h
rename to ion/src/simulator/external/sdl/src/sensor/dummy/SDL_dummysensor.h
diff --git a/ion/src/sdl/external/sdl/src/stdlib/SDL_getenv.c b/ion/src/simulator/external/sdl/src/stdlib/SDL_getenv.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/stdlib/SDL_getenv.c
rename to ion/src/simulator/external/sdl/src/stdlib/SDL_getenv.c
diff --git a/ion/src/sdl/external/sdl/src/stdlib/SDL_iconv.c b/ion/src/simulator/external/sdl/src/stdlib/SDL_iconv.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/stdlib/SDL_iconv.c
rename to ion/src/simulator/external/sdl/src/stdlib/SDL_iconv.c
diff --git a/ion/src/sdl/external/sdl/src/stdlib/SDL_malloc.c b/ion/src/simulator/external/sdl/src/stdlib/SDL_malloc.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/stdlib/SDL_malloc.c
rename to ion/src/simulator/external/sdl/src/stdlib/SDL_malloc.c
diff --git a/ion/src/sdl/external/sdl/src/stdlib/SDL_qsort.c b/ion/src/simulator/external/sdl/src/stdlib/SDL_qsort.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/stdlib/SDL_qsort.c
rename to ion/src/simulator/external/sdl/src/stdlib/SDL_qsort.c
diff --git a/ion/src/sdl/external/sdl/src/stdlib/SDL_stdlib.c b/ion/src/simulator/external/sdl/src/stdlib/SDL_stdlib.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/stdlib/SDL_stdlib.c
rename to ion/src/simulator/external/sdl/src/stdlib/SDL_stdlib.c
diff --git a/ion/src/sdl/external/sdl/src/stdlib/SDL_string.c b/ion/src/simulator/external/sdl/src/stdlib/SDL_string.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/stdlib/SDL_string.c
rename to ion/src/simulator/external/sdl/src/stdlib/SDL_string.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_assert.c b/ion/src/simulator/external/sdl/src/test/SDL_test_assert.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_assert.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_assert.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_common.c b/ion/src/simulator/external/sdl/src/test/SDL_test_common.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_common.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_common.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_compare.c b/ion/src/simulator/external/sdl/src/test/SDL_test_compare.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_compare.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_compare.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_crc32.c b/ion/src/simulator/external/sdl/src/test/SDL_test_crc32.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_crc32.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_crc32.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_font.c b/ion/src/simulator/external/sdl/src/test/SDL_test_font.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_font.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_font.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_fuzzer.c b/ion/src/simulator/external/sdl/src/test/SDL_test_fuzzer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_fuzzer.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_fuzzer.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_harness.c b/ion/src/simulator/external/sdl/src/test/SDL_test_harness.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_harness.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_harness.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_imageBlit.c b/ion/src/simulator/external/sdl/src/test/SDL_test_imageBlit.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_imageBlit.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_imageBlit.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_imageBlitBlend.c b/ion/src/simulator/external/sdl/src/test/SDL_test_imageBlitBlend.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_imageBlitBlend.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_imageBlitBlend.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_imageFace.c b/ion/src/simulator/external/sdl/src/test/SDL_test_imageFace.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_imageFace.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_imageFace.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_imagePrimitives.c b/ion/src/simulator/external/sdl/src/test/SDL_test_imagePrimitives.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_imagePrimitives.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_imagePrimitives.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_imagePrimitivesBlend.c b/ion/src/simulator/external/sdl/src/test/SDL_test_imagePrimitivesBlend.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_imagePrimitivesBlend.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_imagePrimitivesBlend.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_log.c b/ion/src/simulator/external/sdl/src/test/SDL_test_log.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_log.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_log.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_md5.c b/ion/src/simulator/external/sdl/src/test/SDL_test_md5.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_md5.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_md5.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_memory.c b/ion/src/simulator/external/sdl/src/test/SDL_test_memory.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_memory.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_memory.c
diff --git a/ion/src/sdl/external/sdl/src/test/SDL_test_random.c b/ion/src/simulator/external/sdl/src/test/SDL_test_random.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/test/SDL_test_random.c
rename to ion/src/simulator/external/sdl/src/test/SDL_test_random.c
diff --git a/ion/src/sdl/external/sdl/src/thread/SDL_systhread.h b/ion/src/simulator/external/sdl/src/thread/SDL_systhread.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/SDL_systhread.h
rename to ion/src/simulator/external/sdl/src/thread/SDL_systhread.h
diff --git a/ion/src/sdl/external/sdl/src/thread/SDL_thread.c b/ion/src/simulator/external/sdl/src/thread/SDL_thread.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/SDL_thread.c
rename to ion/src/simulator/external/sdl/src/thread/SDL_thread.c
diff --git a/ion/src/sdl/external/sdl/src/thread/SDL_thread_c.h b/ion/src/simulator/external/sdl/src/thread/SDL_thread_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/SDL_thread_c.h
rename to ion/src/simulator/external/sdl/src/thread/SDL_thread_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_syscond.c b/ion/src/simulator/external/sdl/src/thread/generic/SDL_syscond.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_syscond.c
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_syscond.c
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_sysmutex.c b/ion/src/simulator/external/sdl/src/thread/generic/SDL_sysmutex.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_sysmutex.c
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_sysmutex.c
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_sysmutex_c.h b/ion/src/simulator/external/sdl/src/thread/generic/SDL_sysmutex_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_sysmutex_c.h
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_sysmutex_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_syssem.c b/ion/src/simulator/external/sdl/src/thread/generic/SDL_syssem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_syssem.c
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_syssem.c
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_systhread.c b/ion/src/simulator/external/sdl/src/thread/generic/SDL_systhread.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_systhread.c
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_systhread.c
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_systhread_c.h b/ion/src/simulator/external/sdl/src/thread/generic/SDL_systhread_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_systhread_c.h
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_systhread_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/generic/SDL_systls.c b/ion/src/simulator/external/sdl/src/thread/generic/SDL_systls.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/generic/SDL_systls.c
rename to ion/src/simulator/external/sdl/src/thread/generic/SDL_systls.c
diff --git a/ion/src/sdl/external/sdl/src/thread/psp/SDL_syscond.c b/ion/src/simulator/external/sdl/src/thread/psp/SDL_syscond.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/psp/SDL_syscond.c
rename to ion/src/simulator/external/sdl/src/thread/psp/SDL_syscond.c
diff --git a/ion/src/sdl/external/sdl/src/thread/psp/SDL_sysmutex.c b/ion/src/simulator/external/sdl/src/thread/psp/SDL_sysmutex.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/psp/SDL_sysmutex.c
rename to ion/src/simulator/external/sdl/src/thread/psp/SDL_sysmutex.c
diff --git a/ion/src/sdl/external/sdl/src/thread/psp/SDL_sysmutex_c.h b/ion/src/simulator/external/sdl/src/thread/psp/SDL_sysmutex_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/psp/SDL_sysmutex_c.h
rename to ion/src/simulator/external/sdl/src/thread/psp/SDL_sysmutex_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/psp/SDL_syssem.c b/ion/src/simulator/external/sdl/src/thread/psp/SDL_syssem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/psp/SDL_syssem.c
rename to ion/src/simulator/external/sdl/src/thread/psp/SDL_syssem.c
diff --git a/ion/src/sdl/external/sdl/src/thread/psp/SDL_systhread.c b/ion/src/simulator/external/sdl/src/thread/psp/SDL_systhread.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/psp/SDL_systhread.c
rename to ion/src/simulator/external/sdl/src/thread/psp/SDL_systhread.c
diff --git a/ion/src/sdl/external/sdl/src/thread/psp/SDL_systhread_c.h b/ion/src/simulator/external/sdl/src/thread/psp/SDL_systhread_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/psp/SDL_systhread_c.h
rename to ion/src/simulator/external/sdl/src/thread/psp/SDL_systhread_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_syscond.c b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_syscond.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_syscond.c
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_syscond.c
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_sysmutex.c b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_sysmutex.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_sysmutex.c
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_sysmutex.c
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_sysmutex_c.h b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_sysmutex_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_sysmutex_c.h
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_sysmutex_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_syssem.c b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_syssem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_syssem.c
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_syssem.c
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_systhread.c b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_systhread.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_systhread.c
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_systhread.c
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_systhread_c.h b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_systhread_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_systhread_c.h
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_systhread_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/pthread/SDL_systls.c b/ion/src/simulator/external/sdl/src/thread/pthread/SDL_systls.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/pthread/SDL_systls.c
rename to ion/src/simulator/external/sdl/src/thread/pthread/SDL_systls.c
diff --git a/ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_syscond.cpp b/ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_syscond.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_syscond.cpp
rename to ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_syscond.cpp
diff --git a/ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_sysmutex.cpp b/ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
rename to ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
diff --git a/ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_sysmutex_c.h b/ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
rename to ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_systhread.cpp b/ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_systhread.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_systhread.cpp
rename to ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_systhread.cpp
diff --git a/ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_systhread_c.h b/ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_systhread_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/stdcpp/SDL_systhread_c.h
rename to ion/src/simulator/external/sdl/src/thread/stdcpp/SDL_systhread_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/windows/SDL_sysmutex.c b/ion/src/simulator/external/sdl/src/thread/windows/SDL_sysmutex.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/windows/SDL_sysmutex.c
rename to ion/src/simulator/external/sdl/src/thread/windows/SDL_sysmutex.c
diff --git a/ion/src/sdl/external/sdl/src/thread/windows/SDL_syssem.c b/ion/src/simulator/external/sdl/src/thread/windows/SDL_syssem.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/windows/SDL_syssem.c
rename to ion/src/simulator/external/sdl/src/thread/windows/SDL_syssem.c
diff --git a/ion/src/sdl/external/sdl/src/thread/windows/SDL_systhread.c b/ion/src/simulator/external/sdl/src/thread/windows/SDL_systhread.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/windows/SDL_systhread.c
rename to ion/src/simulator/external/sdl/src/thread/windows/SDL_systhread.c
diff --git a/ion/src/sdl/external/sdl/src/thread/windows/SDL_systhread_c.h b/ion/src/simulator/external/sdl/src/thread/windows/SDL_systhread_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/windows/SDL_systhread_c.h
rename to ion/src/simulator/external/sdl/src/thread/windows/SDL_systhread_c.h
diff --git a/ion/src/sdl/external/sdl/src/thread/windows/SDL_systls.c b/ion/src/simulator/external/sdl/src/thread/windows/SDL_systls.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/thread/windows/SDL_systls.c
rename to ion/src/simulator/external/sdl/src/thread/windows/SDL_systls.c
diff --git a/ion/src/sdl/external/sdl/src/timer/SDL_timer.c b/ion/src/simulator/external/sdl/src/timer/SDL_timer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/SDL_timer.c
rename to ion/src/simulator/external/sdl/src/timer/SDL_timer.c
diff --git a/ion/src/sdl/external/sdl/src/timer/SDL_timer_c.h b/ion/src/simulator/external/sdl/src/timer/SDL_timer_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/SDL_timer_c.h
rename to ion/src/simulator/external/sdl/src/timer/SDL_timer_c.h
diff --git a/ion/src/sdl/external/sdl/src/timer/dummy/SDL_systimer.c b/ion/src/simulator/external/sdl/src/timer/dummy/SDL_systimer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/dummy/SDL_systimer.c
rename to ion/src/simulator/external/sdl/src/timer/dummy/SDL_systimer.c
diff --git a/ion/src/sdl/external/sdl/src/timer/haiku/SDL_systimer.c b/ion/src/simulator/external/sdl/src/timer/haiku/SDL_systimer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/haiku/SDL_systimer.c
rename to ion/src/simulator/external/sdl/src/timer/haiku/SDL_systimer.c
diff --git a/ion/src/sdl/external/sdl/src/timer/psp/SDL_systimer.c b/ion/src/simulator/external/sdl/src/timer/psp/SDL_systimer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/psp/SDL_systimer.c
rename to ion/src/simulator/external/sdl/src/timer/psp/SDL_systimer.c
diff --git a/ion/src/sdl/external/sdl/src/timer/unix/SDL_systimer.c b/ion/src/simulator/external/sdl/src/timer/unix/SDL_systimer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/unix/SDL_systimer.c
rename to ion/src/simulator/external/sdl/src/timer/unix/SDL_systimer.c
diff --git a/ion/src/sdl/external/sdl/src/timer/windows/SDL_systimer.c b/ion/src/simulator/external/sdl/src/timer/windows/SDL_systimer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/timer/windows/SDL_systimer.c
rename to ion/src/simulator/external/sdl/src/timer/windows/SDL_systimer.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_RLEaccel.c b/ion/src/simulator/external/sdl/src/video/SDL_RLEaccel.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_RLEaccel.c
rename to ion/src/simulator/external/sdl/src/video/SDL_RLEaccel.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_RLEaccel_c.h b/ion/src/simulator/external/sdl/src/video/SDL_RLEaccel_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_RLEaccel_c.h
rename to ion/src/simulator/external/sdl/src/video/SDL_RLEaccel_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit.c b/ion/src/simulator/external/sdl/src/video/SDL_blit.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit.h b/ion/src/simulator/external/sdl/src/video/SDL_blit.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit.h
rename to ion/src/simulator/external/sdl/src/video/SDL_blit.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_0.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_0.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_0.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_0.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_1.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_1.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_1.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_1.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_A.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_A.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_A.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_A.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_N.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_N.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_N.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_N.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_auto.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_auto.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_auto.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_auto.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_auto.h b/ion/src/simulator/external/sdl/src/video/SDL_blit_auto.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_auto.h
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_auto.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_copy.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_copy.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_copy.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_copy.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_copy.h b/ion/src/simulator/external/sdl/src/video/SDL_blit_copy.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_copy.h
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_copy.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_slow.c b/ion/src/simulator/external/sdl/src/video/SDL_blit_slow.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_slow.c
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_slow.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_blit_slow.h b/ion/src/simulator/external/sdl/src/video/SDL_blit_slow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_blit_slow.h
rename to ion/src/simulator/external/sdl/src/video/SDL_blit_slow.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_bmp.c b/ion/src/simulator/external/sdl/src/video/SDL_bmp.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_bmp.c
rename to ion/src/simulator/external/sdl/src/video/SDL_bmp.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_clipboard.c b/ion/src/simulator/external/sdl/src/video/SDL_clipboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_clipboard.c
rename to ion/src/simulator/external/sdl/src/video/SDL_clipboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_egl.c b/ion/src/simulator/external/sdl/src/video/SDL_egl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_egl.c
rename to ion/src/simulator/external/sdl/src/video/SDL_egl.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_egl_c.h b/ion/src/simulator/external/sdl/src/video/SDL_egl_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_egl_c.h
rename to ion/src/simulator/external/sdl/src/video/SDL_egl_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_fillrect.c b/ion/src/simulator/external/sdl/src/video/SDL_fillrect.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_fillrect.c
rename to ion/src/simulator/external/sdl/src/video/SDL_fillrect.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_pixels.c b/ion/src/simulator/external/sdl/src/video/SDL_pixels.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_pixels.c
rename to ion/src/simulator/external/sdl/src/video/SDL_pixels.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_pixels_c.h b/ion/src/simulator/external/sdl/src/video/SDL_pixels_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_pixels_c.h
rename to ion/src/simulator/external/sdl/src/video/SDL_pixels_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_rect.c b/ion/src/simulator/external/sdl/src/video/SDL_rect.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_rect.c
rename to ion/src/simulator/external/sdl/src/video/SDL_rect.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_rect_c.h b/ion/src/simulator/external/sdl/src/video/SDL_rect_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_rect_c.h
rename to ion/src/simulator/external/sdl/src/video/SDL_rect_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_shape.c b/ion/src/simulator/external/sdl/src/video/SDL_shape.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_shape.c
rename to ion/src/simulator/external/sdl/src/video/SDL_shape.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_shape_internals.h b/ion/src/simulator/external/sdl/src/video/SDL_shape_internals.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_shape_internals.h
rename to ion/src/simulator/external/sdl/src/video/SDL_shape_internals.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_stretch.c b/ion/src/simulator/external/sdl/src/video/SDL_stretch.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_stretch.c
rename to ion/src/simulator/external/sdl/src/video/SDL_stretch.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_surface.c b/ion/src/simulator/external/sdl/src/video/SDL_surface.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_surface.c
rename to ion/src/simulator/external/sdl/src/video/SDL_surface.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_sysvideo.h b/ion/src/simulator/external/sdl/src/video/SDL_sysvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_sysvideo.h
rename to ion/src/simulator/external/sdl/src/video/SDL_sysvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_video.c b/ion/src/simulator/external/sdl/src/video/SDL_video.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_video.c
rename to ion/src/simulator/external/sdl/src/video/SDL_video.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_vulkan_internal.h b/ion/src/simulator/external/sdl/src/video/SDL_vulkan_internal.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_vulkan_internal.h
rename to ion/src/simulator/external/sdl/src/video/SDL_vulkan_internal.h
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_vulkan_utils.c b/ion/src/simulator/external/sdl/src/video/SDL_vulkan_utils.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_vulkan_utils.c
rename to ion/src/simulator/external/sdl/src/video/SDL_vulkan_utils.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_yuv.c b/ion/src/simulator/external/sdl/src/video/SDL_yuv.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_yuv.c
rename to ion/src/simulator/external/sdl/src/video/SDL_yuv.c
diff --git a/ion/src/sdl/external/sdl/src/video/SDL_yuv_c.h b/ion/src/simulator/external/sdl/src/video/SDL_yuv_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/SDL_yuv_c.h
rename to ion/src/simulator/external/sdl/src/video/SDL_yuv_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidclipboard.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidclipboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidclipboard.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidclipboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidclipboard.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidclipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidclipboard.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidclipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidevents.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidevents.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidevents.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidevents.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidgl.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidgl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidgl.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidgl.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidgl.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidgl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidgl.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidgl.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidkeyboard.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidkeyboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidkeyboard.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidkeyboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidkeyboard.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidkeyboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidkeyboard.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidkeyboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidmessagebox.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidmessagebox.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidmessagebox.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidmessagebox.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidmessagebox.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidmessagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidmessagebox.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidmessagebox.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidmouse.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidmouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidmouse.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidmouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidmouse.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidmouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidmouse.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidmouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidtouch.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidtouch.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidtouch.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidtouch.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidtouch.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidtouch.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidtouch.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidtouch.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidvideo.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidvideo.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidvideo.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidvideo.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidvulkan.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidvulkan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidvulkan.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidvulkan.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidvulkan.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidvulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidvulkan.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidvulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidwindow.c b/ion/src/simulator/external/sdl/src/video/android/SDL_androidwindow.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidwindow.c
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidwindow.c
diff --git a/ion/src/sdl/external/sdl/src/video/android/SDL_androidwindow.h b/ion/src/simulator/external/sdl/src/video/android/SDL_androidwindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/android/SDL_androidwindow.h
rename to ion/src/simulator/external/sdl/src/video/android/SDL_androidwindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaclipboard.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaclipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaclipboard.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaclipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaclipboard.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaclipboard.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaclipboard.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaclipboard.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaevents.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaevents.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaevents.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaevents.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaevents.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaevents.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoakeyboard.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoakeyboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoakeyboard.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoakeyboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoakeyboard.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoakeyboard.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoakeyboard.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoakeyboard.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamessagebox.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamessagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamessagebox.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamessagebox.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamessagebox.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamessagebox.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamessagebox.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamessagebox.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoametalview.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoametalview.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoametalview.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoametalview.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoametalview.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoametalview.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoametalview.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoametalview.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamodes.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamodes.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamodes.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamodes.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamodes.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamodes.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamodes.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamodes.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamouse.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamouse.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamouse.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamouse.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamouse.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamouse.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamousetap.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamousetap.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamousetap.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamousetap.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamousetap.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamousetap.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoamousetap.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoamousetap.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengl.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengl.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengl.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengl.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengl.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengl.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengl.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengles.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengles.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengles.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengles.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoaopengles.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoaopengles.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoashape.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoashape.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoashape.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoashape.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoashape.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoashape.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoashape.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoashape.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavideo.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavideo.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavideo.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavideo.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavideo.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavideo.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavulkan.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavulkan.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavulkan.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavulkan.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoavulkan.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoavulkan.m
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoawindow.h b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoawindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoawindow.h
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoawindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoawindow.m b/ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoawindow.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/cocoa/SDL_cocoawindow.m
rename to ion/src/simulator/external/sdl/src/video/cocoa/SDL_cocoawindow.m
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_WM.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_WM.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_WM.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_WM.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_WM.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_WM.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_WM.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_WM.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_dyn.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_dyn.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_dyn.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_dyn.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_dyn.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_dyn.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_dyn.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_dyn.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_events.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_events.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_events.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_events.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_events.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_events.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_events.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_events.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_modes.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_modes.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_modes.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_modes.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_modes.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_modes.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_modes.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_modes.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_mouse.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_mouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_mouse.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_mouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_mouse.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_mouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_mouse.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_mouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_opengl.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_opengl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_opengl.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_opengl.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_opengl.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_opengl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_opengl.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_opengl.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_render.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_render.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_render.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_render.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_render.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_render.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_render.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_render.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_shape.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_shape.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_shape.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_shape.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_shape.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_shape.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_shape.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_shape.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_video.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_video.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_video.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_video.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_video.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_video.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_video.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_video.h
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_window.c b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_window.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_window.c
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_window.c
diff --git a/ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_window.h b/ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_window.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/directfb/SDL_DirectFB_window.h
rename to ion/src/simulator/external/sdl/src/video/directfb/SDL_DirectFB_window.h
diff --git a/ion/src/sdl/external/sdl/src/video/dummy/SDL_nullevents.c b/ion/src/simulator/external/sdl/src/video/dummy/SDL_nullevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/dummy/SDL_nullevents.c
rename to ion/src/simulator/external/sdl/src/video/dummy/SDL_nullevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/dummy/SDL_nullevents_c.h b/ion/src/simulator/external/sdl/src/video/dummy/SDL_nullevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/dummy/SDL_nullevents_c.h
rename to ion/src/simulator/external/sdl/src/video/dummy/SDL_nullevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/dummy/SDL_nullframebuffer.c b/ion/src/simulator/external/sdl/src/video/dummy/SDL_nullframebuffer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/dummy/SDL_nullframebuffer.c
rename to ion/src/simulator/external/sdl/src/video/dummy/SDL_nullframebuffer.c
diff --git a/ion/src/sdl/external/sdl/src/video/dummy/SDL_nullframebuffer_c.h b/ion/src/simulator/external/sdl/src/video/dummy/SDL_nullframebuffer_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/dummy/SDL_nullframebuffer_c.h
rename to ion/src/simulator/external/sdl/src/video/dummy/SDL_nullframebuffer_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/dummy/SDL_nullvideo.c b/ion/src/simulator/external/sdl/src/video/dummy/SDL_nullvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/dummy/SDL_nullvideo.c
rename to ion/src/simulator/external/sdl/src/video/dummy/SDL_nullvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/dummy/SDL_nullvideo.h b/ion/src/simulator/external/sdl/src/video/dummy/SDL_nullvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/dummy/SDL_nullvideo.h
rename to ion/src/simulator/external/sdl/src/video/dummy/SDL_nullvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenevents.c b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenevents.c
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenevents.h b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenevents.h
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenmouse.c b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenmouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenmouse.c
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenmouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenmouse.h b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenmouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenmouse.h
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenmouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenopengles.c b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenopengles.c
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenopengles.h b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenopengles.h
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenvideo.h b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/emscripten/SDL_emscriptenvideo.h
rename to ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_BWin.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_BWin.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_BWin.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_BWin.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bclipboard.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bclipboard.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bclipboard.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bclipboard.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bclipboard.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bclipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bclipboard.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bclipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bevents.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bevents.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bevents.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bevents.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bevents.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bevents.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bframebuffer.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bframebuffer.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bframebuffer.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bframebuffer.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bframebuffer.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bframebuffer.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bframebuffer.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bframebuffer.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bkeyboard.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bkeyboard.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bkeyboard.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bkeyboard.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bkeyboard.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bkeyboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bkeyboard.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bkeyboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bmodes.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bmodes.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bmodes.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bmodes.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bmodes.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bmodes.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bmodes.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bmodes.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bopengl.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bopengl.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bopengl.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bopengl.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bopengl.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bopengl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bopengl.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bopengl.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bvideo.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bvideo.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bvideo.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bvideo.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bvideo.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bvideo.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bwindow.cc b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bwindow.cc
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bwindow.cc
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bwindow.cc
diff --git a/ion/src/sdl/external/sdl/src/video/haiku/SDL_bwindow.h b/ion/src/simulator/external/sdl/src/video/haiku/SDL_bwindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/haiku/SDL_bwindow.h
rename to ion/src/simulator/external/sdl/src/video/haiku/SDL_bwindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/EGL/egl.h b/ion/src/simulator/external/sdl/src/video/khronos/EGL/egl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/EGL/egl.h
rename to ion/src/simulator/external/sdl/src/video/khronos/EGL/egl.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/EGL/eglext.h b/ion/src/simulator/external/sdl/src/video/khronos/EGL/eglext.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/EGL/eglext.h
rename to ion/src/simulator/external/sdl/src/video/khronos/EGL/eglext.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/EGL/eglplatform.h b/ion/src/simulator/external/sdl/src/video/khronos/EGL/eglplatform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/EGL/eglplatform.h
rename to ion/src/simulator/external/sdl/src/video/khronos/EGL/eglplatform.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/GLES2/gl2.h b/ion/src/simulator/external/sdl/src/video/khronos/GLES2/gl2.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/GLES2/gl2.h
rename to ion/src/simulator/external/sdl/src/video/khronos/GLES2/gl2.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/GLES2/gl2ext.h b/ion/src/simulator/external/sdl/src/video/khronos/GLES2/gl2ext.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/GLES2/gl2ext.h
rename to ion/src/simulator/external/sdl/src/video/khronos/GLES2/gl2ext.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/GLES2/gl2platform.h b/ion/src/simulator/external/sdl/src/video/khronos/GLES2/gl2platform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/GLES2/gl2platform.h
rename to ion/src/simulator/external/sdl/src/video/khronos/GLES2/gl2platform.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/KHR/khrplatform.h b/ion/src/simulator/external/sdl/src/video/khronos/KHR/khrplatform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/KHR/khrplatform.h
rename to ion/src/simulator/external/sdl/src/video/khronos/KHR/khrplatform.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_icd.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_icd.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_icd.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_icd.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_layer.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_layer.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_layer.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_layer.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_platform.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_platform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_platform.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_platform.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_sdk_platform.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_sdk_platform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vk_sdk_platform.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vk_sdk_platform.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan.hpp b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan.hpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan.hpp
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan.hpp
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_android.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_android.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_android.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_android.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_core.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_core.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_core.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_core.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_ios.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_ios.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_ios.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_ios.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_macos.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_macos.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_macos.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_macos.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_mir.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_mir.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_mir.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_mir.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_vi.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_vi.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_vi.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_vi.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_wayland.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_wayland.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_wayland.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_wayland.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_win32.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_win32.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_win32.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_win32.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_xcb.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_xcb.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_xcb.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_xcb.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_xlib.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_xlib.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_xlib.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_xlib.h
diff --git a/ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h b/ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h
rename to ion/src/simulator/external/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h b/ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h
rename to ion/src/simulator/external/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclevents.c b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclevents.c
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclevents_c.h b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclevents_c.h
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclglue.c b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclglue.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclglue.c
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclglue.c
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclopengles.c b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclopengles.c
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclopengles.h b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclopengles.h
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclvideo.c b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclvideo.c
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclvideo.h b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclvideo.h
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclwindow.c b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclwindow.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclwindow.c
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclwindow.c
diff --git a/ion/src/sdl/external/sdl/src/video/nacl/SDL_naclwindow.h b/ion/src/simulator/external/sdl/src/video/nacl/SDL_naclwindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/nacl/SDL_naclwindow.h
rename to ion/src/simulator/external/sdl/src/video/nacl/SDL_naclwindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora.c b/ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora.c
rename to ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora.c
diff --git a/ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora.h b/ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora.h
rename to ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora.h
diff --git a/ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora_events.c b/ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora_events.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora_events.c
rename to ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora_events.c
diff --git a/ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora_events.h b/ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora_events.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/pandora/SDL_pandora_events.h
rename to ion/src/simulator/external/sdl/src/video/pandora/SDL_pandora_events.h
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspevents.c b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspevents.c
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspevents_c.h b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspevents_c.h
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspgl.c b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspgl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspgl.c
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspgl.c
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspgl_c.h b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspgl_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspgl_c.h
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspgl_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspmouse.c b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspmouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspmouse.c
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspmouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspmouse_c.h b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspmouse_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspmouse_c.h
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspmouse_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspvideo.c b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspvideo.c
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/psp/SDL_pspvideo.h b/ion/src/simulator/external/sdl/src/video/psp/SDL_pspvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/psp/SDL_pspvideo.h
rename to ion/src/simulator/external/sdl/src/video/psp/SDL_pspvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/qnx/gl.c b/ion/src/simulator/external/sdl/src/video/qnx/gl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/qnx/gl.c
rename to ion/src/simulator/external/sdl/src/video/qnx/gl.c
diff --git a/ion/src/sdl/external/sdl/src/video/qnx/keyboard.c b/ion/src/simulator/external/sdl/src/video/qnx/keyboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/qnx/keyboard.c
rename to ion/src/simulator/external/sdl/src/video/qnx/keyboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/qnx/sdl_qnx.h b/ion/src/simulator/external/sdl/src/video/qnx/sdl_qnx.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/qnx/sdl_qnx.h
rename to ion/src/simulator/external/sdl/src/video/qnx/sdl_qnx.h
diff --git a/ion/src/sdl/external/sdl/src/video/qnx/video.c b/ion/src/simulator/external/sdl/src/video/qnx/video.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/qnx/video.c
rename to ion/src/simulator/external/sdl/src/video/qnx/video.c
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpievents.c b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpievents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpievents.c
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpievents.c
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpievents_c.h b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpievents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpievents_c.h
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpievents_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpimouse.c b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpimouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpimouse.c
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpimouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpimouse.h b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpimouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpimouse.h
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpimouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpiopengles.c b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpiopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpiopengles.c
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpiopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpiopengles.h b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpiopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpiopengles.h
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpiopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpivideo.c b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpivideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpivideo.c
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpivideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpivideo.h b/ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpivideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/raspberry/SDL_rpivideo.h
rename to ion/src/simulator/external/sdl/src/video/raspberry/SDL_rpivideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/sdlgenblit.pl b/ion/src/simulator/external/sdl/src/video/sdlgenblit.pl
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/sdlgenblit.pl
rename to ion/src/simulator/external/sdl/src/video/sdlgenblit.pl
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitappdelegate.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitappdelegate.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitappdelegate.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitappdelegate.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitappdelegate.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitappdelegate.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitappdelegate.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitappdelegate.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitclipboard.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitclipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitclipboard.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitclipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitclipboard.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitclipboard.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitclipboard.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitclipboard.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitevents.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitevents.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitevents.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitevents.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitevents.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitevents.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmessagebox.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmessagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmessagebox.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmessagebox.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmessagebox.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmessagebox.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmessagebox.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmessagebox.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmetalview.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmetalview.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmetalview.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmetalview.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmetalview.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmetalview.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmetalview.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmetalview.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmodes.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmodes.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmodes.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmodes.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmodes.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmodes.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitmodes.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitmodes.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopengles.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopengles.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopengles.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopengles.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopengles.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopengles.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopenglview.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopenglview.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopenglview.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopenglview.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopenglview.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopenglview.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitopenglview.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitopenglview.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvideo.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvideo.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvideo.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvideo.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvideo.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvideo.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitview.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitview.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitview.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitview.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitview.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitview.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitview.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitview.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitviewcontroller.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitviewcontroller.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitviewcontroller.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitviewcontroller.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitviewcontroller.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitviewcontroller.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitviewcontroller.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitviewcontroller.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvulkan.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvulkan.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvulkan.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvulkan.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitvulkan.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitvulkan.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitwindow.h b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitwindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitwindow.h
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitwindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitwindow.m b/ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitwindow.m
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/SDL_uikitwindow.m
rename to ion/src/simulator/external/sdl/src/video/uikit/SDL_uikitwindow.m
diff --git a/ion/src/sdl/external/sdl/src/video/uikit/keyinfotable.h b/ion/src/simulator/external/sdl/src/video/uikit/keyinfotable.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/uikit/keyinfotable.h
rename to ion/src/simulator/external/sdl/src/video/uikit/keyinfotable.h
diff --git a/ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteopengles.c b/ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteopengles.c
rename to ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteopengles.h b/ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteopengles.h
rename to ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteplatform.c b/ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteplatform.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteplatform.c
rename to ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteplatform.c
diff --git a/ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteplatform.h b/ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteplatform.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/vivante/SDL_vivanteplatform.h
rename to ion/src/simulator/external/sdl/src/video/vivante/SDL_vivanteplatform.h
diff --git a/ion/src/sdl/external/sdl/src/video/vivante/SDL_vivantevideo.c b/ion/src/simulator/external/sdl/src/video/vivante/SDL_vivantevideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/vivante/SDL_vivantevideo.c
rename to ion/src/simulator/external/sdl/src/video/vivante/SDL_vivantevideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/vivante/SDL_vivantevideo.h b/ion/src/simulator/external/sdl/src/video/vivante/SDL_vivantevideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/vivante/SDL_vivantevideo.h
rename to ion/src/simulator/external/sdl/src/video/vivante/SDL_vivantevideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandclipboard.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandclipboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandclipboard.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandclipboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandclipboard.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandclipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandclipboard.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandclipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddatamanager.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddatamanager.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddatamanager.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddatamanager.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddatamanager.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddatamanager.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddatamanager.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddatamanager.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddyn.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddyn.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddyn.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddyn.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddyn.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddyn.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylanddyn.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylanddyn.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandevents.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandevents.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandevents_c.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandevents_c.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandmouse.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandmouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandmouse.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandmouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandmouse.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandmouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandmouse.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandmouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandopengles.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandopengles.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandopengles.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandopengles.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandsym.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandsym.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandsym.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandsym.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandtouch.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandtouch.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandtouch.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandtouch.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandtouch.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandtouch.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandtouch.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandtouch.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvideo.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvideo.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvideo.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvideo.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvulkan.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvulkan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvulkan.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvulkan.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvulkan.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandvulkan.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandvulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandwindow.c b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandwindow.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandwindow.c
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandwindow.c
diff --git a/ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandwindow.h b/ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandwindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/wayland/SDL_waylandwindow.h
rename to ion/src/simulator/external/sdl/src/video/wayland/SDL_waylandwindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_msctf.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_msctf.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_msctf.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_msctf.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_vkeys.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_vkeys.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_vkeys.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_vkeys.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsclipboard.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsclipboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsclipboard.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsclipboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsclipboard.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsclipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsclipboard.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsclipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsevents.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsevents.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsevents.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsevents.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsevents.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsevents.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsevents.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsevents.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsframebuffer.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsframebuffer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsframebuffer.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsframebuffer.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsframebuffer.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsframebuffer.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsframebuffer.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsframebuffer.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowskeyboard.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowskeyboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowskeyboard.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowskeyboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowskeyboard.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowskeyboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowskeyboard.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowskeyboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmessagebox.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmessagebox.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmessagebox.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmessagebox.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmessagebox.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmessagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmessagebox.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmessagebox.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmodes.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmodes.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmodes.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmodes.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmodes.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmodes.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmodes.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmodes.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmouse.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmouse.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmouse.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsmouse.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsmouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengl.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengl.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengl.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengl.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengl.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengl.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengles.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengles.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengles.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsopengles.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsshape.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsshape.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsshape.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsshape.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsshape.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsshape.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsshape.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsshape.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowstaskdialog.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowstaskdialog.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowstaskdialog.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowstaskdialog.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvideo.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvideo.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvideo.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvideo.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvideo.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvideo.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvideo.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvideo.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvulkan.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvulkan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvulkan.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvulkan.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvulkan.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowsvulkan.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowsvulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowswindow.c b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowswindow.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowswindow.c
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowswindow.c
diff --git a/ion/src/sdl/external/sdl/src/video/windows/SDL_windowswindow.h b/ion/src/simulator/external/sdl/src/video/windows/SDL_windowswindow.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/SDL_windowswindow.h
rename to ion/src/simulator/external/sdl/src/video/windows/SDL_windowswindow.h
diff --git a/ion/src/sdl/external/sdl/src/video/windows/wmmsg.h b/ion/src/simulator/external/sdl/src/video/windows/wmmsg.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/windows/wmmsg.h
rename to ion/src/simulator/external/sdl/src/video/windows/wmmsg.h
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtevents.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtevents.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtevents.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtevents.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtevents_c.h b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtevents_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtevents_c.h
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtevents_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtgamebar.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtgamebar.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtgamebar.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtgamebar.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtkeyboard.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmessagebox.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmessagebox.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmessagebox.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmessagebox.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmessagebox.h b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmessagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmessagebox.h
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmessagebox.h
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmouse.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmouse.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmouse.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmouse.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmouse_c.h b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmouse_c.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtmouse_c.h
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtmouse_c.h
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtopengles.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtopengles.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtopengles.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtopengles.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtopengles.h b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtopengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtopengles.h
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtopengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtpointerinput.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtvideo.cpp b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtvideo.cpp
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtvideo.cpp
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtvideo.cpp
diff --git a/ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtvideo_cpp.h b/ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
rename to ion/src/simulator/external/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11clipboard.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11clipboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11clipboard.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11clipboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11clipboard.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11clipboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11clipboard.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11clipboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11dyn.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11dyn.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11dyn.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11dyn.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11dyn.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11dyn.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11dyn.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11dyn.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11events.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11events.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11events.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11events.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11events.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11events.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11events.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11events.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11framebuffer.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11framebuffer.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11framebuffer.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11framebuffer.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11framebuffer.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11framebuffer.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11framebuffer.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11framebuffer.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11keyboard.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11keyboard.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11keyboard.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11keyboard.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11keyboard.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11keyboard.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11keyboard.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11keyboard.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11messagebox.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11messagebox.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11messagebox.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11messagebox.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11messagebox.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11messagebox.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11messagebox.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11messagebox.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11modes.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11modes.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11modes.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11modes.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11modes.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11modes.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11modes.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11modes.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11mouse.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11mouse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11mouse.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11mouse.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11mouse.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11mouse.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11mouse.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11mouse.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengl.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengl.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengl.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengl.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengl.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengl.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengl.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengl.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengles.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengles.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengles.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengles.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengles.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengles.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11opengles.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11opengles.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11shape.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11shape.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11shape.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11shape.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11shape.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11shape.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11shape.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11shape.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11sym.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11sym.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11sym.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11sym.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11touch.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11touch.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11touch.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11touch.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11touch.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11touch.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11touch.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11touch.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11video.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11video.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11video.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11video.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11video.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11video.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11video.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11video.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11vulkan.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11vulkan.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11vulkan.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11vulkan.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11vulkan.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11vulkan.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11vulkan.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11vulkan.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11window.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11window.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11window.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11window.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11window.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11window.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11window.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11window.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11xinput2.c b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11xinput2.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11xinput2.c
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11xinput2.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/SDL_x11xinput2.h b/ion/src/simulator/external/sdl/src/video/x11/SDL_x11xinput2.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/SDL_x11xinput2.h
rename to ion/src/simulator/external/sdl/src/video/x11/SDL_x11xinput2.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/edid-parse.c b/ion/src/simulator/external/sdl/src/video/x11/edid-parse.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/edid-parse.c
rename to ion/src/simulator/external/sdl/src/video/x11/edid-parse.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/edid.h b/ion/src/simulator/external/sdl/src/video/x11/edid.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/edid.h
rename to ion/src/simulator/external/sdl/src/video/x11/edid.h
diff --git a/ion/src/sdl/external/sdl/src/video/x11/imKStoUCS.c b/ion/src/simulator/external/sdl/src/video/x11/imKStoUCS.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/imKStoUCS.c
rename to ion/src/simulator/external/sdl/src/video/x11/imKStoUCS.c
diff --git a/ion/src/sdl/external/sdl/src/video/x11/imKStoUCS.h b/ion/src/simulator/external/sdl/src/video/x11/imKStoUCS.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/x11/imKStoUCS.h
rename to ion/src/simulator/external/sdl/src/video/x11/imKStoUCS.h
diff --git a/ion/src/sdl/external/sdl/src/video/yuv2rgb/LICENSE b/ion/src/simulator/external/sdl/src/video/yuv2rgb/LICENSE
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/yuv2rgb/LICENSE
rename to ion/src/simulator/external/sdl/src/video/yuv2rgb/LICENSE
diff --git a/ion/src/sdl/external/sdl/src/video/yuv2rgb/README.md b/ion/src/simulator/external/sdl/src/video/yuv2rgb/README.md
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/yuv2rgb/README.md
rename to ion/src/simulator/external/sdl/src/video/yuv2rgb/README.md
diff --git a/ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb.c b/ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb.c
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb.c
rename to ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb.c
diff --git a/ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb.h b/ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb.h
rename to ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb.h
diff --git a/ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h b/ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h
rename to ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h
diff --git a/ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h b/ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h
similarity index 100%
rename from ion/src/sdl/external/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h
rename to ion/src/simulator/external/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h
diff --git a/ion/src/sdl/ios/Info.plist b/ion/src/simulator/ios/Info.plist
similarity index 100%
rename from ion/src/sdl/ios/Info.plist
rename to ion/src/simulator/ios/Info.plist
diff --git a/ion/src/sdl/ios/Makefile b/ion/src/simulator/ios/Makefile
similarity index 77%
rename from ion/src/sdl/ios/Makefile
rename to ion/src/simulator/ios/Makefile
index a7bd377be..388ffe544 100644
--- a/ion/src/sdl/ios/Makefile
+++ b/ion/src/simulator/ios/Makefile
@@ -1,31 +1,31 @@
-ion_src += $(addprefix ion/src/sdl/ios/, \
+ion_src += $(addprefix ion/src/simulator/ios/, \
   images.m \
 )
 
-ion_src += $(addprefix ion/src/sdl/shared/, \
+ion_src += $(addprefix ion/src/simulator/shared/, \
   apple/language.m \
 )
 
-$(call object_for,ion/src/sdl/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1
+$(call object_for,ion/src/simulator/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1
 
 GOOGLE_ANALYTICS = 1
 ifeq ($(GOOGLE_ANALYTICS),1)
 # Display a nice error if the Google Analytics SDK is not installed
-$(call object_for,ion/src/sdl/ios/telemetry.m): ion/src/sdl/ios/GoogleAnalyticsServices/GoogleAnalytics/Library/GAI.h
-ion/src/sdl/ios/GoogleAnalyticsServices/GoogleAnalytics/Library/GAI.h:
-	$(error GoogleAnalyticsServices needs to be installed in ion/src/sdl/ios/GoogleAnalyticsServices)
+$(call object_for,ion/src/simulator/ios/telemetry.m): ion/src/simulator/ios/GoogleAnalyticsServices/GoogleAnalytics/Library/GAI.h
+ion/src/simulator/ios/GoogleAnalyticsServices/GoogleAnalytics/Library/GAI.h:
+	$(error GoogleAnalyticsServices needs to be installed in ion/src/simulator/ios/GoogleAnalyticsServices)
 
-ion_src += ion/src/sdl/ios/telemetry.m
-$(call object_for,ion/src/sdl/ios/telemetry.m): SFLAGS += -Iion/src/sdl/ios/GoogleAnalyticsServices/GoogleAnalytics/Library
+ion_src += ion/src/simulator/ios/telemetry.m
+$(call object_for,ion/src/simulator/ios/telemetry.m): SFLAGS += -Iion/src/simulator/ios/GoogleAnalyticsServices/GoogleAnalytics/Library
 
 LDFLAGS += -lGoogleAnalyticsServices
 LDFLAGS += -lsqlite3
 LDFLAGS += -lz
 LDFLAGS += -framework SystemConfiguration
 LDFLAGS += -framework CoreData
-LDFLAGS += -Lion/src/sdl/ios/GoogleAnalyticsServices
+LDFLAGS += -Lion/src/simulator/ios/GoogleAnalyticsServices
 else
-ion_src += ion/src/sdl/shared/telemetry_dummy.cpp
+ion_src += ion/src/simulator/shared/telemetry_dummy.cpp
 endif
 
 # App resources
@@ -35,9 +35,9 @@ SIMULATOR_ICON_SIZES = 20x20 29x29 40x40 40x40 40x40 58x58 58x58 60x60 76x76 \
 SIMULATOR_ASSETS_PATH = $(BUILD_DIR)/app/assets/Assets.xcassets
 SIMULATOR_ICONSET = $(SIMULATOR_ASSETS_PATH)/AppIcon.appiconset
 
-include ion/src/sdl/shared/apple/Makefile
+include ion/src/simulator/shared/apple/Makefile
 
-$(call simulator_app_plist,Info.plist): ion/src/sdl/ios/Info.plist $(call simulator_app_resource,Assets.car)
+$(call simulator_app_plist,Info.plist): ion/src/simulator/ios/Info.plist $(call simulator_app_resource,Assets.car)
 	$(call rule_label,PLUTIL)
 	$(Q) cp $< $@
 	$(Q) plutil -insert "BuildMachineOSBuild" -string "$(IOS_BUILD_MACHINE_OS_BUILD)" $@
@@ -56,7 +56,7 @@ $(call simulator_app_plist,Info.plist): ion/src/sdl/ios/Info.plist $(call simula
 	$(Q) plutil -replace CFBundleIcons -json `plutil -extract CFBundleIcons json -o - $(BUILD_DIR)/app/assets/partial.plist` $@
 	$(Q) plutil -replace CFBundleIcons~ipad -json `plutil -extract CFBundleIcons~ipad json -o - $(BUILD_DIR)/app/assets/partial.plist` $@
 
-$(call simulator_app_resource,launch.storyboardc): ion/src/sdl/ios/launch.storyboard | $$(@D)/.
+$(call simulator_app_resource,launch.storyboardc): ion/src/simulator/ios/launch.storyboard | $$(@D)/.
 	$(call rule_label,IBTOOL)
 	$(Q) $(IBTOOL) --minimum-deployment-target $(APPLE_PLATFORM_MIN_VERSION) --compile $@ $^
 
@@ -73,7 +73,7 @@ $(BUILD_DIR)/app/entitlements.plist: $(call simulator_app_resource,embedded.mobi
 	$(call rule_label,SCMS)
 	$(Q) security cms -D -i $(IOS_PROVISIONNING_PROFILE) | plutil -extract Entitlements xml1 - -o $@
 
-$(SIMULATOR_ICONSET)/Contents.json: ion/src/sdl/ios/icon_assets.json $(SIMULATOR_ICONS) | $$(@D)/.
+$(SIMULATOR_ICONSET)/Contents.json: ion/src/simulator/ios/icon_assets.json $(SIMULATOR_ICONS) | $$(@D)/.
 	$(call rule_label,COPY)
 	$(Q) cp $< $@
 
diff --git a/ion/src/sdl/ios/icon_assets.json b/ion/src/simulator/ios/icon_assets.json
similarity index 100%
rename from ion/src/sdl/ios/icon_assets.json
rename to ion/src/simulator/ios/icon_assets.json
diff --git a/ion/src/sdl/ios/images.m b/ion/src/simulator/ios/images.m
similarity index 100%
rename from ion/src/sdl/ios/images.m
rename to ion/src/simulator/ios/images.m
diff --git a/ion/src/sdl/ios/launch.storyboard b/ion/src/simulator/ios/launch.storyboard
similarity index 100%
rename from ion/src/sdl/ios/launch.storyboard
rename to ion/src/simulator/ios/launch.storyboard
diff --git a/ion/src/sdl/ios/telemetry.m b/ion/src/simulator/ios/telemetry.m
similarity index 100%
rename from ion/src/sdl/ios/telemetry.m
rename to ion/src/simulator/ios/telemetry.m
diff --git a/ion/src/sdl/macos/Info.plist b/ion/src/simulator/macos/Info.plist
similarity index 100%
rename from ion/src/sdl/macos/Info.plist
rename to ion/src/simulator/macos/Info.plist
diff --git a/ion/src/sdl/macos/Makefile b/ion/src/simulator/macos/Makefile
similarity index 80%
rename from ion/src/sdl/macos/Makefile
rename to ion/src/simulator/macos/Makefile
index 574492364..12d221703 100644
--- a/ion/src/sdl/macos/Makefile
+++ b/ion/src/simulator/macos/Makefile
@@ -1,8 +1,8 @@
-ion_src += $(addprefix ion/src/sdl/macos/, \
+ion_src += $(addprefix ion/src/simulator/macos/, \
   images.m \
 )
 
-ion_src += $(addprefix ion/src/sdl/shared/, \
+ion_src += $(addprefix ion/src/simulator/shared/, \
   apple/language.m \
   telemetry_dummy.cpp \
 )
@@ -15,9 +15,9 @@ SIMULATOR_APP_RESOURCE_PATH = Contents/Resources/
 SIMULATOR_APP_PLIST_PATH = Contents/
 SIMULATOR_ICONSET = $(BUILD_DIR)/app/assets/app.iconset
 
-include ion/src/sdl/shared/apple/Makefile
+include ion/src/simulator/shared/apple/Makefile
 
-$(call simulator_app_plist,Info.plist): ion/src/sdl/macos/Info.plist
+$(call simulator_app_plist,Info.plist): ion/src/simulator/macos/Info.plist
 	$(call rule_label,PLUTIL)
 	$(Q) cp $< $@
 	$(Q) plutil -insert "LSMinimumSystemVersion" -string "$(MACOS_MIN_VERSION)" $@
diff --git a/ion/src/sdl/macos/images.m b/ion/src/simulator/macos/images.m
similarity index 100%
rename from ion/src/sdl/macos/images.m
rename to ion/src/simulator/macos/images.m
diff --git a/ion/src/sdl/shared/apple/Makefile b/ion/src/simulator/shared/apple/Makefile
similarity index 88%
rename from ion/src/sdl/shared/apple/Makefile
rename to ion/src/simulator/shared/apple/Makefile
index d348de265..f5b1c77fe 100644
--- a/ion/src/sdl/shared/apple/Makefile
+++ b/ion/src/simulator/shared/apple/Makefile
@@ -22,7 +22,7 @@ $(call simulator_app_binary,Epsilon): $(patsubst %,$(BUILD_DIR)/%/epsilon.bin,$(
 
 # Background image
 
-$(call simulator_app_resource,background.jpg): ion/src/sdl/assets/background.jpg | $$(@D)/.
+$(call simulator_app_resource,background.jpg): ion/src/simulator/assets/background.jpg | $$(@D)/.
 	$(call rule_label,COPY)
 	$(Q) cp $^ $@
 
@@ -38,7 +38,7 @@ endif
 
 SIMULATOR_ICONS = $(addprefix $(SIMULATOR_ICONSET)/,$(addsuffix .png,$(addprefix icon_, $(SIMULATOR_ICON_SIZES))))
 
-$(addprefix $(SIMULATOR_ICONSET)/,icon_%.png): ion/src/sdl/assets/logo.svg | $$(@D)/.
+$(addprefix $(SIMULATOR_ICONSET)/,icon_%.png): ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
 	$(Q) convert -background "#FFB734" -resize $* $< $@
 
diff --git a/ion/src/sdl/shared/apple/language.m b/ion/src/simulator/shared/apple/language.m
similarity index 100%
rename from ion/src/sdl/shared/apple/language.m
rename to ion/src/simulator/shared/apple/language.m
diff --git a/ion/src/sdl/shared/display.cpp b/ion/src/simulator/shared/display.cpp
similarity index 100%
rename from ion/src/sdl/shared/display.cpp
rename to ion/src/simulator/shared/display.cpp
diff --git a/ion/src/sdl/shared/display.h b/ion/src/simulator/shared/display.h
similarity index 100%
rename from ion/src/sdl/shared/display.h
rename to ion/src/simulator/shared/display.h
diff --git a/ion/src/sdl/shared/events_keyboard_platform.cpp b/ion/src/simulator/shared/events_keyboard_platform.cpp
similarity index 100%
rename from ion/src/sdl/shared/events_keyboard_platform.cpp
rename to ion/src/simulator/shared/events_keyboard_platform.cpp
diff --git a/ion/src/sdl/shared/keyboard.cpp b/ion/src/simulator/shared/keyboard.cpp
similarity index 100%
rename from ion/src/sdl/shared/keyboard.cpp
rename to ion/src/simulator/shared/keyboard.cpp
diff --git a/ion/src/sdl/shared/layout.cpp b/ion/src/simulator/shared/layout.cpp
similarity index 100%
rename from ion/src/sdl/shared/layout.cpp
rename to ion/src/simulator/shared/layout.cpp
diff --git a/ion/src/sdl/shared/layout.h b/ion/src/simulator/shared/layout.h
similarity index 100%
rename from ion/src/sdl/shared/layout.h
rename to ion/src/simulator/shared/layout.h
diff --git a/ion/src/sdl/shared/main.cpp b/ion/src/simulator/shared/main.cpp
similarity index 100%
rename from ion/src/sdl/shared/main.cpp
rename to ion/src/simulator/shared/main.cpp
diff --git a/ion/src/sdl/shared/main.h b/ion/src/simulator/shared/main.h
similarity index 100%
rename from ion/src/sdl/shared/main.h
rename to ion/src/simulator/shared/main.h
diff --git a/ion/src/sdl/shared/platform.h b/ion/src/simulator/shared/platform.h
similarity index 100%
rename from ion/src/sdl/shared/platform.h
rename to ion/src/simulator/shared/platform.h
diff --git a/ion/src/sdl/shared/telemetry_dummy.cpp b/ion/src/simulator/shared/telemetry_dummy.cpp
similarity index 100%
rename from ion/src/sdl/shared/telemetry_dummy.cpp
rename to ion/src/simulator/shared/telemetry_dummy.cpp
diff --git a/ion/src/emscripten/Makefile b/ion/src/simulator/web/Makefile
similarity index 100%
rename from ion/src/emscripten/Makefile
rename to ion/src/simulator/web/Makefile
diff --git a/ion/src/emscripten/display.cpp b/ion/src/simulator/web/display.cpp
similarity index 100%
rename from ion/src/emscripten/display.cpp
rename to ion/src/simulator/web/display.cpp
diff --git a/ion/src/emscripten/display.h b/ion/src/simulator/web/display.h
similarity index 100%
rename from ion/src/emscripten/display.h
rename to ion/src/simulator/web/display.h
diff --git a/ion/src/emscripten/events_keyboard.cpp b/ion/src/simulator/web/events_keyboard.cpp
similarity index 100%
rename from ion/src/emscripten/events_keyboard.cpp
rename to ion/src/simulator/web/events_keyboard.cpp
diff --git a/ion/src/emscripten/events_keyboard.h b/ion/src/simulator/web/events_keyboard.h
similarity index 100%
rename from ion/src/emscripten/events_keyboard.h
rename to ion/src/simulator/web/events_keyboard.h
diff --git a/ion/src/emscripten/main.cpp b/ion/src/simulator/web/main.cpp
similarity index 100%
rename from ion/src/emscripten/main.cpp
rename to ion/src/simulator/web/main.cpp
diff --git a/ion/src/emscripten/simulator.html b/ion/src/simulator/web/simulator.html
similarity index 100%
rename from ion/src/emscripten/simulator.html
rename to ion/src/simulator/web/simulator.html
diff --git a/ion/src/simulator/windows/Makefile b/ion/src/simulator/windows/Makefile
new file mode 100644
index 000000000..c30d6254f
--- /dev/null
+++ b/ion/src/simulator/windows/Makefile
@@ -0,0 +1,10 @@
+ion_src += $(addprefix ion/src/simulator/windows/, \
+  images.cpp \
+  language.cpp \
+  resources.rc \
+)
+ion_src += $(addprefix ion/src/simulator/shared/, \
+  telemetry_dummy.cpp \
+)
+
+LDFLAGS += -lgdiplus
diff --git a/ion/src/sdl/windows/images.cpp b/ion/src/simulator/windows/images.cpp
similarity index 100%
rename from ion/src/sdl/windows/images.cpp
rename to ion/src/simulator/windows/images.cpp
diff --git a/ion/src/sdl/windows/language.cpp b/ion/src/simulator/windows/language.cpp
similarity index 100%
rename from ion/src/sdl/windows/language.cpp
rename to ion/src/simulator/windows/language.cpp
diff --git a/ion/src/sdl/windows/resources.rc b/ion/src/simulator/windows/resources.rc
similarity index 100%
rename from ion/src/sdl/windows/resources.rc
rename to ion/src/simulator/windows/resources.rc