diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0c20b83..4af66557 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,12 +8,26 @@ option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
 
 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/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/audio/legocachesound.cpp
   LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
   LEGO1/lego/legoomni/src/audio/legosoundmanager.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/gifmanager.cpp
   LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
   LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
@@ -37,11 +51,54 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/entity/legorace.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/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/motorcycle.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/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/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
@@ -57,63 +114,6 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
   LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
   LEGO1/lego/legoomni/src/video/legovideomanager.cpp
-  LEGO1/lego/scripts/act1/act1state.cpp
-  LEGO1/lego/scripts/act2/act2brick.cpp
-  LEGO1/lego/scripts/act2/act2policestation.cpp
-  LEGO1/lego/scripts/act2/legoact2state.cpp
-  LEGO1/lego/scripts/act3/act3.cpp
-  LEGO1/lego/scripts/act3/act3shark.cpp
-  LEGO1/lego/scripts/act3/act3state.cpp
-  LEGO1/lego/scripts/build/buildingentity.cpp
-  LEGO1/lego/scripts/build/dunebuggy.cpp
-  LEGO1/lego/scripts/build/helicopter.cpp
-  LEGO1/lego/scripts/build/helicopterstate.cpp
-  LEGO1/lego/scripts/build/jetski.cpp
-  LEGO1/lego/scripts/build/racecar.cpp
-  LEGO1/lego/scripts/gasstation/gasstation.cpp
-  LEGO1/lego/scripts/gasstation/gasstationentity.cpp
-  LEGO1/lego/scripts/gasstation/gasstationstate.cpp
-  LEGO1/lego/scripts/hospital/ambulance.cpp
-  LEGO1/lego/scripts/hospital/ambulancemissionstate.cpp
-  LEGO1/lego/scripts/hospital/hospital.cpp
-  LEGO1/lego/scripts/hospital/hospitalentity.cpp
-  LEGO1/lego/scripts/hospital/hospitalstate.cpp
-  LEGO1/lego/scripts/infocenter/elevatorbottom.cpp
-  LEGO1/lego/scripts/infocenter/infocenter.cpp
-  LEGO1/lego/scripts/infocenter/infocenterdoor.cpp
-  LEGO1/lego/scripts/infocenter/infocenterentity.cpp
-  LEGO1/lego/scripts/infocenter/infocenterstate.cpp
-  LEGO1/lego/scripts/infocenter/registrationbook.cpp
-  LEGO1/lego/scripts/infocenter/score.cpp
-  LEGO1/lego/scripts/infocenter/scorestate.cpp
-  LEGO1/lego/scripts/isle/animstate.cpp
-  LEGO1/lego/scripts/isle/beachhouseentity.cpp
-  LEGO1/lego/scripts/isle/bike.cpp
-  LEGO1/lego/scripts/isle/bumpbouy.cpp
-  LEGO1/lego/scripts/isle/historybook.cpp
-  LEGO1/lego/scripts/isle/isleactor.cpp
-  LEGO1/lego/scripts/isle/isle.cpp
-  LEGO1/lego/scripts/isle/islepathactor.cpp
-  LEGO1/lego/scripts/isle/jukebox.cpp
-  LEGO1/lego/scripts/isle/jukeboxentity.cpp
-  LEGO1/lego/scripts/isle/jukeboxstate.cpp
-  LEGO1/lego/scripts/isle/motorcycle.cpp
-  LEGO1/lego/scripts/isle/radio.cpp
-  LEGO1/lego/scripts/isle/radiostate.cpp
-  LEGO1/lego/scripts/isle/skateboard.cpp
-  LEGO1/lego/scripts/pizzeria/pizza.cpp
-  LEGO1/lego/scripts/pizzeria/pizzamissionstate.cpp
-  LEGO1/lego/scripts/pizzeria/pizzeria.cpp
-  LEGO1/lego/scripts/pizzeria/pizzeriastate.cpp
-  LEGO1/lego/scripts/police/police.cpp
-  LEGO1/lego/scripts/police/policeentity.cpp
-  LEGO1/lego/scripts/police/policestate.cpp
-  LEGO1/lego/scripts/race/carrace.cpp
-  LEGO1/lego/scripts/race/jetskirace.cpp
-  LEGO1/lego/scripts/race/racestandsentity.cpp
-  LEGO1/lego/scripts/race/racestate.cpp
-  LEGO1/lego/scripts/towtrack/towtrack.cpp
-  LEGO1/lego/scripts/towtrack/towtrackmissionstate.cpp
   LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
   LEGO1/lego/sources/3dmanager/lego3dview.cpp
   LEGO1/lego/sources/3dmanager/legoview1.cpp
@@ -224,6 +224,7 @@ add_library(lego1 SHARED
   LEGO1/viewmanager/viewmanager.cpp
   LEGO1/viewmanager/viewroi.cpp
 )
+
 if (MINGW)
   target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500)
 endif()
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 12a3b6f7..d6f9c293 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -8,7 +8,6 @@
 #include "legomodelpresenter.h"
 #include "legoomni.h"
 #include "legopartpresenter.h"
-#include "legoroi.h"
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
 #include "mxbackgroundaudiomanager.h"
diff --git a/LEGO1/lego/scripts/act1/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
similarity index 100%
rename from LEGO1/lego/scripts/act1/act1state.h
rename to LEGO1/lego/legoomni/include/act1state.h
diff --git a/LEGO1/lego/scripts/act2/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
similarity index 100%
rename from LEGO1/lego/scripts/act2/act2brick.h
rename to LEGO1/lego/legoomni/include/act2brick.h
diff --git a/LEGO1/lego/scripts/act2/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
similarity index 100%
rename from LEGO1/lego/scripts/act2/act2policestation.h
rename to LEGO1/lego/legoomni/include/act2policestation.h
diff --git a/LEGO1/lego/scripts/act3/act3.h b/LEGO1/lego/legoomni/include/act3.h
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3.h
rename to LEGO1/lego/legoomni/include/act3.h
diff --git a/LEGO1/lego/scripts/act3/act3actor.h b/LEGO1/lego/legoomni/include/act3actor.h
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3actor.h
rename to LEGO1/lego/legoomni/include/act3actor.h
diff --git a/LEGO1/lego/scripts/act3/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3shark.h
rename to LEGO1/lego/legoomni/include/act3shark.h
diff --git a/LEGO1/lego/scripts/act3/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3state.h
rename to LEGO1/lego/legoomni/include/act3state.h
diff --git a/LEGO1/lego/scripts/hospital/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
similarity index 100%
rename from LEGO1/lego/scripts/hospital/ambulance.h
rename to LEGO1/lego/legoomni/include/ambulance.h
diff --git a/LEGO1/lego/scripts/hospital/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
similarity index 100%
rename from LEGO1/lego/scripts/hospital/ambulancemissionstate.h
rename to LEGO1/lego/legoomni/include/ambulancemissionstate.h
diff --git a/LEGO1/lego/scripts/isle/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/animstate.h
rename to LEGO1/lego/legoomni/include/animstate.h
diff --git a/LEGO1/lego/scripts/isle/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/beachhouseentity.h
rename to LEGO1/lego/legoomni/include/beachhouseentity.h
diff --git a/LEGO1/lego/scripts/isle/bike.h b/LEGO1/lego/legoomni/include/bike.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/bike.h
rename to LEGO1/lego/legoomni/include/bike.h
diff --git a/LEGO1/lego/legoomni/include/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
new file mode 100644
index 00000000..7f2abe07
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -0,0 +1,27 @@
+#ifndef BUILDINGENTITY_H
+#define BUILDINGENTITY_H
+
+#include "legoentity.h"
+
+// VTABLE: LEGO1 0x100d5c88
+// SIZE <= 0x68, hard to tell because it's always constructed as a derivative
+class BuildingEntity : public LegoEntity {
+public:
+	BuildingEntity();
+	virtual ~BuildingEntity() override; // vtable+0x0
+
+	// FUNCTION: LEGO1 0x10014f20
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f07e8
+		return "BuildingEntity";
+	}
+
+	// FUNCTION: LEGO1 0x10014f30
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, BuildingEntity::ClassName()) || LegoEntity::IsA(p_name);
+	}
+};
+
+#endif // BUILDINGENTITY_H
diff --git a/LEGO1/lego/scripts/isle/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/bumpbouy.h
rename to LEGO1/lego/legoomni/include/bumpbouy.h
diff --git a/LEGO1/lego/scripts/race/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
similarity index 100%
rename from LEGO1/lego/scripts/race/carrace.h
rename to LEGO1/lego/legoomni/include/carrace.h
diff --git a/LEGO1/lego/scripts/race/carracestate.h b/LEGO1/lego/legoomni/include/carracestate.h
similarity index 100%
rename from LEGO1/lego/scripts/race/carracestate.h
rename to LEGO1/lego/legoomni/include/carracestate.h
diff --git a/LEGO1/lego/scripts/isle/doors.h b/LEGO1/lego/legoomni/include/doors.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/doors.h
rename to LEGO1/lego/legoomni/include/doors.h
diff --git a/LEGO1/lego/legoomni/include/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
new file mode 100644
index 00000000..e45fe8fe
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/dunebuggy.h
@@ -0,0 +1,33 @@
+#ifndef DUNEBUGGY_H
+#define DUNEBUGGY_H
+
+#include "decomp.h"
+#include "islepathactor.h"
+
+// VTABLE: LEGO1 0x100d8f98
+// SIZE 0x16c
+class DuneBuggy : public IslePathActor {
+public:
+	DuneBuggy();
+
+	// FUNCTION: LEGO1 0x10067c30
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f0410
+		return "DuneBuggy";
+	}
+
+	// FUNCTION: LEGO1 0x10067c40
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name);
+	}
+
+private:
+	// TODO: Double check DuneBuggy field types
+	undefined4 m_unk0x160;
+	MxFloat m_unk0x164;
+	undefined4 m_unk0x168;
+};
+
+#endif // DUNEBUGGY_H
diff --git a/LEGO1/lego/scripts/infocenter/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/elevatorbottom.h
rename to LEGO1/lego/legoomni/include/elevatorbottom.h
diff --git a/LEGO1/lego/scripts/gasstation/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
similarity index 100%
rename from LEGO1/lego/scripts/gasstation/gasstation.h
rename to LEGO1/lego/legoomni/include/gasstation.h
diff --git a/LEGO1/lego/scripts/gasstation/gasstationentity.h b/LEGO1/lego/legoomni/include/gasstationentity.h
similarity index 100%
rename from LEGO1/lego/scripts/gasstation/gasstationentity.h
rename to LEGO1/lego/legoomni/include/gasstationentity.h
diff --git a/LEGO1/lego/scripts/gasstation/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
similarity index 100%
rename from LEGO1/lego/scripts/gasstation/gasstationstate.h
rename to LEGO1/lego/legoomni/include/gasstationstate.h
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
new file mode 100644
index 00000000..7c5be4ea
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -0,0 +1,63 @@
+#ifndef HELICOPTER_H
+#define HELICOPTER_H
+
+#include "helicopterstate.h"
+#include "islepathactor.h"
+#include "realtime/matrix.h"
+
+// SIZE 0x34
+class HelicopterSubclass {
+public:
+	inline HelicopterSubclass() : m_unk0x30(0) {}
+	MxResult FUN_100040a0(Vector4Impl& p_v, float p_f);
+
+private:
+	Vector4Data m_unk0x0;  // 0x0
+	Vector4Data m_unk0x18; // 0x18
+	undefined4 m_unk0x30;  // 0x30
+};
+
+// VTABLE: LEGO1 0x100d40f8
+// SIZE 0x230
+class Helicopter : public IslePathActor {
+public:
+	Helicopter();
+	virtual ~Helicopter() override; // vtable+0x0
+
+	// FUNCTION: LEGO1 0x10003070
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f0130
+		return "Helicopter";
+	}
+
+	// FUNCTION: LEGO1 0x10003080
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name);
+	}
+
+	virtual MxResult Create(MxDSObject& p_dsObject) override;              // vtable+0x18
+	void VTable0x70(float p_float) override;                               // vtable+0x70
+	void VTable0x74(Matrix4Impl& p_transform) override;                    // vtable+0x74
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
+	// SYNTHETIC: LEGO1 0x10003210
+	// Helicopter::`scalar deleting destructor'
+
+protected:
+	Matrix4Data m_unk0x160;        // 0x160
+	Matrix4Data m_unk0x1a8;        // 0x1a8
+	float m_unk0x1f0;              // 0x1f0
+	HelicopterSubclass m_unk0x1f4; // 0x1f4
+	HelicopterState* m_state;      // 0x228
+	MxAtomId m_script;             // 0x22c
+
+private:
+	void GetState();
+};
+
+#endif // HELICOPTER_H
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
new file mode 100644
index 00000000..2cb3b747
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -0,0 +1,31 @@
+#ifndef HELICOPTERSTATE_H
+#define HELICOPTERSTATE_H
+
+#include "decomp.h"
+#include "legostate.h"
+
+// VTABLE: LEGO1 0x100d5418
+// SIZE 0xc
+class HelicopterState : public LegoState {
+public:
+	// FUNCTION: LEGO1 0x1000e0d0
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f0144
+		return "HelicopterState";
+	}
+
+	// FUNCTION: LEGO1 0x1000e0e0
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, HelicopterState::ClassName()) || LegoState::IsA(p_name);
+	}
+
+	inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; }
+	inline MxU32 GetUnkown8() { return m_unk0x8; }
+
+protected:
+	MxU32 m_unk0x8; // 0x8
+};
+
+#endif // HELICOPTERSTATE_H
diff --git a/LEGO1/lego/scripts/isle/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/historybook.h
rename to LEGO1/lego/legoomni/include/historybook.h
diff --git a/LEGO1/lego/scripts/hospital/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
similarity index 100%
rename from LEGO1/lego/scripts/hospital/hospital.h
rename to LEGO1/lego/legoomni/include/hospital.h
diff --git a/LEGO1/lego/scripts/hospital/hospitalentity.h b/LEGO1/lego/legoomni/include/hospitalentity.h
similarity index 100%
rename from LEGO1/lego/scripts/hospital/hospitalentity.h
rename to LEGO1/lego/legoomni/include/hospitalentity.h
diff --git a/LEGO1/lego/scripts/hospital/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
similarity index 100%
rename from LEGO1/lego/scripts/hospital/hospitalstate.h
rename to LEGO1/lego/legoomni/include/hospitalstate.h
diff --git a/LEGO1/lego/scripts/infocenter/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenter.h
rename to LEGO1/lego/legoomni/include/infocenter.h
diff --git a/LEGO1/lego/scripts/infocenter/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenterdoor.h
rename to LEGO1/lego/legoomni/include/infocenterdoor.h
diff --git a/LEGO1/lego/scripts/infocenter/infocenterentity.h b/LEGO1/lego/legoomni/include/infocenterentity.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenterentity.h
rename to LEGO1/lego/legoomni/include/infocenterentity.h
diff --git a/LEGO1/lego/scripts/infocenter/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenterstate.h
rename to LEGO1/lego/legoomni/include/infocenterstate.h
diff --git a/LEGO1/lego/scripts/isle/isle.h b/LEGO1/lego/legoomni/include/isle.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/isle.h
rename to LEGO1/lego/legoomni/include/isle.h
diff --git a/LEGO1/lego/scripts/isle/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/isleactor.h
rename to LEGO1/lego/legoomni/include/isleactor.h
diff --git a/LEGO1/lego/scripts/isle/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/islepathactor.h
rename to LEGO1/lego/legoomni/include/islepathactor.h
diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
new file mode 100644
index 00000000..1a64a4b6
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/jetski.h
@@ -0,0 +1,31 @@
+#ifndef JETSKI_H
+#define JETSKI_H
+
+#include "decomp.h"
+#include "islepathactor.h"
+
+// VTABLE: LEGO1 0x100d9ec8
+// SIZE 0x164
+class Jetski : public IslePathActor {
+public:
+	Jetski();
+
+	// FUNCTION: LEGO1 0x1007e430
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f03d8
+		return "Jetski";
+	}
+
+	// FUNCTION: LEGO1 0x1007e440
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
+	}
+
+private:
+	// TODO: Jetski fields
+	undefined m_unk0x160[4];
+};
+
+#endif // JETSKI_H
diff --git a/LEGO1/lego/scripts/race/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h
similarity index 100%
rename from LEGO1/lego/scripts/race/jetskirace.h
rename to LEGO1/lego/legoomni/include/jetskirace.h
diff --git a/LEGO1/lego/scripts/race/jetskiracestate.h b/LEGO1/lego/legoomni/include/jetskiracestate.h
similarity index 100%
rename from LEGO1/lego/scripts/race/jetskiracestate.h
rename to LEGO1/lego/legoomni/include/jetskiracestate.h
diff --git a/LEGO1/lego/scripts/isle/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/jukebox.h
rename to LEGO1/lego/legoomni/include/jukebox.h
diff --git a/LEGO1/lego/scripts/isle/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/jukeboxentity.h
rename to LEGO1/lego/legoomni/include/jukeboxentity.h
diff --git a/LEGO1/lego/scripts/isle/jukeboxstate.h b/LEGO1/lego/legoomni/include/jukeboxstate.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/jukeboxstate.h
rename to LEGO1/lego/legoomni/include/jukeboxstate.h
diff --git a/LEGO1/lego/scripts/act2/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
similarity index 100%
rename from LEGO1/lego/scripts/act2/legoact2.h
rename to LEGO1/lego/legoomni/include/legoact2.h
diff --git a/LEGO1/lego/scripts/act2/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
similarity index 100%
rename from LEGO1/lego/scripts/act2/legoact2state.h
rename to LEGO1/lego/legoomni/include/legoact2state.h
diff --git a/LEGO1/lego/scripts/isle/motorcycle.h b/LEGO1/lego/legoomni/include/motorcycle.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/motorcycle.h
rename to LEGO1/lego/legoomni/include/motorcycle.h
diff --git a/LEGO1/lego/scripts/pizzeria/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizza.h
rename to LEGO1/lego/legoomni/include/pizza.h
diff --git a/LEGO1/lego/scripts/pizzeria/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizzamissionstate.h
rename to LEGO1/lego/legoomni/include/pizzamissionstate.h
diff --git a/LEGO1/lego/scripts/pizzeria/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizzeria.h
rename to LEGO1/lego/legoomni/include/pizzeria.h
diff --git a/LEGO1/lego/scripts/pizzeria/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizzeriastate.h
rename to LEGO1/lego/legoomni/include/pizzeriastate.h
diff --git a/LEGO1/lego/scripts/police/police.h b/LEGO1/lego/legoomni/include/police.h
similarity index 100%
rename from LEGO1/lego/scripts/police/police.h
rename to LEGO1/lego/legoomni/include/police.h
diff --git a/LEGO1/lego/scripts/police/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
similarity index 100%
rename from LEGO1/lego/scripts/police/policeentity.h
rename to LEGO1/lego/legoomni/include/policeentity.h
diff --git a/LEGO1/lego/scripts/police/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
similarity index 100%
rename from LEGO1/lego/scripts/police/policestate.h
rename to LEGO1/lego/legoomni/include/policestate.h
diff --git a/LEGO1/lego/legoomni/include/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
new file mode 100644
index 00000000..b4a210e6
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/racecar.h
@@ -0,0 +1,32 @@
+#ifndef RACECAR_H
+#define RACECAR_H
+
+#include "decomp.h"
+#include "islepathactor.h"
+
+// VTABLE: LEGO1 0x100d6918
+// SIZE 0x164
+class RaceCar : public IslePathActor {
+public:
+	RaceCar();
+	virtual ~RaceCar() override; // vtable+0x0
+
+	// FUNCTION: LEGO1 0x10028270
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f03e0
+		return "RaceCar";
+	}
+
+	// FUNCTION: LEGO1 0x10028280
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, RaceCar::ClassName()) || IslePathActor::IsA(p_name);
+	}
+
+private:
+	// TODO: RaceCar fields
+	undefined m_unk0x160[4];
+};
+
+#endif // RACECAR_H
diff --git a/LEGO1/lego/scripts/race/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h
similarity index 100%
rename from LEGO1/lego/scripts/race/racestandsentity.h
rename to LEGO1/lego/legoomni/include/racestandsentity.h
diff --git a/LEGO1/lego/scripts/race/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
similarity index 100%
rename from LEGO1/lego/scripts/race/racestate.h
rename to LEGO1/lego/legoomni/include/racestate.h
diff --git a/LEGO1/lego/scripts/isle/radio.h b/LEGO1/lego/legoomni/include/radio.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/radio.h
rename to LEGO1/lego/legoomni/include/radio.h
diff --git a/LEGO1/lego/scripts/isle/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/radiostate.h
rename to LEGO1/lego/legoomni/include/radiostate.h
diff --git a/LEGO1/lego/scripts/infocenter/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/registrationbook.h
rename to LEGO1/lego/legoomni/include/registrationbook.h
diff --git a/LEGO1/lego/scripts/infocenter/score.h b/LEGO1/lego/legoomni/include/score.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/score.h
rename to LEGO1/lego/legoomni/include/score.h
diff --git a/LEGO1/lego/scripts/infocenter/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/scorestate.h
rename to LEGO1/lego/legoomni/include/scorestate.h
diff --git a/LEGO1/lego/scripts/isle/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
similarity index 100%
rename from LEGO1/lego/scripts/isle/skateboard.h
rename to LEGO1/lego/legoomni/include/skateboard.h
diff --git a/LEGO1/lego/scripts/towtrack/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
similarity index 100%
rename from LEGO1/lego/scripts/towtrack/towtrack.h
rename to LEGO1/lego/legoomni/include/towtrack.h
diff --git a/LEGO1/lego/scripts/towtrack/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
similarity index 100%
rename from LEGO1/lego/scripts/towtrack/towtrackmissionstate.h
rename to LEGO1/lego/legoomni/include/towtrackmissionstate.h
diff --git a/LEGO1/lego/scripts/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act1/act1state.cpp
rename to LEGO1/lego/legoomni/src/act1/act1state.cpp
diff --git a/LEGO1/lego/scripts/act2/act2brick.cpp b/LEGO1/lego/legoomni/src/act2/act2brick.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act2/act2brick.cpp
rename to LEGO1/lego/legoomni/src/act2/act2brick.cpp
diff --git a/LEGO1/lego/scripts/act2/act2policestation.cpp b/LEGO1/lego/legoomni/src/act2/act2policestation.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act2/act2policestation.cpp
rename to LEGO1/lego/legoomni/src/act2/act2policestation.cpp
diff --git a/LEGO1/lego/scripts/act2/legoact2state.cpp b/LEGO1/lego/legoomni/src/act2/legoact2state.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act2/legoact2state.cpp
rename to LEGO1/lego/legoomni/src/act2/legoact2state.cpp
diff --git a/LEGO1/lego/scripts/act3/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3.cpp
rename to LEGO1/lego/legoomni/src/act3/act3.cpp
diff --git a/LEGO1/lego/scripts/act3/act3shark.cpp b/LEGO1/lego/legoomni/src/act3/act3shark.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3shark.cpp
rename to LEGO1/lego/legoomni/src/act3/act3shark.cpp
diff --git a/LEGO1/lego/scripts/act3/act3state.cpp b/LEGO1/lego/legoomni/src/act3/act3state.cpp
similarity index 100%
rename from LEGO1/lego/scripts/act3/act3state.cpp
rename to LEGO1/lego/legoomni/src/act3/act3state.cpp
diff --git a/LEGO1/lego/scripts/isle/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/animstate.cpp
rename to LEGO1/lego/legoomni/src/common/animstate.cpp
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 23e04601..a081248c 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -2,12 +2,12 @@
 
 #include "infocenterstate.h"
 #include "legoomni.h"
-#include "legoroi.h"
 #include "legostate.h"
 #include "legostream.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
 #include "mxvariabletable.h"
+#include "roi/legoroi.h"
 
 #include <stdio.h>
 
diff --git a/LEGO1/lego/scripts/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
similarity index 100%
rename from LEGO1/lego/scripts/gasstation/gasstation.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
diff --git a/LEGO1/lego/scripts/gasstation/gasstationentity.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/gasstation/gasstationentity.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
diff --git a/LEGO1/lego/scripts/gasstation/gasstationstate.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/gasstation/gasstationstate.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
diff --git a/LEGO1/lego/scripts/hospital/ambulance.cpp b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
similarity index 100%
rename from LEGO1/lego/scripts/hospital/ambulance.cpp
rename to LEGO1/lego/legoomni/src/hospital/ambulance.cpp
diff --git a/LEGO1/lego/scripts/hospital/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/hospital/ambulancemissionstate.cpp
rename to LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
diff --git a/LEGO1/lego/scripts/hospital/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
similarity index 100%
rename from LEGO1/lego/scripts/hospital/hospital.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospital.cpp
diff --git a/LEGO1/lego/scripts/hospital/hospitalentity.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/hospital/hospitalentity.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
diff --git a/LEGO1/lego/scripts/hospital/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/hospital/hospitalstate.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
diff --git a/LEGO1/lego/scripts/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/elevatorbottom.cpp
rename to LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
diff --git a/LEGO1/lego/scripts/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenter.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
diff --git a/LEGO1/lego/scripts/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenterdoor.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
diff --git a/LEGO1/lego/scripts/infocenter/infocenterentity.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenterentity.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
diff --git a/LEGO1/lego/scripts/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/infocenterstate.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
diff --git a/LEGO1/lego/scripts/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/registrationbook.cpp
rename to LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
diff --git a/LEGO1/lego/scripts/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/score.cpp
rename to LEGO1/lego/legoomni/src/infocenter/score.cpp
diff --git a/LEGO1/lego/scripts/infocenter/scorestate.cpp b/LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/infocenter/scorestate.cpp
rename to LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
diff --git a/LEGO1/lego/scripts/isle/beachhouseentity.cpp b/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/beachhouseentity.cpp
rename to LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
diff --git a/LEGO1/lego/scripts/isle/bike.cpp b/LEGO1/lego/legoomni/src/isle/bike.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/bike.cpp
rename to LEGO1/lego/legoomni/src/isle/bike.cpp
diff --git a/LEGO1/lego/scripts/isle/bumpbouy.cpp b/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/bumpbouy.cpp
rename to LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
diff --git a/LEGO1/lego/scripts/isle/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/historybook.cpp
rename to LEGO1/lego/legoomni/src/isle/historybook.cpp
diff --git a/LEGO1/lego/scripts/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/isle.cpp
rename to LEGO1/lego/legoomni/src/isle/isle.cpp
diff --git a/LEGO1/lego/scripts/isle/isleactor.cpp b/LEGO1/lego/legoomni/src/isle/isleactor.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/isleactor.cpp
rename to LEGO1/lego/legoomni/src/isle/isleactor.cpp
diff --git a/LEGO1/lego/scripts/isle/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/islepathactor.cpp
rename to LEGO1/lego/legoomni/src/isle/islepathactor.cpp
diff --git a/LEGO1/lego/scripts/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/jukebox.cpp
rename to LEGO1/lego/legoomni/src/isle/jukebox.cpp
diff --git a/LEGO1/lego/scripts/isle/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/jukeboxentity.cpp
rename to LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
diff --git a/LEGO1/lego/scripts/isle/jukeboxstate.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/jukeboxstate.cpp
rename to LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
diff --git a/LEGO1/lego/scripts/isle/motorcycle.cpp b/LEGO1/lego/legoomni/src/isle/motorcycle.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/motorcycle.cpp
rename to LEGO1/lego/legoomni/src/isle/motorcycle.cpp
diff --git a/LEGO1/lego/scripts/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/radio.cpp
rename to LEGO1/lego/legoomni/src/isle/radio.cpp
diff --git a/LEGO1/lego/scripts/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/radiostate.cpp
rename to LEGO1/lego/legoomni/src/isle/radiostate.cpp
diff --git a/LEGO1/lego/scripts/isle/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
similarity index 100%
rename from LEGO1/lego/scripts/isle/skateboard.cpp
rename to LEGO1/lego/legoomni/src/isle/skateboard.cpp
diff --git a/LEGO1/lego/scripts/pizzeria/pizza.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizza.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
diff --git a/LEGO1/lego/scripts/pizzeria/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizzamissionstate.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
diff --git a/LEGO1/lego/scripts/pizzeria/pizzeria.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizzeria.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
diff --git a/LEGO1/lego/scripts/pizzeria/pizzeriastate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/pizzeria/pizzeriastate.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
diff --git a/LEGO1/lego/scripts/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
similarity index 100%
rename from LEGO1/lego/scripts/police/police.cpp
rename to LEGO1/lego/legoomni/src/police/police.cpp
diff --git a/LEGO1/lego/scripts/police/policeentity.cpp b/LEGO1/lego/legoomni/src/police/policeentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/police/policeentity.cpp
rename to LEGO1/lego/legoomni/src/police/policeentity.cpp
diff --git a/LEGO1/lego/scripts/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/police/policestate.cpp
rename to LEGO1/lego/legoomni/src/police/policestate.cpp
diff --git a/LEGO1/lego/scripts/race/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp
similarity index 100%
rename from LEGO1/lego/scripts/race/carrace.cpp
rename to LEGO1/lego/legoomni/src/race/carrace.cpp
diff --git a/LEGO1/lego/scripts/race/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp
similarity index 100%
rename from LEGO1/lego/scripts/race/jetskirace.cpp
rename to LEGO1/lego/legoomni/src/race/jetskirace.cpp
diff --git a/LEGO1/lego/scripts/race/racestandsentity.cpp b/LEGO1/lego/legoomni/src/race/racestandsentity.cpp
similarity index 100%
rename from LEGO1/lego/scripts/race/racestandsentity.cpp
rename to LEGO1/lego/legoomni/src/race/racestandsentity.cpp
diff --git a/LEGO1/lego/scripts/race/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/race/racestate.cpp
rename to LEGO1/lego/legoomni/src/race/racestate.cpp
diff --git a/LEGO1/lego/scripts/towtrack/towtrack.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
similarity index 100%
rename from LEGO1/lego/scripts/towtrack/towtrack.cpp
rename to LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
diff --git a/LEGO1/lego/scripts/towtrack/towtrackmissionstate.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
similarity index 100%
rename from LEGO1/lego/scripts/towtrack/towtrackmissionstate.cpp
rename to LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index f44d1738..43cdde24 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -1,10 +1,10 @@
 #include "legovideomanager.h"
 
 #include "legoomni.h"
-#include "legoroi.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "realtime/matrix.h"
+#include "roi/legoroi.h"
 #include "tgl/d3drm/impl.h"
 #include "viewmanager/viewroi.h"
 
diff --git a/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
index 99c977d5..4fa43a3c 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
@@ -2,8 +2,8 @@
 //
 #include "lego3dmanager.h"
 
-#include "../viewmanager/viewlodlist.h"
 #include "decomp.h"
+#include "viewmanager/viewlodlist.h"
 
 DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
 
diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
index cdededa5..04c9ea22 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
@@ -3,7 +3,7 @@
 
 #include "lego3dview.h"
 
-#include "../viewmanager/viewmanager.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(Lego3DView, 0xa8)
 
diff --git a/LEGO1/lego/sources/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp
index 57117e9c..3705eb33 100644
--- a/LEGO1/lego/sources/3dmanager/legoview1.cpp
+++ b/LEGO1/lego/sources/3dmanager/legoview1.cpp
@@ -3,8 +3,8 @@
 
 #include "legoview1.h"
 
-#include "../realtime/realtime.h"
 #include "decomp.h"
+#include "realtime/realtime.h"
 
 #include <vec.h> // SETMAT4