diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc
index 79d4f418e..bdf58885a 100644
--- a/decompiler/config/all-types.gc
+++ b/decompiler/config/all-types.gc
@@ -22122,7 +22122,7 @@
 (define-extern anim-test-obj-remove-invalid (function anim-test-obj symbol))
 (define-extern anim-tester-post (function none :behavior anim-tester))
 (define-extern anim-tester-string-get-frame!! (function list-field string symbol))
-(define-extern anim-tester-load-object-seqs (function symbol))
+(define-extern anim-tester-load-object-seqs (function anim-tester string symbol))
 (define-extern anim-tester-add-object (function string none))
 (define-extern anim-tester-set-name (function string object))
 (define-extern anim-tester-add-sequence (function string none))
@@ -33808,7 +33808,7 @@
 ;; - Unknowns
 
 (define-extern *lavayellowtarp-sg* skeleton-group)
-(define-extern ripple-for-lavatube-lava ripple-wave-set) ;; unknown type
+(define-extern ripple-for-lavatube-lava ripple-wave-set)
 (define-extern *lavaballoon-sg* skeleton-group)
 (define-extern *chainmine-sg* skeleton-group)
 (define-extern *lavafallsewerb-sg* skeleton-group)
@@ -34055,35 +34055,15 @@
 
 ;; - Types
 
-; (deftype lava (water-anim)
-;   ()
-;   :method-count-assert 28
-;   :size-assert         #xd0
-;   :heap-base           #x60
-;   :flag-assert         #x1c006000d0
-;   ;;  not enough basic ops
-;   (:methods
-;     (dummy-9 () none 9)
-;     (dummy-10 () none 10)
-;     (dummy-11 () none 11)
-;     (dummy-12 () none 12)
-;     (dummy-13 () none 13)
-;     (dummy-14 () none 14)
-;     (dummy-15 () none 15)
-;     (dummy-16 () none 16)
-;     (dummy-17 () none 17)
-;     (dummy-18 () none 18)
-;     (dummy-19 () none 19)
-;     (dummy-20 () none 20)
-;     (dummy-21 () none 21)
-;     (dummy-22 () none 22)
-;     (dummy-23 () none 23)
-;     (dummy-24 () none 24)
-;     (dummy-25 () none 25)
-;     (dummy-26 () none 26)
-;     (dummy-27 () none 27)
-;     )
+(deftype lava (water-anim)
+  ()
+  ;:method-count-assert 28
+  ;:size-assert         #xd0
+  ;:heap-base           #x60
+  ;:flag-assert         #x1c006000d0
+  )
 
+(define-extern ripple-for-lava ripple-wave-set)
 
 ;; cavegeyserrock
 
diff --git a/game/kernel/fileio.cpp b/game/kernel/fileio.cpp
index ff2261879..6070d2255 100644
--- a/game/kernel/fileio.cpp
+++ b/game/kernel/fileio.cpp
@@ -275,11 +275,13 @@ char* DecodeFileName(const char* name) {
  * @param new_string: if true, allocate a new global string for file name.
  *  will otherwise use a static buffer.
  * DONE, Had unused int, char*, and MakeFileNameInfo params.
+ * PC PORT NOTE : Changed some paths so that they work for us (namely, got rid of 'host')
  */
 char* MakeFileName(int type, const char* name, int new_string) {
   using namespace versions;
   // start with network filesystem
-  kstrcpy(buffer_633, "host:");
+  // kstrcpy(buffer_633, "host:");
+  kstrcpy(buffer_633, "");
   char* buf = strend(buffer_633);
 
   // prefix to build directory
@@ -308,11 +310,13 @@ char* MakeFileName(int type, const char* name, int new_string) {
   } else if (type == DATA_FILE_TYPE) {
     // GOAL object file, but containing data instead of code.
     // likely packed by a tool that isn't the GOAL compiler.
-    sprintf(buf, "%sdata/%s.go", prefix, name);
+    // sprintf(buf, "%sdata/%s.go", prefix, name);
+    sprintf(buf, "%sout/obj/%s.go", prefix, name);
   } else if (type == TX_PAGE_FILE_TYPE) {
     // Texture Page
     // part of level files, so it has a version number.
-    sprintf(buf, "%sdata/texture-page%d/%s.go", prefix, TX_PAGE_VERSION, name);
+    // sprintf(buf, "%sdata/texture-page%d/%s.go", prefix, TX_PAGE_VERSION, name);
+    sprintf(buf, "%sout/obj/%s.go", prefix, name);
   } else if (type == JA_FILE_TYPE) {
     // Art JA (joint animation? no idea)
     // part of level files, so it has a version number
diff --git a/game/kernel/klink.cpp b/game/kernel/klink.cpp
index fe4b307ac..6094a2d59 100644
--- a/game/kernel/klink.cpp
+++ b/game/kernel/klink.cpp
@@ -580,9 +580,6 @@ uint32_t link_control::work_v2() {
     if (m_segment_process == 0) {
       m_heap_gap =
           m_object_data - m_heap->current;  // distance between end of heap and start of object
-      if (m_object_data.offset < m_heap->current.offset) {
-        ASSERT(false);
-      }
     }
 
     if (m_heap_gap <
diff --git a/game/kernel/kscheme.cpp b/game/kernel/kscheme.cpp
index 4dc4fc1b4..a8b0b8319 100644
--- a/game/kernel/kscheme.cpp
+++ b/game/kernel/kscheme.cpp
@@ -2101,6 +2101,7 @@ u64 loadc(const char* file_name, kheapinfo* heap, u32 flags) {
 /*!
  * Load Object? Uses DATA_FILE_TYPE and doesn't inform listener about the load, or execute a
  * top level segment if a V3 is loaded. Doesn't load off the CD.
+ * This is used in some debug code to load art-groups directly.
  */
 u64 loado(u32 file_name_in, u32 heap_in) {
   char loadName[272];
diff --git a/game/runtime.cpp b/game/runtime.cpp
index e7d87be7d..f8f6a6cf3 100644
--- a/game/runtime.cpp
+++ b/game/runtime.cpp
@@ -55,6 +55,7 @@
 
 #include "common/goal_constants.h"
 #include "common/cross_os_debug/xdbg.h"
+#include "common/util/FileUtil.h"
 
 u8* g_ee_main_mem = nullptr;
 std::thread::id g_main_thread_id = std::thread::id();
@@ -277,6 +278,8 @@ u32 exec_runtime(int argc, char** argv) {
   g_argv = argv;
   g_main_thread_id = std::this_thread::get_id();
 
+  file_util::create_dir_if_needed("game_config/");
+
   // parse opengoal arguments
   bool enable_display = true;
   for (int i = 1; i < argc; i++) {
diff --git a/goal_src/build/all_files.gc b/goal_src/build/all_files.gc
index 225d10202..9d71ad2d4 100644
--- a/goal_src/build/all_files.gc
+++ b/goal_src/build/all_files.gc
@@ -348,8 +348,8 @@
     "goal_src/levels/citadel/citadel-sages.gc"
     "goal_src/levels/snow/snow-bunny.gc"
     "goal_src/levels/citadel/citb-bunny.gc"
-    "goal_src/levels/citadel/citb-drop-plat-CIT.gc"
-    "goal_src/levels/l1_only/citb-drop-plat-L1.gc"
+    "goal_src/levels/citadel/citb-drop-plat.gc"
+    "goal_src/old/citb-drop-plat-OLD.gc"
     "goal_src/levels/citadel/assistant-citadel.gc"
     "goal_src/levels/demo/demo-obs.gc"
     "goal_src/levels/demo/static-screen.gc"
@@ -362,8 +362,8 @@
     "goal_src/levels/finalboss/green-eco-lurker.gc"
     "goal_src/levels/finalboss/robotboss.gc"
     "goal_src/levels/finalboss/final-door.gc"
-    "goal_src/levels/finalboss/sage-finalboss-FIN.gc"
-    "goal_src/levels/l1_only/sage-finalboss-L1.gc"
+    "goal_src/levels/finalboss/sage-finalboss.gc"
+    "goal_src/old/sage-finalboss-OLD.gc"
     "goal_src/levels/intro/evilbro.gc"
     "goal_src/levels/jungleb/jungleb-obs.gc"
     "goal_src/levels/jungleb/plat-flip.gc"
@@ -377,18 +377,18 @@
     "goal_src/levels/jungle/jungle-obs.gc"
     "goal_src/levels/jungle/jungle-mirrors.gc"
     "goal_src/levels/jungle/junglefish.gc"
-    "goal_src/levels/jungle/fisher-JUN.gc"
-    "goal_src/levels/jungle/fisher-JUNGLE-L1.gc"
+    "goal_src/levels/jungle/fisher.gc"
+    "goal_src/old/fisher-OLD.gc"
     "goal_src/levels/jungle/jungle-part.gc"
     "goal_src/levels/common/launcherdoor.gc"
-    "goal_src/levels/l1_only/target-racer-h-L1-RACERP.gc"
-    "goal_src/levels/racer_common/target-racer-h-FIC-LAV-MIS-OGR-ROL.gc"
+    "goal_src/old/target-racer-h-OLD.gc"
+    "goal_src/levels/racer_common/target-racer-h.gc"
     "goal_src/levels/racer_common/racer-part.gc"
     "goal_src/levels/racer_common/racer.gc"
-    "goal_src/levels/l1_only/target-racer-L1-RACERP.gc"
-    "goal_src/levels/racer_common/target-racer-FIC-LAV-MIS-OGR-ROL.gc"
-    "goal_src/levels/l1_only/racer-states-L1-RACERP.gc"
-    "goal_src/levels/racer_common/racer-states-FIC-LAV-MIS-OGR-ROL.gc"
+    "goal_src/old/target-racer-OLD.gc"
+    "goal_src/levels/racer_common/target-racer.gc"
+    "goal_src/old/racer-states-OLD.gc"
+    "goal_src/levels/racer_common/racer-states.gc"
     "goal_src/levels/racer_common/collide-reaction-racer.gc"
     "goal_src/levels/common/blocking-plane.gc"
     "goal_src/levels/flut_common/flut-part.gc"
@@ -399,8 +399,8 @@
     "goal_src/levels/village1/assistant.gc"
     "goal_src/levels/village1/sage.gc"
     "goal_src/levels/village1/yakow.gc"
-    "goal_src/levels/l1_only/village-obs-L1.gc"
-    "goal_src/levels/village1/village-obs-VI1.gc"
+    "goal_src/old/village-obs-OLD.gc"
+    "goal_src/levels/village1/village-obs.gc"
     "goal_src/levels/village1/fishermans-boat.gc"
     "goal_src/levels/village1/village1-part.gc"
     "goal_src/levels/village1/village1-part2.gc"
diff --git a/goal_src/build/all_objs.json b/goal_src/build/all_objs.json
index 222d16836..60b967081 100644
--- a/goal_src/build/all_objs.json
+++ b/goal_src/build/all_objs.json
@@ -392,8 +392,8 @@
 ["citadel-sages",                         "citadel-sages",               3, ["CIT", "L1"], "levels/citadel"],
 ["snow-bunny",                            "snow-bunny",                  3, ["CIT", "L1", "SNO"], "levels/snow"],
 ["citb-bunny",                            "citb-bunny",                  3, ["CIT", "L1"], "levels/citadel"],
-["citb-drop-plat-CIT",                    "citb-drop-plat",              3, ["CIT"], "levels/citadel"],
-["citb-drop-plat-L1",                     "citb-drop-plat",              3, ["L1"], "levels/l1_only"],
+["citb-drop-plat",                        "citb-drop-plat",              3, ["CIT"], "levels/citadel"],
+["citb-drop-plat-OLD",                    "citb-drop-plat",              3, ["L1"], "old"],
 ["assistant-citadel",                     "assistant-citadel",           3, ["CIT", "L1"], "levels/citadel"],
 ["tpage-1415",                            "tpage-1415",                  4, ["CIT"], "levels/citadel"],
 ["tpage-1417",                            "tpage-1417",                  4, ["CIT"], "levels/citadel"],
@@ -474,8 +474,8 @@
 ["green-eco-lurker",                      "green-eco-lurker",            3, ["FIN", "L1"], "levels/finalboss"],
 ["robotboss",                             "robotboss",                   3, ["FIN", "L1"], "levels/finalboss"],
 ["final-door",                            "final-door",                  3, ["FIN", "L1"], "levels/finalboss"],
-["sage-finalboss-FIN",                    "sage-finalboss",              3, ["FIN"], "levels/finalboss"],
-["sage-finalboss-L1",                     "sage-finalboss",              3, ["L1"], "levels/l1_only"],
+["sage-finalboss",                        "sage-finalboss",              3, ["FIN"], "levels/finalboss"],
+["sage-finalboss-OLD",                    "sage-finalboss",              3, ["L1"], "old"],
 ["tpage-1419",                            "tpage-1419",                  4, ["FIN"], "levels/finalboss"],
 ["tpage-1420",                            "tpage-1420",                  4, ["FIN"], "levels/finalboss"],
 ["tpage-634",                             "tpage-634",                   4, ["FIN"], "levels/finalboss"],
@@ -535,8 +535,8 @@
 ["jungle-obs",                            "jungle-obs",                  3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
 ["jungle-mirrors",                        "jungle-mirrors",              3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
 ["junglefish",                            "junglefish",                  3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
-["fisher-JUN",                            "fisher",                      3, ["JUN"], "levels/jungle"],
-["fisher-JUNGLE-L1",                      "fisher",                      3, ["JUNGLE", "L1"], "levels/jungle"],
+["fisher",                                "fisher",                      3, ["JUN"], "levels/jungle"],
+["fisher-OLD",                            "fisher",                      3, ["JUNGLE", "L1"], "old"],
 ["jungle-part",                           "jungle-part",                 3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
 ["launcherdoor",                          "launcherdoor",                3, ["JUN", "JUNGLE", "L1", "MAI", "MAINCAVE", "SUN", "SUNKEN"], "levels/common"],
 ["tpage-385",                             "tpage-385",                   4, ["JUN"], "levels/jungle"],
@@ -572,14 +572,14 @@
 ["towertop-ag",                           "towertop",                    4, ["JUN"], "levels/jungle"],
 ["water-anim-jungle-ag",                  "water-anim-jungle",           4, ["JUN"], "levels/jungle"],
 ["jungle-vis",                            "jungle-vis",                  4, ["JUN"], "levels/jungle"],
-["target-racer-h-L1-RACERP",              "target-racer-h",              3, ["L1", "RACERP"], "levels/l1_only"],
-["target-racer-h-FIC-LAV-MIS-OGR-ROL",    "target-racer-h",              3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
+["target-racer-h-OLD",                    "target-racer-h",              3, ["L1", "RACERP"], "old"],
+["target-racer-h",                        "target-racer-h",              3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
 ["racer-part",                            "racer-part",                  3, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
 ["racer",                                 "racer",                       3, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
-["target-racer-L1-RACERP",                "target-racer",                3, ["L1", "RACERP"], "levels/l1_only"],
-["target-racer-FIC-LAV-MIS-OGR-ROL",      "target-racer",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
-["racer-states-L1-RACERP",                "racer-states",                3, ["L1", "RACERP"], "levels/l1_only"],
-["racer-states-FIC-LAV-MIS-OGR-ROL",      "racer-states",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
+["target-racer-OLD",                      "target-racer",                3, ["L1", "RACERP"], "old"],
+["target-racer",                          "target-racer",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
+["racer-states-OLD",                      "racer-states",                3, ["L1", "RACERP"], "old"],
+["racer-states",                          "racer-states",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
 ["collide-reaction-racer",                "collide-reaction-racer",      3, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
 ["eichar-racer+0-ag",                     "eichar-racer+0",              4, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
 ["tpage-1119",                            "tpage-1119",                  4, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
@@ -593,8 +593,8 @@
 ["assistant",                             "assistant",                   3, ["L1", "VI1"], "levels/village1"],
 ["sage",                                  "sage",                        3, ["L1", "VI1"], "levels/village1"],
 ["yakow",                                 "yakow",                       3, ["L1", "VI1"], "levels/village1"],
-["village-obs-L1",                        "village-obs",                 3, ["L1"], "levels/l1_only"],
-["village-obs-VI1",                       "village-obs",                 3, ["VI1"], "levels/village1"],
+["village-obs-OLD",                       "village-obs",                 3, ["L1"], "old"],
+["village-obs",                           "village-obs",                 3, ["VI1"], "levels/village1"],
 ["fishermans-boat",                       "fishermans-boat",             3, ["L1", "VI1"], "levels/village1"],
 ["village1-part",                         "village1-part",               3, ["L1", "VI1"], "levels/village1"],
 ["village1-part2",                        "village1-part2",              3, ["L1", "VI1"], "levels/village1"],
diff --git a/goal_src/build/game_dgos.gc b/goal_src/build/game_dgos.gc
index 7d2e4a60d..27199a058 100644
--- a/goal_src/build/game_dgos.gc
+++ b/goal_src/build/game_dgos.gc
@@ -103,7 +103,7 @@
   ("citadel-sages.o" "citadel-sages")
   ("snow-bunny.o" "snow-bunny")
   ("citb-bunny.o" "citb-bunny")
-  ("citb-drop-plat-CIT.o" "citb-drop-plat")
+  ("citb-drop-plat.o" "citb-drop-plat")
   ("assistant-citadel.o" "assistant-citadel")
   ("tpage-1415.go" "tpage-1415")
   ("tpage-1417.go" "tpage-1417")
@@ -506,11 +506,11 @@
   )
 
 ("FIC.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -543,7 +543,7 @@
   ("green-eco-lurker.o" "green-eco-lurker")
   ("robotboss.o" "robotboss")
   ("final-door.o" "final-door")
-  ("sage-finalboss-FIN.o" "sage-finalboss")
+  ("sage-finalboss.o" "sage-finalboss")
   ("tpage-1419.go" "tpage-1419")
   ("tpage-1420.go" "tpage-1420")
   ("tpage-634.go" "tpage-634")
@@ -948,7 +948,7 @@
   ("jungle-obs.o" "jungle-obs")
   ("jungle-mirrors.o" "jungle-mirrors")
   ("junglefish.o" "junglefish")
-  ("fisher-JUN.o" "fisher")
+  ("fisher.o" "fisher")
   ("jungle-part.o" "jungle-part")
   ("launcherdoor.o" "launcherdoor")
   ("tpage-385.go" "tpage-385")
@@ -1001,7 +1001,7 @@
   ("jungle-obs.o" "jungle-obs")
   ("jungle-mirrors.o" "jungle-mirrors")
   ("junglefish.o" "junglefish")
-  ("fisher-JUNGLE-L1.o" "fisher")
+  ("fisher-OLD.o" "fisher")
   ("jungle-part.o" "jungle-part")
   ("launcherdoor.o" "launcherdoor")
   )
@@ -1027,11 +1027,11 @@
   ("ticky.o" "ticky")
   ("villagep-obs.o" "villagep-obs")
   ("oracle.o" "oracle")
-  ("target-racer-h-L1-RACERP.o" "target-racer-h")
+  ("target-racer-h-OLD.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-L1-RACERP.o" "target-racer")
-  ("racer-states-L1-RACERP.o" "racer-states")
+  ("target-racer-OLD.o" "target-racer")
+  ("racer-states-OLD.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -1048,7 +1048,7 @@
   ("assistant.o" "assistant")
   ("sage.o" "sage")
   ("yakow.o" "yakow")
-  ("village-obs-L1.o" "village-obs")
+  ("village-obs-OLD.o" "village-obs")
   ("fishermans-boat.o" "fishermans-boat")
   ("village1-part.o" "village1-part")
   ("village1-part2.o" "village1-part2")
@@ -1080,7 +1080,7 @@
   ("jungle-obs.o" "jungle-obs")
   ("jungle-mirrors.o" "jungle-mirrors")
   ("junglefish.o" "junglefish")
-  ("fisher-JUNGLE-L1.o" "fisher")
+  ("fisher-OLD.o" "fisher")
   ("jungle-part.o" "jungle-part")
   ("jungleb-obs.o" "jungleb-obs")
   ("plat-flip.o" "plat-flip")
@@ -1139,7 +1139,7 @@
   ("green-eco-lurker.o" "green-eco-lurker")
   ("robotboss.o" "robotboss")
   ("final-door.o" "final-door")
-  ("sage-finalboss-L1.o" "sage-finalboss")
+  ("sage-finalboss-OLD.o" "sage-finalboss")
   ("sunken-part.o" "sunken-part")
   ("sunken-part2.o" "sunken-part2")
   ("sunken-part3.o" "sunken-part3")
@@ -1210,7 +1210,7 @@
   ("citadel-sages.o" "citadel-sages")
   ("snow-bunny.o" "snow-bunny")
   ("citb-bunny.o" "citb-bunny")
-  ("citb-drop-plat-L1.o" "citb-drop-plat")
+  ("citb-drop-plat-OLD.o" "citb-drop-plat")
   ("assistant-citadel.o" "assistant-citadel")
   ("demo-obs.o" "demo-obs")
   ("tpage-1485.go" "tpage-1485")
@@ -1230,11 +1230,11 @@
   )
 
 ("LAV.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -1322,11 +1322,11 @@
   )
 
 ("MIS.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -1384,11 +1384,11 @@
   )
 
 ("OGR.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -1422,11 +1422,11 @@
   )
 
 ("RACERP.CGO"
-  ("target-racer-h-L1-RACERP.o" "target-racer-h")
+  ("target-racer-h-OLD.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-L1-RACERP.o" "target-racer")
-  ("racer-states-L1-RACERP.o" "racer-states")
+  ("target-racer-OLD.o" "target-racer")
+  ("racer-states-OLD.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -1459,11 +1459,11 @@
   )
 
 ("ROL.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
@@ -1752,7 +1752,7 @@
   ("assistant.o" "assistant")
   ("sage.o" "sage")
   ("yakow.o" "yakow")
-  ("village-obs-VI1.o" "village-obs")
+  ("village-obs.o" "village-obs")
   ("fishermans-boat.o" "fishermans-boat")
   ("village1-part.o" "village1-part")
   ("village1-part2.o" "village1-part2")
diff --git a/goal_src/dgos/cit.gd b/goal_src/dgos/cit.gd
index ca51c41e7..56f8a358f 100644
--- a/goal_src/dgos/cit.gd
+++ b/goal_src/dgos/cit.gd
@@ -9,7 +9,7 @@
   ("citadel-sages.o" "citadel-sages")
   ("snow-bunny.o" "snow-bunny")
   ("citb-bunny.o" "citb-bunny")
-  ("citb-drop-plat-CIT.o" "citb-drop-plat")
+  ("citb-drop-plat.o" "citb-drop-plat")
   ("assistant-citadel.o" "assistant-citadel")
   ("tpage-1415.go" "tpage-1415")
   ("tpage-1417.go" "tpage-1417")
diff --git a/goal_src/dgos/fic.gd b/goal_src/dgos/fic.gd
index 7f04d451c..5d278239d 100644
--- a/goal_src/dgos/fic.gd
+++ b/goal_src/dgos/fic.gd
@@ -1,10 +1,10 @@
 
 ("FIC.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
diff --git a/goal_src/dgos/fin.gd b/goal_src/dgos/fin.gd
index a9154c709..6d1e928f2 100644
--- a/goal_src/dgos/fin.gd
+++ b/goal_src/dgos/fin.gd
@@ -9,7 +9,7 @@
   ("green-eco-lurker.o" "green-eco-lurker")
   ("robotboss.o" "robotboss")
   ("final-door.o" "final-door")
-  ("sage-finalboss-FIN.o" "sage-finalboss")
+  ("sage-finalboss.o" "sage-finalboss")
   ("tpage-1419.go" "tpage-1419")
   ("tpage-1420.go" "tpage-1420")
   ("tpage-634.go" "tpage-634")
diff --git a/goal_src/dgos/jun.gd b/goal_src/dgos/jun.gd
index f72904894..6f6592a49 100644
--- a/goal_src/dgos/jun.gd
+++ b/goal_src/dgos/jun.gd
@@ -8,7 +8,7 @@
   ("jungle-obs.o" "jungle-obs")
   ("jungle-mirrors.o" "jungle-mirrors")
   ("junglefish.o" "junglefish")
-  ("fisher-JUN.o" "fisher")
+  ("fisher.o" "fisher")
   ("jungle-part.o" "jungle-part")
   ("launcherdoor.o" "launcherdoor")
   ("tpage-385.go" "tpage-385")
diff --git a/goal_src/dgos/lav.gd b/goal_src/dgos/lav.gd
index 0f17ee024..37da6c55c 100644
--- a/goal_src/dgos/lav.gd
+++ b/goal_src/dgos/lav.gd
@@ -1,10 +1,10 @@
 
 ("LAV.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
diff --git a/goal_src/dgos/mis.gd b/goal_src/dgos/mis.gd
index 8d2e1a798..eaacd5f08 100644
--- a/goal_src/dgos/mis.gd
+++ b/goal_src/dgos/mis.gd
@@ -1,10 +1,10 @@
 
 ("MIS.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
diff --git a/goal_src/dgos/ogr.gd b/goal_src/dgos/ogr.gd
index 9ef62fdf4..c73682949 100644
--- a/goal_src/dgos/ogr.gd
+++ b/goal_src/dgos/ogr.gd
@@ -1,10 +1,10 @@
 
 ("OGR.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
diff --git a/goal_src/dgos/rol.gd b/goal_src/dgos/rol.gd
index 5f8989b8a..6c153961d 100644
--- a/goal_src/dgos/rol.gd
+++ b/goal_src/dgos/rol.gd
@@ -1,10 +1,10 @@
 
 ("ROL.DGO"
-  ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h")
+  ("target-racer-h.o" "target-racer-h")
   ("racer-part.o" "racer-part")
   ("racer.o" "racer")
-  ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer")
-  ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states")
+  ("target-racer.o" "target-racer")
+  ("racer-states.o" "racer-states")
   ("collide-reaction-racer.o" "collide-reaction-racer")
   ("eichar-racer+0-ag.go" "eichar-racer+0")
   ("tpage-1119.go" "tpage-1119")
diff --git a/goal_src/dgos/vi1.gd b/goal_src/dgos/vi1.gd
index 36a440b90..a54ee031a 100644
--- a/goal_src/dgos/vi1.gd
+++ b/goal_src/dgos/vi1.gd
@@ -6,7 +6,7 @@
   ("assistant.o" "assistant")
   ("sage.o" "sage")
   ("yakow.o" "yakow")
-  ("village-obs-VI1.o" "village-obs")
+  ("village-obs.o" "village-obs")
   ("fishermans-boat.o" "fishermans-boat")
   ("village1-part.o" "village1-part")
   ("village1-part2.o" "village1-part2")
diff --git a/goal_src/engine/debug/anim-tester.gc b/goal_src/engine/debug/anim-tester.gc
index b9da3d649..1734d48e8 100644
--- a/goal_src/engine/debug/anim-tester.gc
+++ b/goal_src/engine/debug/anim-tester.gc
@@ -8,8 +8,6 @@
 ;; NOTES - removed one of the 2 inspects
 ;; - also fixed up a basic file-stream constructor on the stack
 
-(declare-file (debug))
-
 (declare-type list-control structure)
 (define-extern anim-test-anim-list-handler (function int list-control symbol))
 (define-extern anim-test-edit-sequence-list-handler (function int list-control symbol))
@@ -749,6 +747,10 @@
        )
       (else
         (let ((v1-1 (the-as anim-test-obj (glst-find-node-by-name (-> self obj-list) (-> self current-obj)))))
+          ;; NOTE : added this if, sometimes the value is -1 which just crashes the game after here. nice work!
+          (if (< (-> self list-con current-index) 0)
+              (set! (-> self list-con current-index) 0))
+
           (when (not v1-1)
             (if (>= (-> self list-con current-index) (glst-num-elements (-> self obj-list)))
                 (set! (-> self list-con current-index) (+ (glst-num-elements (-> self obj-list)) -1))
@@ -803,6 +805,8 @@
   )
 
 (defun anim-tester-disp-frame-num ((arg0 string) (arg1 float) (arg2 float) (arg3 font-context))
+  ;; this function does not work
+  (return (the pointer #f))
   (local-vars (sv-16 (function _varargs_ object)))
   (let* ((s3-0 (-> *display* frames (-> *display* on-screen) frame debug-buf))
          (gp-0 (-> s3-0 base))
@@ -2492,7 +2496,7 @@
     )
   )
 
-(defun anim-tester-load-object-seqs ()
+(defun anim-tester-load-object-seqs ((arg0 anim-tester) (arg1 string))
   #f
   )
 
@@ -2602,10 +2606,7 @@
            (if s0-0
                (anim-test-obj-remove-invalid s2-0)
                )
-           (let ((t9-1 anim-tester-load-object-seqs))
-             (-> sv-96 name)
-             (t9-1)
-             )
+           (anim-tester-load-object-seqs arg0 (-> sv-96 name))
            (set! s2-0 (the-as anim-test-obj (glst-find-node-by-name (-> arg0 obj-list) (-> sv-96 name))))
            (set! s0-0 (if s2-0
                           #t
diff --git a/goal_src/engine/game/collectables.gc b/goal_src/engine/game/collectables.gc
index 19f2a9098..9f3013514 100644
--- a/goal_src/engine/game/collectables.gc
+++ b/goal_src/engine/game/collectables.gc
@@ -2435,7 +2435,6 @@
   )
 
 (defmethod initialize buzzer ((obj buzzer))
-  (stack-size-set! (-> obj main-thread) 192) ;; added
   (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player))))
     (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process))
     (set! (-> s5-0 reaction) default-collision-reaction)
diff --git a/goal_src/engine/load/file-io.gc b/goal_src/engine/load/file-io.gc
index 333e1855c..38692b708 100644
--- a/goal_src/engine/load/file-io.gc
+++ b/goal_src/engine/load/file-io.gc
@@ -127,7 +127,10 @@
      (format *file-temp-string* "texture-page~D/dir-tpages" TPAGE_FILE_VERSION)
      )
     ((= kind (file-kind tpage))
-     (format *file-temp-string* "texture-page~D/tpage-~S" TPAGE_FILE_VERSION name)
+     (#if PC_PORT
+        (format *file-temp-string* "tpage-~S" name)
+        (format *file-temp-string* "texture-page~D/tpage-~S" TPAGE_FILE_VERSION name)
+        )
      )
     ((= kind (file-kind level-bt))
      (format *file-temp-string* "level~D/~S-bt" LEVEL_VS_FILE_VERSION name)
@@ -142,13 +145,16 @@
      (format *file-temp-string* "~S.VIS" name)
      )
     ((= kind (file-kind art-group))
-     (format *file-temp-string* "art-group~D/~S-ag"
-             (if (> art-group-version 0)
-                 art-group-version
-                 ART_GROUP_FILE_VERSION
+     (#if PC_PORT
+         (format *file-temp-string* "~S-ag" name)
+         (format *file-temp-string* "art-group~D/~S-ag"
+                 (if (> art-group-version 0)
+                     art-group-version
+                     ART_GROUP_FILE_VERSION
+                     )
+                 name
                  )
-             name
-             )
+         )
      )
     )
   *file-temp-string*
diff --git a/goal_src/engine/util/glist.gc b/goal_src/engine/util/glist.gc
index aff6ff668..5423c7044 100644
--- a/goal_src/engine/util/glist.gc
+++ b/goal_src/engine/util/glist.gc
@@ -136,8 +136,7 @@
   )
 
 (defun-debug glst-get-node-by-index ((list glst-list) (n int))
-  "Return the n-th node in the list, beginning at zero
-   Obviously since this list system sucks there's no upper bounds checking"
+  "Return the n-th node in the list, beginning at zero"
 
   (if (and (< n (glst-num-elements list)) (>= n 0))
     (let ((node (glst-head list)))
@@ -145,7 +144,7 @@
           ;; (nop!) x4
           (set! node (glst-next node))
           )
-        node
+        (return node)
         )
     )
   (the-as glst-node #f)
diff --git a/goal_src/game.gp b/goal_src/game.gp
index c7c0e37a9..b20306d35 100644
--- a/goal_src/game.gp
+++ b/goal_src/game.gp
@@ -394,11 +394,11 @@
    "common/launcherdoor.gc"
    "common/battlecontroller.gc"
 
-   "racer_common/target-racer-h-FIC-LAV-MIS-OGR-ROL.gc"
+   "racer_common/target-racer-h.gc"
    "racer_common/racer-part.gc"
    "racer_common/racer.gc"
-   "racer_common/target-racer-FIC-LAV-MIS-OGR-ROL.gc"
-   "racer_common/racer-states-FIC-LAV-MIS-OGR-ROL.gc"
+   "racer_common/target-racer.gc"
+   "racer_common/racer-states.gc"
    "racer_common/collide-reaction-racer.gc"
 
    "flut_common/flut-part.gc"
@@ -501,7 +501,7 @@
  "jungle-obs.gc"
  "jungle-mirrors.gc"
  "junglefish.gc"
- "fisher-JUN.gc"
+ "fisher.gc"
  "jungle-part.gc"
  )
 
@@ -567,7 +567,7 @@
  "village1/assistant.gc"
  "village1/sage.gc"
  "village1/yakow.gc"
- "village1/village-obs-VI1.gc"
+ "village1/village-obs.gc"
  "village1/fishermans-boat.gc"
  "village1/village1-part.gc"
  "village1/village1-part2.gc"
@@ -1331,7 +1331,7 @@
   "citb-plat.gc"
   "citadel-sages.gc"
   "citb-bunny.gc"
-  "citb-drop-plat-CIT.gc"
+  "citb-drop-plat.gc"
   "assistant-citadel.gc"
   )
 
@@ -1397,7 +1397,7 @@
   "green-eco-lurker.gc"
   "robotboss.gc"
   "final-door.gc"
-  "sage-finalboss-FIN.gc"
+  "sage-finalboss.gc"
   )
 
 (copy-textures 1419 1420 634 1418 545)
diff --git a/goal_src/goal-lib.gc b/goal_src/goal-lib.gc
index bab982df2..8250881d0 100644
--- a/goal_src/goal-lib.gc
+++ b/goal_src/goal-lib.gc
@@ -616,13 +616,23 @@
   )
 
 (defmacro /-0-guard (a b)
+  "same as divide but returns -1 when divisor is zero (EE-like)."
   `(let ((divisor ,b))
       (if (zero? divisor)
-          0
+          -1
           (/ ,a divisor))
       )
   )
 
+(defmacro mod-0-guard (a b)
+  "same as divide but returns the remainder when divisor is zero (EE-like)."
+  `(let ((divisor ,b))
+      (if (zero? divisor)
+          ,a
+          (mod ,a divisor))
+      )
+  )
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Bit Macros
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/goal_src/levels/citadel/citb-drop-plat-CIT.gc b/goal_src/levels/citadel/citb-drop-plat.gc
similarity index 100%
rename from goal_src/levels/citadel/citb-drop-plat-CIT.gc
rename to goal_src/levels/citadel/citb-drop-plat.gc
diff --git a/goal_src/levels/finalboss/sage-finalboss-FIN.gc b/goal_src/levels/finalboss/sage-finalboss.gc
similarity index 100%
rename from goal_src/levels/finalboss/sage-finalboss-FIN.gc
rename to goal_src/levels/finalboss/sage-finalboss.gc
diff --git a/goal_src/levels/jungle/fisher-JUN.gc b/goal_src/levels/jungle/fisher.gc
similarity index 100%
rename from goal_src/levels/jungle/fisher-JUN.gc
rename to goal_src/levels/jungle/fisher.gc
diff --git a/goal_src/levels/racer_common/racer-states-FIC-LAV-MIS-OGR-ROL.gc b/goal_src/levels/racer_common/racer-states.gc
similarity index 100%
rename from goal_src/levels/racer_common/racer-states-FIC-LAV-MIS-OGR-ROL.gc
rename to goal_src/levels/racer_common/racer-states.gc
diff --git a/goal_src/levels/racer_common/target-racer-h-FIC-LAV-MIS-OGR-ROL.gc b/goal_src/levels/racer_common/target-racer-h.gc
similarity index 100%
rename from goal_src/levels/racer_common/target-racer-h-FIC-LAV-MIS-OGR-ROL.gc
rename to goal_src/levels/racer_common/target-racer-h.gc
diff --git a/goal_src/levels/racer_common/target-racer-FIC-LAV-MIS-OGR-ROL.gc b/goal_src/levels/racer_common/target-racer.gc
similarity index 100%
rename from goal_src/levels/racer_common/target-racer-FIC-LAV-MIS-OGR-ROL.gc
rename to goal_src/levels/racer_common/target-racer.gc
diff --git a/goal_src/levels/village1/village-obs-VI1.gc b/goal_src/levels/village1/village-obs.gc
similarity index 100%
rename from goal_src/levels/village1/village-obs-VI1.gc
rename to goal_src/levels/village1/village-obs.gc
diff --git a/goal_src/levels/l1_only/citb-drop-plat-L1.gc b/goal_src/old/citb-drop-plat-OLD.gc
similarity index 99%
rename from goal_src/levels/l1_only/citb-drop-plat-L1.gc
rename to goal_src/old/citb-drop-plat-OLD.gc
index 7a7dbe4d8..970a35946 100644
--- a/goal_src/levels/l1_only/citb-drop-plat-L1.gc
+++ b/goal_src/old/citb-drop-plat-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: citb-drop-plat-L1.gc
 ;; name in dgo: citb-drop-plat
 ;; dgos: L1
-
diff --git a/goal_src/levels/jungle/fisher-JUNGLE-L1.gc b/goal_src/old/fisher-OLD.gc
similarity index 99%
rename from goal_src/levels/jungle/fisher-JUNGLE-L1.gc
rename to goal_src/old/fisher-OLD.gc
index aeac4c2c4..bf0faa670 100644
--- a/goal_src/levels/jungle/fisher-JUNGLE-L1.gc
+++ b/goal_src/old/fisher-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: fisher-JUNGLE-L1.gc
 ;; name in dgo: fisher
 ;; dgos: JUNGLE, L1
-
diff --git a/goal_src/levels/l1_only/racer-states-L1-RACERP.gc b/goal_src/old/racer-states-OLD.gc
similarity index 99%
rename from goal_src/levels/l1_only/racer-states-L1-RACERP.gc
rename to goal_src/old/racer-states-OLD.gc
index 54aaf342b..ae48e2e48 100644
--- a/goal_src/levels/l1_only/racer-states-L1-RACERP.gc
+++ b/goal_src/old/racer-states-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: racer-states-L1-RACERP.gc
 ;; name in dgo: racer-states
 ;; dgos: L1, RACERP
-
diff --git a/goal_src/levels/l1_only/sage-finalboss-L1.gc b/goal_src/old/sage-finalboss-OLD.gc
similarity index 99%
rename from goal_src/levels/l1_only/sage-finalboss-L1.gc
rename to goal_src/old/sage-finalboss-OLD.gc
index dc8e9d6f8..3cb9948c2 100644
--- a/goal_src/levels/l1_only/sage-finalboss-L1.gc
+++ b/goal_src/old/sage-finalboss-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: sage-finalboss-L1.gc
 ;; name in dgo: sage-finalboss
 ;; dgos: L1
-
diff --git a/goal_src/levels/l1_only/target-racer-L1-RACERP.gc b/goal_src/old/target-racer-OLD.gc
similarity index 99%
rename from goal_src/levels/l1_only/target-racer-L1-RACERP.gc
rename to goal_src/old/target-racer-OLD.gc
index 3fcf9c20e..4e4d93da3 100644
--- a/goal_src/levels/l1_only/target-racer-L1-RACERP.gc
+++ b/goal_src/old/target-racer-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: target-racer-L1-RACERP.gc
 ;; name in dgo: target-racer
 ;; dgos: L1, RACERP
-
diff --git a/goal_src/levels/l1_only/target-racer-h-L1-RACERP.gc b/goal_src/old/target-racer-h-OLD.gc
similarity index 99%
rename from goal_src/levels/l1_only/target-racer-h-L1-RACERP.gc
rename to goal_src/old/target-racer-h-OLD.gc
index f6117f02b..e8e77dea1 100644
--- a/goal_src/levels/l1_only/target-racer-h-L1-RACERP.gc
+++ b/goal_src/old/target-racer-h-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: target-racer-h-L1-RACERP.gc
 ;; name in dgo: target-racer-h
 ;; dgos: L1, RACERP
-
diff --git a/goal_src/levels/l1_only/village-obs-L1.gc b/goal_src/old/village-obs-OLD.gc
similarity index 99%
rename from goal_src/levels/l1_only/village-obs-L1.gc
rename to goal_src/old/village-obs-OLD.gc
index 497fadbc7..5b33b0193 100644
--- a/goal_src/levels/l1_only/village-obs-L1.gc
+++ b/goal_src/old/village-obs-OLD.gc
@@ -4,4 +4,3 @@
 ;; name: village-obs-L1.gc
 ;; name in dgo: village-obs
 ;; dgos: L1
-
diff --git a/scripts/jak1_file_list.py b/scripts/jak1_file_list.py
index 91f86e6df..e898491f6 100644
--- a/scripts/jak1_file_list.py
+++ b/scripts/jak1_file_list.py
@@ -393,8 +393,8 @@ file_list = [\
 ["citadel-sages",                         "citadel-sages",               3, ["CIT", "L1"], "levels/citadel"],
 ["snow-bunny",                            "snow-bunny",                  3, ["CIT", "L1", "SNO"], "levels/snow"],
 ["citb-bunny",                            "citb-bunny",                  3, ["CIT", "L1"], "levels/citadel"],
-["citb-drop-plat-CIT",                    "citb-drop-plat",              3, ["CIT"], "levels/citadel"],
-["citb-drop-plat-L1",                     "citb-drop-plat",              3, ["L1"], "levels/l1_only"],
+["citb-drop-plat",                        "citb-drop-plat",              3, ["CIT"], "levels/citadel"],
+["citb-drop-plat-OLD",                    "citb-drop-plat",              3, ["L1"], "old"],
 ["assistant-citadel",                     "assistant-citadel",           3, ["CIT", "L1"], "levels/citadel"],
 ["tpage-1415",                            "tpage-1415",                  4, ["CIT"], "levels/citadel"],
 ["tpage-1417",                            "tpage-1417",                  4, ["CIT"], "levels/citadel"],
@@ -475,8 +475,8 @@ file_list = [\
 ["green-eco-lurker",                      "green-eco-lurker",            3, ["FIN", "L1"], "levels/finalboss"],
 ["robotboss",                             "robotboss",                   3, ["FIN", "L1"], "levels/finalboss"],
 ["final-door",                            "final-door",                  3, ["FIN", "L1"], "levels/finalboss"],
-["sage-finalboss-FIN",                    "sage-finalboss",              3, ["FIN"], "levels/finalboss"],
-["sage-finalboss-L1",                     "sage-finalboss",              3, ["L1"], "levels/l1_only"],
+["sage-finalboss",                        "sage-finalboss",              3, ["FIN"], "levels/finalboss"],
+["sage-finalboss-OLD",                    "sage-finalboss",              3, ["L1"], "old"],
 ["tpage-1419",                            "tpage-1419",                  4, ["FIN"], "levels/finalboss"],
 ["tpage-1420",                            "tpage-1420",                  4, ["FIN"], "levels/finalboss"],
 ["tpage-634",                             "tpage-634",                   4, ["FIN"], "levels/finalboss"],
@@ -536,8 +536,8 @@ file_list = [\
 ["jungle-obs",                            "jungle-obs",                  3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
 ["jungle-mirrors",                        "jungle-mirrors",              3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
 ["junglefish",                            "junglefish",                  3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
-["fisher-JUN",                            "fisher",                      3, ["JUN"], "levels/jungle"],
-["fisher-JUNGLE-L1",                      "fisher",                      3, ["JUNGLE", "L1"], "levels/jungle"],
+["fisher",                                "fisher",                      3, ["JUN"], "levels/jungle"],
+["fisher-OLD",                            "fisher",                      3, ["JUNGLE", "L1"], "old"],
 ["jungle-part",                           "jungle-part",                 3, ["JUN", "JUNGLE", "L1"], "levels/jungle"],
 ["launcherdoor",                          "launcherdoor",                3, ["JUN", "JUNGLE", "L1", "MAI", "MAINCAVE", "SUN", "SUNKEN"], "levels/common"],
 ["tpage-385",                             "tpage-385",                   4, ["JUN"], "levels/jungle"],
@@ -573,14 +573,14 @@ file_list = [\
 ["towertop-ag",                           "towertop",                    4, ["JUN"], "levels/jungle"],
 ["water-anim-jungle-ag",                  "water-anim-jungle",           4, ["JUN"], "levels/jungle"],
 ["jungle-vis",                            "jungle-vis",                  4, ["JUN"], "levels/jungle"],
-["target-racer-h-L1-RACERP",              "target-racer-h",              3, ["L1", "RACERP"], "levels/l1_only"],
-["target-racer-h-FIC-LAV-MIS-OGR-ROL",    "target-racer-h",              3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
+["target-racer-h-OLD",                    "target-racer-h",              3, ["L1", "RACERP"], "old"],
+["target-racer-h",                        "target-racer-h",              3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
 ["racer-part",                            "racer-part",                  3, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
 ["racer",                                 "racer",                       3, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
-["target-racer-L1-RACERP",                "target-racer",                3, ["L1", "RACERP"], "levels/l1_only"],
-["target-racer-FIC-LAV-MIS-OGR-ROL",      "target-racer",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
-["racer-states-L1-RACERP",                "racer-states",                3, ["L1", "RACERP"], "levels/l1_only"],
-["racer-states-FIC-LAV-MIS-OGR-ROL",      "racer-states",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
+["target-racer-OLD",                      "target-racer",                3, ["L1", "RACERP"], "old"],
+["target-racer",                          "target-racer",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
+["racer-states-OLD",                      "racer-states",                3, ["L1", "RACERP"], "old"],
+["racer-states",                          "racer-states",                3, ["FIC", "LAV", "MIS", "OGR", "ROL"], "levels/racer_common"],
 ["collide-reaction-racer",                "collide-reaction-racer",      3, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
 ["eichar-racer+0-ag",                     "eichar-racer+0",              4, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
 ["tpage-1119",                            "tpage-1119",                  4, ["L1", "FIC", "LAV", "MIS", "OGR", "RACERP", "ROL"], "levels/racer_common"],
@@ -594,8 +594,8 @@ file_list = [\
 ["assistant",                             "assistant",                   3, ["L1", "VI1"], "levels/village1"],
 ["sage",                                  "sage",                        3, ["L1", "VI1"], "levels/village1"],
 ["yakow",                                 "yakow",                       3, ["L1", "VI1"], "levels/village1"],
-["village-obs-L1",                        "village-obs",                 3, ["L1"], "levels/l1_only"],
-["village-obs-VI1",                       "village-obs",                 3, ["VI1"], "levels/village1"],
+["village-obs-OLD",                       "village-obs",                 3, ["L1"], "old"],
+["village-obs",                           "village-obs",                 3, ["VI1"], "levels/village1"],
 ["fishermans-boat",                       "fishermans-boat",             3, ["L1", "VI1"], "levels/village1"],
 ["village1-part",                         "village1-part",               3, ["L1", "VI1"], "levels/village1"],
 ["village1-part2",                        "village1-part2",              3, ["L1", "VI1"], "levels/village1"],
diff --git a/test/test_kernel.cpp b/test/test_kernel.cpp
index edea6ce30..2d5342b81 100644
--- a/test/test_kernel.cpp
+++ b/test/test_kernel.cpp
@@ -107,28 +107,28 @@ TEST(Kernel, basename) {
 TEST(Kernel, DecodeFileName) {
   std::string x;
   x = DecodeFileName("$TEXTURE/beans");
-  EXPECT_EQ(x, "host:data/texture-page7/beans.go");
+  EXPECT_EQ(x, "out/obj/beans.go");
 
   x = DecodeFileName("$ART_GROUP/stuff");
-  EXPECT_EQ(x, "host:data/art-group6/stuff-ag.go");
+  EXPECT_EQ(x, "data/art-group6/stuff-ag.go");
 
   x = DecodeFileName("$LEVEL/my-level");
-  EXPECT_EQ(x, "host:data/level30/my-level-bt.go");
+  EXPECT_EQ(x, "data/level30/my-level-bt.go");
 
   x = DecodeFileName("$LEVEL/my-level.123");
-  EXPECT_EQ(x, "host:data/level30/my-level.123");
+  EXPECT_EQ(x, "data/level30/my-level.123");
 
   x = DecodeFileName("$DATA/my-data");
-  EXPECT_EQ(x, "host:data/my-data.go");
+  EXPECT_EQ(x, "out/obj/my-data.go");
 
   x = DecodeFileName("$CODE/my-code");
-  EXPECT_EQ(x, "host:game/obj/my-code.o");
+  EXPECT_EQ(x, "game/obj/my-code.o");
 
   x = DecodeFileName("$RES/my-res");
-  EXPECT_EQ(x, "host:data/res1/my-res.go");
+  EXPECT_EQ(x, "data/res1/my-res.go");
 
   x = DecodeFileName("asdf");
-  EXPECT_EQ(x, "host:game/obj/asdf.o");
+  EXPECT_EQ(x, "game/obj/asdf.o");
 }
 
 TEST(Kernel, reverse) {