diff --git a/CMakeLists.txt b/CMakeLists.txt
index fddedcab..61929c5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,86 +207,81 @@ function(add_lego_libraries NAME)
   target_link_libraries(3dmanager${ARG_SUFFIX} PRIVATE Vec::Vec)
 
   add_library(omni${ARG_SUFFIX} STATIC
-    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/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/mxatom.cpp
-    LEGO1/omni/src/common/mxcompositepresenter.cpp
-    LEGO1/omni/src/common/mxcore.cpp
-    LEGO1/omni/src/common/mxdebug.cpp
-    LEGO1/omni/src/common/mxmediamanager.cpp
-    LEGO1/omni/src/common/mxmediapresenter.cpp
+    LEGO1/omni/src/notify/mxnotificationmanager.cpp
     LEGO1/omni/src/common/mxmisc.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/mxatom.cpp
+    LEGO1/omni/src/action/mxdsaction.cpp
     LEGO1/omni/src/common/mxtimer.cpp
-    LEGO1/omni/src/common/mxutilities.cpp
-    LEGO1/omni/src/common/mxvariable.cpp
-    LEGO1/omni/src/common/mxvariabletable.cpp
-    LEGO1/omni/src/entity/mxentity.cpp
-    LEGO1/omni/src/event/mxeventmanager.cpp
-    LEGO1/omni/src/event/mxeventpresenter.cpp
+    LEGO1/omni/src/common/mxcore.cpp
+    LEGO1/omni/src/common/mxstring.cpp
+    LEGO1/omni/src/audio/mxsoundmanager.cpp
     LEGO1/omni/src/main/mxomni.cpp
+    LEGO1/omni/src/notify/mxactionnotificationparam.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/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/mxdssubscriber.cpp
-    LEGO1/omni/src/stream/mxio.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/system/mxautolock.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/system/mxticklethread.cpp
-    LEGO1/omni/src/video/flic.cpp
-    LEGO1/omni/src/video/mxbitmap.cpp
-    LEGO1/omni/src/video/mxdisplaysurface.cpp
+    LEGO1/omni/src/common/mxobjectfactory.cpp
+    LEGO1/omni/src/audio/mxsoundpresenter.cpp
+    LEGO1/omni/src/audio/mxwavepresenter.cpp
+    LEGO1/omni/src/video/mxvideopresenter.cpp
     LEGO1/omni/src/video/mxflcpresenter.cpp
+    LEGO1/omni/src/video/mxsmkpresenter.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/common/mxpresenter.cpp
+    LEGO1/omni/src/common/mxmediapresenter.cpp
+    LEGO1/omni/src/common/mxcompositepresenter.cpp
+    LEGO1/omni/src/system/mxcriticalsection.cpp
+    LEGO1/omni/src/common/mxutilities.cpp
+    LEGO1/omni/src/common/mxvariabletable.cpp
+    LEGO1/omni/src/stream/mxdssubscriber.cpp
+    LEGO1/omni/src/common/mxmediamanager.cpp
+    LEGO1/omni/src/system/mxticklethread.cpp
+    LEGO1/omni/src/audio/mxaudiomanager.cpp
+    LEGO1/omni/src/system/mxautolock.cpp
+    LEGO1/omni/src/stream/mxstreamer.cpp
     LEGO1/omni/src/video/mxstillpresenter.cpp
+    LEGO1/omni/src/video/mxdisplaysurface.cpp
+    LEGO1/omni/src/video/mxbitmap.cpp
+    LEGO1/omni/src/video/flic.cpp
+    LEGO1/omni/src/common/mxticklemanager.cpp
+    LEGO1/omni/src/stream/mxdschunk.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/omni/src/video/mxvideoparam.cpp
+    LEGO1/omni/src/video/mxpalette.cpp
+    LEGO1/omni/src/system/mxscheduler.cpp
+    LEGO1/omni/src/system/mxthread.cpp
+    LEGO1/omni/src/action/mxdsobject.cpp
+    LEGO1/omni/src/event/mxeventmanager.cpp
+    LEGO1/omni/src/audio/mxmusicmanager.cpp
+    LEGO1/omni/src/stream/mxstreamcontroller.cpp
+    LEGO1/omni/src/audio/mxmusicpresenter.cpp
+    LEGO1/omni/src/audio/mxmidipresenter.cpp
+    LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+    LEGO1/omni/src/event/mxeventpresenter.cpp
+    LEGO1/omni/src/stream/mxstreamchunk.cpp
+    LEGO1/omni/src/video/mxregioncursor.cpp
+    LEGO1/omni/src/video/mxregion.cpp
+    LEGO1/omni/src/video/mxsmack.cpp
+    LEGO1/omni/src/stream/mxramstreamcontroller.cpp
+    LEGO1/omni/src/stream/mxdsbuffer.cpp
+    LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+    LEGO1/omni/src/system/mxsemaphore.cpp
+    LEGO1/omni/src/action/mxdsobjectaction.cpp
+    LEGO1/omni/src/action/mxdsmediaaction.cpp
+    LEGO1/omni/src/action/mxdsanim.cpp
+    LEGO1/omni/src/action/mxdssound.cpp
+    LEGO1/omni/src/action/mxdsevent.cpp
+    LEGO1/omni/src/action/mxdsstill.cpp
+    LEGO1/omni/src/action/mxdsmultiaction.cpp
+    LEGO1/omni/src/action/mxdsserialaction.cpp
+    LEGO1/omni/src/action/mxdsparallelaction.cpp
+    LEGO1/omni/src/action/mxdsselectaction.cpp
+    LEGO1/omni/src/stream/mxdsfile.cpp
+    LEGO1/omni/src/stream/mxio.cpp
+    LEGO1/omni/src/action/mxdsstreamingaction.cpp
+    LEGO1/omni/src/stream/mxramstreamprovider.cpp
+    LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
   )
   list(APPEND list_targets omni${ARG_SUFFIX})
   set_property(TARGET omni${ARG_SUFFIX} PROPERTY ARCHIVE_OUTPUT_NAME "omni$<$<CONFIG:Debug>:d>${ARG_SUFFIX}")
@@ -294,120 +289,120 @@ function(add_lego_libraries NAME)
   target_link_libraries(omni${ARG_SUFFIX} PRIVATE dsound winmm Smacker::Smacker)
 
   add_library(${NAME} SHARED
-    LEGO1/define.cpp
-    LEGO1/lego/legoomni/src/actors/act2actor.cpp
-    LEGO1/lego/legoomni/src/actors/act2genactor.cpp
-    LEGO1/lego/legoomni/src/actors/act3actors.cpp
-    LEGO1/lego/legoomni/src/actors/act3ammo.cpp
-    LEGO1/lego/legoomni/src/actors/ambulance.cpp
-    LEGO1/lego/legoomni/src/actors/bike.cpp
-    LEGO1/lego/legoomni/src/actors/buildingentity.cpp
-    LEGO1/lego/legoomni/src/actors/buildings.cpp
-    LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
-    LEGO1/lego/legoomni/src/actors/doors.cpp
-    LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
+    LEGO1/lego/legoomni/src/worlds/score.cpp
     LEGO1/lego/legoomni/src/actors/helicopter.cpp
-    LEGO1/lego/legoomni/src/actors/isleactor.cpp
-    LEGO1/lego/legoomni/src/actors/islepathactor.cpp
-    LEGO1/lego/legoomni/src/actors/jetski.cpp
-    LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
-    LEGO1/lego/legoomni/src/actors/motorcycle.cpp
-    LEGO1/lego/legoomni/src/actors/pizza.cpp
-    LEGO1/lego/legoomni/src/actors/pizzeria.cpp
-    LEGO1/lego/legoomni/src/actors/racecar.cpp
-    LEGO1/lego/legoomni/src/actors/radio.cpp
-    LEGO1/lego/legoomni/src/actors/skateboard.cpp
-    LEGO1/lego/legoomni/src/actors/towtrack.cpp
-    LEGO1/lego/legoomni/src/audio/lego3dsound.cpp
-    LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
+    LEGO1/lego/legoomni/src/worlds/gasstation.cpp
     LEGO1/lego/legoomni/src/audio/legocachsound.cpp
-    LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp
-    LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
-    LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
-    LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
-    LEGO1/lego/legoomni/src/build/legocarbuild.cpp
-    LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp
-    LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
-    LEGO1/lego/legoomni/src/common/legoactors.cpp
-    LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
-    LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
-    LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
-    LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp
-    LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
-    LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
-    LEGO1/lego/legoomni/src/common/legogamestate.cpp
+    LEGO1/lego/legoomni/src/actors/act2actor.cpp
     LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
-    LEGO1/lego/legoomni/src/common/legophoneme.cpp
-    LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
-    LEGO1/lego/legoomni/src/common/legoplants.cpp
-    LEGO1/lego/legoomni/src/common/legostate.cpp
-    LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
-    LEGO1/lego/legoomni/src/common/legoutils.cpp
-    LEGO1/lego/legoomni/src/common/legovariables.cpp
-    LEGO1/lego/legoomni/src/common/misc.cpp
-    LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
-    LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
-    LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
-    LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
-    LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
-    LEGO1/lego/legoomni/src/entity/act2brick.cpp
-    LEGO1/lego/legoomni/src/entity/act2policestation.cpp
-    LEGO1/lego/legoomni/src/entity/legoactor.cpp
-    LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
-    LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+    LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+    LEGO1/lego/legoomni/src/actors/buildingentity.cpp
+    LEGO1/lego/legoomni/src/actors/skateboard.cpp
     LEGO1/lego/legoomni/src/entity/legoentity.cpp
-    LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
-    LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
-    LEGO1/lego/legoomni/src/entity/legolocations.cpp
-    LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
-    LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
-    LEGO1/lego/legoomni/src/entity/legoworld.cpp
-    LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
-    LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
-    LEGO1/lego/legoomni/src/main/legomain.cpp
-    LEGO1/lego/legoomni/src/main/scripts.cpp
-    LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
-    LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
-    LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
-    LEGO1/lego/legoomni/src/paths/legopathactor.cpp
-    LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
-    LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
-    LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
-    LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
-    LEGO1/lego/legoomni/src/race/carrace.cpp
-    LEGO1/lego/legoomni/src/race/jetskirace.cpp
-    LEGO1/lego/legoomni/src/race/legorace.cpp
-    LEGO1/lego/legoomni/src/race/legoraceactor.cpp
-    LEGO1/lego/legoomni/src/race/legoracemap.cpp
+    LEGO1/lego/legoomni/src/audio/lego3dsound.cpp
+    LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
     LEGO1/lego/legoomni/src/race/legoracers.cpp
-    LEGO1/lego/legoomni/src/race/legoracespecial.cpp
-    LEGO1/lego/legoomni/src/race/raceskel.cpp
-    LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
-    LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
-    LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
-    LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
-    LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
-    LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
-    LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
-    LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
+    LEGO1/lego/legoomni/src/race/legoraceactor.cpp
+    LEGO1/lego/legoomni/src/common/legostate.cpp
+    LEGO1/lego/legoomni/src/actors/buildings.cpp
+    LEGO1/lego/legoomni/src/common/misc.cpp
+    LEGO1/lego/legoomni/src/race/legorace.cpp
+    LEGO1/lego/legoomni/src/race/jetskirace.cpp
+    LEGO1/lego/legoomni/src/race/carrace.cpp
+    LEGO1/lego/legoomni/src/actors/pizzeria.cpp
+    LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
+    LEGO1/lego/legoomni/src/actors/act2genactor.cpp
+    LEGO1/lego/legoomni/src/actors/islepathactor.cpp
+    LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
+    LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
+    LEGO1/lego/legoomni/src/entity/legoworld.cpp
+    LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+    LEGO1/lego/legoomni/src/actors/ambulance.cpp
+    LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
+    LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
+    LEGO1/modeldb/modeldb.cpp
+    LEGO1/lego/legoomni/src/actors/pizza.cpp
+    LEGO1/lego/legoomni/src/actors/racecar.cpp
+    LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+    LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+    LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
+    LEGO1/lego/legoomni/src/actors/isleactor.cpp
+    LEGO1/lego/legoomni/src/actors/radio.cpp
+    LEGO1/lego/legoomni/src/entity/legoactor.cpp
+    LEGO1/lego/legoomni/src/paths/legopathactor.cpp
+    LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp
+    LEGO1/lego/legoomni/src/worlds/isle.cpp
+    LEGO1/lego/legoomni/src/actors/motorcycle.cpp
+    LEGO1/lego/legoomni/src/actors/act3ammo.cpp
+    LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp
+    LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
+    LEGO1/lego/legoomni/src/common/legogamestate.cpp
+    LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+    LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
+    LEGO1/lego/legoomni/src/common/legoutils.cpp
+    LEGO1/lego/legoomni/src/actors/act3actors.cpp
+    LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
+    LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+    LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
+    LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+    LEGO1/lego/legoomni/src/common/legophoneme.cpp
+    LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
+    LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
+    LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
+    LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
+    LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
+    LEGO1/lego/legoomni/src/actors/towtrack.cpp
+    LEGO1/lego/legoomni/src/entity/act2policestation.cpp
     LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
     LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
-    LEGO1/lego/legoomni/src/video/legovideomanager.cpp
-    LEGO1/lego/legoomni/src/worlds/act3.cpp
-    LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
-    LEGO1/lego/legoomni/src/worlds/gasstation.cpp
-    LEGO1/lego/legoomni/src/worlds/historybook.cpp
-    LEGO1/lego/legoomni/src/worlds/hospital.cpp
-    LEGO1/lego/legoomni/src/worlds/infocenter.cpp
-    LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
-    LEGO1/lego/legoomni/src/worlds/isle.cpp
-    LEGO1/lego/legoomni/src/worlds/jukebox.cpp
     LEGO1/lego/legoomni/src/worlds/legoact2.cpp
+    LEGO1/lego/legoomni/src/common/legovariables.cpp
+    LEGO1/lego/legoomni/src/main/scripts.cpp
+    LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+    LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
+    LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
+    LEGO1/lego/legoomni/src/main/legomain.cpp
+    LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+    LEGO1/lego/legoomni/src/race/legoracemap.cpp
+    LEGO1/lego/legoomni/src/worlds/jukebox.cpp
+    LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
     LEGO1/lego/legoomni/src/worlds/police.cpp
+    LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
+    LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp
+    LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
+    LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
+    LEGO1/lego/legoomni/src/actors/doors.cpp
+    LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+    LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
+    LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+    LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
+    LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
+    LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+    LEGO1/lego/legoomni/src/worlds/infocenter.cpp
+    LEGO1/lego/legoomni/src/race/raceskel.cpp
+    LEGO1/lego/legoomni/src/worlds/act3.cpp
+    LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
+    LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+    LEGO1/lego/legoomni/src/worlds/hospital.cpp
+    LEGO1/lego/legoomni/src/actors/bike.cpp
+    LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
     LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
-    LEGO1/lego/legoomni/src/worlds/score.cpp
+    LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+    LEGO1/lego/legoomni/src/entity/act2brick.cpp
+    LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+    LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
+    LEGO1/lego/legoomni/src/actors/jetski.cpp
+    LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+    LEGO1/lego/legoomni/src/race/legoracespecial.cpp
+    LEGO1/lego/legoomni/src/worlds/historybook.cpp
+    LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
+    LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
     LEGO1/main.cpp
-    LEGO1/modeldb/modeldb.cpp
+    LEGO1/lego/legoomni/src/entity/legolocations.cpp
+    LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
+    LEGO1/lego/legoomni/src/common/legoactors.cpp
+    LEGO1/define.cpp
+    LEGO1/lego/legoomni/src/common/legoplants.cpp
   )
   list(APPEND list_targets ${NAME})
 
@@ -430,20 +425,20 @@ function(add_lego_libraries NAME)
 
   # Link libraries
   target_link_libraries(${NAME} PRIVATE
-    tglrl${ARG_SUFFIX}
-    viewmanager${ARG_SUFFIX}
-    realtime${ARG_SUFFIX}
-    mxdirectx${ARG_SUFFIX}
-    roi${ARG_SUFFIX}
-    geom${ARG_SUFFIX}
-    anim${ARG_SUFFIX}
-    Vec::Vec
     dinput
-    dxguid
     misc${ARG_SUFFIX}
+    geom${ARG_SUFFIX}
+    mxdirectx${ARG_SUFFIX}
+    anim${ARG_SUFFIX}
+    tglrl${ARG_SUFFIX}
+    realtime${ARG_SUFFIX}
+    viewmanager${ARG_SUFFIX}
+    roi${ARG_SUFFIX}
     3dmanager${ARG_SUFFIX}
     omni${ARG_SUFFIX}
     shape${ARG_SUFFIX}
+    Vec::Vec
+    dxguid
   )
 
   foreach(tgt IN LISTS list_targets)
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 0d1f9da5..87a63b11 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -59,6 +59,9 @@ class Score : public LegoWorld {
 	~Score() override;
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
+	// FUNCTION: LEGO1 0x100010b0
+	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+
 	// FUNCTION: LEGO1 0x100010c0
 	// FUNCTION: BETA10 0x100f4f20
 	const char* ClassName() const override // vtable+0x0c
@@ -78,7 +81,6 @@ class Score : public LegoWorld {
 
 	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	void ReadyWorld() override;                       // vtable+0x50
-	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool Escape() override;                         // vtable+0x64
 	void Enable(MxBool p_enable) override;            // vtable+0x68
 
diff --git a/LEGO1/lego/legoomni/src/worlds/score.cpp b/LEGO1/lego/legoomni/src/worlds/score.cpp
index e58d57aa..dd9fc6f7 100644
--- a/LEGO1/lego/legoomni/src/worlds/score.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/score.cpp
@@ -32,12 +32,6 @@ Score::Score()
 	NotificationManager()->Register(this);
 }
 
-// FUNCTION: LEGO1 0x100010b0
-MxBool Score::VTable0x5c()
-{
-	return TRUE;
-}
-
 // FUNCTION: LEGO1 0x10001200
 Score::~Score()
 {
diff --git a/LEGO1/lego/sources/misc/legocontainer.h b/LEGO1/lego/sources/misc/legocontainer.h
index 0fbcb3d5..72db3332 100644
--- a/LEGO1/lego/sources/misc/legocontainer.h
+++ b/LEGO1/lego/sources/misc/legocontainer.h
@@ -57,7 +57,6 @@ class LegoContainer {
 		}
 	}
 
-	// FUNCTION: BETA10 0x1007bc00
 	T* Get(const char* p_name)
 	{
 		T* value = NULL;
@@ -197,4 +196,7 @@ class LegoTextureContainer : public LegoContainer<LegoTextureInfo> {
 // _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Nil
 // clang-format on
 
+// TEMPLATE: BETA10 0x1007bc00
+// LegoContainer<LegoTextureInfo>::Get
+
 #endif // LEGOCONTAINER_H