diff --git a/quakespasm/Linux/CodeBlocks/QuakeSpasm-SDL2.cbp b/quakespasm/Linux/CodeBlocks/QuakeSpasm-SDL2.cbp
index 67b24311..4cead89f 100644
--- a/quakespasm/Linux/CodeBlocks/QuakeSpasm-SDL2.cbp
+++ b/quakespasm/Linux/CodeBlocks/QuakeSpasm-SDL2.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="SDL2/bin/Debug/quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
-				<Option object_output="SDL2/obj/Debug/" />
+				<Option output="bin/Debug/quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/SDL2/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
@@ -17,8 +17,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="SDL2/bin/Release/quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
-				<Option object_output="SDL2/obj/Release/" />
+				<Option output="bin/Release/quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/SDL2/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
diff --git a/quakespasm/Linux/CodeBlocks/QuakeSpasm.layout b/quakespasm/Linux/CodeBlocks/QuakeSpasm.layout
deleted file mode 100644
index 23b67ddb..00000000
--- a/quakespasm/Linux/CodeBlocks/QuakeSpasm.layout
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release" />
-</CodeBlocks_layout_file>
diff --git a/quakespasm/Linux/CodeBlocks/QuakeSpasm.workspace b/quakespasm/Linux/CodeBlocks/QuakeSpasm.workspace
deleted file mode 100644
index 4b9d3d91..00000000
--- a/quakespasm/Linux/CodeBlocks/QuakeSpasm.workspace
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-	<Workspace title="Workspace">
-		<Project filename="QuakeSpasm.cbp" active="1" />
-	</Workspace>
-</CodeBlocks_workspace_file>
diff --git a/quakespasm/Windows/CodeBlocks/QuakeSpasm-SDL2.cbp b/quakespasm/Windows/CodeBlocks/QuakeSpasm-SDL2.cbp
index bc0f1422..5cf686f0 100644
--- a/quakespasm/Windows/CodeBlocks/QuakeSpasm-SDL2.cbp
+++ b/quakespasm/Windows/CodeBlocks/QuakeSpasm-SDL2.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="SDL2\bin\Debug\quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
-				<Option object_output="SDL2\obj\Debug\" />
+				<Option output="bin\Debug\quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Debug\SDL2\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="-window -basedir C:\QuakeSpasm" />
@@ -17,8 +17,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="SDL2\bin\Release\quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
-				<Option object_output="SDL2\obj\Release\" />
+				<Option output="bin\Release\quakespasm-sdl2" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Release\SDL2\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="-window -basedir C:\QuakeSpasm" />
diff --git a/quakespasm/Windows/CodeBlocks/QuakeSpasm.layout b/quakespasm/Windows/CodeBlocks/QuakeSpasm.layout
deleted file mode 100644
index 23b67ddb..00000000
--- a/quakespasm/Windows/CodeBlocks/QuakeSpasm.layout
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release" />
-</CodeBlocks_layout_file>
diff --git a/quakespasm/Windows/CodeBlocks/QuakeSpasm.workspace b/quakespasm/Windows/CodeBlocks/QuakeSpasm.workspace
deleted file mode 100644
index 4b9d3d91..00000000
--- a/quakespasm/Windows/CodeBlocks/QuakeSpasm.workspace
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-	<Workspace title="Workspace">
-		<Project filename="QuakeSpasm.cbp" active="1" />
-	</Workspace>
-</CodeBlocks_workspace_file>