diff --git a/CMakeLists.txt b/CMakeLists.txt
index d791fb09..7fc1d7cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,31 +279,42 @@ target_link_libraries(omni PRIVATE dsound winmm Smacker::Smacker)
 add_library(lego1 SHARED
   LEGO1/define.cpp
   LEGO1/lego/legoomni/src/act1/act1state.cpp
-  LEGO1/lego/legoomni/src/act2/act2brick.cpp
-  LEGO1/lego/legoomni/src/act2/act2policestation.cpp
-  LEGO1/lego/legoomni/src/act2/legoact2.cpp
   LEGO1/lego/legoomni/src/act2/legoact2state.cpp
-  LEGO1/lego/legoomni/src/act3/act3.cpp
   LEGO1/lego/legoomni/src/act3/act3shark.cpp
   LEGO1/lego/legoomni/src/act3/act3state.cpp
+  LEGO1/lego/legoomni/src/actors/ambulance.cpp
+  LEGO1/lego/legoomni/src/actors/bike.cpp
+  LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
+  LEGO1/lego/legoomni/src/actors/doors.cpp
+  LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
+  LEGO1/lego/legoomni/src/actors/helicopter.cpp
+  LEGO1/lego/legoomni/src/actors/isleactor.cpp
+  LEGO1/lego/legoomni/src/actors/islepathactor.cpp
+  LEGO1/lego/legoomni/src/actors/jetski.cpp
+  LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
+  LEGO1/lego/legoomni/src/actors/motorcycle.cpp
+  LEGO1/lego/legoomni/src/actors/pizza.cpp
+  LEGO1/lego/legoomni/src/actors/pizzeria.cpp
+  LEGO1/lego/legoomni/src/actors/racecar.cpp
+  LEGO1/lego/legoomni/src/actors/radio.cpp
+  LEGO1/lego/legoomni/src/actors/skateboard.cpp
+  LEGO1/lego/legoomni/src/actors/towtrack.cpp
   LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
-  LEGO1/lego/legoomni/src/audio/legocachesound.cpp
+  LEGO1/lego/legoomni/src/audio/legocachsound.cpp
   LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
   LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
   LEGO1/lego/legoomni/src/audio/legounknown100d5778.cpp
   LEGO1/lego/legoomni/src/audio/legounknown100d6b4c.cpp
   LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
   LEGO1/lego/legoomni/src/build/buildingentity.cpp
-  LEGO1/lego/legoomni/src/build/dunebuggy.cpp
-  LEGO1/lego/legoomni/src/build/helicopter.cpp
   LEGO1/lego/legoomni/src/build/helicopterstate.cpp
-  LEGO1/lego/legoomni/src/build/jetski.cpp
   LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
   LEGO1/lego/legoomni/src/build/legocarbuild.cpp
   LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
-  LEGO1/lego/legoomni/src/build/racecar.cpp
   LEGO1/lego/legoomni/src/common/animstate.cpp
   LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+  LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
+  LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
   LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
   LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
   LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
@@ -312,15 +323,18 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
   LEGO1/lego/legoomni/src/common/legostate.cpp
   LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
-  LEGO1/lego/legoomni/src/common/legoutil.cpp
+  LEGO1/lego/legoomni/src/common/legoutils.cpp
   LEGO1/lego/legoomni/src/common/legovariables.cpp
   LEGO1/lego/legoomni/src/common/misc.cpp
   LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+  LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
+  LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
   LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
-  LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+  LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
+  LEGO1/lego/legoomni/src/entity/act2brick.cpp
+  LEGO1/lego/legoomni/src/entity/act2policestation.cpp
   LEGO1/lego/legoomni/src/entity/legoactor.cpp
   LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
-  LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
   LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
   LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp
   LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -328,79 +342,65 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/entity/legojetski.cpp
   LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
   LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
-  LEGO1/lego/legoomni/src/entity/legopathactor.cpp
   LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
-  LEGO1/lego/legoomni/src/entity/legorace.cpp
-  LEGO1/lego/legoomni/src/entity/legoraceactor.cpp
-  LEGO1/lego/legoomni/src/entity/legoracecar.cpp
   LEGO1/lego/legoomni/src/entity/legoworld.cpp
   LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
-  LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
   LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
   LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
-  LEGO1/lego/legoomni/src/hospital/ambulance.cpp
   LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
-  LEGO1/lego/legoomni/src/hospital/hospital.cpp
   LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
   LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
-  LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
-  LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
-  LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
   LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
   LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
-  LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
-  LEGO1/lego/legoomni/src/infocenter/score.cpp
   LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
   LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
   LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
-  LEGO1/lego/legoomni/src/isle/bike.cpp
-  LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
-  LEGO1/lego/legoomni/src/isle/doors.cpp
-  LEGO1/lego/legoomni/src/isle/historybook.cpp
-  LEGO1/lego/legoomni/src/isle/isleactor.cpp
-  LEGO1/lego/legoomni/src/isle/isle.cpp
-  LEGO1/lego/legoomni/src/isle/islepathactor.cpp
-  LEGO1/lego/legoomni/src/isle/jukebox.cpp
-  LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
   LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
-  LEGO1/lego/legoomni/src/isle/motocycle.cpp
-  LEGO1/lego/legoomni/src/isle/radio.cpp
   LEGO1/lego/legoomni/src/isle/radiostate.cpp
-  LEGO1/lego/legoomni/src/isle/skateboard.cpp
   LEGO1/lego/legoomni/src/main/legoomni.cpp
   LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
+  LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
+  LEGO1/lego/legoomni/src/paths/legopathactor.cpp
   LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
   LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
-  LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
   LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
-  LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
   LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
-  LEGO1/lego/legoomni/src/police/police.cpp
   LEGO1/lego/legoomni/src/police/policeentity.cpp
   LEGO1/lego/legoomni/src/police/policestate.cpp
   LEGO1/lego/legoomni/src/race/carrace.cpp
   LEGO1/lego/legoomni/src/race/jetskirace.cpp
+  LEGO1/lego/legoomni/src/race/legorace.cpp
+  LEGO1/lego/legoomni/src/race/legoraceactor.cpp
+  LEGO1/lego/legoomni/src/race/legoracecar.cpp
   LEGO1/lego/legoomni/src/race/racestandsentity.cpp
   LEGO1/lego/legoomni/src/race/racestate.cpp
-  LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
   LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
   LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
-  LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
-  LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
   LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
   LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
   LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
   LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
   LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
   LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
-  LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
   LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
   LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
   LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
   LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
   LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
   LEGO1/lego/legoomni/src/video/legovideomanager.cpp
-  LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+  LEGO1/lego/legoomni/src/worlds/act3.cpp
+  LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
+  LEGO1/lego/legoomni/src/worlds/gasstation.cpp
+  LEGO1/lego/legoomni/src/worlds/historybook.cpp
+  LEGO1/lego/legoomni/src/worlds/hospital.cpp
+  LEGO1/lego/legoomni/src/worlds/infocenter.cpp
+  LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
+  LEGO1/lego/legoomni/src/worlds/isle.cpp
+  LEGO1/lego/legoomni/src/worlds/jukebox.cpp
+  LEGO1/lego/legoomni/src/worlds/legoact2.cpp
+  LEGO1/lego/legoomni/src/worlds/police.cpp
+  LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
+  LEGO1/lego/legoomni/src/worlds/score.cpp
   LEGO1/main.cpp
   LEGO1/modeldb/modeldb.cpp
 )
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 3dcbfecb..7bc6b005 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -2,7 +2,7 @@
 #define LEGOACTIONCONTROLPRESENTER_H
 
 #include "decomp.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "mxmediapresenter.h"
 
 // VTABLE: LEGO1 0x100d5118
diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
index bd24137f..8cccbd71 100644
--- a/LEGO1/lego/legoomni/include/legoactor.h
+++ b/LEGO1/lego/legoomni/include/legoactor.h
@@ -2,7 +2,7 @@
 #define LEGOACTOR_H
 
 #include "decomp.h"
-#include "legocachesound.h"
+#include "legocachsound.h"
 #include "legoentity.h"
 
 // VTABLE: LEGO1 0x100d6d68
diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
index 4960f6b3..e480c34b 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundlist.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -1,11 +1,10 @@
 #ifndef LEGOCACHESOUNDLIST_H
 #define LEGOCACHESOUNDLIST_H
 
+#include "legocachsound.h"
 #include "mxlist.h"
 #include "mxtypes.h"
 
-class LegoCacheSound;
-
 // VTABLE: LEGO1 0x100d63b0
 // class MxCollection<LegoCacheSound *>
 
diff --git a/LEGO1/lego/legoomni/include/legocachesound.h b/LEGO1/lego/legoomni/include/legocachsound.h
similarity index 95%
rename from LEGO1/lego/legoomni/include/legocachesound.h
rename to LEGO1/lego/legoomni/include/legocachsound.h
index 5843f5bc..941f6cdc 100644
--- a/LEGO1/lego/legoomni/include/legocachesound.h
+++ b/LEGO1/lego/legoomni/include/legocachsound.h
@@ -1,5 +1,5 @@
-#ifndef LEGOCACHESOUND_H
-#define LEGOCACHESOUND_H
+#ifndef LEGOCACHSOUND_H
+#define LEGOCACHSOUND_H
 
 #include "decomp.h"
 #include "legounknown100d5778.h"
@@ -60,4 +60,4 @@ class LegoCacheSound : public MxCore {
 	undefined m_unk0x84;            // 0x84
 };
 
-#endif // LEGOCACHESOUND_H
+#endif // LEGOCACHSOUND_H
diff --git a/LEGO1/lego/legoomni/include/legounknown100d6b4c.h b/LEGO1/lego/legoomni/include/legounknown100d6b4c.h
index eef443a9..139aae96 100644
--- a/LEGO1/lego/legoomni/include/legounknown100d6b4c.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d6b4c.h
@@ -2,7 +2,7 @@
 #define LEGOUNKNOWN100D6B4C_H
 
 #include "decomp.h"
-#include "legocachesound.h"
+#include "legocachsound.h"
 #include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 
diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutils.h
similarity index 94%
rename from LEGO1/lego/legoomni/include/legoutil.h
rename to LEGO1/lego/legoomni/include/legoutils.h
index dcd62705..d2c90bfb 100644
--- a/LEGO1/lego/legoomni/include/legoutil.h
+++ b/LEGO1/lego/legoomni/include/legoutils.h
@@ -1,5 +1,5 @@
-#ifndef LEGOUTIL_H
-#define LEGOUTIL_H
+#ifndef LEGOUTILS_H
+#define LEGOUTILS_H
 
 #include "extra.h"
 #include "misc/legostorage.h"
@@ -33,4 +33,4 @@ void WriteNamedTexture(LegoFile* p_file, LegoNamedTexture* p_texture);
 // SYNTHETIC: LEGO1 0x10034b40
 // LegoTexture::`scalar deleting destructor'
 
-#endif // LEGOUTIL_H
+#endif // LEGOUTILS_H
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 2fa46dd5..526a28d3 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -1,8 +1,8 @@
 #ifndef LEGOWORLD_H
 #define LEGOWORLD_H
 
-#include "legocachesound.h"
 #include "legocachesoundlist.h"
+#include "legocachsound.h"
 #include "legocameracontroller.h"
 #include "legoentity.h"
 #include "legoentitylist.h"
diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
index 19ef3100..4d422619 100644
--- a/LEGO1/lego/legoomni/src/act1/act1state.cpp
+++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -1,6 +1,6 @@
 #include "act1state.h"
 
-#include "legoutil.h"
+#include "legoutils.h"
 
 DECOMP_SIZE_ASSERT(Act1State, 0x26c)
 DECOMP_SIZE_ASSERT(Act1State::NamedPlane, 0x4c)
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/hospital/ambulance.cpp
rename to LEGO1/lego/legoomni/src/actors/ambulance.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/bike.cpp b/LEGO1/lego/legoomni/src/actors/bike.cpp
similarity index 97%
rename from LEGO1/lego/legoomni/src/isle/bike.cpp
rename to LEGO1/lego/legoomni/src/actors/bike.cpp
index a32aeaf5..f9921309 100644
--- a/LEGO1/lego/legoomni/src/isle/bike.cpp
+++ b/LEGO1/lego/legoomni/src/actors/bike.cpp
@@ -3,7 +3,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legoworld.h"
 #include "misc.h"
 
diff --git a/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp b/LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
rename to LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/doors.cpp b/LEGO1/lego/legoomni/src/actors/doors.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/doors.cpp
rename to LEGO1/lego/legoomni/src/actors/doors.cpp
diff --git a/LEGO1/lego/legoomni/src/build/dunebuggy.cpp b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/build/dunebuggy.cpp
rename to LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
similarity index 99%
rename from LEGO1/lego/legoomni/src/build/helicopter.cpp
rename to LEGO1/lego/legoomni/src/actors/helicopter.cpp
index 49d7f8ff..00ac8649 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
@@ -8,7 +8,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legoworld.h"
 #include "misc.h"
 #include "mxtransitionmanager.h"
diff --git a/LEGO1/lego/legoomni/src/isle/isleactor.cpp b/LEGO1/lego/legoomni/src/actors/isleactor.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/isleactor.cpp
rename to LEGO1/lego/legoomni/src/actors/isleactor.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/islepathactor.cpp
rename to LEGO1/lego/legoomni/src/actors/islepathactor.cpp
diff --git a/LEGO1/lego/legoomni/src/build/jetski.cpp b/LEGO1/lego/legoomni/src/actors/jetski.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/build/jetski.cpp
rename to LEGO1/lego/legoomni/src/actors/jetski.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
similarity index 99%
rename from LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
rename to LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
index c3243624..f7d4ab21 100644
--- a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
+++ b/LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
@@ -5,7 +5,7 @@
 #include "jukeboxstate.h"
 #include "legogamestate.h"
 #include "legoomni.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/isle/motocycle.cpp b/LEGO1/lego/legoomni/src/actors/motorcycle.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/motocycle.cpp
rename to LEGO1/lego/legoomni/src/actors/motorcycle.cpp
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp b/LEGO1/lego/legoomni/src/actors/pizza.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
rename to LEGO1/lego/legoomni/src/actors/pizza.cpp
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
rename to LEGO1/lego/legoomni/src/actors/pizzeria.cpp
diff --git a/LEGO1/lego/legoomni/src/build/racecar.cpp b/LEGO1/lego/legoomni/src/actors/racecar.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/build/racecar.cpp
rename to LEGO1/lego/legoomni/src/actors/racecar.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/actors/radio.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/radio.cpp
rename to LEGO1/lego/legoomni/src/actors/radio.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/skateboard.cpp
rename to LEGO1/lego/legoomni/src/actors/skateboard.cpp
diff --git a/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp b/LEGO1/lego/legoomni/src/actors/towtrack.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
rename to LEGO1/lego/legoomni/src/actors/towtrack.cpp
diff --git a/LEGO1/lego/legoomni/src/audio/legocachesound.cpp b/LEGO1/lego/legoomni/src/audio/legocachsound.cpp
similarity index 98%
rename from LEGO1/lego/legoomni/src/audio/legocachesound.cpp
rename to LEGO1/lego/legoomni/src/audio/legocachsound.cpp
index 6ea8e7b3..d43012c8 100644
--- a/LEGO1/lego/legoomni/src/audio/legocachesound.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legocachsound.cpp
@@ -1,4 +1,4 @@
-#include "legocachesound.h"
+#include "legocachsound.h"
 
 #include "legosoundmanager.h"
 #include "misc.h"
diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
index edcd6b34..8f88ddc9 100644
--- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
@@ -1,6 +1,6 @@
 #include "legoloadcachesoundpresenter.h"
 
-#include "legocachesound.h"
+#include "legocachsound.h"
 #include "mxstreamchunk.h"
 #include "mxwavepresenter.h"
 
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index f97e17d4..f1a9d747 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -3,7 +3,7 @@
 #include "define.h"
 #include "extra.h"
 #include "legoomni.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "mxcompositepresenter.h"
 #include "mxmediapresenter.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
rename to LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
diff --git a/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
rename to LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
index 0327320d..2bc721a3 100644
--- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
@@ -1,7 +1,7 @@
 #include "legobackgroundcolor.h"
 
 #include "decomp.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "misc.h"
 
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 5826806d..6f2b43b7 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -15,7 +15,7 @@
 #include "legoomni.h"
 #include "legoplantmanager.h"
 #include "legostate.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "misc.h"
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp
similarity index 99%
rename from LEGO1/lego/legoomni/src/common/legoutil.cpp
rename to LEGO1/lego/legoomni/src/common/legoutils.cpp
index 67fc5fb2..b6c9be17 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp
@@ -1,4 +1,4 @@
-#include "legoutil.h"
+#include "legoutils.h"
 
 #include "legoinputmanager.h"
 #include "legonamedtexture.h"
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
rename to LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
similarity index 99%
rename from LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
rename to LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
index 65e8387e..158568c1 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
@@ -1,7 +1,7 @@
 #include "mxtransitionmanager.h"
 
 #include "legoinputmanager.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "misc.h"
diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
rename to LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
diff --git a/LEGO1/lego/legoomni/src/act2/act2brick.cpp b/LEGO1/lego/legoomni/src/entity/act2brick.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/act2/act2brick.cpp
rename to LEGO1/lego/legoomni/src/entity/act2brick.cpp
diff --git a/LEGO1/lego/legoomni/src/act2/act2policestation.cpp b/LEGO1/lego/legoomni/src/entity/act2policestation.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/act2/act2policestation.cpp
rename to LEGO1/lego/legoomni/src/entity/act2policestation.cpp
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 3f9e8d21..bb473c14 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -4,7 +4,7 @@
 #include "legobuildingmanager.h"
 #include "legocharactermanager.h"
 #include "legoplantmanager.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "misc.h"
diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
index 2d0373e1..93d513db 100644
--- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
@@ -1,7 +1,7 @@
 #include "legonavcontroller.h"
 
 #include "legoinputmanager.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "misc.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 9c43f82e..fc31b459 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -11,7 +11,7 @@
 #include "legoomni.h"
 #include "legoplantmanager.h"
 #include "legosoundmanager.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "misc.h"
 #include "mxactionnotificationparam.h"
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 083325ab..cb1f5b05 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -8,7 +8,7 @@
 #include "legoobjectfactory.h"
 #include "legoplantmanager.h"
 #include "legosoundmanager.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovariables.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
diff --git a/LEGO1/lego/legoomni/src/entity/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
rename to LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
diff --git a/LEGO1/lego/legoomni/src/entity/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/entity/legopathactor.cpp
rename to LEGO1/lego/legoomni/src/paths/legopathactor.cpp
diff --git a/LEGO1/lego/legoomni/src/entity/legorace.cpp b/LEGO1/lego/legoomni/src/race/legorace.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/entity/legorace.cpp
rename to LEGO1/lego/legoomni/src/race/legorace.cpp
diff --git a/LEGO1/lego/legoomni/src/entity/legoraceactor.cpp b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/entity/legoraceactor.cpp
rename to LEGO1/lego/legoomni/src/race/legoraceactor.cpp
diff --git a/LEGO1/lego/legoomni/src/entity/legoracecar.cpp b/LEGO1/lego/legoomni/src/race/legoracecar.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/entity/legoracecar.cpp
rename to LEGO1/lego/legoomni/src/race/legoracecar.cpp
diff --git a/LEGO1/lego/legoomni/src/act3/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/act3/act3.cpp
rename to LEGO1/lego/legoomni/src/worlds/act3.cpp
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
rename to LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
rename to LEGO1/lego/legoomni/src/worlds/gasstation.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/historybook.cpp
rename to LEGO1/lego/legoomni/src/worlds/historybook.cpp
diff --git a/LEGO1/lego/legoomni/src/hospital/hospital.cpp b/LEGO1/lego/legoomni/src/worlds/hospital.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/hospital/hospital.cpp
rename to LEGO1/lego/legoomni/src/worlds/hospital.cpp
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp
similarity index 99%
rename from LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
rename to LEGO1/lego/legoomni/src/worlds/infocenter.cpp
index 41f76390..eda820b5 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp
@@ -13,7 +13,7 @@
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "legoplantmanager.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "legovideomanager.h"
 #include "misc.h"
 #include "mxactionnotificationparam.h"
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
rename to LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp
similarity index 99%
rename from LEGO1/lego/legoomni/src/isle/isle.cpp
rename to LEGO1/lego/legoomni/src/worlds/isle.cpp
index aa293c1a..3572c3ee 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp
@@ -7,7 +7,7 @@
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
diff --git a/LEGO1/lego/legoomni/src/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/isle/jukebox.cpp
rename to LEGO1/lego/legoomni/src/worlds/jukebox.cpp
diff --git a/LEGO1/lego/legoomni/src/act2/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/act2/legoact2.cpp
rename to LEGO1/lego/legoomni/src/worlds/legoact2.cpp
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/police/police.cpp
rename to LEGO1/lego/legoomni/src/worlds/police.cpp
diff --git a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
rename to LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/worlds/score.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/infocenter/score.cpp
rename to LEGO1/lego/legoomni/src/worlds/score.cpp
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index 465b2026..7a106072 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -82,7 +82,7 @@ class MxBitmap : public MxCore {
 	// https://learn.microsoft.com/en-us/windows/win32/medfound/image-stride
 	inline MxLong AlignToFourByte(MxLong p_value) const { return (p_value + 3) & -4; }
 
-	// Same as the one from legoutil.h, but flipped the other way
+	// Same as the one from legoutils.h, but flipped the other way
 	// TODO: While it's not outside the realm of possibility that they
 	// reimplemented Abs for only this file, that seems odd, right?
 	inline MxLong AbsFlipped(MxLong p_value) const { return p_value > 0 ? p_value : -p_value; }