diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ece5b43a..c678bebe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,6 @@ set(OLYMPIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/olympic")
 
 if(TURBINE_BUILD_TYPE STREQUAL "Native")
     add_subdirectory(glutils)
-    add_subdirectory(studio)
 endif()
-add_subdirectory(keel)
 add_subdirectory(nostalgia)
 add_subdirectory(olympic)
-add_subdirectory(turbine)
diff --git a/src/olympic/CMakeLists.txt b/src/olympic/CMakeLists.txt
index 3f1ac5d2..f0931e60 100644
--- a/src/olympic/CMakeLists.txt
+++ b/src/olympic/CMakeLists.txt
@@ -1 +1,6 @@
-add_subdirectory(applib)
\ No newline at end of file
+add_subdirectory(applib)
+add_subdirectory(keel)
+add_subdirectory(turbine)
+if(TURBINE_BUILD_TYPE STREQUAL "Native")
+    add_subdirectory(studio)
+endif()
diff --git a/src/olympic/keel/CMakeLists.txt b/src/olympic/keel/CMakeLists.txt
new file mode 100644
index 00000000..1f4f9954
--- /dev/null
+++ b/src/olympic/keel/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_subdirectory(src)
+
+if(TURBINE_BUILD_TYPE STREQUAL "Native")
+	add_subdirectory(test)
+endif()
diff --git a/src/keel/asset.hpp b/src/olympic/keel/include/keel/asset.hpp
similarity index 100%
rename from src/keel/asset.hpp
rename to src/olympic/keel/include/keel/asset.hpp
diff --git a/src/keel/assetmanager.hpp b/src/olympic/keel/include/keel/assetmanager.hpp
similarity index 100%
rename from src/keel/assetmanager.hpp
rename to src/olympic/keel/include/keel/assetmanager.hpp
diff --git a/src/keel/context.hpp b/src/olympic/keel/include/keel/context.hpp
similarity index 100%
rename from src/keel/context.hpp
rename to src/olympic/keel/include/keel/context.hpp
diff --git a/src/keel/keel.hpp b/src/olympic/keel/include/keel/keel.hpp
similarity index 100%
rename from src/keel/keel.hpp
rename to src/olympic/keel/include/keel/keel.hpp
diff --git a/src/keel/media.hpp b/src/olympic/keel/include/keel/media.hpp
similarity index 100%
rename from src/keel/media.hpp
rename to src/olympic/keel/include/keel/media.hpp
diff --git a/src/keel/module.hpp b/src/olympic/keel/include/keel/module.hpp
similarity index 100%
rename from src/keel/module.hpp
rename to src/olympic/keel/include/keel/module.hpp
diff --git a/src/keel/pack.hpp b/src/olympic/keel/include/keel/pack.hpp
similarity index 100%
rename from src/keel/pack.hpp
rename to src/olympic/keel/include/keel/pack.hpp
diff --git a/src/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp
similarity index 100%
rename from src/keel/typeconv.hpp
rename to src/olympic/keel/include/keel/typeconv.hpp
diff --git a/src/keel/typestore.hpp b/src/olympic/keel/include/keel/typestore.hpp
similarity index 100%
rename from src/keel/typestore.hpp
rename to src/olympic/keel/include/keel/typestore.hpp
diff --git a/src/keel/CMakeLists.txt b/src/olympic/keel/src/CMakeLists.txt
similarity index 79%
rename from src/keel/CMakeLists.txt
rename to src/olympic/keel/src/CMakeLists.txt
index 1b670b26..0e5872e8 100644
--- a/src/keel/CMakeLists.txt
+++ b/src/olympic/keel/src/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
 		typestore.cpp
 )
 
+target_include_directories(
+	Keel PUBLIC
+		../include
+)
+
 target_link_libraries(
 	Keel PUBLIC
 		OxClaw
@@ -20,16 +25,8 @@ target_link_libraries(
 )
 
 install(
-	FILES
-		asset.hpp
-		assetmanager.hpp
-		context.hpp
-		keel.hpp
-		media.hpp
-		module.hpp
-		pack.hpp
-		typeconv.hpp
-		typestore.hpp
+	DIRECTORY
+		../include/keel
 	DESTINATION
 		include/keel
 )
@@ -47,6 +44,10 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
 		KeelPack-AppLib
 			pack-applib.cpp
 	)
+	target_include_directories(
+		KeelPack-AppLib PUBLIC
+			../include
+	)
 	target_compile_definitions(
 		KeelPack-AppLib PUBLIC
 			OLYMPIC_LOAD_KEEL_MODULES=1
@@ -54,9 +55,9 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
 	)
 	target_link_libraries(
 		KeelPack-AppLib
+			Keel
 			OxClArgs
 			OxClaw
 			OxLogConn
 	)
-	add_subdirectory(test)
 endif()
diff --git a/src/keel/asset.cpp b/src/olympic/keel/src/asset.cpp
similarity index 98%
rename from src/keel/asset.cpp
rename to src/olympic/keel/src/asset.cpp
index 11141a70..c318ebde 100644
--- a/src/keel/asset.cpp
+++ b/src/olympic/keel/src/asset.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "asset.hpp"
+#include <keel/asset.hpp>
 
 namespace keel {
 
diff --git a/src/keel/keel.cpp b/src/olympic/keel/src/keel.cpp
similarity index 97%
rename from src/keel/keel.cpp
rename to src/olympic/keel/src/keel.cpp
index 89e6167c..92479c81 100644
--- a/src/keel/keel.cpp
+++ b/src/olympic/keel/src/keel.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "keel.hpp"
+#include <keel/keel.hpp>
 
 namespace keel {
 
diff --git a/src/keel/media.cpp b/src/olympic/keel/src/media.cpp
similarity index 99%
rename from src/keel/media.cpp
rename to src/olympic/keel/src/media.cpp
index 8f33d635..40cb00df 100644
--- a/src/keel/media.cpp
+++ b/src/olympic/keel/src/media.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "media.hpp"
+#include <keel/media.hpp>
 
 #ifndef OX_BARE_METAL
 
@@ -116,7 +116,7 @@ ox::Error performPackTransforms(Context &ctx, ox::Buffer &clawData) noexcept {
 
 #else
 
-#include "context.hpp"
+#include <keel/context.hpp>
 
 #define MEM_ROM reinterpret_cast<char*>(0x0800'0000)
 
diff --git a/src/keel/module.cpp b/src/olympic/keel/src/module.cpp
similarity index 95%
rename from src/keel/module.cpp
rename to src/olympic/keel/src/module.cpp
index 92e93157..86bfb881 100644
--- a/src/keel/module.cpp
+++ b/src/olympic/keel/src/module.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "module.hpp"
+#include <keel/module.hpp>
 
 namespace keel {
 
diff --git a/src/keel/pack-applib.cpp b/src/olympic/keel/src/pack-applib.cpp
similarity index 100%
rename from src/keel/pack-applib.cpp
rename to src/olympic/keel/src/pack-applib.cpp
diff --git a/src/keel/pack.cpp b/src/olympic/keel/src/pack.cpp
similarity index 99%
rename from src/keel/pack.cpp
rename to src/olympic/keel/src/pack.cpp
index 7f1cf309..f6627d7d 100644
--- a/src/keel/pack.cpp
+++ b/src/olympic/keel/src/pack.cpp
@@ -7,7 +7,7 @@
 
 #include <keel/media.hpp>
 
-#include "pack.hpp"
+#include <keel/pack.hpp>
 
 namespace keel {
 
diff --git a/src/keel/typeconv.cpp b/src/olympic/keel/src/typeconv.cpp
similarity index 97%
rename from src/keel/typeconv.cpp
rename to src/olympic/keel/src/typeconv.cpp
index 0ce33c40..7fabe00b 100644
--- a/src/keel/typeconv.cpp
+++ b/src/olympic/keel/src/typeconv.cpp
@@ -4,8 +4,8 @@
 
 #include <ox/claw/read.hpp>
 
-#include "media.hpp"
-#include "typeconv.hpp"
+#include <keel/media.hpp>
+#include <keel/typeconv.hpp>
 
 namespace keel {
 
diff --git a/src/keel/typestore.cpp b/src/olympic/keel/src/typestore.cpp
similarity index 94%
rename from src/keel/typestore.cpp
rename to src/olympic/keel/src/typestore.cpp
index aae7523c..14fad394 100644
--- a/src/keel/typestore.cpp
+++ b/src/olympic/keel/src/typestore.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "typestore.hpp"
+#include <keel/typestore.hpp>
 
 namespace keel {
 
diff --git a/src/keel/test/CMakeLists.txt b/src/olympic/keel/test/CMakeLists.txt
similarity index 100%
rename from src/keel/test/CMakeLists.txt
rename to src/olympic/keel/test/CMakeLists.txt
diff --git a/src/keel/test/tests.cpp b/src/olympic/keel/test/tests.cpp
similarity index 100%
rename from src/keel/test/tests.cpp
rename to src/olympic/keel/test/tests.cpp
diff --git a/src/studio/CMakeLists.txt b/src/olympic/studio/CMakeLists.txt
similarity index 100%
rename from src/studio/CMakeLists.txt
rename to src/olympic/studio/CMakeLists.txt
diff --git a/src/studio/applib/CMakeLists.txt b/src/olympic/studio/applib/CMakeLists.txt
similarity index 100%
rename from src/studio/applib/CMakeLists.txt
rename to src/olympic/studio/applib/CMakeLists.txt
diff --git a/src/studio/applib/include/studioapp/studioapp.hpp b/src/olympic/studio/applib/include/studioapp/studioapp.hpp
similarity index 100%
rename from src/studio/applib/include/studioapp/studioapp.hpp
rename to src/olympic/studio/applib/include/studioapp/studioapp.hpp
diff --git a/src/studio/applib/src/CMakeLists.txt b/src/olympic/studio/applib/src/CMakeLists.txt
similarity index 100%
rename from src/studio/applib/src/CMakeLists.txt
rename to src/olympic/studio/applib/src/CMakeLists.txt
diff --git a/src/studio/applib/src/aboutpopup.cpp b/src/olympic/studio/applib/src/aboutpopup.cpp
similarity index 100%
rename from src/studio/applib/src/aboutpopup.cpp
rename to src/olympic/studio/applib/src/aboutpopup.cpp
diff --git a/src/studio/applib/src/aboutpopup.hpp b/src/olympic/studio/applib/src/aboutpopup.hpp
similarity index 100%
rename from src/studio/applib/src/aboutpopup.hpp
rename to src/olympic/studio/applib/src/aboutpopup.hpp
diff --git a/src/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp
similarity index 100%
rename from src/studio/applib/src/clawviewer.cpp
rename to src/olympic/studio/applib/src/clawviewer.cpp
diff --git a/src/studio/applib/src/clawviewer.hpp b/src/olympic/studio/applib/src/clawviewer.hpp
similarity index 100%
rename from src/studio/applib/src/clawviewer.hpp
rename to src/olympic/studio/applib/src/clawviewer.hpp
diff --git a/src/studio/applib/src/filedialogmanager.cpp b/src/olympic/studio/applib/src/filedialogmanager.cpp
similarity index 100%
rename from src/studio/applib/src/filedialogmanager.cpp
rename to src/olympic/studio/applib/src/filedialogmanager.cpp
diff --git a/src/studio/applib/src/filedialogmanager.hpp b/src/olympic/studio/applib/src/filedialogmanager.hpp
similarity index 100%
rename from src/studio/applib/src/filedialogmanager.hpp
rename to src/olympic/studio/applib/src/filedialogmanager.hpp
diff --git a/src/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/main.cpp
similarity index 100%
rename from src/studio/applib/src/main.cpp
rename to src/olympic/studio/applib/src/main.cpp
diff --git a/src/studio/applib/src/newmenu.cpp b/src/olympic/studio/applib/src/newmenu.cpp
similarity index 100%
rename from src/studio/applib/src/newmenu.cpp
rename to src/olympic/studio/applib/src/newmenu.cpp
diff --git a/src/studio/applib/src/newmenu.hpp b/src/olympic/studio/applib/src/newmenu.hpp
similarity index 100%
rename from src/studio/applib/src/newmenu.hpp
rename to src/olympic/studio/applib/src/newmenu.hpp
diff --git a/src/studio/applib/src/projectexplorer.cpp b/src/olympic/studio/applib/src/projectexplorer.cpp
similarity index 100%
rename from src/studio/applib/src/projectexplorer.cpp
rename to src/olympic/studio/applib/src/projectexplorer.cpp
diff --git a/src/studio/applib/src/projectexplorer.hpp b/src/olympic/studio/applib/src/projectexplorer.hpp
similarity index 100%
rename from src/studio/applib/src/projectexplorer.hpp
rename to src/olympic/studio/applib/src/projectexplorer.hpp
diff --git a/src/studio/applib/src/projecttreemodel.cpp b/src/olympic/studio/applib/src/projecttreemodel.cpp
similarity index 100%
rename from src/studio/applib/src/projecttreemodel.cpp
rename to src/olympic/studio/applib/src/projecttreemodel.cpp
diff --git a/src/studio/applib/src/projecttreemodel.hpp b/src/olympic/studio/applib/src/projecttreemodel.hpp
similarity index 100%
rename from src/studio/applib/src/projecttreemodel.hpp
rename to src/olympic/studio/applib/src/projecttreemodel.hpp
diff --git a/src/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioapp.cpp
similarity index 100%
rename from src/studio/applib/src/studioapp.cpp
rename to src/olympic/studio/applib/src/studioapp.cpp
diff --git a/src/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioapp.hpp
similarity index 100%
rename from src/studio/applib/src/studioapp.hpp
rename to src/olympic/studio/applib/src/studioapp.hpp
diff --git a/src/studio/modlib/CMakeLists.txt b/src/olympic/studio/modlib/CMakeLists.txt
similarity index 100%
rename from src/studio/modlib/CMakeLists.txt
rename to src/olympic/studio/modlib/CMakeLists.txt
diff --git a/src/studio/modlib/include/studio/configio.hpp b/src/olympic/studio/modlib/include/studio/configio.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/configio.hpp
rename to src/olympic/studio/modlib/include/studio/configio.hpp
diff --git a/src/studio/modlib/include/studio/context.hpp b/src/olympic/studio/modlib/include/studio/context.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/context.hpp
rename to src/olympic/studio/modlib/include/studio/context.hpp
diff --git a/src/studio/modlib/include/studio/editor.hpp b/src/olympic/studio/modlib/include/studio/editor.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/editor.hpp
rename to src/olympic/studio/modlib/include/studio/editor.hpp
diff --git a/src/studio/modlib/include/studio/filedialog.hpp b/src/olympic/studio/modlib/include/studio/filedialog.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/filedialog.hpp
rename to src/olympic/studio/modlib/include/studio/filedialog.hpp
diff --git a/src/studio/modlib/include/studio/imguiuitl.hpp b/src/olympic/studio/modlib/include/studio/imguiuitl.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/imguiuitl.hpp
rename to src/olympic/studio/modlib/include/studio/imguiuitl.hpp
diff --git a/src/studio/modlib/include/studio/itemmaker.hpp b/src/olympic/studio/modlib/include/studio/itemmaker.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/itemmaker.hpp
rename to src/olympic/studio/modlib/include/studio/itemmaker.hpp
diff --git a/src/studio/modlib/include/studio/module.hpp b/src/olympic/studio/modlib/include/studio/module.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/module.hpp
rename to src/olympic/studio/modlib/include/studio/module.hpp
diff --git a/src/studio/modlib/include/studio/popup.hpp b/src/olympic/studio/modlib/include/studio/popup.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/popup.hpp
rename to src/olympic/studio/modlib/include/studio/popup.hpp
diff --git a/src/studio/modlib/include/studio/project.hpp b/src/olympic/studio/modlib/include/studio/project.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/project.hpp
rename to src/olympic/studio/modlib/include/studio/project.hpp
diff --git a/src/studio/modlib/include/studio/studio.hpp b/src/olympic/studio/modlib/include/studio/studio.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/studio.hpp
rename to src/olympic/studio/modlib/include/studio/studio.hpp
diff --git a/src/studio/modlib/include/studio/task.hpp b/src/olympic/studio/modlib/include/studio/task.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/task.hpp
rename to src/olympic/studio/modlib/include/studio/task.hpp
diff --git a/src/studio/modlib/include/studio/undostack.hpp b/src/olympic/studio/modlib/include/studio/undostack.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/undostack.hpp
rename to src/olympic/studio/modlib/include/studio/undostack.hpp
diff --git a/src/studio/modlib/include/studio/widget.hpp b/src/olympic/studio/modlib/include/studio/widget.hpp
similarity index 100%
rename from src/studio/modlib/include/studio/widget.hpp
rename to src/olympic/studio/modlib/include/studio/widget.hpp
diff --git a/src/studio/modlib/src/CMakeLists.txt b/src/olympic/studio/modlib/src/CMakeLists.txt
similarity index 100%
rename from src/studio/modlib/src/CMakeLists.txt
rename to src/olympic/studio/modlib/src/CMakeLists.txt
diff --git a/src/studio/modlib/src/configio.cpp b/src/olympic/studio/modlib/src/configio.cpp
similarity index 100%
rename from src/studio/modlib/src/configio.cpp
rename to src/olympic/studio/modlib/src/configio.cpp
diff --git a/src/studio/modlib/src/editor.cpp b/src/olympic/studio/modlib/src/editor.cpp
similarity index 100%
rename from src/studio/modlib/src/editor.cpp
rename to src/olympic/studio/modlib/src/editor.cpp
diff --git a/src/studio/modlib/src/filedialog_nfd.cpp b/src/olympic/studio/modlib/src/filedialog_nfd.cpp
similarity index 100%
rename from src/studio/modlib/src/filedialog_nfd.cpp
rename to src/olympic/studio/modlib/src/filedialog_nfd.cpp
diff --git a/src/studio/modlib/src/imguiutil.cpp b/src/olympic/studio/modlib/src/imguiutil.cpp
similarity index 100%
rename from src/studio/modlib/src/imguiutil.cpp
rename to src/olympic/studio/modlib/src/imguiutil.cpp
diff --git a/src/studio/modlib/src/module.cpp b/src/olympic/studio/modlib/src/module.cpp
similarity index 100%
rename from src/studio/modlib/src/module.cpp
rename to src/olympic/studio/modlib/src/module.cpp
diff --git a/src/studio/modlib/src/popup.cpp b/src/olympic/studio/modlib/src/popup.cpp
similarity index 100%
rename from src/studio/modlib/src/popup.cpp
rename to src/olympic/studio/modlib/src/popup.cpp
diff --git a/src/studio/modlib/src/project.cpp b/src/olympic/studio/modlib/src/project.cpp
similarity index 100%
rename from src/studio/modlib/src/project.cpp
rename to src/olympic/studio/modlib/src/project.cpp
diff --git a/src/studio/modlib/src/task.cpp b/src/olympic/studio/modlib/src/task.cpp
similarity index 100%
rename from src/studio/modlib/src/task.cpp
rename to src/olympic/studio/modlib/src/task.cpp
diff --git a/src/studio/modlib/src/undostack.cpp b/src/olympic/studio/modlib/src/undostack.cpp
similarity index 100%
rename from src/studio/modlib/src/undostack.cpp
rename to src/olympic/studio/modlib/src/undostack.cpp
diff --git a/src/studio/modlib/src/widget.cpp b/src/olympic/studio/modlib/src/widget.cpp
similarity index 100%
rename from src/studio/modlib/src/widget.cpp
rename to src/olympic/studio/modlib/src/widget.cpp
diff --git a/src/turbine/CMakeLists.txt b/src/olympic/turbine/CMakeLists.txt
similarity index 100%
rename from src/turbine/CMakeLists.txt
rename to src/olympic/turbine/CMakeLists.txt
diff --git a/src/turbine/include/turbine/clipboard.hpp b/src/olympic/turbine/include/turbine/clipboard.hpp
similarity index 100%
rename from src/turbine/include/turbine/clipboard.hpp
rename to src/olympic/turbine/include/turbine/clipboard.hpp
diff --git a/src/turbine/include/turbine/context.hpp b/src/olympic/turbine/include/turbine/context.hpp
similarity index 100%
rename from src/turbine/include/turbine/context.hpp
rename to src/olympic/turbine/include/turbine/context.hpp
diff --git a/src/turbine/include/turbine/event.hpp b/src/olympic/turbine/include/turbine/event.hpp
similarity index 100%
rename from src/turbine/include/turbine/event.hpp
rename to src/olympic/turbine/include/turbine/event.hpp
diff --git a/src/turbine/include/turbine/gfx.hpp b/src/olympic/turbine/include/turbine/gfx.hpp
similarity index 100%
rename from src/turbine/include/turbine/gfx.hpp
rename to src/olympic/turbine/include/turbine/gfx.hpp
diff --git a/src/turbine/include/turbine/input.hpp b/src/olympic/turbine/include/turbine/input.hpp
similarity index 100%
rename from src/turbine/include/turbine/input.hpp
rename to src/olympic/turbine/include/turbine/input.hpp
diff --git a/src/turbine/include/turbine/turbine.hpp b/src/olympic/turbine/include/turbine/turbine.hpp
similarity index 100%
rename from src/turbine/include/turbine/turbine.hpp
rename to src/olympic/turbine/include/turbine/turbine.hpp
diff --git a/src/turbine/src/CMakeLists.txt b/src/olympic/turbine/src/CMakeLists.txt
similarity index 100%
rename from src/turbine/src/CMakeLists.txt
rename to src/olympic/turbine/src/CMakeLists.txt
diff --git a/src/turbine/src/gba/CMakeLists.txt b/src/olympic/turbine/src/gba/CMakeLists.txt
similarity index 100%
rename from src/turbine/src/gba/CMakeLists.txt
rename to src/olympic/turbine/src/gba/CMakeLists.txt
diff --git a/src/turbine/src/gba/clipboard.cpp b/src/olympic/turbine/src/gba/clipboard.cpp
similarity index 100%
rename from src/turbine/src/gba/clipboard.cpp
rename to src/olympic/turbine/src/gba/clipboard.cpp
diff --git a/src/turbine/src/gba/config.hpp b/src/olympic/turbine/src/gba/config.hpp
similarity index 100%
rename from src/turbine/src/gba/config.hpp
rename to src/olympic/turbine/src/gba/config.hpp
diff --git a/src/turbine/src/gba/context.cpp b/src/olympic/turbine/src/gba/context.cpp
similarity index 100%
rename from src/turbine/src/gba/context.cpp
rename to src/olympic/turbine/src/gba/context.cpp
diff --git a/src/turbine/src/gba/context.hpp b/src/olympic/turbine/src/gba/context.hpp
similarity index 100%
rename from src/turbine/src/gba/context.hpp
rename to src/olympic/turbine/src/gba/context.hpp
diff --git a/src/turbine/src/gba/event.cpp b/src/olympic/turbine/src/gba/event.cpp
similarity index 100%
rename from src/turbine/src/gba/event.cpp
rename to src/olympic/turbine/src/gba/event.cpp
diff --git a/src/turbine/src/gba/gfx.cpp b/src/olympic/turbine/src/gba/gfx.cpp
similarity index 100%
rename from src/turbine/src/gba/gfx.cpp
rename to src/olympic/turbine/src/gba/gfx.cpp
diff --git a/src/turbine/src/gba/irq.arm.cpp b/src/olympic/turbine/src/gba/irq.arm.cpp
similarity index 100%
rename from src/turbine/src/gba/irq.arm.cpp
rename to src/olympic/turbine/src/gba/irq.arm.cpp
diff --git a/src/turbine/src/gba/irq.s b/src/olympic/turbine/src/gba/irq.s
similarity index 100%
rename from src/turbine/src/gba/irq.s
rename to src/olympic/turbine/src/gba/irq.s
diff --git a/src/turbine/src/gba/irqstub.cpp b/src/olympic/turbine/src/gba/irqstub.cpp
similarity index 100%
rename from src/turbine/src/gba/irqstub.cpp
rename to src/olympic/turbine/src/gba/irqstub.cpp
diff --git a/src/turbine/src/gba/turbine.arm.cpp b/src/olympic/turbine/src/gba/turbine.arm.cpp
similarity index 100%
rename from src/turbine/src/gba/turbine.arm.cpp
rename to src/olympic/turbine/src/gba/turbine.arm.cpp
diff --git a/src/turbine/src/gba/turbine.cpp b/src/olympic/turbine/src/gba/turbine.cpp
similarity index 100%
rename from src/turbine/src/gba/turbine.cpp
rename to src/olympic/turbine/src/gba/turbine.cpp
diff --git a/src/turbine/src/gba/turbine.hpp b/src/olympic/turbine/src/gba/turbine.hpp
similarity index 100%
rename from src/turbine/src/gba/turbine.hpp
rename to src/olympic/turbine/src/gba/turbine.hpp
diff --git a/src/turbine/src/glfw/CMakeLists.txt b/src/olympic/turbine/src/glfw/CMakeLists.txt
similarity index 100%
rename from src/turbine/src/glfw/CMakeLists.txt
rename to src/olympic/turbine/src/glfw/CMakeLists.txt
diff --git a/src/turbine/src/glfw/clipboard.cpp b/src/olympic/turbine/src/glfw/clipboard.cpp
similarity index 100%
rename from src/turbine/src/glfw/clipboard.cpp
rename to src/olympic/turbine/src/glfw/clipboard.cpp
diff --git a/src/turbine/src/glfw/config.hpp b/src/olympic/turbine/src/glfw/config.hpp
similarity index 100%
rename from src/turbine/src/glfw/config.hpp
rename to src/olympic/turbine/src/glfw/config.hpp
diff --git a/src/turbine/src/glfw/context.cpp b/src/olympic/turbine/src/glfw/context.cpp
similarity index 100%
rename from src/turbine/src/glfw/context.cpp
rename to src/olympic/turbine/src/glfw/context.cpp
diff --git a/src/turbine/src/glfw/context.hpp b/src/olympic/turbine/src/glfw/context.hpp
similarity index 100%
rename from src/turbine/src/glfw/context.hpp
rename to src/olympic/turbine/src/glfw/context.hpp
diff --git a/src/turbine/src/glfw/event.cpp b/src/olympic/turbine/src/glfw/event.cpp
similarity index 100%
rename from src/turbine/src/glfw/event.cpp
rename to src/olympic/turbine/src/glfw/event.cpp
diff --git a/src/turbine/src/glfw/gfx.cpp b/src/olympic/turbine/src/glfw/gfx.cpp
similarity index 100%
rename from src/turbine/src/glfw/gfx.cpp
rename to src/olympic/turbine/src/glfw/gfx.cpp
diff --git a/src/turbine/src/glfw/turbine.cpp b/src/olympic/turbine/src/glfw/turbine.cpp
similarity index 100%
rename from src/turbine/src/glfw/turbine.cpp
rename to src/olympic/turbine/src/glfw/turbine.cpp