diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index aaa41235..07b646fb 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -11,19 +11,12 @@ jobs:
 
     - name: Run clang-format
       run: |
+        find LEGO1 ISLE -iname '*.h' -o -iname '*.cpp' | xargs \
         pipx run "clang-format>=17,<18" \
           --Werror \
           --dry-run \
           --style=file \
-          ISLE/*.cpp ISLE/*.h \
-          LEGO1/*.cpp LEGO1/*.h \
-          LEGO1/3dmanager/*.cpp LEGO1/3dmanager/*.h \
-          LEGO1/mxdirectx/*.cpp LEGO1/mxdirectx/*.h \
-          LEGO1/mxstl/*.h \
-          LEGO1/realtime/*.cpp LEGO1/realtime/*.h \
-          LEGO1/tgl/*.h \
-          LEGO1/tgl/d3drm/*.cpp LEGO1/tgl/d3drm/*.h \
-          LEGO1/viewmanager/*.cpp LEGO1/viewmanager/*.h
+          -i
 
   python-format:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml
index c870d7dd..163354d5 100644
--- a/.github/workflows/naming.yml
+++ b/.github/workflows/naming.yml
@@ -22,8 +22,14 @@ jobs:
       run: |
         python3 tools/ncc/ncc.py \
           --clang-lib ${{ env.LLVM_PATH }}/lib/libclang.so \
+          --recurse \
           --style tools/ncc/ncc.style \
           --skip tools/ncc/skip.yml \
           --definition WINAPI FAR BOOL CALLBACK HWND__=HWND \
-          --include util \
-          --path LEGO1
+          --include \
+            util \
+            LEGO1 \
+            LEGO1/omni/include \
+            LEGO1/lego/legoomni/include \
+            LEGO1/lego/sources \
+          --path LEGO1/omni LEGO1/lego/legoomni
diff --git a/.gitignore b/.gitignore
index 72d6fef6..7e16a6ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ env.bak/
 venv.bak/
 ISLE.EXE
 LEGO1.DLL
-build/
+/build/
 *.swp
 LEGO1PROGRESS.*
 ISLEPROGRESS.*
diff --git a/3rdparty/smack/rad.h b/3rdparty/smacker/rad.h
similarity index 100%
rename from 3rdparty/smack/rad.h
rename to 3rdparty/smacker/rad.h
diff --git a/3rdparty/smack/smack.h b/3rdparty/smacker/smack.h
similarity index 100%
rename from 3rdparty/smack/smack.h
rename to 3rdparty/smacker/smack.h
diff --git a/3rdparty/smack/smack.lib b/3rdparty/smacker/smack.lib
similarity index 100%
rename from 3rdparty/smack/smack.lib
rename to 3rdparty/smacker/smack.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0e3eae5..10f30c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,212 +7,210 @@ option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC})
 option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
 
 add_library(lego1 SHARED
-  LEGO1/3dmanager/lego3dmanager.cpp
-  LEGO1/3dmanager/lego3dview.cpp
-  LEGO1/3dmanager/legoview1.cpp
-  LEGO1/3dmanager/tglsurface.cpp
-  LEGO1/act1state.cpp
-  LEGO1/act2brick.cpp
-  LEGO1/act2policestation.cpp
-  LEGO1/act3.cpp
-  LEGO1/act3shark.cpp
-  LEGO1/act3state.cpp
-  LEGO1/ambulance.cpp
-  LEGO1/ambulancemissionstate.cpp
-  LEGO1/animstate.cpp
-  LEGO1/beachhouseentity.cpp
-  LEGO1/bike.cpp
-  LEGO1/buildingentity.cpp
-  LEGO1/bumpbouy.cpp
-  LEGO1/carrace.cpp
   LEGO1/define.cpp
-  LEGO1/dllmain.cpp
-  LEGO1/dunebuggy.cpp
-  LEGO1/elevatorbottom.cpp
-  LEGO1/gasstation.cpp
-  LEGO1/gasstationentity.cpp
-  LEGO1/gasstationstate.cpp
-  LEGO1/gifmanager.cpp
-  LEGO1/helicopter.cpp
-  LEGO1/helicopterstate.cpp
-  LEGO1/historybook.cpp
-  LEGO1/hospital.cpp
-  LEGO1/hospitalentity.cpp
-  LEGO1/hospitalstate.cpp
-  LEGO1/infocenter.cpp
-  LEGO1/infocenterdoor.cpp
-  LEGO1/infocenterentity.cpp
-  LEGO1/infocenterstate.cpp
-  LEGO1/isle.cpp
-  LEGO1/isleactor.cpp
-  LEGO1/islepathactor.cpp
-  LEGO1/jetski.cpp
-  LEGO1/jetskirace.cpp
-  LEGO1/jukebox.cpp
-  LEGO1/jukeboxentity.cpp
-  LEGO1/jukeboxstate.cpp
-  LEGO1/legoact2state.cpp
-  LEGO1/legoactioncontrolpresenter.cpp
-  LEGO1/legoactor.cpp
-  LEGO1/legoactor.cpp
-  LEGO1/legoanimactor.cpp
-  LEGO1/legoanimationmanager.cpp
-  LEGO1/legoanimmmpresenter.cpp
-  LEGO1/legoanimpresenter.cpp
-  LEGO1/legobackgroundcolor.cpp
-  LEGO1/legobackgroundcolor.cpp
-  LEGO1/legobuildingmanager.cpp
-  LEGO1/legocachesound.cpp
-  LEGO1/legocameracontroller.cpp
-  LEGO1/legocarbuild.cpp
-  LEGO1/legocarbuildanimpresenter.cpp
-  LEGO1/legocontrolmanager.cpp
-  LEGO1/legoentity.cpp
-  LEGO1/legoentitypresenter.cpp
-  LEGO1/legoeventnotificationparam.cpp
-  LEGO1/legoflctexturepresenter.cpp
-  LEGO1/legofullscreenmovie.cpp
-  LEGO1/legogamestate.cpp
-  LEGO1/legohideanimpresenter.cpp
-  LEGO1/legoinputmanager.cpp
-  LEGO1/legojetski.cpp
-  LEGO1/legoloadcachesoundpresenter.cpp
-  LEGO1/legolocomotionanimpresenter.cpp
-  LEGO1/legometerpresenter.cpp
-  LEGO1/legomodelpresenter.cpp
-  LEGO1/legonavcontroller.cpp
-  LEGO1/legoobjectfactory.cpp
-  LEGO1/legoomni.cpp
-  LEGO1/legopalettepresenter.cpp
-  LEGO1/legopartpresenter.cpp
-  LEGO1/legopathactor.cpp
-  LEGO1/legopathcontroller.cpp
-  LEGO1/legopathpresenter.cpp
-  LEGO1/legophonemepresenter.cpp
-  LEGO1/legoplantmanager.cpp
-  LEGO1/legorace.cpp
-  LEGO1/legoroi.cpp
-  LEGO1/legosoundmanager.cpp
-  LEGO1/legostate.cpp
-  LEGO1/legostream.cpp
-  LEGO1/legotexturepresenter.cpp
-  LEGO1/legoutil.cpp
-  LEGO1/legounksavedatawriter.cpp
-  LEGO1/legovehiclebuildstate.cpp
-  LEGO1/legovideomanager.cpp
-  LEGO1/legoworld.cpp
-  LEGO1/legoworldpresenter.cpp
-  LEGO1/motorcycle.cpp
-  LEGO1/mxactionnotificationparam.cpp
-  LEGO1/mxatomid.cpp
-  LEGO1/mxatomidcounter.cpp
-  LEGO1/mxaudiomanager.cpp
-  LEGO1/mxaudiopresenter.cpp
-  LEGO1/mxautolocker.cpp
-  LEGO1/mxbackgroundaudiomanager.cpp
-  LEGO1/mxbitmap.cpp
-  LEGO1/mxcompositemediapresenter.cpp
-  LEGO1/mxcompositepresenter.cpp
-  LEGO1/mxcontrolpresenter.cpp
-  LEGO1/mxcore.cpp
-  LEGO1/mxcriticalsection.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
+  LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
+  LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
+  LEGO1/lego/legoomni/src/common/legogamestate.cpp
+  LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
+  LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
+  LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
+  LEGO1/lego/legoomni/src/common/legostate.cpp
+  LEGO1/lego/legoomni/src/common/legostream.cpp
+  LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
+  LEGO1/lego/legoomni/src/common/legoutil.cpp
+  LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+  LEGO1/lego/legoomni/src/entity/legoactor.cpp
+  LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
+  LEGO1/lego/legoomni/src/entity/legoentity.cpp
+  LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+  LEGO1/lego/legoomni/src/entity/legojetski.cpp
+  LEGO1/lego/legoomni/src/entity/legopathactor.cpp
+  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
+  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/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/sources/3dmanager/lego3dmanager.cpp
+  LEGO1/lego/sources/3dmanager/lego3dview.cpp
+  LEGO1/lego/sources/3dmanager/legoview1.cpp
+  LEGO1/lego/sources/3dmanager/tglsurface.cpp
+  LEGO1/lego/sources/roi/legoroi.cpp
   LEGO1/mxdirectx/mxdirect3d.cpp
   LEGO1/mxdirectx/mxdirectdraw.cpp
-  LEGO1/mxdiskstreamcontroller.cpp
-  LEGO1/mxdiskstreamprovider.cpp
-  LEGO1/mxdisplaysurface.cpp
-  LEGO1/mxdsaction.cpp
-  LEGO1/mxdsanim.cpp
-  LEGO1/mxdsbuffer.cpp
-  LEGO1/mxdschunk.cpp
-  LEGO1/mxdsevent.cpp
-  LEGO1/mxdsfile.cpp
-  LEGO1/mxdsmediaaction.cpp
-  LEGO1/mxdsmultiaction.cpp
-  LEGO1/mxdsobject.cpp
-  LEGO1/mxdsobjectaction.cpp
-  LEGO1/mxdsparallelaction.cpp
-  LEGO1/mxdsselectaction.cpp
-  LEGO1/mxdsserialaction.cpp
-  LEGO1/mxdssound.cpp
-  LEGO1/mxdssource.cpp
-  LEGO1/mxdsstill.cpp
-  LEGO1/mxdsstreamingaction.cpp
-  LEGO1/mxdssubscriber.cpp
-  LEGO1/mxentity.cpp
-  LEGO1/mxeventmanager.cpp
-  LEGO1/mxeventpresenter.cpp
-  LEGO1/mxflcpresenter.cpp
-  LEGO1/mxioinfo.cpp
-  LEGO1/mxloopingflcpresenter.cpp
-  LEGO1/mxloopingmidipresenter.cpp
-  LEGO1/mxloopingsmkpresenter.cpp
-  LEGO1/mxmediamanager.cpp
-  LEGO1/mxmediapresenter.cpp
-  LEGO1/mxmidipresenter.cpp
-  LEGO1/mxmusicmanager.cpp
-  LEGO1/mxmusicpresenter.cpp
-  LEGO1/mxnotificationmanager.cpp
-  LEGO1/mxnotificationparam.cpp
-  LEGO1/mxobjectfactory.cpp
-  LEGO1/mxomni.cpp
-  LEGO1/mxomnicreateflags.cpp
-  LEGO1/mxomnicreateparam.cpp
-  LEGO1/mxpalette.cpp
-  LEGO1/mxparam.cpp
-  LEGO1/mxpresenter.cpp
-  LEGO1/mxramstreamcontroller.cpp
-  LEGO1/mxramstreamprovider.cpp
-  LEGO1/mxregion.cpp
-  LEGO1/mxregioncursor.cpp
-  LEGO1/mxscheduler.cpp
-  LEGO1/mxsemaphore.cpp
-  LEGO1/mxsmack.cpp
-  LEGO1/mxsmkpresenter.cpp
-  LEGO1/mxsoundmanager.cpp
-  LEGO1/mxsoundpresenter.cpp
-  LEGO1/mxstillpresenter.cpp
-  LEGO1/mxstreamchunk.cpp
-  LEGO1/mxstreamcontroller.cpp
-  LEGO1/mxstreamer.cpp
-  LEGO1/mxstreamlist.cpp
-  LEGO1/mxstreamprovider.cpp
-  LEGO1/mxstring.cpp
-  LEGO1/mxthread.cpp
-  LEGO1/mxticklemanager.cpp
-  LEGO1/mxtimer.cpp
-  LEGO1/mxtransitionmanager.cpp
-  LEGO1/mxtype17notificationparam.cpp
-  LEGO1/mxunknown100d7c88.cpp
-  LEGO1/mxvariable.cpp
-  LEGO1/mxvariabletable.cpp
-  LEGO1/mxvideomanager.cpp
-  LEGO1/mxvideoparam.cpp
-  LEGO1/mxvideoparamflags.cpp
-  LEGO1/mxvideopresenter.cpp
-  LEGO1/mxwavepresenter.cpp
-  LEGO1/pizza.cpp
-  LEGO1/pizzamissionstate.cpp
-  LEGO1/pizzeria.cpp
-  LEGO1/pizzeriastate.cpp
-  LEGO1/police.cpp
-  LEGO1/policeentity.cpp
-  LEGO1/policestate.cpp
-  LEGO1/racecar.cpp
-  LEGO1/racestandsentity.cpp
-  LEGO1/racestate.cpp
-  LEGO1/radio.cpp
-  LEGO1/radiostate.cpp
+  LEGO1/omni/src/action/mxdsaction.cpp
+  LEGO1/omni/src/action/mxdsanim.cpp
+  LEGO1/omni/src/action/mxdsevent.cpp
+  LEGO1/omni/src/action/mxdsmediaaction.cpp
+  LEGO1/omni/src/action/mxdsmultiaction.cpp
+  LEGO1/omni/src/action/mxdsobjectaction.cpp
+  LEGO1/omni/src/action/mxdsobject.cpp
+  LEGO1/omni/src/action/mxdsparallelaction.cpp
+  LEGO1/omni/src/action/mxdsselectaction.cpp
+  LEGO1/omni/src/action/mxdsserialaction.cpp
+  LEGO1/omni/src/action/mxdssound.cpp
+  LEGO1/omni/src/action/mxdsstill.cpp
+  LEGO1/omni/src/action/mxdsstreamingaction.cpp
+  LEGO1/omni/src/audio/mxaudiomanager.cpp
+  LEGO1/omni/src/audio/mxaudiopresenter.cpp
+  LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
+  LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+  LEGO1/omni/src/audio/mxmidipresenter.cpp
+  LEGO1/omni/src/audio/mxmusicmanager.cpp
+  LEGO1/omni/src/audio/mxmusicpresenter.cpp
+  LEGO1/omni/src/audio/mxsoundmanager.cpp
+  LEGO1/omni/src/audio/mxsoundpresenter.cpp
+  LEGO1/omni/src/audio/mxwavepresenter.cpp
+  LEGO1/omni/src/common/mxatomidcounter.cpp
+  LEGO1/omni/src/common/mxatomid.cpp
+  LEGO1/omni/src/common/mxcompositemediapresenter.cpp
+  LEGO1/omni/src/common/mxcompositepresenter.cpp
+  LEGO1/omni/src/common/mxcore.cpp
+  LEGO1/omni/src/common/mxmediamanager.cpp
+  LEGO1/omni/src/common/mxmediapresenter.cpp
+  LEGO1/omni/src/common/mxobjectfactory.cpp
+  LEGO1/omni/src/common/mxpresenter.cpp
+  LEGO1/omni/src/common/mxstring.cpp
+  LEGO1/omni/src/common/mxticklemanager.cpp
+  LEGO1/omni/src/common/mxtimer.cpp
+  LEGO1/omni/src/common/mxvariable.cpp
+  LEGO1/omni/src/common/mxvariabletable.cpp
+  LEGO1/omni/src/control/mxcontrolpresenter.cpp
+  LEGO1/omni/src/entity/mxentity.cpp
+  LEGO1/omni/src/event/mxeventmanager.cpp
+  LEGO1/omni/src/event/mxeventpresenter.cpp
+  LEGO1/omni/src/main/mxmain.cpp
+  LEGO1/omni/src/main/mxomni.cpp
+  LEGO1/omni/src/main/mxomnicreateflags.cpp
+  LEGO1/omni/src/main/mxomnicreateparam.cpp
+  LEGO1/omni/src/notify/mxactionnotificationparam.cpp
+  LEGO1/omni/src/notify/mxnotificationmanager.cpp
+  LEGO1/omni/src/notify/mxnotificationparam.cpp
+  LEGO1/omni/src/notify/mxtype17notificationparam.cpp
+  LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+  LEGO1/omni/src/stream/mxdsbuffer.cpp
+  LEGO1/omni/src/stream/mxdschunk.cpp
+  LEGO1/omni/src/stream/mxdsfile.cpp
+  LEGO1/omni/src/stream/mxdssource.cpp
+  LEGO1/omni/src/stream/mxdssubscriber.cpp
+  LEGO1/omni/src/stream/mxioinfo.cpp
+  LEGO1/omni/src/stream/mxramstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxramstreamprovider.cpp
+  LEGO1/omni/src/stream/mxstreamchunk.cpp
+  LEGO1/omni/src/stream/mxstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxstreamer.cpp
+  LEGO1/omni/src/stream/mxstreamlist.cpp
+  LEGO1/omni/src/stream/mxstreamprovider.cpp
+  LEGO1/omni/src/system/mxautolocker.cpp
+  LEGO1/omni/src/system/mxcriticalsection.cpp
+  LEGO1/omni/src/system/mxscheduler.cpp
+  LEGO1/omni/src/system/mxsemaphore.cpp
+  LEGO1/omni/src/system/mxthread.cpp
+  LEGO1/omni/src/video/mxbitmap.cpp
+  LEGO1/omni/src/video/mxdisplaysurface.cpp
+  LEGO1/omni/src/video/mxflcpresenter.cpp
+  LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+  LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+  LEGO1/omni/src/video/mxpalette.cpp
+  LEGO1/omni/src/video/mxregion.cpp
+  LEGO1/omni/src/video/mxregioncursor.cpp
+  LEGO1/omni/src/video/mxsmack.cpp
+  LEGO1/omni/src/video/mxsmkpresenter.cpp
+  LEGO1/omni/src/video/mxstillpresenter.cpp
+  LEGO1/omni/src/video/mxtransitionmanager.cpp
+  LEGO1/omni/src/video/mxvideomanager.cpp
+  LEGO1/omni/src/video/mxvideoparam.cpp
+  LEGO1/omni/src/video/mxvideoparamflags.cpp
+  LEGO1/omni/src/video/mxvideopresenter.cpp
   LEGO1/realtime/matrix.cpp
   LEGO1/realtime/orientableroi.cpp
   LEGO1/realtime/realtime.cpp
   LEGO1/realtime/realtimeview.cpp
   LEGO1/realtime/vector.cpp
-  LEGO1/registrationbook.cpp
-  LEGO1/res/lego1.rc
-  LEGO1/score.cpp
-  LEGO1/scorestate.cpp
-  LEGO1/skateboard.cpp
   LEGO1/tgl/d3drm/camera.cpp
   LEGO1/tgl/d3drm/device.cpp
   LEGO1/tgl/d3drm/group.cpp
@@ -222,21 +220,25 @@ add_library(lego1 SHARED
   LEGO1/tgl/d3drm/texture.cpp
   LEGO1/tgl/d3drm/unk.cpp
   LEGO1/tgl/d3drm/view.cpp
-  LEGO1/towtrack.cpp
-  LEGO1/towtrackmissionstate.cpp
   LEGO1/viewmanager/viewlodlist.cpp
   LEGO1/viewmanager/viewmanager.cpp
   LEGO1/viewmanager/viewroi.cpp
 )
+
 if (MINGW)
   target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500)
 endif()
 
-# Additional include directories
 target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/util")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
+
+# Additional include directories
 target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec")
 target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
 
 if (ISLE_USE_SMARTHEAP)
   add_library(SmartHeap::SmartHeap STATIC IMPORTED)
@@ -254,7 +256,7 @@ if (ISLE_USE_DX5)
   target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
 endif()
 
-target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack")
+target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
 
 # Link libraries
 target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack)
@@ -272,9 +274,10 @@ if (ISLE_BUILD_APP)
   )
 
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util")
-
-  # Include LEGO1 headers in ISLE
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
+  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
+  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
+  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
 
   # Use internal DirectX 5 if required
   if (ISLE_USE_DX5)
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/ISLE/res/resource.h b/ISLE/res/resource.h
index 6148e89f..647c616e 100644
--- a/ISLE/res/resource.h
+++ b/ISLE/res/resource.h
@@ -1,5 +1,5 @@
-#define ISLE_ARROW  102
-#define ISLE_NO     103
-#define ISLE_BUSY   104
+#define ISLE_ARROW 102
+#define ISLE_NO 103
+#define ISLE_BUSY 104
 
-#define APP_ICON    105
+#define APP_ICON 105
diff --git a/LEGO1/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
similarity index 100%
rename from LEGO1/act1state.h
rename to LEGO1/lego/legoomni/include/act1state.h
diff --git a/LEGO1/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
similarity index 100%
rename from LEGO1/act2brick.h
rename to LEGO1/lego/legoomni/include/act2brick.h
diff --git a/LEGO1/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
similarity index 100%
rename from LEGO1/act2policestation.h
rename to LEGO1/lego/legoomni/include/act2policestation.h
diff --git a/LEGO1/act3.h b/LEGO1/lego/legoomni/include/act3.h
similarity index 100%
rename from LEGO1/act3.h
rename to LEGO1/lego/legoomni/include/act3.h
diff --git a/LEGO1/act3actor.h b/LEGO1/lego/legoomni/include/act3actor.h
similarity index 100%
rename from LEGO1/act3actor.h
rename to LEGO1/lego/legoomni/include/act3actor.h
diff --git a/LEGO1/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
similarity index 100%
rename from LEGO1/act3shark.h
rename to LEGO1/lego/legoomni/include/act3shark.h
diff --git a/LEGO1/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
similarity index 100%
rename from LEGO1/act3state.h
rename to LEGO1/lego/legoomni/include/act3state.h
diff --git a/LEGO1/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
similarity index 100%
rename from LEGO1/ambulance.h
rename to LEGO1/lego/legoomni/include/ambulance.h
diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
similarity index 100%
rename from LEGO1/ambulancemissionstate.h
rename to LEGO1/lego/legoomni/include/ambulancemissionstate.h
diff --git a/LEGO1/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
similarity index 100%
rename from LEGO1/animstate.h
rename to LEGO1/lego/legoomni/include/animstate.h
diff --git a/LEGO1/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h
similarity index 100%
rename from LEGO1/beachhouseentity.h
rename to LEGO1/lego/legoomni/include/beachhouseentity.h
diff --git a/LEGO1/bike.h b/LEGO1/lego/legoomni/include/bike.h
similarity index 100%
rename from LEGO1/bike.h
rename to LEGO1/lego/legoomni/include/bike.h
diff --git a/LEGO1/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
similarity index 100%
rename from LEGO1/buildingentity.h
rename to LEGO1/lego/legoomni/include/buildingentity.h
diff --git a/LEGO1/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
similarity index 100%
rename from LEGO1/bumpbouy.h
rename to LEGO1/lego/legoomni/include/bumpbouy.h
diff --git a/LEGO1/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
similarity index 100%
rename from LEGO1/carrace.h
rename to LEGO1/lego/legoomni/include/carrace.h
diff --git a/LEGO1/carracestate.h b/LEGO1/lego/legoomni/include/carracestate.h
similarity index 100%
rename from LEGO1/carracestate.h
rename to LEGO1/lego/legoomni/include/carracestate.h
diff --git a/LEGO1/doors.h b/LEGO1/lego/legoomni/include/doors.h
similarity index 100%
rename from LEGO1/doors.h
rename to LEGO1/lego/legoomni/include/doors.h
diff --git a/LEGO1/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
similarity index 100%
rename from LEGO1/dunebuggy.h
rename to LEGO1/lego/legoomni/include/dunebuggy.h
diff --git a/LEGO1/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
similarity index 100%
rename from LEGO1/elevatorbottom.h
rename to LEGO1/lego/legoomni/include/elevatorbottom.h
diff --git a/LEGO1/extra.h b/LEGO1/lego/legoomni/include/extra.h
similarity index 100%
rename from LEGO1/extra.h
rename to LEGO1/lego/legoomni/include/extra.h
diff --git a/LEGO1/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
similarity index 100%
rename from LEGO1/gasstation.h
rename to LEGO1/lego/legoomni/include/gasstation.h
diff --git a/LEGO1/gasstationentity.h b/LEGO1/lego/legoomni/include/gasstationentity.h
similarity index 100%
rename from LEGO1/gasstationentity.h
rename to LEGO1/lego/legoomni/include/gasstationentity.h
diff --git a/LEGO1/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
similarity index 100%
rename from LEGO1/gasstationstate.h
rename to LEGO1/lego/legoomni/include/gasstationstate.h
diff --git a/LEGO1/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
similarity index 100%
rename from LEGO1/gifmanager.h
rename to LEGO1/lego/legoomni/include/gifmanager.h
diff --git a/LEGO1/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
similarity index 100%
rename from LEGO1/helicopter.h
rename to LEGO1/lego/legoomni/include/helicopter.h
diff --git a/LEGO1/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
similarity index 100%
rename from LEGO1/helicopterstate.h
rename to LEGO1/lego/legoomni/include/helicopterstate.h
diff --git a/LEGO1/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
similarity index 100%
rename from LEGO1/historybook.h
rename to LEGO1/lego/legoomni/include/historybook.h
diff --git a/LEGO1/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
similarity index 100%
rename from LEGO1/hospital.h
rename to LEGO1/lego/legoomni/include/hospital.h
diff --git a/LEGO1/hospitalentity.h b/LEGO1/lego/legoomni/include/hospitalentity.h
similarity index 100%
rename from LEGO1/hospitalentity.h
rename to LEGO1/lego/legoomni/include/hospitalentity.h
diff --git a/LEGO1/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
similarity index 100%
rename from LEGO1/hospitalstate.h
rename to LEGO1/lego/legoomni/include/hospitalstate.h
diff --git a/LEGO1/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
similarity index 100%
rename from LEGO1/infocenter.h
rename to LEGO1/lego/legoomni/include/infocenter.h
diff --git a/LEGO1/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
similarity index 100%
rename from LEGO1/infocenterdoor.h
rename to LEGO1/lego/legoomni/include/infocenterdoor.h
diff --git a/LEGO1/infocenterentity.h b/LEGO1/lego/legoomni/include/infocenterentity.h
similarity index 100%
rename from LEGO1/infocenterentity.h
rename to LEGO1/lego/legoomni/include/infocenterentity.h
diff --git a/LEGO1/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
similarity index 100%
rename from LEGO1/infocenterstate.h
rename to LEGO1/lego/legoomni/include/infocenterstate.h
diff --git a/LEGO1/isle.h b/LEGO1/lego/legoomni/include/isle.h
similarity index 100%
rename from LEGO1/isle.h
rename to LEGO1/lego/legoomni/include/isle.h
diff --git a/LEGO1/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
similarity index 100%
rename from LEGO1/isleactor.h
rename to LEGO1/lego/legoomni/include/isleactor.h
diff --git a/LEGO1/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
similarity index 100%
rename from LEGO1/islepathactor.h
rename to LEGO1/lego/legoomni/include/islepathactor.h
diff --git a/LEGO1/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
similarity index 100%
rename from LEGO1/jetski.h
rename to LEGO1/lego/legoomni/include/jetski.h
diff --git a/LEGO1/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h
similarity index 100%
rename from LEGO1/jetskirace.h
rename to LEGO1/lego/legoomni/include/jetskirace.h
diff --git a/LEGO1/jetskiracestate.h b/LEGO1/lego/legoomni/include/jetskiracestate.h
similarity index 100%
rename from LEGO1/jetskiracestate.h
rename to LEGO1/lego/legoomni/include/jetskiracestate.h
diff --git a/LEGO1/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
similarity index 100%
rename from LEGO1/jukebox.h
rename to LEGO1/lego/legoomni/include/jukebox.h
diff --git a/LEGO1/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
similarity index 100%
rename from LEGO1/jukeboxentity.h
rename to LEGO1/lego/legoomni/include/jukeboxentity.h
diff --git a/LEGO1/jukeboxstate.h b/LEGO1/lego/legoomni/include/jukeboxstate.h
similarity index 100%
rename from LEGO1/jukeboxstate.h
rename to LEGO1/lego/legoomni/include/jukeboxstate.h
diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
similarity index 100%
rename from LEGO1/lego3dwavepresenter.h
rename to LEGO1/lego/legoomni/include/lego3dwavepresenter.h
diff --git a/LEGO1/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
similarity index 100%
rename from LEGO1/legoact2.h
rename to LEGO1/lego/legoomni/include/legoact2.h
diff --git a/LEGO1/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
similarity index 100%
rename from LEGO1/legoact2state.h
rename to LEGO1/lego/legoomni/include/legoact2state.h
diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
similarity index 100%
rename from LEGO1/legoactioncontrolpresenter.h
rename to LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
diff --git a/LEGO1/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
similarity index 100%
rename from LEGO1/legoactor.h
rename to LEGO1/lego/legoomni/include/legoactor.h
diff --git a/LEGO1/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h
similarity index 100%
rename from LEGO1/legoactorpresenter.h
rename to LEGO1/lego/legoomni/include/legoactorpresenter.h
diff --git a/LEGO1/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h
similarity index 100%
rename from LEGO1/legoanimactor.h
rename to LEGO1/lego/legoomni/include/legoanimactor.h
diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
similarity index 100%
rename from LEGO1/legoanimationmanager.h
rename to LEGO1/lego/legoomni/include/legoanimationmanager.h
diff --git a/LEGO1/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
similarity index 100%
rename from LEGO1/legoanimmmpresenter.h
rename to LEGO1/lego/legoomni/include/legoanimmmpresenter.h
diff --git a/LEGO1/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
similarity index 100%
rename from LEGO1/legoanimpresenter.h
rename to LEGO1/lego/legoomni/include/legoanimpresenter.h
diff --git a/LEGO1/legobackgroundcolor.h b/LEGO1/lego/legoomni/include/legobackgroundcolor.h
similarity index 100%
rename from LEGO1/legobackgroundcolor.h
rename to LEGO1/lego/legoomni/include/legobackgroundcolor.h
diff --git a/LEGO1/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
similarity index 100%
rename from LEGO1/legobuildingmanager.h
rename to LEGO1/lego/legoomni/include/legobuildingmanager.h
diff --git a/LEGO1/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
similarity index 100%
rename from LEGO1/legocachesound.h
rename to LEGO1/lego/legoomni/include/legocachesound.h
diff --git a/LEGO1/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
similarity index 100%
rename from LEGO1/legocameracontroller.h
rename to LEGO1/lego/legoomni/include/legocameracontroller.h
diff --git a/LEGO1/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
similarity index 100%
rename from LEGO1/legocarbuild.h
rename to LEGO1/lego/legoomni/include/legocarbuild.h
diff --git a/LEGO1/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
similarity index 100%
rename from LEGO1/legocarbuildanimpresenter.h
rename to LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
diff --git a/LEGO1/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h
similarity index 100%
rename from LEGO1/legocarraceactor.h
rename to LEGO1/lego/legoomni/include/legocarraceactor.h
diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
similarity index 100%
rename from LEGO1/legocontrolmanager.h
rename to LEGO1/lego/legoomni/include/legocontrolmanager.h
diff --git a/LEGO1/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
similarity index 99%
rename from LEGO1/legoentity.h
rename to LEGO1/lego/legoomni/include/legoentity.h
index 5a2eb715..ba0e1a7b 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -3,10 +3,10 @@
 
 #include "decomp.h"
 #include "extra.h"
-#include "legoroi.h"
 #include "mxdsobject.h"
 #include "mxentity.h"
 #include "realtime/vector.h"
+#include "roi/legoroi.h"
 
 // VTABLE: LEGO1 0x100d4858
 // SIZE 0x68 (probably)
diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
similarity index 100%
rename from LEGO1/legoentitypresenter.h
rename to LEGO1/lego/legoomni/include/legoentitypresenter.h
diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
similarity index 100%
rename from LEGO1/legoeventnotificationparam.h
rename to LEGO1/lego/legoomni/include/legoeventnotificationparam.h
diff --git a/LEGO1/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h
similarity index 100%
rename from LEGO1/legoextraactor.h
rename to LEGO1/lego/legoomni/include/legoextraactor.h
diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
similarity index 100%
rename from LEGO1/legoflctexturepresenter.h
rename to LEGO1/lego/legoomni/include/legoflctexturepresenter.h
diff --git a/LEGO1/legofullscreenmovie.h b/LEGO1/lego/legoomni/include/legofullscreenmovie.h
similarity index 100%
rename from LEGO1/legofullscreenmovie.h
rename to LEGO1/lego/legoomni/include/legofullscreenmovie.h
diff --git a/LEGO1/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
similarity index 100%
rename from LEGO1/legogamestate.h
rename to LEGO1/lego/legoomni/include/legogamestate.h
diff --git a/LEGO1/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
similarity index 100%
rename from LEGO1/legohideanimpresenter.h
rename to LEGO1/lego/legoomni/include/legohideanimpresenter.h
diff --git a/LEGO1/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
similarity index 100%
rename from LEGO1/legoinputmanager.h
rename to LEGO1/lego/legoomni/include/legoinputmanager.h
diff --git a/LEGO1/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
similarity index 100%
rename from LEGO1/legojetski.h
rename to LEGO1/lego/legoomni/include/legojetski.h
diff --git a/LEGO1/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
similarity index 100%
rename from LEGO1/legojetskiraceactor.h
rename to LEGO1/lego/legoomni/include/legojetskiraceactor.h
diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
similarity index 100%
rename from LEGO1/legoloadcachesoundpresenter.h
rename to LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
similarity index 100%
rename from LEGO1/legolocomotionanimpresenter.h
rename to LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
similarity index 100%
rename from LEGO1/legoloopinganimpresenter.h
rename to LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
diff --git a/LEGO1/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h
similarity index 100%
rename from LEGO1/legometerpresenter.h
rename to LEGO1/lego/legoomni/include/legometerpresenter.h
diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
similarity index 100%
rename from LEGO1/legomodelpresenter.h
rename to LEGO1/lego/legoomni/include/legomodelpresenter.h
diff --git a/LEGO1/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
similarity index 100%
rename from LEGO1/legonavcontroller.h
rename to LEGO1/lego/legoomni/include/legonavcontroller.h
diff --git a/LEGO1/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h
similarity index 100%
rename from LEGO1/legoobjectfactory.h
rename to LEGO1/lego/legoomni/include/legoobjectfactory.h
diff --git a/LEGO1/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
similarity index 100%
rename from LEGO1/legoomni.h
rename to LEGO1/lego/legoomni/include/legoomni.h
diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
similarity index 100%
rename from LEGO1/legopalettepresenter.h
rename to LEGO1/lego/legoomni/include/legopalettepresenter.h
diff --git a/LEGO1/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
similarity index 100%
rename from LEGO1/legopartpresenter.h
rename to LEGO1/lego/legoomni/include/legopartpresenter.h
diff --git a/LEGO1/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
similarity index 100%
rename from LEGO1/legopathactor.h
rename to LEGO1/lego/legoomni/include/legopathactor.h
diff --git a/LEGO1/legopathboundary.h b/LEGO1/lego/legoomni/include/legopathboundary.h
similarity index 100%
rename from LEGO1/legopathboundary.h
rename to LEGO1/lego/legoomni/include/legopathboundary.h
diff --git a/LEGO1/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
similarity index 100%
rename from LEGO1/legopathcontroller.h
rename to LEGO1/lego/legoomni/include/legopathcontroller.h
diff --git a/LEGO1/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
similarity index 100%
rename from LEGO1/legopathcontrollerlist.h
rename to LEGO1/lego/legoomni/include/legopathcontrollerlist.h
diff --git a/LEGO1/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
similarity index 100%
rename from LEGO1/legopathpresenter.h
rename to LEGO1/lego/legoomni/include/legopathpresenter.h
diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
similarity index 100%
rename from LEGO1/legophonemepresenter.h
rename to LEGO1/lego/legoomni/include/legophonemepresenter.h
diff --git a/LEGO1/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
similarity index 100%
rename from LEGO1/legoplantmanager.h
rename to LEGO1/lego/legoomni/include/legoplantmanager.h
diff --git a/LEGO1/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
similarity index 100%
rename from LEGO1/legorace.h
rename to LEGO1/lego/legoomni/include/legorace.h
diff --git a/LEGO1/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
similarity index 100%
rename from LEGO1/legoraceactor.h
rename to LEGO1/lego/legoomni/include/legoraceactor.h
diff --git a/LEGO1/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
similarity index 100%
rename from LEGO1/legoracecar.h
rename to LEGO1/lego/legoomni/include/legoracecar.h
diff --git a/LEGO1/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h
similarity index 100%
rename from LEGO1/legosoundmanager.h
rename to LEGO1/lego/legoomni/include/legosoundmanager.h
diff --git a/LEGO1/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
similarity index 100%
rename from LEGO1/legostate.h
rename to LEGO1/lego/legoomni/include/legostate.h
diff --git a/LEGO1/legostream.h b/LEGO1/lego/legoomni/include/legostream.h
similarity index 100%
rename from LEGO1/legostream.h
rename to LEGO1/lego/legoomni/include/legostream.h
diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/lego/legoomni/include/legotexturepresenter.h
similarity index 100%
rename from LEGO1/legotexturepresenter.h
rename to LEGO1/lego/legoomni/include/legotexturepresenter.h
diff --git a/LEGO1/mxunknown100d7c88.h b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
similarity index 59%
rename from LEGO1/mxunknown100d7c88.h
rename to LEGO1/lego/legoomni/include/legounknown100d7c88.h
index eccc6ee4..a6004053 100644
--- a/LEGO1/mxunknown100d7c88.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
@@ -1,12 +1,12 @@
-#ifndef MXUNKNOWN100D7C88_H
-#define MXUNKNOWN100D7C88_H
+#ifndef LEGOUNKNOWN100D7C88_H
+#define LEGOUNKNOWN100D7C88_H
 
 #include "decomp.h"
 #include "mxstring.h"
 
-class MxUnknown100d7c88 {
+class LegoUnknown100d7c88 {
 public:
-	~MxUnknown100d7c88();
+	~LegoUnknown100d7c88();
 
 	virtual undefined4 VTable0x00(); // vtable+0x00
 									 // More virtual functions
@@ -16,4 +16,4 @@ class MxUnknown100d7c88 {
 	undefined4 m_unk0x14; // 0x14
 };
 
-#endif // MXUNKNOWN100D7C88_H
+#endif // LEGOUNKNOWN100D7C88_H
diff --git a/LEGO1/lego/legoomni/include/legounknown100d9d00.h b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
new file mode 100644
index 00000000..d31634fe
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
@@ -0,0 +1,42 @@
+#ifndef LEGOUNKNOWN100D9D00_H
+#define LEGOUNKNOWN100D9D00_H
+
+#include "decomp.h"
+#include "legounknown100d7c88.h"
+#include "mxlist.h"
+
+// VTABLE: LEGO1 0x100d9cd0
+// class MxCollection<LegoUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9ce8
+// class MxList<LegoUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9d00
+// SIZE 0x18
+class LegoUnknown100d9d00 : public MxList<LegoUnknown100d7c88*> {
+public:
+	LegoUnknown100d9d00() { SetDestroy(Destroy); }
+
+	// STUB: LEGO1 0x1007b210
+	virtual MxS8 Compare(LegoUnknown100d7c88* p_a, LegoUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
+
+	// FUNCTION: LEGO1 0x1007b2e0
+	static void Destroy(LegoUnknown100d7c88* p_element) { delete p_element; }
+};
+
+// TEMPLATE: LEGO1 0x1007b300
+// MxCollection<LegoUnknown100d7c88 *>::Compare
+
+// TEMPLATE: LEGO1 0x1007b360
+// MxCollection<LegoUnknown100d7c88 *>::Destroy
+
+// SYNTHETIC: LEGO1 0x1007b400
+// LegoUnknown100d9d00::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b470
+// MxCollection<LegoUnknown100d7c88 *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b4e0
+// MxList<LegoUnknown100d7c88 *>::`scalar deleting destructor'
+
+#endif // LEGOUNKNOWN100D9D00_H
diff --git a/LEGO1/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
similarity index 100%
rename from LEGO1/legounksavedatawriter.h
rename to LEGO1/lego/legoomni/include/legounksavedatawriter.h
diff --git a/LEGO1/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
similarity index 100%
rename from LEGO1/legoutil.h
rename to LEGO1/lego/legoomni/include/legoutil.h
diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
similarity index 100%
rename from LEGO1/legovehiclebuildstate.h
rename to LEGO1/lego/legoomni/include/legovehiclebuildstate.h
diff --git a/LEGO1/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
similarity index 52%
rename from LEGO1/legovideomanager.h
rename to LEGO1/lego/legoomni/include/legovideomanager.h
index 884b31ad..0783931a 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -3,9 +3,9 @@
 
 #include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
+#include "legounknown100d9d00.h"
 #include "mxdirectx/mxdirect3d.h"
 #include "mxdirectx/mxstopwatch.h"
-#include "mxunknown100d9d00.h"
 #include "mxvideomanager.h"
 
 #include <ddraw.h>
@@ -33,7 +33,7 @@ class LegoVideoManager : public MxVideoManager {
 	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
 	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
 	// FUNCTION: LGEO1 0x1007ab10
-	virtual MxUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
+	virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
 
 	void SetSkyColor(float p_red, float p_green, float p_blue);
 	void OverrideSkyColor(MxBool p_shouldOverride);
@@ -49,39 +49,39 @@ class LegoVideoManager : public MxVideoManager {
 
 	inline void DrawCursor();
 
-	Tgl::Renderer* m_renderer;          // 0x64
-	Lego3DManager* m_3dManager;         // 0x68
-	LegoROI* m_viewROI;                 // 0x6c
-	undefined4 m_unk0x70;               // 0x70
-	MxDirect3D* m_direct3d;             // 0x74
-	undefined4 m_unk0x78[27];           // 0x78
-	MxBool m_unk0xe4;                   // 0xe4
-	MxBool m_unk0xe5;                   // 0xe5
-	MxBool m_unk0xe6;                   // 0xe6
-	PALETTEENTRY m_paletteEntries[256]; // 0xe7
-	undefined m_padding0x4e7;           // 0x4e7
-	MxUnknown100d9d00* m_unk0x100d9d00; // 0x4e8
-	MxBool m_isFullscreenMovie;         // 0x4ec
-	MxPalette* m_palette;               // 0x4f0
-	MxStopWatch* m_stopWatch;           // 0x4f4
-	double m_elapsedSeconds;            // 0x4f8
-	MxBool m_unk0x500;                  // 0x500
-	MxBool m_drawCursor;                // 0x501
-	MxS32 m_cursorXCopy;                // 0x504
-	MxS32 m_cursorYCopy;                // 0x508
-	MxS32 m_cursorX;                    // 0x50c
-	MxS32 m_cursorY;                    // 0x510
-	LPDIRECTDRAWSURFACE m_unk0x514;     // 0x514
-	RECT m_unk0x518;                    // 0x518
-	undefined4 m_unk0x528;              // 0x528
-	MxBool m_drawFPS;                   // 0x52c
-	RECT m_fpsRect;                     // 0x530
-	HFONT m_arialFont;                  // 0x540
-	SIZE m_fpsSize;                     // 0x544
-	undefined m_pad0x54c[8];            // 0x54c
-	MxBool m_unk0x554;                  // 0x554
-	MxBool m_initialized;               // 0x555
-	undefined m_pad0x556[0x39];         // 0x556
+	Tgl::Renderer* m_renderer;            // 0x64
+	Lego3DManager* m_3dManager;           // 0x68
+	LegoROI* m_viewROI;                   // 0x6c
+	undefined4 m_unk0x70;                 // 0x70
+	MxDirect3D* m_direct3d;               // 0x74
+	undefined4 m_unk0x78[27];             // 0x78
+	MxBool m_unk0xe4;                     // 0xe4
+	MxBool m_unk0xe5;                     // 0xe5
+	MxBool m_unk0xe6;                     // 0xe6
+	PALETTEENTRY m_paletteEntries[256];   // 0xe7
+	undefined m_padding0x4e7;             // 0x4e7
+	LegoUnknown100d9d00* m_unk0x100d9d00; // 0x4e8
+	MxBool m_isFullscreenMovie;           // 0x4ec
+	MxPalette* m_palette;                 // 0x4f0
+	MxStopWatch* m_stopWatch;             // 0x4f4
+	double m_elapsedSeconds;              // 0x4f8
+	MxBool m_unk0x500;                    // 0x500
+	MxBool m_drawCursor;                  // 0x501
+	MxS32 m_cursorXCopy;                  // 0x504
+	MxS32 m_cursorYCopy;                  // 0x508
+	MxS32 m_cursorX;                      // 0x50c
+	MxS32 m_cursorY;                      // 0x510
+	LPDIRECTDRAWSURFACE m_unk0x514;       // 0x514
+	RECT m_unk0x518;                      // 0x518
+	undefined4 m_unk0x528;                // 0x528
+	MxBool m_drawFPS;                     // 0x52c
+	RECT m_fpsRect;                       // 0x530
+	HFONT m_arialFont;                    // 0x540
+	SIZE m_fpsSize;                       // 0x544
+	undefined m_pad0x54c[8];              // 0x54c
+	MxBool m_unk0x554;                    // 0x554
+	MxBool m_initialized;                 // 0x555
+	undefined m_pad0x556[0x39];           // 0x556
 };
 
 // SYNTHETIC: LEGO1 0x1007ab20
diff --git a/LEGO1/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
similarity index 100%
rename from LEGO1/legoworld.h
rename to LEGO1/lego/legoomni/include/legoworld.h
diff --git a/LEGO1/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
similarity index 100%
rename from LEGO1/legoworldlist.h
rename to LEGO1/lego/legoomni/include/legoworldlist.h
diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
similarity index 100%
rename from LEGO1/legoworldpresenter.h
rename to LEGO1/lego/legoomni/include/legoworldpresenter.h
diff --git a/LEGO1/motorcycle.h b/LEGO1/lego/legoomni/include/motorcycle.h
similarity index 100%
rename from LEGO1/motorcycle.h
rename to LEGO1/lego/legoomni/include/motorcycle.h
diff --git a/LEGO1/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
similarity index 100%
rename from LEGO1/pizza.h
rename to LEGO1/lego/legoomni/include/pizza.h
diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
similarity index 100%
rename from LEGO1/pizzamissionstate.h
rename to LEGO1/lego/legoomni/include/pizzamissionstate.h
diff --git a/LEGO1/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h
similarity index 100%
rename from LEGO1/pizzeria.h
rename to LEGO1/lego/legoomni/include/pizzeria.h
diff --git a/LEGO1/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
similarity index 100%
rename from LEGO1/pizzeriastate.h
rename to LEGO1/lego/legoomni/include/pizzeriastate.h
diff --git a/LEGO1/police.h b/LEGO1/lego/legoomni/include/police.h
similarity index 100%
rename from LEGO1/police.h
rename to LEGO1/lego/legoomni/include/police.h
diff --git a/LEGO1/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
similarity index 100%
rename from LEGO1/policeentity.h
rename to LEGO1/lego/legoomni/include/policeentity.h
diff --git a/LEGO1/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
similarity index 100%
rename from LEGO1/policestate.h
rename to LEGO1/lego/legoomni/include/policestate.h
diff --git a/LEGO1/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
similarity index 100%
rename from LEGO1/racecar.h
rename to LEGO1/lego/legoomni/include/racecar.h
diff --git a/LEGO1/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h
similarity index 100%
rename from LEGO1/racestandsentity.h
rename to LEGO1/lego/legoomni/include/racestandsentity.h
diff --git a/LEGO1/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
similarity index 100%
rename from LEGO1/racestate.h
rename to LEGO1/lego/legoomni/include/racestate.h
diff --git a/LEGO1/radio.h b/LEGO1/lego/legoomni/include/radio.h
similarity index 100%
rename from LEGO1/radio.h
rename to LEGO1/lego/legoomni/include/radio.h
diff --git a/LEGO1/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
similarity index 100%
rename from LEGO1/radiostate.h
rename to LEGO1/lego/legoomni/include/radiostate.h
diff --git a/LEGO1/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
similarity index 100%
rename from LEGO1/registrationbook.h
rename to LEGO1/lego/legoomni/include/registrationbook.h
diff --git a/LEGO1/score.h b/LEGO1/lego/legoomni/include/score.h
similarity index 100%
rename from LEGO1/score.h
rename to LEGO1/lego/legoomni/include/score.h
diff --git a/LEGO1/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
similarity index 100%
rename from LEGO1/scorestate.h
rename to LEGO1/lego/legoomni/include/scorestate.h
diff --git a/LEGO1/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
similarity index 100%
rename from LEGO1/skateboard.h
rename to LEGO1/lego/legoomni/include/skateboard.h
diff --git a/LEGO1/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
similarity index 100%
rename from LEGO1/towtrack.h
rename to LEGO1/lego/legoomni/include/towtrack.h
diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
similarity index 100%
rename from LEGO1/towtrackmissionstate.h
rename to LEGO1/lego/legoomni/include/towtrackmissionstate.h
diff --git a/LEGO1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
similarity index 100%
rename from LEGO1/act1state.cpp
rename to LEGO1/lego/legoomni/src/act1/act1state.cpp
diff --git a/LEGO1/act2brick.cpp b/LEGO1/lego/legoomni/src/act2/act2brick.cpp
similarity index 100%
rename from LEGO1/act2brick.cpp
rename to LEGO1/lego/legoomni/src/act2/act2brick.cpp
diff --git a/LEGO1/act2policestation.cpp b/LEGO1/lego/legoomni/src/act2/act2policestation.cpp
similarity index 100%
rename from LEGO1/act2policestation.cpp
rename to LEGO1/lego/legoomni/src/act2/act2policestation.cpp
diff --git a/LEGO1/legoact2state.cpp b/LEGO1/lego/legoomni/src/act2/legoact2state.cpp
similarity index 100%
rename from LEGO1/legoact2state.cpp
rename to LEGO1/lego/legoomni/src/act2/legoact2state.cpp
diff --git a/LEGO1/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
similarity index 100%
rename from LEGO1/act3.cpp
rename to LEGO1/lego/legoomni/src/act3/act3.cpp
diff --git a/LEGO1/act3shark.cpp b/LEGO1/lego/legoomni/src/act3/act3shark.cpp
similarity index 100%
rename from LEGO1/act3shark.cpp
rename to LEGO1/lego/legoomni/src/act3/act3shark.cpp
diff --git a/LEGO1/act3state.cpp b/LEGO1/lego/legoomni/src/act3/act3state.cpp
similarity index 100%
rename from LEGO1/act3state.cpp
rename to LEGO1/lego/legoomni/src/act3/act3state.cpp
diff --git a/LEGO1/legocachesound.cpp b/LEGO1/lego/legoomni/src/audio/legocachesound.cpp
similarity index 100%
rename from LEGO1/legocachesound.cpp
rename to LEGO1/lego/legoomni/src/audio/legocachesound.cpp
diff --git a/LEGO1/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
similarity index 100%
rename from LEGO1/legoloadcachesoundpresenter.cpp
rename to LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
similarity index 100%
rename from LEGO1/legosoundmanager.cpp
rename to LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
diff --git a/LEGO1/buildingentity.cpp b/LEGO1/lego/legoomni/src/build/buildingentity.cpp
similarity index 100%
rename from LEGO1/buildingentity.cpp
rename to LEGO1/lego/legoomni/src/build/buildingentity.cpp
diff --git a/LEGO1/dunebuggy.cpp b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
similarity index 100%
rename from LEGO1/dunebuggy.cpp
rename to LEGO1/lego/legoomni/src/build/dunebuggy.cpp
diff --git a/LEGO1/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
similarity index 100%
rename from LEGO1/helicopter.cpp
rename to LEGO1/lego/legoomni/src/build/helicopter.cpp
diff --git a/LEGO1/helicopterstate.cpp b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
similarity index 100%
rename from LEGO1/helicopterstate.cpp
rename to LEGO1/lego/legoomni/src/build/helicopterstate.cpp
diff --git a/LEGO1/jetski.cpp b/LEGO1/lego/legoomni/src/build/jetski.cpp
similarity index 100%
rename from LEGO1/jetski.cpp
rename to LEGO1/lego/legoomni/src/build/jetski.cpp
diff --git a/LEGO1/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
similarity index 100%
rename from LEGO1/legobuildingmanager.cpp
rename to LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
similarity index 100%
rename from LEGO1/legocarbuild.cpp
rename to LEGO1/lego/legoomni/src/build/legocarbuild.cpp
diff --git a/LEGO1/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
similarity index 100%
rename from LEGO1/legovehiclebuildstate.cpp
rename to LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
diff --git a/LEGO1/racecar.cpp b/LEGO1/lego/legoomni/src/build/racecar.cpp
similarity index 100%
rename from LEGO1/racecar.cpp
rename to LEGO1/lego/legoomni/src/build/racecar.cpp
diff --git a/LEGO1/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp
similarity index 100%
rename from LEGO1/animstate.cpp
rename to LEGO1/lego/legoomni/src/common/animstate.cpp
diff --git a/LEGO1/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
similarity index 100%
rename from LEGO1/gifmanager.cpp
rename to LEGO1/lego/legoomni/src/common/gifmanager.cpp
diff --git a/LEGO1/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
similarity index 100%
rename from LEGO1/legoactioncontrolpresenter.cpp
rename to LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
diff --git a/LEGO1/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
similarity index 100%
rename from LEGO1/legobackgroundcolor.cpp
rename to LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
similarity index 100%
rename from LEGO1/legocameracontroller.cpp
rename to LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
diff --git a/LEGO1/legofullscreenmovie.cpp b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
similarity index 100%
rename from LEGO1/legofullscreenmovie.cpp
rename to LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
diff --git a/LEGO1/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
similarity index 99%
rename from LEGO1/legogamestate.cpp
rename to LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 23e04601..a081248c 100644
--- a/LEGO1/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/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
similarity index 100%
rename from LEGO1/legonavcontroller.cpp
rename to LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
similarity index 100%
rename from LEGO1/legoobjectfactory.cpp
rename to LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
similarity index 100%
rename from LEGO1/legoplantmanager.cpp
rename to LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
diff --git a/LEGO1/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
similarity index 100%
rename from LEGO1/legostate.cpp
rename to LEGO1/lego/legoomni/src/common/legostate.cpp
diff --git a/LEGO1/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp
similarity index 100%
rename from LEGO1/legostream.cpp
rename to LEGO1/lego/legoomni/src/common/legostream.cpp
diff --git a/LEGO1/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
similarity index 100%
rename from LEGO1/legounksavedatawriter.cpp
rename to LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
diff --git a/LEGO1/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
similarity index 100%
rename from LEGO1/legoutil.cpp
rename to LEGO1/lego/legoomni/src/common/legoutil.cpp
diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
similarity index 100%
rename from LEGO1/legocontrolmanager.cpp
rename to LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
diff --git a/LEGO1/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
similarity index 100%
rename from LEGO1/legoactor.cpp
rename to LEGO1/lego/legoomni/src/entity/legoactor.cpp
diff --git a/LEGO1/legoanimactor.cpp b/LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
similarity index 100%
rename from LEGO1/legoanimactor.cpp
rename to LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
diff --git a/LEGO1/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
similarity index 100%
rename from LEGO1/legoentity.cpp
rename to LEGO1/lego/legoomni/src/entity/legoentity.cpp
diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
similarity index 100%
rename from LEGO1/legoentitypresenter.cpp
rename to LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
diff --git a/LEGO1/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp
similarity index 100%
rename from LEGO1/legojetski.cpp
rename to LEGO1/lego/legoomni/src/entity/legojetski.cpp
diff --git a/LEGO1/legopathactor.cpp b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
similarity index 100%
rename from LEGO1/legopathactor.cpp
rename to LEGO1/lego/legoomni/src/entity/legopathactor.cpp
diff --git a/LEGO1/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp
similarity index 100%
rename from LEGO1/legorace.cpp
rename to LEGO1/lego/legoomni/src/entity/legorace.cpp
diff --git a/LEGO1/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
similarity index 100%
rename from LEGO1/legoworld.cpp
rename to LEGO1/lego/legoomni/src/entity/legoworld.cpp
diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
similarity index 100%
rename from LEGO1/legoworldpresenter.cpp
rename to LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
diff --git a/LEGO1/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
similarity index 100%
rename from LEGO1/gasstation.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
diff --git a/LEGO1/gasstationentity.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
similarity index 100%
rename from LEGO1/gasstationentity.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
diff --git a/LEGO1/gasstationstate.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
similarity index 100%
rename from LEGO1/gasstationstate.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
diff --git a/LEGO1/ambulance.cpp b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
similarity index 100%
rename from LEGO1/ambulance.cpp
rename to LEGO1/lego/legoomni/src/hospital/ambulance.cpp
diff --git a/LEGO1/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
similarity index 100%
rename from LEGO1/ambulancemissionstate.cpp
rename to LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
diff --git a/LEGO1/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
similarity index 100%
rename from LEGO1/hospital.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospital.cpp
diff --git a/LEGO1/hospitalentity.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
similarity index 100%
rename from LEGO1/hospitalentity.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
diff --git a/LEGO1/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
similarity index 100%
rename from LEGO1/hospitalstate.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
diff --git a/LEGO1/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
similarity index 100%
rename from LEGO1/elevatorbottom.cpp
rename to LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
diff --git a/LEGO1/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
similarity index 100%
rename from LEGO1/infocenter.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
diff --git a/LEGO1/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
similarity index 100%
rename from LEGO1/infocenterdoor.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
diff --git a/LEGO1/infocenterentity.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
similarity index 100%
rename from LEGO1/infocenterentity.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
diff --git a/LEGO1/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
similarity index 100%
rename from LEGO1/infocenterstate.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
diff --git a/LEGO1/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
similarity index 100%
rename from LEGO1/registrationbook.cpp
rename to LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
diff --git a/LEGO1/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
similarity index 100%
rename from LEGO1/score.cpp
rename to LEGO1/lego/legoomni/src/infocenter/score.cpp
diff --git a/LEGO1/scorestate.cpp b/LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
similarity index 100%
rename from LEGO1/scorestate.cpp
rename to LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
similarity index 100%
rename from LEGO1/legoinputmanager.cpp
rename to LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
diff --git a/LEGO1/beachhouseentity.cpp b/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
similarity index 100%
rename from LEGO1/beachhouseentity.cpp
rename to LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
diff --git a/LEGO1/bike.cpp b/LEGO1/lego/legoomni/src/isle/bike.cpp
similarity index 100%
rename from LEGO1/bike.cpp
rename to LEGO1/lego/legoomni/src/isle/bike.cpp
diff --git a/LEGO1/bumpbouy.cpp b/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
similarity index 100%
rename from LEGO1/bumpbouy.cpp
rename to LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
diff --git a/LEGO1/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp
similarity index 100%
rename from LEGO1/historybook.cpp
rename to LEGO1/lego/legoomni/src/isle/historybook.cpp
diff --git a/LEGO1/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
similarity index 100%
rename from LEGO1/isle.cpp
rename to LEGO1/lego/legoomni/src/isle/isle.cpp
diff --git a/LEGO1/isleactor.cpp b/LEGO1/lego/legoomni/src/isle/isleactor.cpp
similarity index 100%
rename from LEGO1/isleactor.cpp
rename to LEGO1/lego/legoomni/src/isle/isleactor.cpp
diff --git a/LEGO1/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
similarity index 100%
rename from LEGO1/islepathactor.cpp
rename to LEGO1/lego/legoomni/src/isle/islepathactor.cpp
diff --git a/LEGO1/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
similarity index 100%
rename from LEGO1/jukebox.cpp
rename to LEGO1/lego/legoomni/src/isle/jukebox.cpp
diff --git a/LEGO1/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
similarity index 100%
rename from LEGO1/jukeboxentity.cpp
rename to LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
diff --git a/LEGO1/jukeboxstate.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
similarity index 100%
rename from LEGO1/jukeboxstate.cpp
rename to LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
diff --git a/LEGO1/motorcycle.cpp b/LEGO1/lego/legoomni/src/isle/motorcycle.cpp
similarity index 100%
rename from LEGO1/motorcycle.cpp
rename to LEGO1/lego/legoomni/src/isle/motorcycle.cpp
diff --git a/LEGO1/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
similarity index 100%
rename from LEGO1/radio.cpp
rename to LEGO1/lego/legoomni/src/isle/radio.cpp
diff --git a/LEGO1/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
similarity index 100%
rename from LEGO1/radiostate.cpp
rename to LEGO1/lego/legoomni/src/isle/radiostate.cpp
diff --git a/LEGO1/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
similarity index 100%
rename from LEGO1/skateboard.cpp
rename to LEGO1/lego/legoomni/src/isle/skateboard.cpp
diff --git a/LEGO1/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
similarity index 100%
rename from LEGO1/legoomni.cpp
rename to LEGO1/lego/legoomni/src/main/legoomni.cpp
diff --git a/LEGO1/legoeventnotificationparam.cpp b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
similarity index 100%
rename from LEGO1/legoeventnotificationparam.cpp
rename to LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
diff --git a/LEGO1/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
similarity index 100%
rename from LEGO1/legopathcontroller.cpp
rename to LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
diff --git a/LEGO1/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
similarity index 100%
rename from LEGO1/legopathpresenter.cpp
rename to LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
diff --git a/LEGO1/pizza.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
similarity index 100%
rename from LEGO1/pizza.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
diff --git a/LEGO1/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
similarity index 100%
rename from LEGO1/pizzamissionstate.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
diff --git a/LEGO1/pizzeria.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
similarity index 100%
rename from LEGO1/pizzeria.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
diff --git a/LEGO1/pizzeriastate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
similarity index 100%
rename from LEGO1/pizzeriastate.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
diff --git a/LEGO1/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
similarity index 100%
rename from LEGO1/police.cpp
rename to LEGO1/lego/legoomni/src/police/police.cpp
diff --git a/LEGO1/policeentity.cpp b/LEGO1/lego/legoomni/src/police/policeentity.cpp
similarity index 100%
rename from LEGO1/policeentity.cpp
rename to LEGO1/lego/legoomni/src/police/policeentity.cpp
diff --git a/LEGO1/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
similarity index 100%
rename from LEGO1/policestate.cpp
rename to LEGO1/lego/legoomni/src/police/policestate.cpp
diff --git a/LEGO1/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp
similarity index 100%
rename from LEGO1/carrace.cpp
rename to LEGO1/lego/legoomni/src/race/carrace.cpp
diff --git a/LEGO1/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp
similarity index 100%
rename from LEGO1/jetskirace.cpp
rename to LEGO1/lego/legoomni/src/race/jetskirace.cpp
diff --git a/LEGO1/racestandsentity.cpp b/LEGO1/lego/legoomni/src/race/racestandsentity.cpp
similarity index 100%
rename from LEGO1/racestandsentity.cpp
rename to LEGO1/lego/legoomni/src/race/racestandsentity.cpp
diff --git a/LEGO1/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp
similarity index 100%
rename from LEGO1/racestate.cpp
rename to LEGO1/lego/legoomni/src/race/racestate.cpp
diff --git a/LEGO1/towtrack.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
similarity index 100%
rename from LEGO1/towtrack.cpp
rename to LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
diff --git a/LEGO1/towtrackmissionstate.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
similarity index 100%
rename from LEGO1/towtrackmissionstate.cpp
rename to LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
diff --git a/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
new file mode 100644
index 00000000..b3f386e3
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
@@ -0,0 +1,12 @@
+#include "legounknown100d7c88.h"
+
+// FUNCTION: LEGO1 0x10044e50
+LegoUnknown100d7c88::~LegoUnknown100d7c88()
+{
+}
+
+// FUNCTION: LEGO1 0x10044eb0
+MxU32 LegoUnknown100d7c88::VTable0x00()
+{
+	return m_unk0x14;
+}
diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
similarity index 100%
rename from LEGO1/legoanimationmanager.cpp
rename to LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
diff --git a/LEGO1/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
similarity index 100%
rename from LEGO1/legoanimmmpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
diff --git a/LEGO1/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
similarity index 100%
rename from LEGO1/legoanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
diff --git a/LEGO1/legocarbuildanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
similarity index 100%
rename from LEGO1/legocarbuildanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
diff --git a/LEGO1/legoflctexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
similarity index 100%
rename from LEGO1/legoflctexturepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
diff --git a/LEGO1/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
similarity index 100%
rename from LEGO1/legohideanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
diff --git a/LEGO1/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
similarity index 100%
rename from LEGO1/legolocomotionanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
diff --git a/LEGO1/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
similarity index 100%
rename from LEGO1/legometerpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
diff --git a/LEGO1/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
similarity index 100%
rename from LEGO1/legomodelpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
diff --git a/LEGO1/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
similarity index 100%
rename from LEGO1/legopalettepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
diff --git a/LEGO1/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
similarity index 100%
rename from LEGO1/legopartpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
diff --git a/LEGO1/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
similarity index 100%
rename from LEGO1/legophonemepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
diff --git a/LEGO1/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
similarity index 100%
rename from LEGO1/legotexturepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
similarity index 99%
rename from LEGO1/legovideomanager.cpp
rename to LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 78f3788e..43cdde24 100644
--- a/LEGO1/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"
 
@@ -178,7 +178,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	m_3dManager->Add(*m_viewROI);
 	m_3dManager->SetPointOfView(*m_viewROI);
 
-	m_unk0x100d9d00 = new MxUnknown100d9d00;
+	m_unk0x100d9d00 = new LegoUnknown100d9d00;
 	m_unk0xe4 = FALSE;
 	m_stopWatch = new MxStopWatch;
 	m_stopWatch->Start();
diff --git a/LEGO1/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
similarity index 98%
rename from LEGO1/3dmanager/lego3dmanager.cpp
rename to LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
index 99c977d5..4fa43a3c 100644
--- a/LEGO1/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/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h
similarity index 100%
rename from LEGO1/3dmanager/lego3dmanager.h
rename to LEGO1/lego/sources/3dmanager/lego3dmanager.h
diff --git a/LEGO1/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
similarity index 99%
rename from LEGO1/3dmanager/lego3dview.cpp
rename to LEGO1/lego/sources/3dmanager/lego3dview.cpp
index cdededa5..04c9ea22 100644
--- a/LEGO1/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/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h
similarity index 100%
rename from LEGO1/3dmanager/lego3dview.h
rename to LEGO1/lego/sources/3dmanager/lego3dview.h
diff --git a/LEGO1/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp
similarity index 99%
rename from LEGO1/3dmanager/legoview1.cpp
rename to LEGO1/lego/sources/3dmanager/legoview1.cpp
index 57117e9c..3705eb33 100644
--- a/LEGO1/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
 
diff --git a/LEGO1/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h
similarity index 100%
rename from LEGO1/3dmanager/legoview1.h
rename to LEGO1/lego/sources/3dmanager/legoview1.h
diff --git a/LEGO1/3dmanager/tglsurface.cpp b/LEGO1/lego/sources/3dmanager/tglsurface.cpp
similarity index 100%
rename from LEGO1/3dmanager/tglsurface.cpp
rename to LEGO1/lego/sources/3dmanager/tglsurface.cpp
diff --git a/LEGO1/3dmanager/tglsurface.h b/LEGO1/lego/sources/3dmanager/tglsurface.h
similarity index 97%
rename from LEGO1/3dmanager/tglsurface.h
rename to LEGO1/lego/sources/3dmanager/tglsurface.h
index 1e4abc09..2ea4cf12 100644
--- a/LEGO1/3dmanager/tglsurface.h
+++ b/LEGO1/lego/sources/3dmanager/tglsurface.h
@@ -1,8 +1,8 @@
 #ifndef _TglSurface_h
 #define _TglSurface_h
 
-#include "../mxdirectx/mxstopwatch.h"
-#include "../tgl/tgl.h"
+#include "mxdirectx/mxstopwatch.h"
+#include "tgl/tgl.h"
 
 class Tgl::Renderer;
 class Tgl::Device;
diff --git a/LEGO1/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
similarity index 100%
rename from LEGO1/legoroi.cpp
rename to LEGO1/lego/sources/roi/legoroi.cpp
diff --git a/LEGO1/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
similarity index 100%
rename from LEGO1/legoroi.h
rename to LEGO1/lego/sources/roi/legoroi.h
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 34c28b42..f0c87c69 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -1,9 +1,9 @@
 #ifndef MXDIRECT3D_H
 #define MXDIRECT3D_H
 
-#include "../mxstl/stlcompat.h"
 #include "decomp.h"
 #include "mxdirectdraw.h"
+#include "mxstl/stlcompat.h"
 
 #include <d3d.h>
 
diff --git a/LEGO1/mxparam.cpp b/LEGO1/mxparam.cpp
deleted file mode 100644
index 4faa1625..00000000
--- a/LEGO1/mxparam.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "mxparam.h"
diff --git a/LEGO1/mxunknown100d7c88.cpp b/LEGO1/mxunknown100d7c88.cpp
deleted file mode 100644
index 04ddbf4f..00000000
--- a/LEGO1/mxunknown100d7c88.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "mxunknown100d7c88.h"
-
-// FUNCTION: LEGO1 0x10044e50
-MxUnknown100d7c88::~MxUnknown100d7c88()
-{
-}
-
-// FUNCTION: LEGO1 0x10044eb0
-MxU32 MxUnknown100d7c88::VTable0x00()
-{
-	return m_unk0x14;
-}
diff --git a/LEGO1/mxunknown100d9d00.h b/LEGO1/mxunknown100d9d00.h
deleted file mode 100644
index d5dd456f..00000000
--- a/LEGO1/mxunknown100d9d00.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef MXUNKNOWN100D9D00_H
-#define MXUNKNOWN100D9D00_H
-
-#include "decomp.h"
-#include "mxlist.h"
-#include "mxunknown100d7c88.h"
-
-// VTABLE: LEGO1 0x100d9cd0
-// class MxCollection<MxUnknown100d7c88 *>
-
-// VTABLE: LEGO1 0x100d9ce8
-// class MxList<MxUnknown100d7c88 *>
-
-// VTABLE: LEGO1 0x100d9d00
-// SIZE 0x18
-class MxUnknown100d9d00 : public MxList<MxUnknown100d7c88*> {
-public:
-	MxUnknown100d9d00() { SetDestroy(Destroy); }
-
-	// STUB: LEGO1 0x1007b210
-	virtual MxS8 Compare(MxUnknown100d7c88* p_a, MxUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
-
-	// FUNCTION: LEGO1 0x1007b2e0
-	static void Destroy(MxUnknown100d7c88* p_element) { delete p_element; }
-};
-
-// TEMPLATE: LEGO1 0x1007b300
-// MxCollection<MxUnknown100d7c88 *>::Compare
-
-// TEMPLATE: LEGO1 0x1007b360
-// MxCollection<MxUnknown100d7c88 *>::Destroy
-
-// SYNTHETIC: LEGO1 0x1007b400
-// MxUnknown100d9d00::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1007b470
-// MxCollection<MxUnknown100d7c88 *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1007b4e0
-// MxList<MxUnknown100d7c88 *>::`scalar deleting destructor'
-
-#endif // MXUNKNOWN100D9D00_H
diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
similarity index 100%
rename from LEGO1/mxactionnotificationparam.h
rename to LEGO1/omni/include/mxactionnotificationparam.h
diff --git a/LEGO1/mxatomid.h b/LEGO1/omni/include/mxatomid.h
similarity index 100%
rename from LEGO1/mxatomid.h
rename to LEGO1/omni/include/mxatomid.h
diff --git a/LEGO1/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h
similarity index 100%
rename from LEGO1/mxatomidcounter.h
rename to LEGO1/omni/include/mxatomidcounter.h
diff --git a/LEGO1/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
similarity index 100%
rename from LEGO1/mxaudiomanager.h
rename to LEGO1/omni/include/mxaudiomanager.h
diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
similarity index 100%
rename from LEGO1/mxaudiopresenter.h
rename to LEGO1/omni/include/mxaudiopresenter.h
diff --git a/LEGO1/mxautolocker.h b/LEGO1/omni/include/mxautolocker.h
similarity index 100%
rename from LEGO1/mxautolocker.h
rename to LEGO1/omni/include/mxautolocker.h
diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/omni/include/mxbackgroundaudiomanager.h
similarity index 100%
rename from LEGO1/mxbackgroundaudiomanager.h
rename to LEGO1/omni/include/mxbackgroundaudiomanager.h
diff --git a/LEGO1/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
similarity index 100%
rename from LEGO1/mxbitmap.h
rename to LEGO1/omni/include/mxbitmap.h
diff --git a/LEGO1/mxcollection.h b/LEGO1/omni/include/mxcollection.h
similarity index 100%
rename from LEGO1/mxcollection.h
rename to LEGO1/omni/include/mxcollection.h
diff --git a/LEGO1/mxcompositemediapresenter.h b/LEGO1/omni/include/mxcompositemediapresenter.h
similarity index 100%
rename from LEGO1/mxcompositemediapresenter.h
rename to LEGO1/omni/include/mxcompositemediapresenter.h
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
similarity index 100%
rename from LEGO1/mxcompositepresenter.h
rename to LEGO1/omni/include/mxcompositepresenter.h
diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/omni/include/mxcontrolpresenter.h
similarity index 100%
rename from LEGO1/mxcontrolpresenter.h
rename to LEGO1/omni/include/mxcontrolpresenter.h
diff --git a/LEGO1/mxcore.h b/LEGO1/omni/include/mxcore.h
similarity index 100%
rename from LEGO1/mxcore.h
rename to LEGO1/omni/include/mxcore.h
diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/omni/include/mxcriticalsection.h
similarity index 100%
rename from LEGO1/mxcriticalsection.h
rename to LEGO1/omni/include/mxcriticalsection.h
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
similarity index 100%
rename from LEGO1/mxdiskstreamcontroller.h
rename to LEGO1/omni/include/mxdiskstreamcontroller.h
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h
similarity index 100%
rename from LEGO1/mxdiskstreamprovider.h
rename to LEGO1/omni/include/mxdiskstreamprovider.h
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
similarity index 100%
rename from LEGO1/mxdisplaysurface.h
rename to LEGO1/omni/include/mxdisplaysurface.h
diff --git a/LEGO1/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
similarity index 100%
rename from LEGO1/mxdsaction.h
rename to LEGO1/omni/include/mxdsaction.h
diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h
similarity index 100%
rename from LEGO1/mxdsactionlist.h
rename to LEGO1/omni/include/mxdsactionlist.h
diff --git a/LEGO1/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h
similarity index 100%
rename from LEGO1/mxdsanim.h
rename to LEGO1/omni/include/mxdsanim.h
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h
similarity index 100%
rename from LEGO1/mxdsbuffer.h
rename to LEGO1/omni/include/mxdsbuffer.h
diff --git a/LEGO1/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
similarity index 100%
rename from LEGO1/mxdschunk.h
rename to LEGO1/omni/include/mxdschunk.h
diff --git a/LEGO1/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h
similarity index 100%
rename from LEGO1/mxdsevent.h
rename to LEGO1/omni/include/mxdsevent.h
diff --git a/LEGO1/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
similarity index 100%
rename from LEGO1/mxdsfile.h
rename to LEGO1/omni/include/mxdsfile.h
diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h
similarity index 100%
rename from LEGO1/mxdsmediaaction.h
rename to LEGO1/omni/include/mxdsmediaaction.h
diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
similarity index 100%
rename from LEGO1/mxdsmultiaction.h
rename to LEGO1/omni/include/mxdsmultiaction.h
diff --git a/LEGO1/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
similarity index 100%
rename from LEGO1/mxdsobject.h
rename to LEGO1/omni/include/mxdsobject.h
diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h
similarity index 100%
rename from LEGO1/mxdsobjectaction.h
rename to LEGO1/omni/include/mxdsobjectaction.h
diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h
similarity index 100%
rename from LEGO1/mxdsparallelaction.h
rename to LEGO1/omni/include/mxdsparallelaction.h
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h
similarity index 100%
rename from LEGO1/mxdsselectaction.h
rename to LEGO1/omni/include/mxdsselectaction.h
diff --git a/LEGO1/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h
similarity index 100%
rename from LEGO1/mxdsserialaction.h
rename to LEGO1/omni/include/mxdsserialaction.h
diff --git a/LEGO1/mxdssound.h b/LEGO1/omni/include/mxdssound.h
similarity index 100%
rename from LEGO1/mxdssound.h
rename to LEGO1/omni/include/mxdssound.h
diff --git a/LEGO1/mxdssource.h b/LEGO1/omni/include/mxdssource.h
similarity index 100%
rename from LEGO1/mxdssource.h
rename to LEGO1/omni/include/mxdssource.h
diff --git a/LEGO1/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h
similarity index 100%
rename from LEGO1/mxdsstill.h
rename to LEGO1/omni/include/mxdsstill.h
diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h
similarity index 100%
rename from LEGO1/mxdsstreamingaction.h
rename to LEGO1/omni/include/mxdsstreamingaction.h
diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h
similarity index 100%
rename from LEGO1/mxdssubscriber.h
rename to LEGO1/omni/include/mxdssubscriber.h
diff --git a/LEGO1/mxdstypes.h b/LEGO1/omni/include/mxdstypes.h
old mode 100755
new mode 100644
similarity index 100%
rename from LEGO1/mxdstypes.h
rename to LEGO1/omni/include/mxdstypes.h
diff --git a/LEGO1/mxentity.h b/LEGO1/omni/include/mxentity.h
similarity index 100%
rename from LEGO1/mxentity.h
rename to LEGO1/omni/include/mxentity.h
diff --git a/LEGO1/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h
similarity index 100%
rename from LEGO1/mxeventmanager.h
rename to LEGO1/omni/include/mxeventmanager.h
diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h
similarity index 100%
rename from LEGO1/mxeventpresenter.h
rename to LEGO1/omni/include/mxeventpresenter.h
diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
similarity index 100%
rename from LEGO1/mxflcpresenter.h
rename to LEGO1/omni/include/mxflcpresenter.h
diff --git a/LEGO1/mxhashtable.h b/LEGO1/omni/include/mxhashtable.h
similarity index 100%
rename from LEGO1/mxhashtable.h
rename to LEGO1/omni/include/mxhashtable.h
diff --git a/LEGO1/mxioinfo.h b/LEGO1/omni/include/mxioinfo.h
similarity index 100%
rename from LEGO1/mxioinfo.h
rename to LEGO1/omni/include/mxioinfo.h
diff --git a/LEGO1/mxlist.h b/LEGO1/omni/include/mxlist.h
similarity index 100%
rename from LEGO1/mxlist.h
rename to LEGO1/omni/include/mxlist.h
diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
similarity index 100%
rename from LEGO1/mxloopingflcpresenter.h
rename to LEGO1/omni/include/mxloopingflcpresenter.h
diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h
similarity index 100%
rename from LEGO1/mxloopingmidipresenter.h
rename to LEGO1/omni/include/mxloopingmidipresenter.h
diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h
similarity index 100%
rename from LEGO1/mxloopingsmkpresenter.h
rename to LEGO1/omni/include/mxloopingsmkpresenter.h
diff --git a/LEGO1/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
similarity index 100%
rename from LEGO1/mxmediamanager.h
rename to LEGO1/omni/include/mxmediamanager.h
diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
similarity index 100%
rename from LEGO1/mxmediapresenter.h
rename to LEGO1/omni/include/mxmediapresenter.h
diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h
similarity index 100%
rename from LEGO1/mxmidipresenter.h
rename to LEGO1/omni/include/mxmidipresenter.h
diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
similarity index 100%
rename from LEGO1/mxmusicmanager.h
rename to LEGO1/omni/include/mxmusicmanager.h
diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h
similarity index 100%
rename from LEGO1/mxmusicpresenter.h
rename to LEGO1/omni/include/mxmusicpresenter.h
diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h
similarity index 100%
rename from LEGO1/mxnextactiondatastart.h
rename to LEGO1/omni/include/mxnextactiondatastart.h
diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
similarity index 100%
rename from LEGO1/mxnotificationmanager.h
rename to LEGO1/omni/include/mxnotificationmanager.h
diff --git a/LEGO1/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
similarity index 100%
rename from LEGO1/mxnotificationparam.h
rename to LEGO1/omni/include/mxnotificationparam.h
diff --git a/LEGO1/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h
similarity index 100%
rename from LEGO1/mxobjectfactory.h
rename to LEGO1/omni/include/mxobjectfactory.h
diff --git a/LEGO1/mxomni.h b/LEGO1/omni/include/mxomni.h
similarity index 100%
rename from LEGO1/mxomni.h
rename to LEGO1/omni/include/mxomni.h
diff --git a/LEGO1/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h
similarity index 100%
rename from LEGO1/mxomnicreateflags.h
rename to LEGO1/omni/include/mxomnicreateflags.h
diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h
similarity index 100%
rename from LEGO1/mxomnicreateparam.h
rename to LEGO1/omni/include/mxomnicreateparam.h
diff --git a/LEGO1/mxpalette.h b/LEGO1/omni/include/mxpalette.h
similarity index 100%
rename from LEGO1/mxpalette.h
rename to LEGO1/omni/include/mxpalette.h
diff --git a/LEGO1/mxparam.h b/LEGO1/omni/include/mxparam.h
similarity index 100%
rename from LEGO1/mxparam.h
rename to LEGO1/omni/include/mxparam.h
diff --git a/LEGO1/mxpoint32.h b/LEGO1/omni/include/mxpoint32.h
old mode 100755
new mode 100644
similarity index 100%
rename from LEGO1/mxpoint32.h
rename to LEGO1/omni/include/mxpoint32.h
diff --git a/LEGO1/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
similarity index 100%
rename from LEGO1/mxpresenter.h
rename to LEGO1/omni/include/mxpresenter.h
diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
similarity index 100%
rename from LEGO1/mxpresenterlist.h
rename to LEGO1/omni/include/mxpresenterlist.h
diff --git a/LEGO1/mxqueue.h b/LEGO1/omni/include/mxqueue.h
similarity index 100%
rename from LEGO1/mxqueue.h
rename to LEGO1/omni/include/mxqueue.h
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h
similarity index 100%
rename from LEGO1/mxramstreamcontroller.h
rename to LEGO1/omni/include/mxramstreamcontroller.h
diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h
similarity index 100%
rename from LEGO1/mxramstreamprovider.h
rename to LEGO1/omni/include/mxramstreamprovider.h
diff --git a/LEGO1/mxrect32.h b/LEGO1/omni/include/mxrect32.h
similarity index 100%
rename from LEGO1/mxrect32.h
rename to LEGO1/omni/include/mxrect32.h
diff --git a/LEGO1/mxrectlist.h b/LEGO1/omni/include/mxrectlist.h
similarity index 100%
rename from LEGO1/mxrectlist.h
rename to LEGO1/omni/include/mxrectlist.h
diff --git a/LEGO1/mxregion.h b/LEGO1/omni/include/mxregion.h
similarity index 100%
rename from LEGO1/mxregion.h
rename to LEGO1/omni/include/mxregion.h
diff --git a/LEGO1/mxregioncursor.h b/LEGO1/omni/include/mxregioncursor.h
similarity index 100%
rename from LEGO1/mxregioncursor.h
rename to LEGO1/omni/include/mxregioncursor.h
diff --git a/LEGO1/mxregionlist.h b/LEGO1/omni/include/mxregionlist.h
similarity index 100%
rename from LEGO1/mxregionlist.h
rename to LEGO1/omni/include/mxregionlist.h
diff --git a/LEGO1/mxscheduler.h b/LEGO1/omni/include/mxscheduler.h
similarity index 100%
rename from LEGO1/mxscheduler.h
rename to LEGO1/omni/include/mxscheduler.h
diff --git a/LEGO1/mxsemaphore.h b/LEGO1/omni/include/mxsemaphore.h
similarity index 100%
rename from LEGO1/mxsemaphore.h
rename to LEGO1/omni/include/mxsemaphore.h
diff --git a/LEGO1/mxsize32.h b/LEGO1/omni/include/mxsize32.h
similarity index 100%
rename from LEGO1/mxsize32.h
rename to LEGO1/omni/include/mxsize32.h
diff --git a/LEGO1/mxsmack.h b/LEGO1/omni/include/mxsmack.h
similarity index 100%
rename from LEGO1/mxsmack.h
rename to LEGO1/omni/include/mxsmack.h
diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h
similarity index 100%
rename from LEGO1/mxsmkpresenter.h
rename to LEGO1/omni/include/mxsmkpresenter.h
diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h
similarity index 100%
rename from LEGO1/mxsoundmanager.h
rename to LEGO1/omni/include/mxsoundmanager.h
diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
similarity index 100%
rename from LEGO1/mxsoundpresenter.h
rename to LEGO1/omni/include/mxsoundpresenter.h
diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
similarity index 100%
rename from LEGO1/mxstillpresenter.h
rename to LEGO1/omni/include/mxstillpresenter.h
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h
similarity index 100%
rename from LEGO1/mxstreamchunk.h
rename to LEGO1/omni/include/mxstreamchunk.h
diff --git a/LEGO1/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h
similarity index 100%
rename from LEGO1/mxstreamchunklist.h
rename to LEGO1/omni/include/mxstreamchunklist.h
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
similarity index 100%
rename from LEGO1/mxstreamcontroller.h
rename to LEGO1/omni/include/mxstreamcontroller.h
diff --git a/LEGO1/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
similarity index 100%
rename from LEGO1/mxstreamer.h
rename to LEGO1/omni/include/mxstreamer.h
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h
similarity index 100%
rename from LEGO1/mxstreamlist.h
rename to LEGO1/omni/include/mxstreamlist.h
diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h
similarity index 100%
rename from LEGO1/mxstreamprovider.h
rename to LEGO1/omni/include/mxstreamprovider.h
diff --git a/LEGO1/mxstring.h b/LEGO1/omni/include/mxstring.h
similarity index 100%
rename from LEGO1/mxstring.h
rename to LEGO1/omni/include/mxstring.h
diff --git a/LEGO1/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h
similarity index 100%
rename from LEGO1/mxstringlist.h
rename to LEGO1/omni/include/mxstringlist.h
diff --git a/LEGO1/mxthread.h b/LEGO1/omni/include/mxthread.h
similarity index 100%
rename from LEGO1/mxthread.h
rename to LEGO1/omni/include/mxthread.h
diff --git a/LEGO1/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
similarity index 100%
rename from LEGO1/mxticklemanager.h
rename to LEGO1/omni/include/mxticklemanager.h
diff --git a/LEGO1/mxtimer.h b/LEGO1/omni/include/mxtimer.h
similarity index 100%
rename from LEGO1/mxtimer.h
rename to LEGO1/omni/include/mxtimer.h
diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/omni/include/mxtransitionmanager.h
similarity index 100%
rename from LEGO1/mxtransitionmanager.h
rename to LEGO1/omni/include/mxtransitionmanager.h
diff --git a/LEGO1/mxtype17notificationparam.h b/LEGO1/omni/include/mxtype17notificationparam.h
similarity index 100%
rename from LEGO1/mxtype17notificationparam.h
rename to LEGO1/omni/include/mxtype17notificationparam.h
diff --git a/LEGO1/mxtype18notificationparam.h b/LEGO1/omni/include/mxtype18notificationparam.h
similarity index 100%
rename from LEGO1/mxtype18notificationparam.h
rename to LEGO1/omni/include/mxtype18notificationparam.h
diff --git a/LEGO1/mxtype19notificationparam.h b/LEGO1/omni/include/mxtype19notificationparam.h
similarity index 100%
rename from LEGO1/mxtype19notificationparam.h
rename to LEGO1/omni/include/mxtype19notificationparam.h
diff --git a/LEGO1/mxtypes.h b/LEGO1/omni/include/mxtypes.h
similarity index 100%
rename from LEGO1/mxtypes.h
rename to LEGO1/omni/include/mxtypes.h
diff --git a/LEGO1/mxvariable.h b/LEGO1/omni/include/mxvariable.h
similarity index 100%
rename from LEGO1/mxvariable.h
rename to LEGO1/omni/include/mxvariable.h
diff --git a/LEGO1/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
similarity index 100%
rename from LEGO1/mxvariabletable.h
rename to LEGO1/omni/include/mxvariabletable.h
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
similarity index 100%
rename from LEGO1/mxvideomanager.h
rename to LEGO1/omni/include/mxvideomanager.h
diff --git a/LEGO1/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h
similarity index 100%
rename from LEGO1/mxvideoparam.h
rename to LEGO1/omni/include/mxvideoparam.h
diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/omni/include/mxvideoparamflags.h
similarity index 100%
rename from LEGO1/mxvideoparamflags.h
rename to LEGO1/omni/include/mxvideoparamflags.h
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
similarity index 100%
rename from LEGO1/mxvideopresenter.h
rename to LEGO1/omni/include/mxvideopresenter.h
diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
similarity index 100%
rename from LEGO1/mxwavepresenter.h
rename to LEGO1/omni/include/mxwavepresenter.h
diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
similarity index 100%
rename from LEGO1/mxdsaction.cpp
rename to LEGO1/omni/src/action/mxdsaction.cpp
diff --git a/LEGO1/mxdsanim.cpp b/LEGO1/omni/src/action/mxdsanim.cpp
similarity index 100%
rename from LEGO1/mxdsanim.cpp
rename to LEGO1/omni/src/action/mxdsanim.cpp
diff --git a/LEGO1/mxdsevent.cpp b/LEGO1/omni/src/action/mxdsevent.cpp
similarity index 100%
rename from LEGO1/mxdsevent.cpp
rename to LEGO1/omni/src/action/mxdsevent.cpp
diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp
similarity index 100%
rename from LEGO1/mxdsmediaaction.cpp
rename to LEGO1/omni/src/action/mxdsmediaaction.cpp
diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/omni/src/action/mxdsmultiaction.cpp
similarity index 100%
rename from LEGO1/mxdsmultiaction.cpp
rename to LEGO1/omni/src/action/mxdsmultiaction.cpp
diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp
similarity index 100%
rename from LEGO1/mxdsobject.cpp
rename to LEGO1/omni/src/action/mxdsobject.cpp
diff --git a/LEGO1/mxdsobjectaction.cpp b/LEGO1/omni/src/action/mxdsobjectaction.cpp
similarity index 100%
rename from LEGO1/mxdsobjectaction.cpp
rename to LEGO1/omni/src/action/mxdsobjectaction.cpp
diff --git a/LEGO1/mxdsparallelaction.cpp b/LEGO1/omni/src/action/mxdsparallelaction.cpp
similarity index 100%
rename from LEGO1/mxdsparallelaction.cpp
rename to LEGO1/omni/src/action/mxdsparallelaction.cpp
diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp
similarity index 100%
rename from LEGO1/mxdsselectaction.cpp
rename to LEGO1/omni/src/action/mxdsselectaction.cpp
diff --git a/LEGO1/mxdsserialaction.cpp b/LEGO1/omni/src/action/mxdsserialaction.cpp
similarity index 100%
rename from LEGO1/mxdsserialaction.cpp
rename to LEGO1/omni/src/action/mxdsserialaction.cpp
diff --git a/LEGO1/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp
similarity index 100%
rename from LEGO1/mxdssound.cpp
rename to LEGO1/omni/src/action/mxdssound.cpp
diff --git a/LEGO1/mxdsstill.cpp b/LEGO1/omni/src/action/mxdsstill.cpp
similarity index 100%
rename from LEGO1/mxdsstill.cpp
rename to LEGO1/omni/src/action/mxdsstill.cpp
diff --git a/LEGO1/mxdsstreamingaction.cpp b/LEGO1/omni/src/action/mxdsstreamingaction.cpp
similarity index 100%
rename from LEGO1/mxdsstreamingaction.cpp
rename to LEGO1/omni/src/action/mxdsstreamingaction.cpp
diff --git a/LEGO1/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp
similarity index 100%
rename from LEGO1/mxaudiomanager.cpp
rename to LEGO1/omni/src/audio/mxaudiomanager.cpp
diff --git a/LEGO1/mxaudiopresenter.cpp b/LEGO1/omni/src/audio/mxaudiopresenter.cpp
similarity index 100%
rename from LEGO1/mxaudiopresenter.cpp
rename to LEGO1/omni/src/audio/mxaudiopresenter.cpp
diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
similarity index 100%
rename from LEGO1/mxbackgroundaudiomanager.cpp
rename to LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
similarity index 100%
rename from LEGO1/mxloopingmidipresenter.cpp
rename to LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
diff --git a/LEGO1/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
similarity index 100%
rename from LEGO1/mxmidipresenter.cpp
rename to LEGO1/omni/src/audio/mxmidipresenter.cpp
diff --git a/LEGO1/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
similarity index 100%
rename from LEGO1/mxmusicmanager.cpp
rename to LEGO1/omni/src/audio/mxmusicmanager.cpp
diff --git a/LEGO1/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp
similarity index 100%
rename from LEGO1/mxmusicpresenter.cpp
rename to LEGO1/omni/src/audio/mxmusicpresenter.cpp
diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp
similarity index 100%
rename from LEGO1/mxsoundmanager.cpp
rename to LEGO1/omni/src/audio/mxsoundmanager.cpp
diff --git a/LEGO1/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
similarity index 100%
rename from LEGO1/mxsoundpresenter.cpp
rename to LEGO1/omni/src/audio/mxsoundpresenter.cpp
diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
similarity index 100%
rename from LEGO1/mxwavepresenter.cpp
rename to LEGO1/omni/src/audio/mxwavepresenter.cpp
diff --git a/LEGO1/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp
similarity index 100%
rename from LEGO1/mxatomid.cpp
rename to LEGO1/omni/src/common/mxatomid.cpp
diff --git a/LEGO1/mxatomidcounter.cpp b/LEGO1/omni/src/common/mxatomidcounter.cpp
similarity index 100%
rename from LEGO1/mxatomidcounter.cpp
rename to LEGO1/omni/src/common/mxatomidcounter.cpp
diff --git a/LEGO1/mxcompositemediapresenter.cpp b/LEGO1/omni/src/common/mxcompositemediapresenter.cpp
similarity index 100%
rename from LEGO1/mxcompositemediapresenter.cpp
rename to LEGO1/omni/src/common/mxcompositemediapresenter.cpp
diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp
similarity index 100%
rename from LEGO1/mxcompositepresenter.cpp
rename to LEGO1/omni/src/common/mxcompositepresenter.cpp
diff --git a/LEGO1/mxcore.cpp b/LEGO1/omni/src/common/mxcore.cpp
similarity index 100%
rename from LEGO1/mxcore.cpp
rename to LEGO1/omni/src/common/mxcore.cpp
diff --git a/LEGO1/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp
similarity index 100%
rename from LEGO1/mxmediamanager.cpp
rename to LEGO1/omni/src/common/mxmediamanager.cpp
diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
similarity index 100%
rename from LEGO1/mxmediapresenter.cpp
rename to LEGO1/omni/src/common/mxmediapresenter.cpp
diff --git a/LEGO1/mxobjectfactory.cpp b/LEGO1/omni/src/common/mxobjectfactory.cpp
similarity index 100%
rename from LEGO1/mxobjectfactory.cpp
rename to LEGO1/omni/src/common/mxobjectfactory.cpp
diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
similarity index 100%
rename from LEGO1/mxpresenter.cpp
rename to LEGO1/omni/src/common/mxpresenter.cpp
diff --git a/LEGO1/mxstring.cpp b/LEGO1/omni/src/common/mxstring.cpp
similarity index 100%
rename from LEGO1/mxstring.cpp
rename to LEGO1/omni/src/common/mxstring.cpp
diff --git a/LEGO1/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp
similarity index 100%
rename from LEGO1/mxticklemanager.cpp
rename to LEGO1/omni/src/common/mxticklemanager.cpp
diff --git a/LEGO1/mxtimer.cpp b/LEGO1/omni/src/common/mxtimer.cpp
similarity index 100%
rename from LEGO1/mxtimer.cpp
rename to LEGO1/omni/src/common/mxtimer.cpp
diff --git a/LEGO1/mxvariable.cpp b/LEGO1/omni/src/common/mxvariable.cpp
similarity index 100%
rename from LEGO1/mxvariable.cpp
rename to LEGO1/omni/src/common/mxvariable.cpp
diff --git a/LEGO1/mxvariabletable.cpp b/LEGO1/omni/src/common/mxvariabletable.cpp
similarity index 100%
rename from LEGO1/mxvariabletable.cpp
rename to LEGO1/omni/src/common/mxvariabletable.cpp
diff --git a/LEGO1/mxcontrolpresenter.cpp b/LEGO1/omni/src/control/mxcontrolpresenter.cpp
similarity index 100%
rename from LEGO1/mxcontrolpresenter.cpp
rename to LEGO1/omni/src/control/mxcontrolpresenter.cpp
diff --git a/LEGO1/mxentity.cpp b/LEGO1/omni/src/entity/mxentity.cpp
similarity index 100%
rename from LEGO1/mxentity.cpp
rename to LEGO1/omni/src/entity/mxentity.cpp
diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp
similarity index 100%
rename from LEGO1/mxeventmanager.cpp
rename to LEGO1/omni/src/event/mxeventmanager.cpp
diff --git a/LEGO1/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
similarity index 100%
rename from LEGO1/mxeventpresenter.cpp
rename to LEGO1/omni/src/event/mxeventpresenter.cpp
diff --git a/LEGO1/dllmain.cpp b/LEGO1/omni/src/main/mxmain.cpp
similarity index 100%
rename from LEGO1/dllmain.cpp
rename to LEGO1/omni/src/main/mxmain.cpp
diff --git a/LEGO1/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
similarity index 100%
rename from LEGO1/mxomni.cpp
rename to LEGO1/omni/src/main/mxomni.cpp
diff --git a/LEGO1/mxomnicreateflags.cpp b/LEGO1/omni/src/main/mxomnicreateflags.cpp
similarity index 100%
rename from LEGO1/mxomnicreateflags.cpp
rename to LEGO1/omni/src/main/mxomnicreateflags.cpp
diff --git a/LEGO1/mxomnicreateparam.cpp b/LEGO1/omni/src/main/mxomnicreateparam.cpp
similarity index 100%
rename from LEGO1/mxomnicreateparam.cpp
rename to LEGO1/omni/src/main/mxomnicreateparam.cpp
diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/omni/src/notify/mxactionnotificationparam.cpp
similarity index 100%
rename from LEGO1/mxactionnotificationparam.cpp
rename to LEGO1/omni/src/notify/mxactionnotificationparam.cpp
diff --git a/LEGO1/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
similarity index 100%
rename from LEGO1/mxnotificationmanager.cpp
rename to LEGO1/omni/src/notify/mxnotificationmanager.cpp
diff --git a/LEGO1/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp
similarity index 100%
rename from LEGO1/mxnotificationparam.cpp
rename to LEGO1/omni/src/notify/mxnotificationparam.cpp
diff --git a/LEGO1/mxtype17notificationparam.cpp b/LEGO1/omni/src/notify/mxtype17notificationparam.cpp
similarity index 100%
rename from LEGO1/mxtype17notificationparam.cpp
rename to LEGO1/omni/src/notify/mxtype17notificationparam.cpp
diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
similarity index 100%
rename from LEGO1/mxdiskstreamcontroller.cpp
rename to LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
similarity index 100%
rename from LEGO1/mxdiskstreamprovider.cpp
rename to LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
similarity index 100%
rename from LEGO1/mxdsbuffer.cpp
rename to LEGO1/omni/src/stream/mxdsbuffer.cpp
diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
similarity index 100%
rename from LEGO1/mxdschunk.cpp
rename to LEGO1/omni/src/stream/mxdschunk.cpp
diff --git a/LEGO1/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp
similarity index 100%
rename from LEGO1/mxdsfile.cpp
rename to LEGO1/omni/src/stream/mxdsfile.cpp
diff --git a/LEGO1/mxdssource.cpp b/LEGO1/omni/src/stream/mxdssource.cpp
similarity index 100%
rename from LEGO1/mxdssource.cpp
rename to LEGO1/omni/src/stream/mxdssource.cpp
diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp
similarity index 100%
rename from LEGO1/mxdssubscriber.cpp
rename to LEGO1/omni/src/stream/mxdssubscriber.cpp
diff --git a/LEGO1/mxioinfo.cpp b/LEGO1/omni/src/stream/mxioinfo.cpp
similarity index 100%
rename from LEGO1/mxioinfo.cpp
rename to LEGO1/omni/src/stream/mxioinfo.cpp
diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp
similarity index 100%
rename from LEGO1/mxramstreamcontroller.cpp
rename to LEGO1/omni/src/stream/mxramstreamcontroller.cpp
diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
similarity index 100%
rename from LEGO1/mxramstreamprovider.cpp
rename to LEGO1/omni/src/stream/mxramstreamprovider.cpp
diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp
similarity index 100%
rename from LEGO1/mxstreamchunk.cpp
rename to LEGO1/omni/src/stream/mxstreamchunk.cpp
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
similarity index 100%
rename from LEGO1/mxstreamcontroller.cpp
rename to LEGO1/omni/src/stream/mxstreamcontroller.cpp
diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
similarity index 100%
rename from LEGO1/mxstreamer.cpp
rename to LEGO1/omni/src/stream/mxstreamer.cpp
diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp
similarity index 100%
rename from LEGO1/mxstreamlist.cpp
rename to LEGO1/omni/src/stream/mxstreamlist.cpp
diff --git a/LEGO1/mxstreamprovider.cpp b/LEGO1/omni/src/stream/mxstreamprovider.cpp
similarity index 100%
rename from LEGO1/mxstreamprovider.cpp
rename to LEGO1/omni/src/stream/mxstreamprovider.cpp
diff --git a/LEGO1/mxautolocker.cpp b/LEGO1/omni/src/system/mxautolocker.cpp
similarity index 100%
rename from LEGO1/mxautolocker.cpp
rename to LEGO1/omni/src/system/mxautolocker.cpp
diff --git a/LEGO1/mxcriticalsection.cpp b/LEGO1/omni/src/system/mxcriticalsection.cpp
similarity index 100%
rename from LEGO1/mxcriticalsection.cpp
rename to LEGO1/omni/src/system/mxcriticalsection.cpp
diff --git a/LEGO1/mxscheduler.cpp b/LEGO1/omni/src/system/mxscheduler.cpp
similarity index 100%
rename from LEGO1/mxscheduler.cpp
rename to LEGO1/omni/src/system/mxscheduler.cpp
diff --git a/LEGO1/mxsemaphore.cpp b/LEGO1/omni/src/system/mxsemaphore.cpp
similarity index 100%
rename from LEGO1/mxsemaphore.cpp
rename to LEGO1/omni/src/system/mxsemaphore.cpp
diff --git a/LEGO1/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp
similarity index 100%
rename from LEGO1/mxthread.cpp
rename to LEGO1/omni/src/system/mxthread.cpp
diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp
similarity index 100%
rename from LEGO1/mxbitmap.cpp
rename to LEGO1/omni/src/video/mxbitmap.cpp
diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
similarity index 100%
rename from LEGO1/mxdisplaysurface.cpp
rename to LEGO1/omni/src/video/mxdisplaysurface.cpp
diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
similarity index 100%
rename from LEGO1/mxflcpresenter.cpp
rename to LEGO1/omni/src/video/mxflcpresenter.cpp
diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
similarity index 100%
rename from LEGO1/mxloopingflcpresenter.cpp
rename to LEGO1/omni/src/video/mxloopingflcpresenter.cpp
diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
similarity index 100%
rename from LEGO1/mxloopingsmkpresenter.cpp
rename to LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
diff --git a/LEGO1/mxpalette.cpp b/LEGO1/omni/src/video/mxpalette.cpp
similarity index 100%
rename from LEGO1/mxpalette.cpp
rename to LEGO1/omni/src/video/mxpalette.cpp
diff --git a/LEGO1/mxregion.cpp b/LEGO1/omni/src/video/mxregion.cpp
similarity index 100%
rename from LEGO1/mxregion.cpp
rename to LEGO1/omni/src/video/mxregion.cpp
diff --git a/LEGO1/mxregioncursor.cpp b/LEGO1/omni/src/video/mxregioncursor.cpp
similarity index 100%
rename from LEGO1/mxregioncursor.cpp
rename to LEGO1/omni/src/video/mxregioncursor.cpp
diff --git a/LEGO1/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp
similarity index 100%
rename from LEGO1/mxsmack.cpp
rename to LEGO1/omni/src/video/mxsmack.cpp
diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
similarity index 100%
rename from LEGO1/mxsmkpresenter.cpp
rename to LEGO1/omni/src/video/mxsmkpresenter.cpp
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
similarity index 100%
rename from LEGO1/mxstillpresenter.cpp
rename to LEGO1/omni/src/video/mxstillpresenter.cpp
diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/omni/src/video/mxtransitionmanager.cpp
similarity index 100%
rename from LEGO1/mxtransitionmanager.cpp
rename to LEGO1/omni/src/video/mxtransitionmanager.cpp
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
similarity index 100%
rename from LEGO1/mxvideomanager.cpp
rename to LEGO1/omni/src/video/mxvideomanager.cpp
diff --git a/LEGO1/mxvideoparam.cpp b/LEGO1/omni/src/video/mxvideoparam.cpp
similarity index 100%
rename from LEGO1/mxvideoparam.cpp
rename to LEGO1/omni/src/video/mxvideoparam.cpp
diff --git a/LEGO1/mxvideoparamflags.cpp b/LEGO1/omni/src/video/mxvideoparamflags.cpp
similarity index 100%
rename from LEGO1/mxvideoparamflags.cpp
rename to LEGO1/omni/src/video/mxvideoparamflags.cpp
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
similarity index 100%
rename from LEGO1/mxvideopresenter.cpp
rename to LEGO1/omni/src/video/mxvideopresenter.cpp
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index 287407ac..c8458cd7 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -3,10 +3,10 @@
 
 // ROI stands for Real-time Object Instance.
 
-#include "../mxstl/stlcompat.h"
-#include "../realtime/realtime.h"
 #include "compat.h"
 #include "lodlist.h"
+#include "mxstl/stlcompat.h"
+#include "realtime/realtime.h"
 #include "vector.h"
 
 /*
diff --git a/LEGO1/res/resource.h b/LEGO1/res/resource.h
index d11b6281..5a51e019 100644
--- a/LEGO1/res/resource.h
+++ b/LEGO1/res/resource.h
@@ -1,12 +1,12 @@
-#define LEGO1_ARROW  101
-#define LEGO1_LEAF4  102
-#define LEGO1_LEAF7  103
-#define LEGO1_LEAF1  104
-#define LEGO1_LEAF2  105
-#define LEGO1_LEAF6  106
-#define LEGO1_LEAF0  107
-#define LEGO1_LEAF5  108
-#define LEGO1_LEAF3  109
-#define LEGO1_BUSY   111
+#define LEGO1_ARROW 101
+#define LEGO1_LEAF4 102
+#define LEGO1_LEAF7 103
+#define LEGO1_LEAF1 104
+#define LEGO1_LEAF2 105
+#define LEGO1_LEAF6 106
+#define LEGO1_LEAF0 107
+#define LEGO1_LEAF5 108
+#define LEGO1_LEAF3 109
+#define LEGO1_BUSY 111
 
-#define APP_ICON    105
+#define APP_ICON 105
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index cf14ada1..4c76a365 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -1,7 +1,7 @@
 
-#include "../tgl.h"
 #include "compat.h"
 #include "decomp.h"
+#include "tgl/tgl.h"
 
 #include <d3drm.h>
 
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 4d848533..9dc06d7b 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -1,10 +1,10 @@
 #ifndef VIEWLODLIST_H
 #define VIEWLODLIST_H
 
-#include "../mxstl/stlcompat.h"
-#include "../realtime/lodlist.h"
 #include "assert.h"
 #include "compat.h"
+#include "mxstl/stlcompat.h"
+#include "realtime/lodlist.h"
 
 #include <string.h>
 
diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h
index fb2e8e54..02d69ab5 100644
--- a/LEGO1/viewmanager/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -1,9 +1,9 @@
 #ifndef VIEWROI_H
 #define VIEWROI_H
 
-#include "../realtime/orientableroi.h"
-#include "../tgl/tgl.h"
 #include "decomp.h"
+#include "realtime/orientableroi.h"
+#include "tgl/tgl.h"
 #include "viewlodlist.h"
 
 /*
diff --git a/tools/isledecomp/.gitignore b/tools/isledecomp/.gitignore
index 00aa29cb..a7c50887 100644
--- a/tools/isledecomp/.gitignore
+++ b/tools/isledecomp/.gitignore
@@ -1 +1,2 @@
-isledecomp.egg-info/
\ No newline at end of file
+isledecomp.egg-info/
+build
\ No newline at end of file