diff --git a/decompile/objdiff.json b/decompile/objdiff.json
index d175152..5f6b41f 100644
--- a/decompile/objdiff.json
+++ b/decompile/objdiff.json
@@ -6,12 +6,12 @@
   ],
   "units": [
     {
-      "name": "Jet2",
-      "target_path": "target/Jet2.obj",
-      "base_path": "src/Jet2.obj",
-      "complete": true,
+      "name": "JSRF/Jet2",
+      "target_path": "target/JSRF/Jet2.obj",
+      "base_path": "src/JSRF/Jet2.obj",
       "metadata": {
-        "source_path": "src/Jet2.cpp"
+        "source_path": "src/JSRF/Jet2.cpp",
+        "complete": true
       },
       "symbol_mappings": {
         "_main_handler": "$L522",
@@ -19,4 +19,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/decompile/src/Core.cpp b/decompile/src/JSRF/Core.cpp
similarity index 100%
rename from decompile/src/Core.cpp
rename to decompile/src/JSRF/Core.cpp
diff --git a/decompile/src/Core.hpp b/decompile/src/JSRF/Core.hpp
similarity index 100%
rename from decompile/src/Core.hpp
rename to decompile/src/JSRF/Core.hpp
diff --git a/decompile/src/Jet2.cpp b/decompile/src/JSRF/Jet2.cpp
similarity index 100%
rename from decompile/src/Jet2.cpp
rename to decompile/src/JSRF/Jet2.cpp
diff --git a/decompile/src/D3D.hpp b/decompile/src/Microsoft/D3D.hpp
similarity index 100%
rename from decompile/src/D3D.hpp
rename to decompile/src/Microsoft/D3D.hpp
diff --git a/decompile/src/Win32.hpp b/decompile/src/Microsoft/Win32.hpp
similarity index 100%
rename from decompile/src/Win32.hpp
rename to decompile/src/Microsoft/Win32.hpp
diff --git a/decompile/src/MMatrix.cpp b/decompile/src/Smilebit/MMatrix.cpp
similarity index 100%
rename from decompile/src/MMatrix.cpp
rename to decompile/src/Smilebit/MMatrix.cpp
diff --git a/decompile/src/MMatrix.hpp b/decompile/src/Smilebit/MMatrix.hpp
similarity index 100%
rename from decompile/src/MMatrix.hpp
rename to decompile/src/Smilebit/MMatrix.hpp
diff --git a/decompile/target/.gitkeep b/decompile/target/JSRF/.gitkeep
similarity index 100%
rename from decompile/target/.gitkeep
rename to decompile/target/JSRF/.gitkeep
diff --git a/delink/delink.sh b/delink/delink.sh
index 56a4d65..161fda4 100755
--- a/delink/delink.sh
+++ b/delink/delink.sh
@@ -51,7 +51,7 @@ delink() {
 # $2: Ghidra project path
 # $3: Ghidra project name
 # $4: Whitespace-separated address ranges to include in object
-# $5: Output path (inside /target)
+# $5: Output path (inside decompile/target/)
 	# Call the right script depending on whether we're on Windows
 	# (this seems like the most reliable method I can find for POSIX sh)
 	if [ -n "$WINDIR" ]; then suffix=.bat
diff --git a/delink/objects.csv b/delink/objects.csv
index 4589f51..5f32179 100644
--- a/delink/objects.csv
+++ b/delink/objects.csv
@@ -1,6 +1,6 @@
 Object,Delink?,.text,.text$x,D3D,DSOUND,MMATRIX,XGRPH,XPP,.rdata,.rdata$x,.data,DOLBY
-Core.obj,false,0x00011000-0x00013FF0,0x00186BA0-0x00186C1F,,,,,,0x001C4390-0x001C44FF,0x001E4D20-0x001E4DAB,0x00251D40-0x00251DAB,
-Jet2.obj,true,0x0006F9E0-0x0006FA6F,0x00187710-0x00187724,,,,,,,0x001E620C-0x001E622F,0x0022FCE0-0x0022FCE7,
+JSRF/Core.obj,false,0x00011000-0x00013FF0,0x00186BA0-0x00186C1F,,,,,,0x001C4390-0x001C44FF,0x001E4D20-0x001E4DAB,0x00251D40-0x00251DAB,
+JSRF/Jet2.obj,true,0x0006F9E0-0x0006FA6F,0x00187710-0x00187724,,,,,,,0x001E620C-0x001E622F,0x0022FCE0-0x0022FCE7,
 ADX (need to decompose),false,0x0013A570-0x0014555F,?,,,,,,?,?,?,
 XDK Core (need to decompose),false,0x00145560-0x0014B79F,?,,,,,,?,?,?,
 Smilebit libs (need to decompose),false,0x0014B7A0-0x0017BF3F,?,,,,,,?,?,?-0x0022ED2B,