diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4805365bc..1daf33d78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -462,20 +462,14 @@ set(OC_CLONK_SOURCES
 	src/game/C4FullScreen.h
 	src/game/C4Game.cpp
 	src/game/C4Game.h
+	src/game/C4GameScript.cpp
+	src/game/C4GameScript.h
 	src/game/C4GameVersion.h
 	src/game/C4GraphicsSystem.cpp
 	src/game/C4GraphicsSystem.h
 	src/game/C4Physics.h
 	src/game/C4Viewport.cpp
 	src/game/C4Viewport.h
-	src/gamescript/C4Effect.cpp
-	src/gamescript/C4Effect.h
-	src/gamescript/C4FindObject.cpp
-	src/gamescript/C4FindObject.h
-	src/gamescript/C4GameScript.cpp
-	src/gamescript/C4GameScript.h
-	src/gamescript/C4TransferZone.cpp
-	src/gamescript/C4TransferZone.h
 	src/graphics/Bitmap256.cpp
 	src/graphics/Bitmap256.h
 	src/graphics/C4Draw.cpp
@@ -622,6 +616,8 @@ set(OC_CLONK_SOURCES
 	src/landscape/C4Texture.h
 	src/landscape/C4TextureShape.cpp
 	src/landscape/C4TextureShape.h
+	src/landscape/C4TransferZone.cpp
+	src/landscape/C4TransferZone.h
 	src/landscape/C4Weather.cpp
 	src/landscape/C4Weather.h
 	src/lib/C4LogBuf.cpp
@@ -692,6 +688,8 @@ set(OC_CLONK_SOURCES
 	src/object/C4Def.h
 	src/object/C4DefList.cpp
 	src/object/C4DefList.h
+	src/object/C4FindObject.cpp
+	src/object/C4FindObject.h
 	src/object/C4GameObjects.cpp
 	src/object/C4GameObjects.h
 	src/object/C4Id.cpp
@@ -1053,6 +1051,8 @@ src/script/C4AulLink.cpp
 src/script/C4AulParse.cpp
 src/script/C4AulScriptFunc.cpp
 src/script/C4AulScriptFunc.h
+src/script/C4Effect.cpp
+src/script/C4Effect.h
 src/script/C4PropList.cpp
 src/script/C4PropList.h
 src/script/C4Script.cpp
diff --git a/src/gamescript/C4GameScript.cpp b/src/game/C4GameScript.cpp
similarity index 100%
rename from src/gamescript/C4GameScript.cpp
rename to src/game/C4GameScript.cpp
diff --git a/src/gamescript/C4GameScript.h b/src/game/C4GameScript.h
similarity index 100%
rename from src/gamescript/C4GameScript.h
rename to src/game/C4GameScript.h
diff --git a/src/gamescript/C4TransferZone.cpp b/src/landscape/C4TransferZone.cpp
similarity index 100%
rename from src/gamescript/C4TransferZone.cpp
rename to src/landscape/C4TransferZone.cpp
diff --git a/src/gamescript/C4TransferZone.h b/src/landscape/C4TransferZone.h
similarity index 100%
rename from src/gamescript/C4TransferZone.h
rename to src/landscape/C4TransferZone.h
diff --git a/src/gamescript/C4FindObject.cpp b/src/object/C4FindObject.cpp
similarity index 100%
rename from src/gamescript/C4FindObject.cpp
rename to src/object/C4FindObject.cpp
diff --git a/src/gamescript/C4FindObject.h b/src/object/C4FindObject.h
similarity index 100%
rename from src/gamescript/C4FindObject.h
rename to src/object/C4FindObject.h
diff --git a/src/gamescript/C4Effect.cpp b/src/script/C4Effect.cpp
similarity index 100%
rename from src/gamescript/C4Effect.cpp
rename to src/script/C4Effect.cpp
diff --git a/src/gamescript/C4Effect.h b/src/script/C4Effect.h
similarity index 100%
rename from src/gamescript/C4Effect.h
rename to src/script/C4Effect.h