diff --git a/Code/iso/JabyEngineLBAFile.json b/Code/iso/JabyEngineLBAFile.json
deleted file mode 100644
index eb49df0b..00000000
--- a/Code/iso/JabyEngineLBAFile.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Output":"Code/bin/GlobalLBATable.bin",
-    "Input":"Code/iso/Info/JabyEngine.lba",
-    "Order": [
-    ]
-  }
\ No newline at end of file
diff --git a/JabyEngine.code-workspace b/JabyEngine.code-workspace
index f6fbf200..73630ba3 100644
--- a/JabyEngine.code-workspace
+++ b/JabyEngine.code-workspace
@@ -12,14 +12,14 @@
 				"type": "shell",
 				"command": "wsl make ${input:target} BUILD=${input:build}",
 				"options": {
-					"cwd": "Code"
+					"cwd": "Library/Code"
 				},
 				"problemMatcher": []
 			},
 			{
 				"label": "finalize",
 				"type": "shell",
-				"command": "FinalizeCD.bat ${input:finalize} JabyEngine Code\\iso",
+				"command": "FinalizeCD.bat ${input:finalize} JabyEngine Library\\Code",
 				"options": {
 					"env": {
 						"PATH": "../../Tools/;../../Tools/mkpsxiso;${env:PATH}"
@@ -46,7 +46,7 @@
 				"type": "shell",
 				"command": "wsl make ${input:target} BUILD=${input:build} USE_JABY_MAKE=true",
 				"options": {
-					"cwd": "Code"
+					"cwd": "Library/Code"
 				},
 				"group": {
 					"kind": "build",
diff --git a/Code/Makefile b/Library/Code/Makefile
similarity index 89%
rename from Code/Makefile
rename to Library/Code/Makefile
index 975f8a52..3681d9f3 100644
--- a/Code/Makefile
+++ b/Library/Code/Makefile
@@ -1,6 +1,6 @@
 BINDIR     ?= bin/
-PCSX_REDUX ?= ../../../GIT/pcsx-redux/src/mips
-PSYQ_PATH  ?= ../../../PSYQ/Converted
+PCSX_REDUX ?= ../../../../GIT/pcsx-redux/src/mips
+PSYQ_PATH  ?= ../../../../PSYQ/Converted
 TARGET      = JabyEngine
 TYPE        = ps-exe
 BUILD       = Release
diff --git a/Code/Wrapper.mk b/Library/Code/Wrapper.mk
similarity index 100%
rename from Code/Wrapper.mk
rename to Library/Code/Wrapper.mk
diff --git a/Code/iso/JabyEngine.cnf b/Library/Code/iso/JabyEngine.cnf
similarity index 100%
rename from Code/iso/JabyEngine.cnf
rename to Library/Code/iso/JabyEngine.cnf
diff --git a/Code/iso/JabyEngineISODesc.xml b/Library/Code/iso/JabyEngineISODesc.xml
similarity index 77%
rename from Code/iso/JabyEngineISODesc.xml
rename to Library/Code/iso/JabyEngineISODesc.xml
index 6c3c0841..6ca9c2f9 100644
--- a/Code/iso/JabyEngineISODesc.xml
+++ b/Library/Code/iso/JabyEngineISODesc.xml
@@ -12,8 +12,8 @@
 		/>
 		<license file="../../PSYQ/psyq/cdgen/LCNSFILE/LICENSEE.DAT"/>
 		<directory_tree>
-			<file name="SYSTEM.CNF"   type="data" source="Code/iso/JabyEngine.cnf"/>
-			<file name="SCES_003.90"  type="data" source="Code/bin/PSX-release/JabyEngine.psexe"/>
+			<file name="SYSTEM.CNF"   type="data" source="Library/Code/iso/JabyEngine.cnf"/>
+			<file name="SCES_003.90"  type="data" source="Library/Code/bin/PSX-release/JabyEngine.psexe"/>
 			
 			<dummy sectors="1024"/>	
 		</directory_tree>
diff --git a/Library/Code/iso/JabyEngineLBAFile.json b/Library/Code/iso/JabyEngineLBAFile.json
new file mode 100644
index 00000000..ab6aaedc
--- /dev/null
+++ b/Library/Code/iso/JabyEngineLBAFile.json
@@ -0,0 +1,6 @@
+{
+    "Output":"Library/Code/bin/GlobalLBATable.bin",
+    "Input":"Library/Code/iso/Info/JabyEngine.lba",
+    "Order": [
+    ]
+  }
\ No newline at end of file
diff --git a/Code/src/JabyEngine.cpp b/Library/Code/src/JabyEngine.cpp
similarity index 100%
rename from Code/src/JabyEngine.cpp
rename to Library/Code/src/JabyEngine.cpp
diff --git a/Code/src/JabyEngine.h b/Library/Code/src/JabyEngine.h
similarity index 100%
rename from Code/src/JabyEngine.h
rename to Library/Code/src/JabyEngine.h
diff --git a/Makefile b/Library/Makefile
similarity index 100%
rename from Makefile
rename to Library/Makefile