diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi
index bcb07b167..9a34c579d 100644
--- a/packaging/windows/speed-dreams-base.nsi
+++ b/packaging/windows/speed-dreams-base.nsi
@@ -99,13 +99,17 @@ Section "!Base System" SEC01
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\track\*.*"
   SetOutPath "$INSTDIR\lib\modules\userinterface"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\userinterface\*.*"
+  SetOutPath "$INSTDIR\lib\modules\sound"
+  File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\sound\*.*"
+  SetOutPath "$INSTDIR\lib\modules\racing"
+  File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\racing\*.*"
 
   ; Core data files (sound, textures, menus, car categories, ...)
   SetOutPath "$INSTDIR\data"
   File "${BUILD_INST_DIR}\data\*.*"
 
-  SetOutPath "$INSTDIR\data\categories"
-  File /r "${BUILD_INST_DIR}\data\categories\*.*"
+  SetOutPath "$INSTDIR\data\cars\categories"
+  File /r "${BUILD_INST_DIR}\data\cars\categories\*.*"
 
   SetOutPath "$INSTDIR\data\config"
   File "${BUILD_INST_DIR}\data\config\*.*"
@@ -156,23 +160,23 @@ Section "!Base System" SEC01
   File /r /x *.lib "${BUILD_INST_DIR}\data\drivers\usr_sc\*.*"
 
   ; Base car models (only Supercars)
-  SetOutPath "$INSTDIR\data\cars\sc-boxer-96"
-  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\sc-boxer-96\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\sc-boxer-96"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-boxer-96\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\sc-cavallo-360"
-  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\sc-cavallo-360\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\sc-cavallo-360"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-cavallo-360\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\sc-fmc-gt4"
-  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\sc-fmc-gt4\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\sc-fmc-gt4"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-fmc-gt4\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\sc-lynx-220"
-  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\sc-lynx-220\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\sc-lynx-220"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-lynx-220\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\sc-murasama-nsx"
-  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\sc-murasama-nsx\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\sc-murasama-nsx"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-murasama-nsx\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\sc-spirit-300"
-  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\sc-spirit-300\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\sc-spirit-300"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-spirit-300\*.*"
 
   ; Base tracks (only Espie)
   SetOutPath "$INSTDIR\data\tracks\circuit\espie"
diff --git a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi
index 42d1fe7d7..493420088 100644
--- a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi
+++ b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi
@@ -126,51 +126,51 @@ Section -Cars
   SetOverwrite on
 
   ; HQ / AI driven LD-GT1 car models
-  SetOutPath "$INSTDIR\data\cars\ls1-archer-r9"
-  File /r "${BUILD_INST_DIR}\data\cars\ls1-archer-r9\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls1-archer-r9"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls1-archer-r9\*.*"
 
-  ;SetOutPath "$INSTDIR\data\cars\ls1-cavallo-570s1"
-  ;File /r "${BUILD_INST_DIR}\data\cars\ls1-cavallo-570s1\*.*"
+  ;SetOutPath "$INSTDIR\data\cars\models\ls1-cavallo-570s1"
+  ;File /r "${BUILD_INST_DIR}\data\cars\models\ls1-cavallo-570s1\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls1-newcastle-fury"
-  File /r "${BUILD_INST_DIR}\data\cars\ls1-newcastle-fury\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls1-newcastle-fury"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls1-newcastle-fury\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls1-taipan-ltsr"
-  File /r "${BUILD_INST_DIR}\data\cars\ls1-taipan-ltsr\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls1-taipan-ltsr"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls1-taipan-ltsr\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls1-toro-rgt"
-  File /r "${BUILD_INST_DIR}\data\cars\ls1-toro-rgt\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls1-toro-rgt"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls1-toro-rgt\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls1-vulture-v6r"
-  File /r "${BUILD_INST_DIR}\data\cars\ls1-vulture-v6r\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls1-vulture-v6r"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls1-vulture-v6r\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls1-zentek-z7r"
-  File /r "${BUILD_INST_DIR}\data\cars\ls1-zentek-z7r\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls1-zentek-z7r"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls1-zentek-z7r\*.*"
 
   ; HQ / AI driven 36 Grand-Prix car models
-  SetOutPath "$INSTDIR\data\cars\36gp-century-r11b"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-century-r11b\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-century-r11b"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-century-r11b\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-ettore-t59"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-ettore-t59\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-ettore-t59"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-ettore-t59\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-milano-12c36"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-milano-12c36\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-milano-12c36"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-milano-12c36\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-milano-tipop3"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-milano-tipop3\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-milano-tipop3"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-milano-tipop3\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-motorunion-typec"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-motorunion-typec\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-motorunion-typec"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-motorunion-typec\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-silber-w25b"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-silber-w25b\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-silber-w25b"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-silber-w25b\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-tridenti-6c34"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-tridenti-6c34\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-tridenti-6c34"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-tridenti-6c34\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\36gp-tridenti-v8ri"
-  File /r "${BUILD_INST_DIR}\data\cars\36gp-tridenti-v8ri\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\36gp-tridenti-v8ri"
+  File /r "${BUILD_INST_DIR}\data\cars\models\36gp-tridenti-v8ri\*.*"
 
 SectionEnd
 
diff --git a/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi b/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi
index 63c26732e..9a2d85300 100644
--- a/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi
+++ b/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi
@@ -102,29 +102,29 @@ Section -Cars
   SetOverwrite on
 
   ; HQ / AI driven TORCS Racing Board car models
-  SetOutPath "$INSTDIR\data\cars\trb1-boxer-trbrs"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-boxer-trbrs\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-boxer-trbrs"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-boxer-trbrs\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-cavallo-360rb"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-cavallo-360rb\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-cavallo-360rb"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-cavallo-360rb\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-sector-rb1"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-sector-rb1\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-sector-rb1"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-sector-rb1\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-silber-rblk"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-silber-rblk\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-silber-rblk"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-silber-rblk\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-spirit-rb1lt"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-spirit-rb1lt\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-spirit-rb1lt"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-spirit-rb1lt\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-taipan-rb1"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-taipan-rb1\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-taipan-rb1"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-taipan-rb1\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-vieringe-5rb"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-vieringe-5rb\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-vieringe-5rb"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-vieringe-5rb\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\trb1-zaxxon-rb"
-  File /r "${BUILD_INST_DIR}\data\cars\trb1-zaxxon-rb\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\trb1-zaxxon-rb"
+  File /r "${BUILD_INST_DIR}\data\cars\models\trb1-zaxxon-rb\*.*"
 
 SectionEnd
 
diff --git a/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi b/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi
index 7ba6ee042..65911fe85 100644
--- a/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi
+++ b/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi
@@ -109,53 +109,53 @@ Section -Cars
 
   SetOverwrite on
 
-  SetOutPath "$INSTDIR\data\cars\mp5-fmc"
-  File /r "${BUILD_INST_DIR}\data\cars\mp5-fmc\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\mp5-fmc"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mp5-fmc\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\mp5-fmc-drift"
-  File /r "${BUILD_INST_DIR}\data\cars\mp5-fmc-drift\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\mp5-fmc-drift"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mp5-fmc-drift\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\mp5-fmc-speedy"
-  File /r "${BUILD_INST_DIR}\data\cars\mp5-fmc-speedy\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\mp5-fmc-speedy"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mp5-fmc-speedy\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\rs1-citrus-cs4"
-  File /r "${BUILD_INST_DIR}\data\cars\rs1-citrus-cs4\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\rs1-citrus-cs4"
+  File /r "${BUILD_INST_DIR}\data\cars\models\rs1-citrus-cs4\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\rs1-fmc-centre"
-  File /r "${BUILD_INST_DIR}\data\cars\rs1-fmc-centre\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\rs1-fmc-centre"
+  File /r "${BUILD_INST_DIR}\data\cars\models\rs1-fmc-centre\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\rs1-kenji-08"
-  File /r "${BUILD_INST_DIR}\data\cars\rs1-kenji-08\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\rs1-kenji-08"
+  File /r "${BUILD_INST_DIR}\data\cars\models\rs1-kenji-08\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\rs2-fai-dot"
-  File /r "${BUILD_INST_DIR}\data\cars\rs2-fai-dot\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\rs2-fai-dot"
+  File /r "${BUILD_INST_DIR}\data\cars\models\rs2-fai-dot\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\rs2-lion-2m"
-  File /r "${BUILD_INST_DIR}\data\cars\rs2-lion-2m\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\rs2-lion-2m"
+  File /r "${BUILD_INST_DIR}\data\cars\models\rs2-lion-2m\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-bavaria-g3gtr"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-bavaria-g3gtr\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-bavaria-g3gtr"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-bavaria-g3gtr\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-boxer-96rsr"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-boxer-96rsr\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-boxer-96rsr"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-boxer-96rsr\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-cavallo-360r"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-cavallo-360r\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-cavallo-360r"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-cavallo-360r\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-condor-c400r"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-condor-c400r\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-condor-c400r"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-condor-c400r\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-lynx-xkr"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-lynx-xkr\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-lynx-xkr"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-lynx-xkr\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-morley-r900"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-morley-r900\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-morley-r900"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-morley-r900\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-sprite-gts"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-sprite-gts\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-sprite-gts"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-sprite-gts\*.*"
 
-  SetOutPath "$INSTDIR\data\cars\ls2-vortex-gt"
-  File /r "${BUILD_INST_DIR}\data\cars\ls2-vortex-gt\*.*"
+  SetOutPath "$INSTDIR\data\cars\models\ls2-vortex-gt"
+  File /r "${BUILD_INST_DIR}\data\cars\models\ls2-vortex-gt\*.*"
 
 SectionEnd