diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d7a1e07..d6e7a847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,6 @@ add_library(lego1 SHARED
   LEGO1/mxvideoparamflags.cpp
   LEGO1/mxvideopresenter.cpp
   LEGO1/mxwavepresenter.cpp
-  LEGO1/orientableroi.cpp
   LEGO1/pizza.cpp
   LEGO1/pizzamissionstate.cpp
   LEGO1/pizzeria.cpp
@@ -202,6 +201,7 @@ add_library(lego1 SHARED
   LEGO1/racestate.cpp
   LEGO1/radio.cpp
   LEGO1/radiostate.cpp
+  LEGO1/realtime/orientableroi.cpp
   LEGO1/realtime/realtime.cpp
   LEGO1/realtime/realtimeview.cpp
   LEGO1/registrationbook.cpp
@@ -210,9 +210,9 @@ add_library(lego1 SHARED
   LEGO1/skateboard.cpp
   LEGO1/towtrack.cpp
   LEGO1/towtrackmissionstate.cpp
-  LEGO1/viewmanager.cpp
-  LEGO1/viewroi.cpp
-)
+  LEGO1/viewmanager/viewmanager.cpp
+  LEGO1/viewmanager/viewroi.cpp
+ "LEGO1/realtime/mxmatrix.h" "LEGO1/realtime/mxvector.h")
 if (MINGW)
   target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500)
 endif()
@@ -249,7 +249,7 @@ if (ISLE_BUILD_APP)
     ISLE/res/isle.rc
     ISLE/isleapp.cpp
     ISLE/define.cpp
-  )
+   "LEGO1/realtime/mxmatrix.h" "LEGO1/realtime/mxvector.h")
 
   # Include LEGO1 headers in ISLE
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
index 68c8f57d..626ecbd6 100644
--- a/LEGO1/lego3dview.h
+++ b/LEGO1/lego3dview.h
@@ -1,7 +1,7 @@
 #ifndef LEGO3DVIEW_H
 #define LEGO3DVIEW_H
 
-#include "viewmanager.h"
+#include "viewmanager/viewmanager.h"
 
 class Lego3DView {
 public:
diff --git a/LEGO1/lodlist.h b/LEGO1/realtime/lodlist.h
similarity index 100%
rename from LEGO1/lodlist.h
rename to LEGO1/realtime/lodlist.h
diff --git a/LEGO1/mxmatrix.h b/LEGO1/realtime/mxmatrix.h
similarity index 100%
rename from LEGO1/mxmatrix.h
rename to LEGO1/realtime/mxmatrix.h
diff --git a/LEGO1/mxvector.h b/LEGO1/realtime/mxvector.h
similarity index 99%
rename from LEGO1/mxvector.h
rename to LEGO1/realtime/mxvector.h
index 3b850ee1..6c2b0288 100644
--- a/LEGO1/mxvector.h
+++ b/LEGO1/realtime/mxvector.h
@@ -1,7 +1,7 @@
 #ifndef MXVECTOR_H
 #define MXVECTOR_H
 
-#include "mxtypes.h"
+#include "../mxtypes.h"
 
 #include <vec.h>
 
diff --git a/LEGO1/orientableroi.cpp b/LEGO1/realtime/orientableroi.cpp
similarity index 98%
rename from LEGO1/orientableroi.cpp
rename to LEGO1/realtime/orientableroi.cpp
index a5915847..88f6dc24 100644
--- a/LEGO1/orientableroi.cpp
+++ b/LEGO1/realtime/orientableroi.cpp
@@ -1,6 +1,6 @@
 #include "orientableroi.h"
 
-#include "decomp.h"
+#include "../decomp.h"
 
 DECOMP_SIZE_ASSERT(OrientableROI, 0xdc)
 
diff --git a/LEGO1/orientableroi.h b/LEGO1/realtime/orientableroi.h
similarity index 100%
rename from LEGO1/orientableroi.h
rename to LEGO1/realtime/orientableroi.h
diff --git a/LEGO1/roi.h b/LEGO1/realtime/roi.h
similarity index 96%
rename from LEGO1/roi.h
rename to LEGO1/realtime/roi.h
index 58d03745..f7bb51dd 100644
--- a/LEGO1/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -1,11 +1,11 @@
 #ifndef ROI_H
 #define ROI_H
 
-#include "compat.h"
+#include "../compat.h"
+#include "../mxstl.h"
+#include "../realtime/realtime.h"
 #include "lodlist.h"
-#include "mxstl.h"
 #include "mxvector.h"
-#include "realtime/realtime.h"
 
 /*
  * A simple bounding box object with Min and Max accessor methods.
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index 080c8ea0..0fe0e7dc 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -10,7 +10,6 @@
 
 #endif /* _WIN32 */
 
-#include "mxmatrix.h"
 #include "tglVector.h"
 
 namespace Tgl
diff --git a/LEGO1/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
similarity index 97%
rename from LEGO1/viewlodlist.h
rename to LEGO1/viewmanager/viewlodlist.h
index b996d088..4cdbfe1b 100644
--- a/LEGO1/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -1,10 +1,10 @@
 #ifndef VIEWLODLIST_H
 #define VIEWLODLIST_H
 
-#include "LODList.h"
+#include "../compat.h"
+#include "../mxtypes.h"
+#include "../realtime/LODList.h"
 #include "assert.h"
-#include "compat.h"
-#include "mxtypes.h"
 #pragma warning(disable : 4786)
 
 class ViewLOD;
diff --git a/LEGO1/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp
similarity index 100%
rename from LEGO1/viewmanager.cpp
rename to LEGO1/viewmanager/viewmanager.cpp
diff --git a/LEGO1/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
similarity index 100%
rename from LEGO1/viewmanager.h
rename to LEGO1/viewmanager/viewmanager.h
diff --git a/LEGO1/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp
similarity index 97%
rename from LEGO1/viewroi.cpp
rename to LEGO1/viewmanager/viewroi.cpp
index 7bfc4ab8..a3a9f167 100644
--- a/LEGO1/viewroi.cpp
+++ b/LEGO1/viewmanager/viewroi.cpp
@@ -1,6 +1,6 @@
 #include "viewroi.h"
 
-#include "decomp.h"
+#include "../decomp.h"
 
 DECOMP_SIZE_ASSERT(ViewROI, 0xe0)
 
diff --git a/LEGO1/viewroi.h b/LEGO1/viewmanager/viewroi.h
similarity index 94%
rename from LEGO1/viewroi.h
rename to LEGO1/viewmanager/viewroi.h
index 1104e1f5..cc5fe0fc 100644
--- a/LEGO1/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -1,8 +1,8 @@
 #ifndef VIEWROI_H
 #define VIEWROI_H
 
-#include "orientableroi.h"
-#include "tgl/tgl.h"
+#include "../realtime/orientableroi.h"
+#include "../tgl/tgl.h"
 #include "viewlodlist.h"
 
 /*