diff --git a/.gitignore b/.gitignore
index 83c3c2acc..0057cda89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,8 +101,7 @@ mingw64/
 !tools/ido-recomp/*/*
 
 # models
-models/*/*
-!models/*/*.json
+*.blend
 
 # torch
 torch.hash.yml
diff --git a/models/common_textures/models.json b/models/common_textures.json
similarity index 100%
rename from models/common_textures/models.json
rename to models/common_textures.json
diff --git a/models/banshee_boardwalk/models.json b/models/tracks/banshee_boardwalk.json
similarity index 95%
rename from models/banshee_boardwalk/models.json
rename to models/tracks/banshee_boardwalk.json
index d75f17090..9c63d24c2 100644
--- a/models/banshee_boardwalk/models.json
+++ b/models/tracks/banshee_boardwalk.json
@@ -1,7 +1,7 @@
 [
     {
         "file":"courses/banshee_boardwalk/course_data.c",
-        "out_dir": "banshee_boardwalk/objects",
+        "out_dir": "tracks/banshee_boardwalk/objects",
         "models": [
             "d_course_banshee_boardwalk_dl_B278",
             "d_course_banshee_boardwalk_dl_trash_bin",
@@ -10,7 +10,7 @@
     },
     {
         "file": "courses/banshee_boardwalk/course_data.c",
-        "out_dir": "banshee_boardwalk/sections",
+        "out_dir": "tracks/banshee_boardwalk/sections",
         "models": [
             "d_course_banshee_boardwalk_dl_A0",
             "d_course_banshee_boardwalk_dl_210",
@@ -116,7 +116,7 @@
     },
     {
         "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "out_dir": "tracks/banshee_boardwalk/collision_sections",
         "models": [
             "d_course_banshee_boardwalk_packed_dl_1DA0",
             "d_course_banshee_boardwalk_packed_dl_5498",
@@ -167,5 +167,12 @@
             "d_course_banshee_boardwalk_packed_dl_1CF8",
             "d_course_banshee_boardwalk_packed_dl_1748"
         ]
+    },
+    {
+        "file":"courses/banshee_boardwalk/course_data.c",
+        "out_dir": "tracks/banshee_boardwalk/preview",
+        "models": [
+            "d_course_banshee_boardwalk_dl_B308"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/tracks/battle_track.json b/models/tracks/battle_track.json
new file mode 100644
index 000000000..a30c49f4d
--- /dev/null
+++ b/models/tracks/battle_track.json
@@ -0,0 +1,30 @@
+[
+    {
+        "file":"courses/big_donut/course_data.c",
+        "out_dir": "tracks/big_donut/preview",
+        "models": [
+            "d_course_big_donut_dl"
+        ]
+    },
+    {
+        "file":"courses/block_fort/course_data.c",
+        "out_dir": "tracks/block_fort/preview",
+        "models": [
+            "d_course_block_fort_dl"
+        ]
+    },
+    {
+        "file":"courses/double_deck/course_data.c",
+        "out_dir": "tracks/double_deck/preview",
+        "models": [
+            "d_course_double_deck_dl"
+        ]
+    },
+    {
+        "file":"courses/skyscraper/course_data.c",
+        "out_dir": "tracks/skyscraper/preview",
+        "models": [
+            "d_course_skyscraper_dl"
+        ]
+    }
+]
\ No newline at end of file
diff --git a/models/bowsers_castle/models.json b/models/tracks/bowsers_castle.json
similarity index 94%
rename from models/bowsers_castle/models.json
rename to models/tracks/bowsers_castle.json
index a9890a7e2..0606dae6b 100644
--- a/models/bowsers_castle/models.json
+++ b/models/tracks/bowsers_castle.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/bowsers_castle/course_data.c",
-        "out_dir": "bowsers_castle/objects",
+        "out_dir": "tracks/bowsers_castle/objects",
         "models": [
             "d_course_bowsers_castle_dl_thwomp",
             "d_course_bowsers_castle_dl_bush"
@@ -9,7 +9,7 @@
     },
     {
         "file": "courses/bowsers_castle/course_data.c",
-        "out_dir": "bowsers_castle/sections",
+        "out_dir": "tracks/bowsers_castle/sections",
         "models": [
             "d_course_bowsers_castle_dl_0",
             "d_course_bowsers_castle_dl_230",
@@ -122,8 +122,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/bowsers_castle/course_displaylists.inc.c",
+        "out_dir": "tracks/bowsers_castle/collision_sections",
         "models": [
             "d_course_bowsers_castle_packed_dl_5448",
             "d_course_bowsers_castle_packed_dl_53E0",
@@ -162,5 +162,12 @@
             "d_course_bowsers_castle_packed_dl_3B0",
             "d_course_bowsers_castle_packed_dl_83B0"
         ]
+    },
+    {
+        "file":"courses/bowsers_castle/course_data.c",
+        "out_dir": "tracks/bowsers_castle/preview",
+        "models": [
+            "d_course_bowsers_castle_dl_9148"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/choco_mountain/models.json b/models/tracks/choco_mountain.json
similarity index 95%
rename from models/choco_mountain/models.json
rename to models/tracks/choco_mountain.json
index 10cc169c5..99cc68fff 100644
--- a/models/choco_mountain/models.json
+++ b/models/tracks/choco_mountain.json
@@ -1,14 +1,14 @@
 [
     {
         "file": "courses/choco_mountain/course_data.c",
-        "out_dir": "choco_mountain/objects",
+        "out_dir": "tracks/choco_mountain/objects",
         "models": [
             "d_course_choco_mountain_dl_falling_rock"
         ]
     },
     {
         "file": "courses/choco_mountain/course_data.c",
-        "out_dir": "choco_mountain/sections",
+        "out_dir": "tracks/choco_mountain/sections",
         "models": [
             "d_course_choco_mountain_dl_0",
             "d_course_choco_mountain_dl_150",
@@ -109,8 +109,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/choco_mountain/course_displaylists.inc.c",
+        "out_dir": "tracks/choco_mountain/collision_sections",
         "models": [
             "d_course_choco_mountain_packed_dl_5A70",
             "d_course_choco_mountain_packed_dl_8E0",
@@ -183,5 +183,12 @@
             "d_course_choco_mountain_packed_dl_30A8",
             "d_course_choco_mountain_packed_dl_3410"
         ]
+    },
+    {
+        "file":"courses/choco_mountain/course_data.c",
+        "out_dir": "tracks/choco_mountain/preview",
+        "models": [
+            "d_course_choco_mountain_dl_71B8"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/dks_jungle_parkway/models.json b/models/tracks/dks_jungle_parkway.json
similarity index 96%
rename from models/dks_jungle_parkway/models.json
rename to models/tracks/dks_jungle_parkway.json
index 38c46538a..3f94da87f 100644
--- a/models/dks_jungle_parkway/models.json
+++ b/models/tracks/dks_jungle_parkway.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/dks_jungle_parkway/course_data.c",
-        "out_dir": "dks_jungle_parkway/objects",
+        "out_dir": "tracks/dks_jungle_parkway/objects",
         "models":[
             "d_course_dks_jungle_parkway_dl_E730",
             "d_course_dks_jungle_parkway_dl_E058",
@@ -17,7 +17,7 @@
 
     {
         "file": "courses/dks_jungle_parkway/course_data.c",
-        "out_dir": "dks_jungle_parkway/sections",
+        "out_dir": "tracks/dks_jungle_parkway/sections",
         "models":[
             "d_course_dks_jungle_parkway_dl_20", "d_course_dks_jungle_parkway_dl_210", 
             "d_course_dks_jungle_parkway_dl_180", "d_course_dks_jungle_parkway_dl_310",
@@ -74,8 +74,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/dks_jungle_parkway/course_displaylists.inc.c",
+        "out_dir": "tracks/dks_jungle_parkway/collision_sections",
         "models": [
             "d_course_dks_jungle_parkway_packed_dl_7DA0",
             "d_course_dks_jungle_parkway_packed_dl_7E50",
@@ -192,5 +192,12 @@
             "d_course_dks_jungle_parkway_packed_dl_37C0",
             "d_course_dks_jungle_parkway_packed_dl_3758"
         ]
+    },
+    {
+        "file":"courses/dks_jungle_parkway/course_data.c",
+        "out_dir": "tracks/dks_jungle_parkway/preview",
+        "models": [
+            "d_course_dks_jungle_parkway_dl_13C30"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/frappe_snowland/models.json b/models/tracks/frappe_snowland.json
similarity index 92%
rename from models/frappe_snowland/models.json
rename to models/tracks/frappe_snowland.json
index a715dd1e0..4be8a24e2 100644
--- a/models/frappe_snowland/models.json
+++ b/models/tracks/frappe_snowland.json
@@ -1,14 +1,14 @@
 [
     {
         "file":"courses/frappe_snowland/course_data.c",
-        "out_dir": "frappe_snowland/objects",
+        "out_dir": "tracks/frappe_snowland/objects",
         "models": [
             "d_course_frappe_snowland_dl_tree"
         ]
     },
     {
         "file": "courses/frappe_snowland/course_data.c",
-        "out_dir": "frappe_snowland/sections",
+        "out_dir": "tracks/frappe_snowland/sections",
         "models": [
             "d_course_frappe_snowland_dl_0", "d_course_frappe_snowland_dl_1B8",
             "d_course_frappe_snowland_dl_C8", "d_course_frappe_snowland_dl_298",
@@ -47,8 +47,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/frappe_snowland/course_displaylists.inc.c",
+        "out_dir": "tracks/frappe_snowland/collision_sections",
         "models": [
             "d_course_frappe_snowland_packed_dl_3B20",
             "d_course_frappe_snowland_packed_dl_3118",
@@ -98,5 +98,12 @@
             "d_course_frappe_snowland_packed_dl_5BE0",
             "d_course_frappe_snowland_packed_dl_5C70"
         ]
+    },
+    {
+        "file":"courses/frappe_snowland/course_data.c",
+        "out_dir": "tracks/frappe_snowland/preview",
+        "models": [
+            "d_course_frappe_snowland_dl_76A0"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/kalimari_desert/models.json b/models/tracks/kalimari_desert.json
similarity index 96%
rename from models/kalimari_desert/models.json
rename to models/tracks/kalimari_desert.json
index 8952fed08..6ab285fb3 100644
--- a/models/kalimari_desert/models.json
+++ b/models/tracks/kalimari_desert.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/kalimari_desert/course_data.c",
-        "out_dir": "kalimari_desert/objects",
+        "out_dir": "tracks/kalimari_desert/objects",
         "models": [
             "d_course_kalimari_desert_dl_cactus1",
             "d_course_kalimari_desert_dl_cactus2",
@@ -30,7 +30,7 @@
     },
     {
         "file": "courses/kalimari_desert/course_data.c",
-        "out_dir": "kalimari_desert/sections",
+        "out_dir": "tracks/kalimari_desert/sections",
         "models": [
             "d_course_kalimari_desert_dl_0",
             "d_course_kalimari_desert_dl_258",
@@ -115,8 +115,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/kalimari_desert/course_displaylists.inc.c",
+        "out_dir": "tracks/kalimari_desert/collision_sections",
         "models": [
             "d_course_kalimari_desert_packed_dl_8690",
             "d_course_kalimari_desert_packed_dl_8728",
@@ -220,5 +220,12 @@
             "d_course_kalimari_desert_packed_dl_1B18",
             "d_course_kalimari_desert_packed_dl_998"
         ]
+    },
+    {
+        "file":"courses/kalimari_desert/course_data.c",
+        "out_dir": "tracks/kalimari_desert/preview",
+        "models": [
+            "d_course_kalimari_desert_dl_22E00"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/koopa_troopa_beach/models.json b/models/tracks/koopa_troopa_beach.json
similarity index 97%
rename from models/koopa_troopa_beach/models.json
rename to models/tracks/koopa_troopa_beach.json
index 77d9f2e46..c5f4e2b59 100644
--- a/models/koopa_troopa_beach/models.json
+++ b/models/tracks/koopa_troopa_beach.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/koopa_troopa_beach/course_data.c",
-        "out_dir": "koopa_troopa_beach/objects",
+        "out_dir": "tracks/koopa_troopa_beach/objects",
         "models": [
             "d_course_koopa_troopa_beach_dl_16630",
             "d_course_koopa_troopa_beach_dl_tree_top1",
@@ -14,7 +14,7 @@
     },
     {
         "file": "courses/koopa_troopa_beach/course_data.c",
-        "out_dir": "koopa_troopa_beach/sections/list2",
+        "out_dir": "tracks/koopa_troopa_beach/sections/list2",
         "models": [
             "d_course_koopa_troopa_beach_dl_118", "d_course_koopa_troopa_beach_dl_328",
             "d_course_koopa_troopa_beach_dl_218", "d_course_koopa_troopa_beach_dl_458",
@@ -94,7 +94,7 @@
     },
     {
         "file": "courses/koopa_troopa_beach/course_data.c",
-        "out_dir": "koopa_troopa_beach/sections/list1",
+        "out_dir": "tracks/koopa_troopa_beach/sections/list1",
         "models": [
             "d_course_koopa_troopa_beach_dl_90", "d_course_koopa_troopa_beach_dl_278",
             "d_course_koopa_troopa_beach_dl_188", "d_course_koopa_troopa_beach_dl_3C0",
@@ -173,8 +173,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/koopa_troopa_beach/course_displaylists.inc.c",
+        "out_dir": "tracks/koopa_troopa_beach/collision_sections",
         "models": [
             "d_course_koopa_troopa_beach_packed_dl_9688",
             "d_course_koopa_troopa_beach_packed_dl_D70",
@@ -282,5 +282,12 @@
             "d_course_koopa_troopa_beach_packed_dl_9B20",
             "d_course_koopa_troopa_beach_packed_dl_9B78"
         ]
+    },
+    {
+        "file":"courses/koopa_troopa_beach/course_data.c",
+        "out_dir": "tracks/koopa_troopa_beach/preview",
+        "models": [
+            "d_course_koopa_troopa_beach_dl_18D68"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/luigi_raceway/models.json b/models/tracks/luigi_raceway.json
similarity index 96%
rename from models/luigi_raceway/models.json
rename to models/tracks/luigi_raceway.json
index dd27e7e81..250b28c90 100644
--- a/models/luigi_raceway/models.json
+++ b/models/tracks/luigi_raceway.json
@@ -2,7 +2,7 @@
 
     {
         "file": "courses/luigi_raceway/course_data.c",
-        "out_dir": "luigi_raceway/objects",
+        "out_dir": "tracks/luigi_raceway/objects",
         "models": [
             "d_course_luigi_raceway_dl_F650",
             "d_course_luigi_raceway_dl_F960",
@@ -13,7 +13,7 @@
     },
     {
         "file": "courses/luigi_raceway/course_data.c",
-        "out_dir": "luigi_raceway/sections",
+        "out_dir": "tracks/luigi_raceway/sections",
         "models": [
             "d_course_luigi_raceway_dl_0",
             "d_course_luigi_raceway_dl_328",
@@ -138,8 +138,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/luigi_raceway/course_displaylists.inc.c",
+        "out_dir": "tracks/luigi_raceway/collision_sections",
         "models": [
             "d_course_luigi_raceway_packed_dl_6B00",
             "d_course_luigi_raceway_packed_dl_6BF0",
@@ -254,5 +254,12 @@
             "d_course_luigi_raceway_packed_dl_8200",
             "d_course_luigi_raceway_packed_dl_4EE8"
         ]
+    },
+    {
+        "file":"courses/luigi_raceway/course_data.c",
+        "out_dir": "tracks/luigi_raceway/preview",
+        "models": [
+            "d_course_luigi_raceway_dl_FD40"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/mario_raceway/models.json b/models/tracks/mario_raceway.json
similarity index 93%
rename from models/mario_raceway/models.json
rename to models/tracks/mario_raceway.json
index cd3916d3a..41ef28aa0 100644
--- a/models/mario_raceway/models.json
+++ b/models/tracks/mario_raceway.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/mario_raceway/course_data.c",
-        "out_dir": "mario_raceway/objects",
+        "out_dir": "tracks/mario_raceway/objects",
         "models": [
             "d_course_mario_raceway_dl_piranha_plant",
             "d_course_mario_raceway_dl_tree",
@@ -10,7 +10,7 @@
     },
     {
         "file": "courses/mario_raceway/course_data.c",
-        "out_dir": "mario_raceway/sections",
+        "out_dir": "tracks/mario_raceway/sections",
         "models": [
             "d_course_mario_raceway_dl_0",
             "d_course_mario_raceway_dl_1D0",
@@ -83,8 +83,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/mario_raceway/course_displaylists.inc.c",
+        "out_dir": "tracks/mario_raceway/collision_sections",
         "models": [
             "d_course_mario_raceway_packed_dl_17D8",
             "d_course_mario_raceway_packed_dl_1770",
@@ -139,5 +139,12 @@
             "d_course_mario_raceway_packed_dl_6308",
             "d_course_mario_raceway_packed_dl_6490"
         ]
+    },
+    {
+        "file":"courses/mario_raceway/course_data.c",
+        "out_dir": "tracks/mario_raceway/preview",
+        "models": [
+            "d_course_mario_raceway_dl_9348"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/moo_moo_farm/models.json b/models/tracks/moo_moo_farm.json
similarity index 95%
rename from models/moo_moo_farm/models.json
rename to models/tracks/moo_moo_farm.json
index 0e6a90759..7b24ac597 100644
--- a/models/moo_moo_farm/models.json
+++ b/models/tracks/moo_moo_farm.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/moo_moo_farm/course_data.c",
-        "out_dir": "moo_moo_farm/objects",
+        "out_dir": "tracks/moo_moo_farm/objects",
         "models": [
             "d_course_moo_moo_farm_dl_cow1",
             "d_course_moo_moo_farm_dl_cow2",
@@ -13,7 +13,7 @@
     },
     {
         "file": "courses/moo_moo_farm/course_data.c",
-        "out_dir": "moo_moo_farm/sections",
+        "out_dir": "tracks/moo_moo_farm/sections",
         "models": [
             "d_course_moo_moo_farm_dl_88",
             "d_course_moo_moo_farm_dl_598",
@@ -110,8 +110,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/moo_moo_farm/course_displaylists.inc.c",
+        "out_dir": "tracks/moo_moo_farm/collision_sections",
         "models": [
             "d_course_moo_moo_farm_packed_dl_39F8",
             "d_course_moo_moo_farm_packed_dl_3B88",
@@ -190,5 +190,12 @@
             "d_course_moo_moo_farm_packed_dl_CB0",
             "d_course_moo_moo_farm_packed_dl_F20"
         ]
+    },
+    {
+        "file":"courses/moo_moo_farm/course_data.c",
+        "out_dir": "tracks/moo_moo_farm/preview",
+        "models": [
+            "d_course_moo_moo_farm_dl_14088"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/rainbow_road/models.json b/models/tracks/rainbow_road.json
similarity index 87%
rename from models/rainbow_road/models.json
rename to models/tracks/rainbow_road.json
index 1f45bc295..2f21483bd 100644
--- a/models/rainbow_road/models.json
+++ b/models/tracks/rainbow_road.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/rainbow_road/course_data.c",
-        "out_dir": "rainbow_road/objects",
+        "out_dir": "tracks/rainbow_road/objects",
         "models": [
             "d_course_rainbow_road_dl_151A8",
             "d_course_rainbow_road_dl_15550",
@@ -12,7 +12,7 @@
     },
     {
         "file": "courses/rainbow_road/course_data.c",
-        "out_dir": "rainbow_road/sections",
+        "out_dir": "tracks/rainbow_road/sections",
         "models": [
             "d_course_rainbow_road_dl_D8", "d_course_rainbow_road_dl_210",
             "d_course_rainbow_road_dl_178", "d_course_rainbow_road_dl_288",
@@ -41,8 +41,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/rainbow_road/course_displaylists.inc.c",
+        "out_dir": "tracks/rainbow_road/collision_sections",
         "models": [
             "d_course_rainbow_road_packed_dl_20C0",
             "d_course_rainbow_road_packed_dl_1850",
@@ -59,5 +59,12 @@
             "d_course_rainbow_road_packed_dl_1A20",
             "d_course_rainbow_road_packed_dl_1318"
         ]
+    },
+    {
+        "file":"courses/rainbow_road/course_data.c",
+        "out_dir": "tracks/rainbow_road/preview",
+        "models": [
+            "d_course_rainbow_road_dl_16220"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/royal_raceway/models.json b/models/tracks/royal_raceway.json
similarity index 96%
rename from models/royal_raceway/models.json
rename to models/tracks/royal_raceway.json
index 1f44be798..df5d25032 100644
--- a/models/royal_raceway/models.json
+++ b/models/tracks/royal_raceway.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/royal_raceway/course_data.c",
-        "out_dir": "royal_raceway/objects",
+        "out_dir": "tracks/royal_raceway/objects",
         "models": [
             "d_course_royal_raceway_dl_tree",
             "d_course_royal_raceway_dl_castle_tree",
@@ -10,7 +10,7 @@
     },
     {
         "file": "courses/royal_raceway/course_data.c",
-        "out_dir": "royal_raceway/sections",
+        "out_dir": "tracks/royal_raceway/sections",
         "models": [
             "d_course_royal_raceway_dl_0",
             "d_course_royal_raceway_dl_360",
@@ -147,8 +147,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/royal_raceway/course_displaylists.inc.c",
+        "out_dir": "tracks/royal_raceway/collision_sections",
         "models": [
             "d_course_royal_raceway_packed_dl_650",
             "d_course_royal_raceway_packed_dl_1FE8",
@@ -269,5 +269,12 @@
             "d_course_royal_raceway_packed_dl_C38",
             "d_course_royal_raceway_packed_dl_A618"
         ]
+    },
+    {
+        "file":"courses/royal_raceway/course_data.c",
+        "out_dir": "tracks/royal_raceway/preview",
+        "models": [
+            "d_course_royal_raceway_dl_D8E8"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/sherbet_land/models.json b/models/tracks/sherbet_land.json
similarity index 94%
rename from models/sherbet_land/models.json
rename to models/tracks/sherbet_land.json
index 54e950d90..2b9cdedbc 100644
--- a/models/sherbet_land/models.json
+++ b/models/tracks/sherbet_land.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/sherbet_land/course_data.c",
-        "out_dir": "sherbet_land/objects",
+        "out_dir": "tracks/sherbet_land/objects",
         "models": [
             "d_course_sherbet_land_dl_ice_block",
             "d_course_sherbet_land_dl_8E00"
@@ -9,7 +9,7 @@
     },
     {
         "file": "courses/sherbet_land/course_data.c",
-        "out_dir": "sherbet_land/sections/list1",
+        "out_dir": "tracks/sherbet_land/sections/list1",
         "models": [
             "d_course_sherbet_land_dl_0",
             "d_course_sherbet_land_dl_158",
@@ -87,7 +87,7 @@
     },
     {
         "file": "courses/sherbet_land/course_data.c",
-        "out_dir": "sherbet_land/sections/list2",
+        "out_dir": "tracks/sherbet_land/sections/list2",
         "models": [
             "d_course_sherbet_land_dl_26D0",
             "d_course_sherbet_land_dl_28A0",
@@ -164,8 +164,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/sherbet_land/course_displaylists.inc.c",
+        "out_dir": "tracks/sherbet_land/collision_sections",
         "models": [
             "d_course_sherbet_land_packed_dl_1B20",
             "d_course_sherbet_land_packed_dl_1A98",
@@ -191,5 +191,12 @@
             "d_course_sherbet_land_packed_dl_2738",
             "d_course_sherbet_land_packed_dl_2798"
         ]
+    },
+    {
+        "file":"courses/sherbet_land/course_data.c",
+        "out_dir": "tracks/sherbet_land/preview",
+        "models": [
+            "d_course_sherbet_land_dl_9AE8"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/toads_turnpike/models.json b/models/tracks/toads_turnpike.json
similarity index 93%
rename from models/toads_turnpike/models.json
rename to models/tracks/toads_turnpike.json
index 1201cdffb..3e33c3e3b 100644
--- a/models/toads_turnpike/models.json
+++ b/models/tracks/toads_turnpike.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/toads_turnpike/course_data.c",
-        "out_dir": "toads_turnpike/objects",
+        "out_dir": "tracks/toads_turnpike/objects",
         "models": [
             "d_course_toads_turnpike_dl_19020",
             "d_course_toads_turnpike_dl_19518",
@@ -34,7 +34,7 @@
     },
     {
         "file": "courses/toads_turnpike/course_data.c",
-        "out_dir": "toads_turnpike/sections",
+        "out_dir": "tracks/toads_turnpike/sections",
         "models": [
             "d_course_toads_turnpike_dl_80", "d_course_toads_turnpike_dl_1F8",
             "d_course_toads_turnpike_dl_158", "d_course_toads_turnpike_dl_2D0",
@@ -79,8 +79,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/toads_turnpike/course_displaylists.inc.c",
+        "out_dir": "tracks/toads_turnpike/collision_sections",
         "models": [
             "d_course_toads_turnpike_packed_dl_32A0",
             "d_course_toads_turnpike_packed_dl_33A8",
@@ -105,5 +105,12 @@
             "d_course_toads_turnpike_packed_dl_FA8",
             "d_course_toads_turnpike_packed_dl_51C8"
         ]
+    },
+    {
+        "file":"courses/toads_turnpike/course_data.c",
+        "out_dir": "tracks/toads_turnpike/preview",
+        "models": [
+            "d_course_toads_turnpike_dl_23930"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/wario_stadium/models.json b/models/tracks/wario_stadium.json
similarity index 94%
rename from models/wario_stadium/models.json
rename to models/tracks/wario_stadium.json
index fea7be028..724d2f96b 100644
--- a/models/wario_stadium/models.json
+++ b/models/tracks/wario_stadium.json
@@ -1,14 +1,14 @@
 [
     {
         "file": "courses/wario_stadium/course_data.c",
-        "out_dir": "wario_stadium/objects",
+        "out_dir": "tracks/wario_stadium/objects",
         "models": [
             "d_course_wario_stadium_dl_sign"
         ]
     },
     {
         "file": "courses/wario_stadium/course_data.c",
-        "out_dir": "wario_stadium/sections",
+        "out_dir": "tracks/wario_stadium/sections",
         "models":[
             "d_course_wario_stadium_dl_0",
             "d_course_wario_stadium_dl_158",
@@ -121,8 +121,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/wario_stadium/course_displaylists.inc.c",
+        "out_dir": "tracks/wario_stadium/collision_sections",
         "models": [
             "d_course_wario_stadium_packed_dl_8D28",
             "d_course_wario_stadium_packed_dl_8DE8",
@@ -156,5 +156,12 @@
             "d_course_wario_stadium_packed_dl_5D90",
             "d_course_wario_stadium_packed_dl_9F18"
         ]
+    },
+    {
+        "file":"courses/wario_stadium/course_data.c",
+        "out_dir": "tracks/wario_stadium/preview",
+        "models": [
+            "d_course_wario_stadium_dl_CA78"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/models/yoshi_valley/models.json b/models/tracks/yoshi_valley.json
similarity index 95%
rename from models/yoshi_valley/models.json
rename to models/tracks/yoshi_valley.json
index 40a375b7c..f712e1825 100644
--- a/models/yoshi_valley/models.json
+++ b/models/tracks/yoshi_valley.json
@@ -1,7 +1,7 @@
 [
     {
         "file": "courses/yoshi_valley/course_data.c",
-        "out_dir": "yoshi_valley/objects",
+        "out_dir": "tracks/yoshi_valley/objects",
         "models": [
             "d_course_yoshi_valley_dl_142C0",
             "d_course_yoshi_valley_dl_143C8",
@@ -16,7 +16,7 @@
     },
     {
         "file": "courses/yoshi_valley/course_data.c",
-        "out_dir": "yoshi_valley/sections",
+        "out_dir": "tracks/yoshi_valley/sections",
         "models": [
             "d_course_yoshi_valley_dl_40", "d_course_yoshi_valley_dl_3F0",
             "d_course_yoshi_valley_dl_290", "d_course_yoshi_valley_dl_4E8",
@@ -83,8 +83,8 @@
         ]
     },
     {
-        "file":"courses/banshee_boardwalk/course_displaylists.inc.c",
-        "out_dir": "banshee_boardwalk/collision_sections",
+        "file":"courses/yoshi_valley/course_displaylists.inc.c",
+        "out_dir": "tracks/yoshi_valley/collision_sections",
         "models": [
             "d_course_yoshi_valley_packed_dl_44C8",
             "d_course_yoshi_valley_packed_dl_4588",
@@ -140,5 +140,12 @@
             "d_course_yoshi_valley_packed_dl_13D8",
             "d_course_yoshi_valley_packed_dl_D20"
         ]
+    },
+    {
+        "file":"courses/yoshi_valley/course_data.c",
+        "out_dir": "tracks/yoshi_valley/preview",
+        "models": [
+            "d_course_yoshi_valley_dl_18020"
+        ]
     }
 ]
\ No newline at end of file