diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt
index 6158554d4..73421210a 100644
--- a/src/nostalgia/CMakeLists.txt
+++ b/src/nostalgia/CMakeLists.txt
@@ -1,9 +1,7 @@
 
 #project packages
 
-add_subdirectory(appmodules)
-add_subdirectory(core)
-add_subdirectory(scene)
+add_subdirectory(modules)
 
 if(NOSTALGIA_BUILD_PLAYER)
 	add_subdirectory(player)
diff --git a/src/nostalgia/appmodules/CMakeLists.txt b/src/nostalgia/modules/CMakeLists.txt
similarity index 88%
rename from src/nostalgia/appmodules/CMakeLists.txt
rename to src/nostalgia/modules/CMakeLists.txt
index 9083583c2..5ebb0a62f 100644
--- a/src/nostalgia/appmodules/CMakeLists.txt
+++ b/src/nostalgia/modules/CMakeLists.txt
@@ -1,3 +1,11 @@
+# module dir list
+
+add_subdirectory(core)
+add_subdirectory(scene)
+
+
+# module libraries
+
 add_library(
 	NostalgiaKeelModules OBJECT
 		keelmodules.cpp
diff --git a/src/nostalgia/modules/core/CMakeLists.txt b/src/nostalgia/modules/core/CMakeLists.txt
new file mode 100644
index 000000000..ea484df9c
--- /dev/null
+++ b/src/nostalgia/modules/core/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(src)
+
+install(
+	DIRECTORY
+		include/nostalgia
+	DESTINATION
+		include
+)
\ No newline at end of file
diff --git a/src/nostalgia/core/color.hpp b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp
similarity index 100%
rename from src/nostalgia/core/color.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/color.hpp
diff --git a/src/nostalgia/core/config.hpp b/src/nostalgia/modules/core/include/nostalgia/core/config.hpp
similarity index 100%
rename from src/nostalgia/core/config.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/config.hpp
diff --git a/src/nostalgia/core/consts.hpp b/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp
similarity index 80%
rename from src/nostalgia/core/consts.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/consts.hpp
index 4faa07b7f..db390f7f6 100644
--- a/src/nostalgia/core/consts.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
diff --git a/src/nostalgia/core/context.hpp b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp
similarity index 100%
rename from src/nostalgia/core/context.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/context.hpp
diff --git a/src/nostalgia/core/core.hpp b/src/nostalgia/modules/core/include/nostalgia/core/core.hpp
similarity index 92%
rename from src/nostalgia/core/core.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/core.hpp
index d10124598..2bcb1dade 100644
--- a/src/nostalgia/core/core.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/core.hpp
@@ -12,4 +12,3 @@
 #include "palette.hpp"
 #include "ptidxconv.hpp"
 #include "tilesheet.hpp"
-#include "typeconv.hpp"
\ No newline at end of file
diff --git a/src/nostalgia/core/gfx.hpp b/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp
similarity index 100%
rename from src/nostalgia/core/gfx.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp
diff --git a/src/nostalgia/core/initparams.hpp b/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp
similarity index 100%
rename from src/nostalgia/core/initparams.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp
diff --git a/src/nostalgia/core/keelmodule.hpp b/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp
similarity index 100%
rename from src/nostalgia/core/keelmodule.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp
diff --git a/src/nostalgia/core/palette.hpp b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp
similarity index 100%
rename from src/nostalgia/core/palette.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/palette.hpp
diff --git a/src/nostalgia/core/ptidxconv.hpp b/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp
similarity index 100%
rename from src/nostalgia/core/ptidxconv.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp
diff --git a/src/nostalgia/core/studio/studiomodule.hpp b/src/nostalgia/modules/core/include/nostalgia/core/studio/studiomodule.hpp
similarity index 100%
rename from src/nostalgia/core/studio/studiomodule.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/studio/studiomodule.hpp
diff --git a/src/nostalgia/core/tilesheet.hpp b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
similarity index 100%
rename from src/nostalgia/core/tilesheet.hpp
rename to src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
diff --git a/src/nostalgia/core/CMakeLists.txt b/src/nostalgia/modules/core/src/CMakeLists.txt
similarity index 73%
rename from src/nostalgia/core/CMakeLists.txt
rename to src/nostalgia/modules/core/src/CMakeLists.txt
index eb497e337..ff2cda797 100644
--- a/src/nostalgia/core/CMakeLists.txt
+++ b/src/nostalgia/modules/core/src/CMakeLists.txt
@@ -16,6 +16,11 @@ if(NOT MSVC)
 	target_compile_options(NostalgiaCore PRIVATE -Wconversion)
 endif()
 
+target_include_directories(
+	NostalgiaCore PUBLIC
+		../include
+)
+
 target_link_libraries(
 	NostalgiaCore PUBLIC
 		Turbine
@@ -25,26 +30,10 @@ if(NOSTALGIA_BUILD_STUDIO)
 	add_subdirectory(studio)
 endif()
 
-install(
-	FILES
-		color.hpp
-		config.hpp
-		consts.hpp
-		context.hpp
-		core.hpp
-		gfx.hpp
-		initparams.hpp
-		ptidxconv.hpp
-		tilesheet.hpp
-		typeconv.hpp
-	DESTINATION
-		include/nostalgia/core
-)
-
 install(
 	TARGETS
 		NostalgiaCore
 	DESTINATION
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib
-)
+)
\ No newline at end of file
diff --git a/src/nostalgia/core/gba/CMakeLists.txt b/src/nostalgia/modules/core/src/gba/CMakeLists.txt
similarity index 100%
rename from src/nostalgia/core/gba/CMakeLists.txt
rename to src/nostalgia/modules/core/src/gba/CMakeLists.txt
diff --git a/src/nostalgia/core/gba/context.cpp b/src/nostalgia/modules/core/src/gba/context.cpp
similarity index 92%
rename from src/nostalgia/core/gba/context.cpp
rename to src/nostalgia/modules/core/src/gba/context.cpp
index 5092152e9..ca8f74edf 100644
--- a/src/nostalgia/core/gba/context.cpp
+++ b/src/nostalgia/modules/core/src/gba/context.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "../gfx.hpp"
+#include <nostalgia/core/gfx.hpp>
 
 #include "context.hpp"
 
diff --git a/src/nostalgia/core/gba/context.hpp b/src/nostalgia/modules/core/src/gba/context.hpp
similarity index 88%
rename from src/nostalgia/core/gba/context.hpp
rename to src/nostalgia/modules/core/src/gba/context.hpp
index f498de776..2a20c070c 100644
--- a/src/nostalgia/core/gba/context.hpp
+++ b/src/nostalgia/modules/core/src/gba/context.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../context.hpp"
+#include <nostalgia/core/context.hpp>
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/core/gba/gfx.cpp b/src/nostalgia/modules/core/src/gba/gfx.cpp
similarity index 100%
rename from src/nostalgia/core/gba/gfx.cpp
rename to src/nostalgia/modules/core/src/gba/gfx.cpp
diff --git a/src/nostalgia/core/gba/gfx.hpp b/src/nostalgia/modules/core/src/gba/gfx.hpp
similarity index 83%
rename from src/nostalgia/core/gba/gfx.hpp
rename to src/nostalgia/modules/core/src/gba/gfx.hpp
index 3ed1de9fd..19e998eba 100644
--- a/src/nostalgia/core/gba/gfx.hpp
+++ b/src/nostalgia/modules/core/src/gba/gfx.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../context.hpp"
+#include <nostalgia/core/context.hpp>
 
 namespace nostalgia::core {
 ox::Error initGfx(Context *ctx, const InitParams&) noexcept;
diff --git a/src/nostalgia/core/gba/panic.cpp b/src/nostalgia/modules/core/src/gba/panic.cpp
similarity index 95%
rename from src/nostalgia/core/gba/panic.cpp
rename to src/nostalgia/modules/core/src/gba/panic.cpp
index c4e83a72f..47c8d2cde 100644
--- a/src/nostalgia/core/gba/panic.cpp
+++ b/src/nostalgia/modules/core/src/gba/panic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 
diff --git a/src/nostalgia/core/gfx.cpp b/src/nostalgia/modules/core/src/gfx.cpp
similarity index 97%
rename from src/nostalgia/core/gfx.cpp
rename to src/nostalgia/modules/core/src/gfx.cpp
index 7d4719bfe..af6a159ca 100644
--- a/src/nostalgia/core/gfx.cpp
+++ b/src/nostalgia/modules/core/src/gfx.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "gfx.hpp"
+#include <nostalgia/core/gfx.hpp>
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/core/keelmodule.cpp b/src/nostalgia/modules/core/src/keelmodule.cpp
similarity index 96%
rename from src/nostalgia/core/keelmodule.cpp
rename to src/nostalgia/modules/core/src/keelmodule.cpp
index 622e4b3ec..c2519cde6 100644
--- a/src/nostalgia/core/keelmodule.cpp
+++ b/src/nostalgia/modules/core/src/keelmodule.cpp
@@ -7,10 +7,11 @@
 #include <keel/asset.hpp>
 #include <keel/module.hpp>
 
-#include "gfx.hpp"
-#include "typeconv.hpp"
+#include <nostalgia/core/gfx.hpp>
 
-#include "keelmodule.hpp"
+#include <nostalgia/core/keelmodule.hpp>
+
+#include "typeconv.hpp"
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/core/opengl/CMakeLists.txt b/src/nostalgia/modules/core/src/opengl/CMakeLists.txt
similarity index 100%
rename from src/nostalgia/core/opengl/CMakeLists.txt
rename to src/nostalgia/modules/core/src/opengl/CMakeLists.txt
diff --git a/src/nostalgia/core/opengl/context.cpp b/src/nostalgia/modules/core/src/opengl/context.cpp
similarity index 100%
rename from src/nostalgia/core/opengl/context.cpp
rename to src/nostalgia/modules/core/src/opengl/context.cpp
diff --git a/src/nostalgia/core/opengl/context.hpp b/src/nostalgia/modules/core/src/opengl/context.hpp
similarity index 90%
rename from src/nostalgia/core/opengl/context.hpp
rename to src/nostalgia/modules/core/src/opengl/context.hpp
index bfc9dc167..97aa0de30 100644
--- a/src/nostalgia/core/opengl/context.hpp
+++ b/src/nostalgia/modules/core/src/opengl/context.hpp
@@ -8,10 +8,10 @@
 
 #include <glutils/glutils.hpp>
 
-#include "gfx.hpp"
+#include <nostalgia/core/gfx.hpp>
+#include <nostalgia/core/context.hpp>
 
-#include "../gfx.hpp"
-#include "../context.hpp"
+#include "gfx.hpp"
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/core/opengl/gfx.cpp b/src/nostalgia/modules/core/src/opengl/gfx.cpp
similarity index 100%
rename from src/nostalgia/core/opengl/gfx.cpp
rename to src/nostalgia/modules/core/src/opengl/gfx.cpp
diff --git a/src/nostalgia/core/opengl/gfx.hpp b/src/nostalgia/modules/core/src/opengl/gfx.hpp
similarity index 97%
rename from src/nostalgia/core/opengl/gfx.hpp
rename to src/nostalgia/modules/core/src/opengl/gfx.hpp
index b9bd05c11..2f3314824 100644
--- a/src/nostalgia/core/opengl/gfx.hpp
+++ b/src/nostalgia/modules/core/src/opengl/gfx.hpp
@@ -10,7 +10,7 @@
 
 #include <glutils/glutils.hpp>
 
-#include "../context.hpp"
+#include <nostalgia/core/context.hpp>
 
 namespace nostalgia::core::renderer {
 
diff --git a/src/nostalgia/core/studio/CMakeLists.txt b/src/nostalgia/modules/core/src/studio/CMakeLists.txt
similarity index 100%
rename from src/nostalgia/core/studio/CMakeLists.txt
rename to src/nostalgia/modules/core/src/studio/CMakeLists.txt
diff --git a/src/nostalgia/core/studio/paletteeditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor-imgui.cpp
similarity index 100%
rename from src/nostalgia/core/studio/paletteeditor-imgui.cpp
rename to src/nostalgia/modules/core/src/studio/paletteeditor-imgui.cpp
diff --git a/src/nostalgia/core/studio/paletteeditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor-imgui.hpp
similarity index 100%
rename from src/nostalgia/core/studio/paletteeditor-imgui.hpp
rename to src/nostalgia/modules/core/src/studio/paletteeditor-imgui.hpp
diff --git a/src/nostalgia/core/studio/paletteeditor.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor.cpp
similarity index 97%
rename from src/nostalgia/core/studio/paletteeditor.cpp
rename to src/nostalgia/modules/core/src/studio/paletteeditor.cpp
index 9dab758ef..299804b29 100644
--- a/src/nostalgia/core/studio/paletteeditor.cpp
+++ b/src/nostalgia/modules/core/src/studio/paletteeditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #include "paletteeditor.hpp"
diff --git a/src/nostalgia/core/studio/paletteeditor.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor.hpp
similarity index 96%
rename from src/nostalgia/core/studio/paletteeditor.hpp
rename to src/nostalgia/modules/core/src/studio/paletteeditor.hpp
index bac0a2620..86e1289f4 100644
--- a/src/nostalgia/core/studio/paletteeditor.hpp
+++ b/src/nostalgia/modules/core/src/studio/paletteeditor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
diff --git a/src/nostalgia/core/studio/studiomodule.cpp b/src/nostalgia/modules/core/src/studio/studiomodule.cpp
similarity index 97%
rename from src/nostalgia/core/studio/studiomodule.cpp
rename to src/nostalgia/modules/core/src/studio/studiomodule.cpp
index 34ea4a5cc..d899064ea 100644
--- a/src/nostalgia/core/studio/studiomodule.cpp
+++ b/src/nostalgia/modules/core/src/studio/studiomodule.cpp
@@ -4,11 +4,11 @@
 
 #include <ox/std/memory.hpp>
 
+#include <studio/studio.hpp>
+
 #include "paletteeditor-imgui.hpp"
 #include "tilesheeteditor-imgui.hpp"
 
-#include "studiomodule.hpp"
-
 namespace nostalgia::core {
 
 class StudioModule: public studio::Module {
diff --git a/src/nostalgia/core/studio/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor-imgui.cpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheeteditor-imgui.cpp
rename to src/nostalgia/modules/core/src/studio/tilesheeteditor-imgui.cpp
diff --git a/src/nostalgia/core/studio/tilesheeteditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor-imgui.hpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheeteditor-imgui.hpp
rename to src/nostalgia/modules/core/src/studio/tilesheeteditor-imgui.hpp
diff --git a/src/nostalgia/core/studio/tilesheeteditormodel.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheeteditormodel.cpp
rename to src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
diff --git a/src/nostalgia/core/studio/tilesheeteditormodel.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditormodel.hpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheeteditormodel.hpp
rename to src/nostalgia/modules/core/src/studio/tilesheeteditormodel.hpp
diff --git a/src/nostalgia/core/studio/tilesheeteditorview.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditorview.cpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheeteditorview.cpp
rename to src/nostalgia/modules/core/src/studio/tilesheeteditorview.cpp
diff --git a/src/nostalgia/core/studio/tilesheeteditorview.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditorview.hpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheeteditorview.hpp
rename to src/nostalgia/modules/core/src/studio/tilesheeteditorview.hpp
diff --git a/src/nostalgia/core/studio/tilesheetpixelgrid.cpp b/src/nostalgia/modules/core/src/studio/tilesheetpixelgrid.cpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheetpixelgrid.cpp
rename to src/nostalgia/modules/core/src/studio/tilesheetpixelgrid.cpp
diff --git a/src/nostalgia/core/studio/tilesheetpixelgrid.hpp b/src/nostalgia/modules/core/src/studio/tilesheetpixelgrid.hpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheetpixelgrid.hpp
rename to src/nostalgia/modules/core/src/studio/tilesheetpixelgrid.hpp
diff --git a/src/nostalgia/core/studio/tilesheetpixels.cpp b/src/nostalgia/modules/core/src/studio/tilesheetpixels.cpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheetpixels.cpp
rename to src/nostalgia/modules/core/src/studio/tilesheetpixels.cpp
diff --git a/src/nostalgia/core/studio/tilesheetpixels.hpp b/src/nostalgia/modules/core/src/studio/tilesheetpixels.hpp
similarity index 100%
rename from src/nostalgia/core/studio/tilesheetpixels.hpp
rename to src/nostalgia/modules/core/src/studio/tilesheetpixels.hpp
diff --git a/src/nostalgia/core/typeconv.cpp b/src/nostalgia/modules/core/src/typeconv.cpp
similarity index 100%
rename from src/nostalgia/core/typeconv.cpp
rename to src/nostalgia/modules/core/src/typeconv.cpp
diff --git a/src/nostalgia/core/typeconv.hpp b/src/nostalgia/modules/core/src/typeconv.hpp
similarity index 93%
rename from src/nostalgia/core/typeconv.hpp
rename to src/nostalgia/modules/core/src/typeconv.hpp
index 287e08fc8..f818133da 100644
--- a/src/nostalgia/core/typeconv.hpp
+++ b/src/nostalgia/modules/core/src/typeconv.hpp
@@ -8,8 +8,8 @@
 
 #include <keel/typeconv.hpp>
 
-#include "context.hpp"
-#include "gfx.hpp"
+#include <nostalgia/core/context.hpp>
+#include <nostalgia/core/gfx.hpp>
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/appmodules/keelmodules.cpp b/src/nostalgia/modules/keelmodules.cpp
similarity index 100%
rename from src/nostalgia/appmodules/keelmodules.cpp
rename to src/nostalgia/modules/keelmodules.cpp
diff --git a/src/nostalgia/appmodules/keelmodules.hpp b/src/nostalgia/modules/keelmodules.hpp
similarity index 100%
rename from src/nostalgia/appmodules/keelmodules.hpp
rename to src/nostalgia/modules/keelmodules.hpp
diff --git a/src/nostalgia/modules/scene/CMakeLists.txt b/src/nostalgia/modules/scene/CMakeLists.txt
new file mode 100644
index 000000000..bdd3812b7
--- /dev/null
+++ b/src/nostalgia/modules/scene/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_subdirectory(src)
+
+target_include_directories(
+	NostalgiaScene PUBLIC
+		include
+)
+
+install(
+	DIRECTORY
+		include/nostalgia
+	DESTINATION
+		include
+)
diff --git a/src/nostalgia/scene/keelmodule.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp
similarity index 100%
rename from src/nostalgia/scene/keelmodule.hpp
rename to src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp
diff --git a/src/nostalgia/scene/scene.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp
similarity index 100%
rename from src/nostalgia/scene/scene.hpp
rename to src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp
diff --git a/src/nostalgia/scene/scenestatic.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp
similarity index 100%
rename from src/nostalgia/scene/scenestatic.hpp
rename to src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp
diff --git a/src/nostalgia/scene/studio/studiomodule.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/studio/studiomodule.hpp
similarity index 100%
rename from src/nostalgia/scene/studio/studiomodule.hpp
rename to src/nostalgia/modules/scene/include/nostalgia/scene/studio/studiomodule.hpp
diff --git a/src/nostalgia/scene/CMakeLists.txt b/src/nostalgia/modules/scene/src/CMakeLists.txt
similarity index 68%
rename from src/nostalgia/scene/CMakeLists.txt
rename to src/nostalgia/modules/scene/src/CMakeLists.txt
index 7af14f353..2b0e31a41 100644
--- a/src/nostalgia/scene/CMakeLists.txt
+++ b/src/nostalgia/modules/scene/src/CMakeLists.txt
@@ -7,20 +7,16 @@ add_library(
 		typeconv.cpp
 )
 
+target_include_directories(
+	NostalgiaScene PUBLIC
+		../include
+)
+
 target_link_libraries(
 	NostalgiaScene PUBLIC
 		NostalgiaCore
 )
 
-install(
-	FILES
-		scenestatic.hpp
-		keelmodule.hpp
-		typeconv.hpp
-	DESTINATION
-		include/nostalgia/scene
-)
-
 if(NOSTALGIA_BUILD_STUDIO)
 	add_subdirectory(studio)
 endif()
diff --git a/src/nostalgia/scene/keelmodule.cpp b/src/nostalgia/modules/scene/src/keelmodule.cpp
similarity index 92%
rename from src/nostalgia/scene/keelmodule.cpp
rename to src/nostalgia/modules/scene/src/keelmodule.cpp
index 730a671f8..29d0744a3 100644
--- a/src/nostalgia/scene/keelmodule.cpp
+++ b/src/nostalgia/modules/scene/src/keelmodule.cpp
@@ -2,10 +2,11 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "scenestatic.hpp"
-#include "typeconv.hpp"
+#include <keel/module.hpp>
 
-#include "keelmodule.hpp"
+#include <nostalgia/scene/scenestatic.hpp>
+
+#include "typeconv.hpp"
 
 namespace nostalgia::scene {
 
diff --git a/src/nostalgia/scene/scene.cpp b/src/nostalgia/modules/scene/src/scene.cpp
similarity index 96%
rename from src/nostalgia/scene/scene.cpp
rename to src/nostalgia/modules/scene/src/scene.cpp
index 4ac8ae216..2e9ee5eb2 100644
--- a/src/nostalgia/scene/scene.cpp
+++ b/src/nostalgia/modules/scene/src/scene.cpp
@@ -4,7 +4,7 @@
 
 #include <nostalgia/core/gfx.hpp>
 
-#include "scene.hpp"
+#include <nostalgia/scene/scene.hpp>
 
 namespace nostalgia::scene {
 
diff --git a/src/nostalgia/scene/scenestatic.cpp b/src/nostalgia/modules/scene/src/scenestatic.cpp
similarity index 74%
rename from src/nostalgia/scene/scenestatic.cpp
rename to src/nostalgia/modules/scene/src/scenestatic.cpp
index 3f9b653ad..3e987a3db 100644
--- a/src/nostalgia/scene/scenestatic.cpp
+++ b/src/nostalgia/modules/scene/src/scenestatic.cpp
@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "scenestatic.hpp"
+#include <nostalgia/scene/scenestatic.hpp>
 
 namespace nostalgia::scene {
 
diff --git a/src/nostalgia/scene/studio/CMakeLists.txt b/src/nostalgia/modules/scene/src/studio/CMakeLists.txt
similarity index 100%
rename from src/nostalgia/scene/studio/CMakeLists.txt
rename to src/nostalgia/modules/scene/src/studio/CMakeLists.txt
diff --git a/src/nostalgia/scene/studio/sceneeditor-imgui.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp
similarity index 100%
rename from src/nostalgia/scene/studio/sceneeditor-imgui.cpp
rename to src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp
diff --git a/src/nostalgia/scene/studio/sceneeditor-imgui.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp
similarity index 100%
rename from src/nostalgia/scene/studio/sceneeditor-imgui.hpp
rename to src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp
diff --git a/src/nostalgia/scene/studio/sceneeditor.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp
similarity index 100%
rename from src/nostalgia/scene/studio/sceneeditor.cpp
rename to src/nostalgia/modules/scene/src/studio/sceneeditor.cpp
diff --git a/src/nostalgia/scene/studio/sceneeditor.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp
similarity index 100%
rename from src/nostalgia/scene/studio/sceneeditor.hpp
rename to src/nostalgia/modules/scene/src/studio/sceneeditor.hpp
diff --git a/src/nostalgia/scene/studio/sceneeditorview.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp
similarity index 100%
rename from src/nostalgia/scene/studio/sceneeditorview.cpp
rename to src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp
diff --git a/src/nostalgia/scene/studio/sceneeditorview.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp
similarity index 100%
rename from src/nostalgia/scene/studio/sceneeditorview.hpp
rename to src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp
diff --git a/src/nostalgia/scene/studio/studiomodule.cpp b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp
similarity index 96%
rename from src/nostalgia/scene/studio/studiomodule.cpp
rename to src/nostalgia/modules/scene/src/studio/studiomodule.cpp
index 834ae32e9..532deb50b 100644
--- a/src/nostalgia/scene/studio/studiomodule.cpp
+++ b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp
@@ -2,8 +2,9 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#include <studio/studio.hpp>
+
 #include "sceneeditor-imgui.hpp"
-#include "studiomodule.hpp"
 
 namespace nostalgia::scene {
 
diff --git a/src/nostalgia/scene/typeconv.cpp b/src/nostalgia/modules/scene/src/typeconv.cpp
similarity index 100%
rename from src/nostalgia/scene/typeconv.cpp
rename to src/nostalgia/modules/scene/src/typeconv.cpp
diff --git a/src/nostalgia/scene/typeconv.hpp b/src/nostalgia/modules/scene/src/typeconv.hpp
similarity index 88%
rename from src/nostalgia/scene/typeconv.hpp
rename to src/nostalgia/modules/scene/src/typeconv.hpp
index 5b0fb8ad9..e9a2342ee 100644
--- a/src/nostalgia/scene/typeconv.hpp
+++ b/src/nostalgia/modules/scene/src/typeconv.hpp
@@ -6,7 +6,7 @@
 
 #include <keel/typeconv.hpp>
 
-#include "scenestatic.hpp"
+#include <nostalgia/scene/scenestatic.hpp>
 
 namespace nostalgia::scene {
 
diff --git a/src/nostalgia/appmodules/studiomodules.cpp b/src/nostalgia/modules/studiomodules.cpp
similarity index 100%
rename from src/nostalgia/appmodules/studiomodules.cpp
rename to src/nostalgia/modules/studiomodules.cpp
diff --git a/src/nostalgia/appmodules/studiomodules.hpp b/src/nostalgia/modules/studiomodules.hpp
similarity index 100%
rename from src/nostalgia/appmodules/studiomodules.hpp
rename to src/nostalgia/modules/studiomodules.hpp
diff --git a/src/nostalgia/player/main.cpp b/src/nostalgia/player/main.cpp
index f9e9d22d3..9fb9eeacc 100644
--- a/src/nostalgia/player/main.cpp
+++ b/src/nostalgia/player/main.cpp
@@ -6,7 +6,7 @@
 
 #include <keel/media.hpp>
 
-#include <nostalgia/appmodules/keelmodules.hpp>
+#include <nostalgia/modules/keelmodules.hpp>
 
 #include "app.hpp"
 
diff --git a/src/nostalgia/studio/main.cpp b/src/nostalgia/studio/main.cpp
index e47919cc4..8523df5cf 100644
--- a/src/nostalgia/studio/main.cpp
+++ b/src/nostalgia/studio/main.cpp
@@ -2,8 +2,8 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include <nostalgia/appmodules/keelmodules.hpp>
-#include <nostalgia/appmodules/studiomodules.hpp>
+#include <nostalgia/modules/keelmodules.hpp>
+#include <nostalgia/modules/studiomodules.hpp>
 
 #include <studioapp/studioapp.hpp>
 
diff --git a/src/nostalgia/tools/pack.cpp b/src/nostalgia/tools/pack.cpp
index c9e0f7d54..164e76bfd 100644
--- a/src/nostalgia/tools/pack.cpp
+++ b/src/nostalgia/tools/pack.cpp
@@ -10,9 +10,7 @@
 
 #include <keel/keel.hpp>
 
-#include <nostalgia/appmodules/keelmodules.hpp>
-
-using namespace nostalgia;
+#include <nostalgia/modules/keelmodules.hpp>
 
 static ox::Error writeFileBuff(ox::CRStringView path, const ox::Buffer &buff) noexcept {
 	try {
@@ -52,7 +50,7 @@ static ox::Error generateTypes(ox::TypeStore *ts) noexcept {
 }
 
 static ox::Error run(const ox::ClArgs &args) noexcept {
-	registerKeelModules();
+	nostalgia::registerKeelModules();
 	const auto argSrc = args.getString("src", "");
 	const auto argRomBin = args.getString("rom-bin", "");
 	if (argSrc == "") {