diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6e7a847..ccdd4e8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ add_library(lego1 SHARED
   LEGO1/mxloopingflcpresenter.cpp
   LEGO1/mxloopingmidipresenter.cpp
   LEGO1/mxloopingsmkpresenter.cpp
-  LEGO1/mxmatrix.cpp
+  
   LEGO1/mxmediamanager.cpp
   LEGO1/mxmediapresenter.cpp
   LEGO1/mxmidipresenter.cpp
@@ -183,7 +183,7 @@ add_library(lego1 SHARED
   LEGO1/mxtype17notificationparam.cpp
   LEGO1/mxvariable.cpp
   LEGO1/mxvariabletable.cpp
-  LEGO1/mxvector.cpp
+  
   LEGO1/mxvideomanager.cpp
   LEGO1/mxvideoparam.cpp
   LEGO1/mxvideoparamflags.cpp
@@ -201,6 +201,8 @@ add_library(lego1 SHARED
   LEGO1/racestate.cpp
   LEGO1/radio.cpp
   LEGO1/radiostate.cpp
+  LEGO1/realtime/mxmatrix.cpp
+  LEGO1/realtime/mxvector.cpp
   LEGO1/realtime/orientableroi.cpp
   LEGO1/realtime/realtime.cpp
   LEGO1/realtime/realtimeview.cpp
@@ -212,7 +214,7 @@ add_library(lego1 SHARED
   LEGO1/towtrackmissionstate.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 +251,7 @@ if (ISLE_BUILD_APP)
     ISLE/res/isle.rc
     ISLE/isleapp.cpp
     ISLE/define.cpp
-   "LEGO1/realtime/mxmatrix.h" "LEGO1/realtime/mxvector.h")
+   "LEGO1/realtime/mxmatrix.h" "LEGO1/realtime/mxvector.h" "LEGO1/realtime/mxmatrix.cpp" "LEGO1/realtime/mxvector.cpp")
 
   # Include LEGO1 headers in ISLE
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h
index d9de2854..184ae591 100644
--- a/LEGO1/helicopter.h
+++ b/LEGO1/helicopter.h
@@ -3,7 +3,7 @@
 
 #include "helicopterstate.h"
 #include "islepathactor.h"
-#include "mxmatrix.h"
+#include "realtime/mxmatrix.h"
 
 // VTABLE 0x100d40f8
 // SIZE 0x230
diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h
index c0a16c32..c7d97fd7 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/legoentity.h
@@ -6,7 +6,7 @@
 #include "legoroi.h"
 #include "mxdsobject.h"
 #include "mxentity.h"
-#include "mxvector.h"
+#include "realtime/mxvector.h"
 
 // VTABLE 0x100d4858
 // SIZE 0x68 (probably)
diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h
index 01e4af51..4df8179e 100644
--- a/LEGO1/mxdsaction.h
+++ b/LEGO1/mxdsaction.h
@@ -3,7 +3,7 @@
 
 #include "mxdsobject.h"
 #include "mxtypes.h"
-#include "mxvector.h"
+#include "realtime/mxvector.h"
 
 class MxOmni;
 
diff --git a/LEGO1/mxmatrix.cpp b/LEGO1/realtime/mxmatrix.cpp
similarity index 99%
rename from LEGO1/mxmatrix.cpp
rename to LEGO1/realtime/mxmatrix.cpp
index 8380f4de..0e74598e 100644
--- a/LEGO1/mxmatrix.cpp
+++ b/LEGO1/realtime/mxmatrix.cpp
@@ -1,7 +1,7 @@
 
 #include "mxmatrix.h"
 
-#include "decomp.h"
+#include "../decomp.h"
 #include "math.h"
 
 #include <memory.h>
diff --git a/LEGO1/mxvector.cpp b/LEGO1/realtime/mxvector.cpp
similarity index 99%
rename from LEGO1/mxvector.cpp
rename to LEGO1/realtime/mxvector.cpp
index 17d3de9b..88005fe9 100644
--- a/LEGO1/mxvector.cpp
+++ b/LEGO1/realtime/mxvector.cpp
@@ -1,7 +1,7 @@
 
 #include "mxvector.h"
 
-#include "decomp.h"
+#include "../decomp.h"
 
 #include <math.h>
 #include <memory.h>
diff --git a/LEGO1/realtime/realtime.h b/LEGO1/realtime/realtime.h
index feca3493..4b38cb8b 100644
--- a/LEGO1/realtime/realtime.h
+++ b/LEGO1/realtime/realtime.h
@@ -1,7 +1,7 @@
 #ifndef REALTIME_H
 #define REALTIME_H
 
-#include "../mxmatrix.h"
+#include "mxmatrix.h"
 
 #define NORMVEC3(dst, src)                                                                                             \
 	{                                                                                                                  \