diff --git a/decompile/Makefile b/decompile/Makefile
index 165c483..3c42208 100644
--- a/decompile/Makefile
+++ b/decompile/Makefile
@@ -1,4 +1,4 @@
-all: src/Jet2.obj
+all: src/JSRF/Jet2.obj
 
 # Simple inference rule for producing object files
 .SUFFIXES: .cpp .obj
@@ -6,5 +6,5 @@ all: src/Jet2.obj
 	CL.EXE /nologo /Wall /TP /W3 /O2 /G6 /MT /GX /Fo$@ /c $<
 
 # Header files used for each object
-src/Jet2.obj: src/Core.hpp src/D3D.hpp src/MMatrix.hpp src/Std.hpp\
-              src/Win32.hpp
+src/JSRF/Jet2.obj: src/JSRF/Core.hpp src/XDK/D3D.hpp src/XDK/Win32.hpp\
+                   src/Std.hpp
diff --git a/decompile/src/JSRF/Core.hpp b/decompile/src/JSRF/Core.hpp
index faf54f4..ac9ea71 100644
--- a/decompile/src/JSRF/Core.hpp
+++ b/decompile/src/JSRF/Core.hpp
@@ -5,10 +5,10 @@ Game and GameObj classes that form the foundation of the JSRF game code.
 #ifndef CORE_HPP
 #define CORE_HPP
 
-#include "D3D.hpp"
-#include "MMatrix.hpp"
-#include "Std.hpp"
-#include "Win32.hpp"
+#include "../Smilebit/MMatrix.hpp"
+#include "../Std.hpp"
+#include "../XDK/D3D.hpp"
+#include "../XDK/Win32.hpp"
 
 
 // TODO; move to header for Graphics COM object in Smilebit libraries
diff --git a/decompile/src/Smilebit/MMatrix.hpp b/decompile/src/Smilebit/MMatrix.hpp
index a2ef473..c83f404 100644
--- a/decompile/src/Smilebit/MMatrix.hpp
+++ b/decompile/src/Smilebit/MMatrix.hpp
@@ -5,7 +5,7 @@ Smilebit's stack-based matrix math library.
 #ifndef MMATRIX_HPP
 #define MMATRIX_HPP
 
-#include "D3D.hpp"
+#include "../XDK/D3D.hpp"
 
 
 // 4x4 matrix type
diff --git a/decompile/src/Microsoft/D3D.hpp b/decompile/src/XDK/D3D.hpp
similarity index 100%
rename from decompile/src/Microsoft/D3D.hpp
rename to decompile/src/XDK/D3D.hpp
diff --git a/decompile/src/Microsoft/Win32.hpp b/decompile/src/XDK/Win32.hpp
similarity index 100%
rename from decompile/src/Microsoft/Win32.hpp
rename to decompile/src/XDK/Win32.hpp
diff --git a/decompile/target/Smilebit/.gitkeep b/decompile/target/Smilebit/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/decompile/target/XDK/.gitkeep b/decompile/target/XDK/.gitkeep
new file mode 100644
index 0000000..e69de29