diff --git a/src/Tools/psxcdgen/.gitignore b/src/Tools/.gitignore
similarity index 100%
rename from src/Tools/psxcdgen/.gitignore
rename to src/Tools/.gitignore
diff --git a/src/Tools/psxcdgen/cdtypes/Cargo.toml b/src/Tools/cdtypes/Cargo.toml
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/Cargo.toml
rename to src/Tools/cdtypes/Cargo.toml
diff --git a/src/Tools/psxcdgen/cdtypes/src/cd/mod.rs b/src/Tools/cdtypes/src/cd/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/cd/mod.rs
rename to src/Tools/cdtypes/src/cd/mod.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/cd/reader.rs b/src/Tools/cdtypes/src/cd/reader.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/cd/reader.rs
rename to src/Tools/cdtypes/src/cd/reader.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/cd/sector.rs b/src/Tools/cdtypes/src/cd/sector.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/cd/sector.rs
rename to src/Tools/cdtypes/src/cd/sector.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/lib.rs b/src/Tools/cdtypes/src/lib.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/lib.rs
rename to src/Tools/cdtypes/src/lib.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/bcd.rs b/src/Tools/cdtypes/src/types/bcd.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/bcd.rs
rename to src/Tools/cdtypes/src/types/bcd.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/cdstring.rs b/src/Tools/cdtypes/src/types/cdstring.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/cdstring.rs
rename to src/Tools/cdtypes/src/types/cdstring.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/cue/mod.rs b/src/Tools/cdtypes/src/types/cue/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/cue/mod.rs
rename to src/Tools/cdtypes/src/types/cue/mod.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/cue/read.rs b/src/Tools/cdtypes/src/types/cue/read.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/cue/read.rs
rename to src/Tools/cdtypes/src/types/cue/read.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/cue/writer.rs b/src/Tools/cdtypes/src/types/cue/writer.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/cue/writer.rs
rename to src/Tools/cdtypes/src/types/cue/writer.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/date.rs b/src/Tools/cdtypes/src/types/date.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/date.rs
rename to src/Tools/cdtypes/src/types/date.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/dir_record.rs b/src/Tools/cdtypes/src/types/dir_record.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/dir_record.rs
rename to src/Tools/cdtypes/src/types/dir_record.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/error_correction/mod.rs b/src/Tools/cdtypes/src/types/error_correction/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/error_correction/mod.rs
rename to src/Tools/cdtypes/src/types/error_correction/mod.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/error_correction/tables.rs b/src/Tools/cdtypes/src/types/error_correction/tables.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/error_correction/tables.rs
rename to src/Tools/cdtypes/src/types/error_correction/tables.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/helper.rs b/src/Tools/cdtypes/src/types/helper.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/helper.rs
rename to src/Tools/cdtypes/src/types/helper.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/lsb_msb.rs b/src/Tools/cdtypes/src/types/lsb_msb.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/lsb_msb.rs
rename to src/Tools/cdtypes/src/types/lsb_msb.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/mod.rs b/src/Tools/cdtypes/src/types/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/mod.rs
rename to src/Tools/cdtypes/src/types/mod.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/path_table.rs b/src/Tools/cdtypes/src/types/path_table.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/path_table.rs
rename to src/Tools/cdtypes/src/types/path_table.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/pvd.rs b/src/Tools/cdtypes/src/types/pvd.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/pvd.rs
rename to src/Tools/cdtypes/src/types/pvd.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/sector.rs b/src/Tools/cdtypes/src/types/sector.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/sector.rs
rename to src/Tools/cdtypes/src/types/sector.rs
diff --git a/src/Tools/psxcdgen/cdtypes/src/types/time.rs b/src/Tools/cdtypes/src/types/time.rs
similarity index 100%
rename from src/Tools/psxcdgen/cdtypes/src/types/time.rs
rename to src/Tools/cdtypes/src/types/time.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/Cargo.toml b/src/Tools/psxcdgen/Cargo.toml
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/Cargo.toml
rename to src/Tools/psxcdgen/Cargo.toml
diff --git a/src/Tools/psxcdgen/psxcdgen.code-workspace b/src/Tools/psxcdgen/psxcdgen.code-workspace
deleted file mode 100644
index e3723981..00000000
--- a/src/Tools/psxcdgen/psxcdgen.code-workspace
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"tasks": {
-		"version": "2.0.0",
-		"tasks": [
-			{
-				"label": "cargo",
-				"type": "shell",
-				"command": "cargo ${input:cmd} --${input:cfg}",
-				"problemMatcher": [],
-				"group": {
-					"kind": "build",
-					"isDefault": true
-				},
-				"options": 
-				{
-					"cwd": "${workspaceFolder}/${input:project}"
-				},
-			},
-			{
-				"label": "run psxcdread with",
-				"type": "shell",
-				"command": "cargo run --release -- ${input:psxcdread_parameter}",
-				"problemMatcher": [],
-				"group": {
-					"kind": "build",
-					"isDefault": true,
-				},
-				"options": 
-				{
-					"cwd": "${workspaceFolder}/psxcdread"
-				}
-			},
-			{
-				"label": "run psxcdgen with",
-				"type": "shell",
-				"command": "cargo run --release -- Dino.xml",
-				"problemMatcher": [],
-				"group": {
-					"kind": "build",
-					"isDefault": true,
-				},
-				"options": 
-				{
-					"cwd": "${workspaceFolder}/psxcdgen"
-				}
-			}
-		],
-		"inputs": [
-			{
-				"id": "cmd",
-				"type": "pickString",
-				"description": "Command to use",
-				"options": ["check", "test", "run", "build", "clean"],
-				"default": "run"
-			},
-			{
-				"id": "cfg",
-				"type": "pickString",
-				"description": "Configuration for the project",
-				"options": ["debug", "release"],
-				"default": "release"
-			},
-			{
-				"id": "project",
-				"type": "pickString",
-				"description": "Project to run cargo for",
-				"options": ["psxcdgen", "psxcdread", "cdtypes"],
-				"default": "psxcdgen"
-			},
-			{
-				"id": "psxcdread_parameter",
-				"type": "pickString",
-				"description": "Parameter for tool",
-				"options": ["../../../iso/JabyEngine.bin", "../../../iso/JabyEngine.cue", "../Output/Test.bin"]
-			}
-		],
-	},
-	"settings": {}
-}
\ No newline at end of file
diff --git a/src/Tools/psxcdgen/psxcdgen/src/file_helper.rs b/src/Tools/psxcdgen/src/file_helper.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/file_helper.rs
rename to src/Tools/psxcdgen/src/file_helper.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/cd_desc.rs b/src/Tools/psxcdgen/src/iso_writer/cd_desc.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/cd_desc.rs
rename to src/Tools/psxcdgen/src/iso_writer/cd_desc.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/lba_map.rs b/src/Tools/psxcdgen/src/iso_writer/lba_map.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/lba_map.rs
rename to src/Tools/psxcdgen/src/iso_writer/lba_map.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/mod.rs b/src/Tools/psxcdgen/src/iso_writer/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/mod.rs
rename to src/Tools/psxcdgen/src/iso_writer/mod.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/psx/encoder/helper.rs b/src/Tools/psxcdgen/src/iso_writer/psx/encoder/helper.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/psx/encoder/helper.rs
rename to src/Tools/psxcdgen/src/iso_writer/psx/encoder/helper.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/psx/encoder/mod.rs b/src/Tools/psxcdgen/src/iso_writer/psx/encoder/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/psx/encoder/mod.rs
rename to src/Tools/psxcdgen/src/iso_writer/psx/encoder/mod.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/psx/mod.rs b/src/Tools/psxcdgen/src/iso_writer/psx/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/psx/mod.rs
rename to src/Tools/psxcdgen/src/iso_writer/psx/mod.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/types/builder.rs b/src/Tools/psxcdgen/src/iso_writer/types/builder.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/types/builder.rs
rename to src/Tools/psxcdgen/src/iso_writer/types/builder.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/iso_writer/types/mod.rs b/src/Tools/psxcdgen/src/iso_writer/types/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/iso_writer/types/mod.rs
rename to src/Tools/psxcdgen/src/iso_writer/types/mod.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/lib.rs b/src/Tools/psxcdgen/src/lib.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/lib.rs
rename to src/Tools/psxcdgen/src/lib.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/main.rs b/src/Tools/psxcdgen/src/main.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/main.rs
rename to src/Tools/psxcdgen/src/main.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/xml_reader/mkpsxiso.rs b/src/Tools/psxcdgen/src/xml_reader/mkpsxiso.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/xml_reader/mkpsxiso.rs
rename to src/Tools/psxcdgen/src/xml_reader/mkpsxiso.rs
diff --git a/src/Tools/psxcdgen/psxcdgen/src/xml_reader/mod.rs b/src/Tools/psxcdgen/src/xml_reader/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdgen/src/xml_reader/mod.rs
rename to src/Tools/psxcdgen/src/xml_reader/mod.rs
diff --git a/src/Tools/psxcdgen/psxcdread/Cargo.toml b/src/Tools/psxcdread/Cargo.toml
similarity index 100%
rename from src/Tools/psxcdgen/psxcdread/Cargo.toml
rename to src/Tools/psxcdread/Cargo.toml
diff --git a/src/Tools/psxcdgen/psxcdread/src/complex_dump/mod.rs b/src/Tools/psxcdread/src/complex_dump/mod.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdread/src/complex_dump/mod.rs
rename to src/Tools/psxcdread/src/complex_dump/mod.rs
diff --git a/src/Tools/psxcdgen/psxcdread/src/lib.rs b/src/Tools/psxcdread/src/lib.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdread/src/lib.rs
rename to src/Tools/psxcdread/src/lib.rs
diff --git a/src/Tools/psxcdgen/psxcdread/src/main.rs b/src/Tools/psxcdread/src/main.rs
similarity index 100%
rename from src/Tools/psxcdgen/psxcdread/src/main.rs
rename to src/Tools/psxcdread/src/main.rs