diff --git a/games/ootw/Makefile b/games/ootw/Makefile
index 07c195c1..812b52b7 100644
--- a/games/ootw/Makefile
+++ b/games/ootw/Makefile
@@ -5,27 +5,28 @@ PNG2RLE = ../../utils/gr-utils/png2rle
 PNG2LZ4 = ../../utils/gr-utils/png2lz4
 TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
 
+EMPTY_DISK = ../../empty_disk
 
 all:	ootw.dsk ootw_side2.dsk ootw_side3.dsk
 
 ootw.dsk:	HELLO TITLE \
 		./intro/INTRO ./ootw_c1/OOTW_C1 ./ootw_c2/OOTW_C2 \
-		OOTW_C3 OOTW_C4 OOTW_C5
-	cp empty.dsk ootw.dsk
+		./ootw_c3/OOTW_C3 ./ootw_c4/OOTW_C4 OOTW_C5
+	cp $(EMPTY_DISK)/empty.dsk ootw.dsk
 	$(DOS33) -y ootw.dsk SAVE A HELLO
 	$(DOS33) -y ootw.dsk BSAVE -a 0xd00 TITLE
 	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./intro/INTRO INTRO
 	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c1/OOTW_C1
 	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c2/OOTW_C2
-	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C3
-	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C4
+	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c3/OOTW_C3
+	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c4/OOTW_C4
 	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C5
 #	$(DOS33) -y ootw.dsk BSAVE -a 0x1700 AUDIO_TEST
 #	$(DOS33) -y ootw.dsk BSAVE -a 0x2000 COMPRESS-TEST
 
 ootw_side2.dsk:	HELLO TITLE \
 	OOTW_C6 OOTW_C7 OOTW_C8 OOTW_C9 OOTW_C10
-	cp empty.dsk ootw_side2.dsk
+	cp $(EMPTY_DISK)/empty.dsk ootw_side2.dsk
 	$(DOS33) -y ootw_side2.dsk SAVE A HELLO HELLO
 	$(DOS33) -y ootw_side2.dsk BSAVE -a 0xd00 TITLE
 	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 OOTW_C6
@@ -36,7 +37,7 @@ ootw_side2.dsk:	HELLO TITLE \
 
 ootw_side3.dsk:	HELLO TITLE ENDING \
 	OOTW_C11 OOTW_C12 OOTW_C13 OOTW_C14 OOTW_C15
-	cp empty.dsk ootw_side3.dsk
+	cp $(EMPTY_DISK)/empty.dsk ootw_side3.dsk
 	$(DOS33) -y ootw_side3.dsk SAVE A HELLO HELLO
 	$(DOS33) -y ootw_side3.dsk BSAVE -a 0xd00 TITLE
 	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C11
@@ -48,37 +49,6 @@ ootw_side3.dsk:	HELLO TITLE ENDING \
 
 ####
 
-OOTW_C3:	ootw_c3.o
-	ld65 -o OOTW_C3 ootw_c3.o -C ../../linker_scripts/apple2_1700.inc
-
-ootw_c3.o:	ootw_c3.s \
-	gr_copy.s gr_copy_offset.s gr_fast_clear.s gr_pageflip.s gr_unrle.s \
-	gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \
-	keyboard.s \
-	ootw_c3_vent.s \
-	ootw_graphics/sprites/physicist_rolling.inc \
-	ootw_graphics/l3vent/ootw_c3_vent.inc
-	ca65 -o ootw_c3.o ootw_c3.s -l ootw_c3.lst
-
-###
-
-OOTW_C4:	ootw_c4.o
-	ld65 -o OOTW_C4 ootw_c4.o -C ../../linker_scripts/apple2_1700.inc
-
-ootw_c4.o:	ootw_c4.s \
-	gr_copy.s gr_twoscreen_scroll.s gr_fast_clear.s gr_pageflip.s \
-	gr_unrle.s gr_hlin.s \
-	gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \
-	keyboard.s gr_run_sequence.s physicist.s \
-	collision.s alien.s alien_laser.s \
-	ootw_c4_city.s ootw_c4_action.s \
-	door.s laser.s shield.s blast.s gun.s charger.s \
-	ootw_graphics/sprites/physicist.inc \
-	ootw_graphics/l4city/ootw_c4_city.inc
-	ca65 -o ootw_c4.o ootw_c4.s -l ootw_c4.lst
-
-###
-
 OOTW_C5:	ootw_c5.o
 	ld65 -o OOTW_C5 ootw_c5.o -C ../../linker_scripts/apple2_1700.inc
 
@@ -260,6 +230,11 @@ ootw_c1/OOTW_C1:
 ootw_c2/OOTW_C2:
 	cd ootw_c2 && make
 
+ootw_c3/OOTW_C3:
+	cd ootw_c3 && make
+
+ootw_c4/OOTW_C4:
+	cd ootw_c4 && make
 
 ####
 
diff --git a/games/ootw/empty.dsk b/games/ootw/empty.dsk
deleted file mode 100644
index b34eb519..00000000
Binary files a/games/ootw/empty.dsk and /dev/null differ
diff --git a/games/ootw/ootw_c3/Makefile b/games/ootw/ootw_c3/Makefile
new file mode 100644
index 00000000..be88d883
--- /dev/null
+++ b/games/ootw/ootw_c3/Makefile
@@ -0,0 +1,35 @@
+include ../../../Makefile.inc
+
+COMMON = ..
+SPRITES = ../ootw_graphics/sprites
+LINKER_SCRIPTS = ../../../linker_scripts
+
+all:	OOTW_C3
+
+####
+
+OOTW_C3:	ootw_c3.o
+	ld65 -o OOTW_C3 ootw_c3.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+
+ootw_c3.o:	ootw_c3.s \
+	$(COMMON)/gr_copy.s \
+	$(COMMON)/gr_copy_offset.s \
+	$(COMMON)/gr_fast_clear.s \
+	$(COMMON)/gr_pageflip.s \
+	$(COMMON)/gr_unrle.s \
+	$(COMMON)/gr_putsprite.s \
+	$(COMMON)/gr_putsprite_flipped.s \
+	$(COMMON)/gr_putsprite_crop.s \
+	$(COMMON)/keyboard.s \
+	ootw_c3_vent.s \
+	$(SPRITES)/physicist_rolling.inc \
+	graphics/l3_vent/ootw_c3_vent.inc
+	ca65 -o ootw_c3.o ootw_c3.s -l ootw_c3.lst
+
+
+#####
+
+clean:		
+		rm -f *~ *.o *.lst *.lz4 OOTW_C3
+
+
diff --git a/games/ootw/ootw_graphics/l3vent/Makefile b/games/ootw/ootw_c3/graphics/l3_vent/Makefile
similarity index 100%
rename from games/ootw/ootw_graphics/l3vent/Makefile
rename to games/ootw/ootw_c3/graphics/l3_vent/Makefile
diff --git a/games/ootw/ootw_graphics/l3vent/ootw_c3_vent.inc b/games/ootw/ootw_c3/graphics/l3_vent/ootw_c3_vent.inc
similarity index 100%
rename from games/ootw/ootw_graphics/l3vent/ootw_c3_vent.inc
rename to games/ootw/ootw_c3/graphics/l3_vent/ootw_c3_vent.inc
diff --git a/games/ootw/ootw_graphics/l3vent/vent.png b/games/ootw/ootw_c3/graphics/l3_vent/vent.png
similarity index 100%
rename from games/ootw/ootw_graphics/l3vent/vent.png
rename to games/ootw/ootw_c3/graphics/l3_vent/vent.png
diff --git a/games/ootw/ootw_c3.s b/games/ootw/ootw_c3/ootw_c3.s
similarity index 68%
rename from games/ootw/ootw_c3.s
rename to games/ootw/ootw_c3/ootw_c3.s
index 9d52d7ac..80a46ccd 100644
--- a/games/ootw/ootw_c3.s
+++ b/games/ootw/ootw_c3/ootw_c3.s
@@ -2,8 +2,8 @@
 
 ; by Vince "Deater" Weaver	<vince@deater.net>
 
-.include "zp.inc"
-.include "hardware.inc"
+.include "../zp.inc"
+.include "../hardware.inc"
 
 
 
@@ -80,24 +80,19 @@ end_message:
 .byte	11,20,"ACCESS CODE: VENT",0
 
 .include "ootw_c3_vent.s"
-.include "text_print.s"
-.include "gr_pageflip.s"
-.include "gr_unrle.s"
-.include "gr_fast_clear.s"
-.include "gr_copy.s"
-;.include "gr_copy_offset.s"
-.include "gr_putsprite.s"
-;.include "gr_putsprite_flipped.s"
-.include "gr_putsprite_crop.s"
-.include "gr_offsets.s"
-.include "gr_offsets_hl.s"
-;.include "gr_run_sequence.s"
-;.include "gr_overlay.s"
-;.include "random16.s"
-.include "keyboard.s"
+.include "../text_print.s"
+.include "../gr_pageflip.s"
+.include "../gr_unrle.s"
+.include "../gr_fast_clear.s"
+.include "../gr_copy.s"
+.include "../gr_putsprite.s"
+.include "../gr_putsprite_crop.s"
+.include "../gr_offsets.s"
+.include "../gr_offsets_hl.s"
+.include "../keyboard.s"
 
 ; room backgrounds
-.include "ootw_graphics/l3vent/ootw_c3_vent.inc"
+.include "graphics/l3_vent/ootw_c3_vent.inc"
 ; sprites
-.include "ootw_graphics/sprites/physicist_rolling.inc"
+.include "../ootw_graphics/sprites/physicist_rolling.inc"
 
diff --git a/games/ootw/ootw_c3_vent.s b/games/ootw/ootw_c3/ootw_c3_vent.s
similarity index 100%
rename from games/ootw/ootw_c3_vent.s
rename to games/ootw/ootw_c3/ootw_c3_vent.s
diff --git a/games/ootw/ootw_c4/Makefile b/games/ootw/ootw_c4/Makefile
new file mode 100644
index 00000000..bfefc52a
--- /dev/null
+++ b/games/ootw/ootw_c4/Makefile
@@ -0,0 +1,46 @@
+include ../../../Makefile.inc
+
+COMMON = ..
+LINKER_SCRIPTS = ../../../linker_scripts
+SPRITES = ../ootw_graphics/sprites
+
+all:	OOTW_C4
+
+####
+
+OOTW_C4:	ootw_c4.o
+	ld65 -o OOTW_C4 ootw_c4.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+
+ootw_c4.o:	ootw_c4.s \
+	$(COMMON)/gr_copy.s \
+	$(COMMON)/gr_twoscreen_scroll.s \
+	$(COMMON)/gr_fast_clear.s \
+	$(COMMON)/gr_pageflip.s \
+	$(COMMON)/gr_unrle.s \
+	$(COMMON)/gr_hlin.s \
+	$(COMMON)/gr_putsprite.s \
+	$(COMMON)/gr_putsprite_flipped.s \
+	$(COMMON)/gr_putsprite_crop.s \
+	$(COMMON)/keyboard.s \
+	$(COMMON)/gr_run_sequence.s \
+	$(COMMON)/physicist.s \
+	$(COMMON)/collision.s \
+	$(COMMON)/alien.s \
+	$(COMMON)/alien_laser.s \
+	ootw_c4_city.s ootw_c4_action.s \
+	$(COMMON)/door.s \
+	$(COMMON)/laser.s \
+	$(COMMON)/shield.s \
+	$(COMMON)/blast.s \
+	$(COMMON)/gun.s \
+	$(COMMON)/charger.s \
+	$(SPRITES)/physicist.inc \
+	graphics/l4_city/ootw_c4_city.inc
+	ca65 -o ootw_c4.o ootw_c4.s -l ootw_c4.lst
+
+###
+
+clean:		
+		rm -f *~ *.o *.lst *.lz4 OOTW_C4
+
+
diff --git a/games/ootw/ootw_graphics/l4city/Makefile b/games/ootw/ootw_c4/graphics/l4_city/Makefile
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/Makefile
rename to games/ootw/ootw_c4/graphics/l4_city/Makefile
diff --git a/games/ootw/ootw_graphics/l4city/causeway1.png b/games/ootw/ootw_c4/graphics/l4_city/causeway1.png
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/causeway1.png
rename to games/ootw/ootw_c4/graphics/l4_city/causeway1.png
diff --git a/games/ootw/ootw_graphics/l4city/causeway2.png b/games/ootw/ootw_c4/graphics/l4_city/causeway2.png
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/causeway2.png
rename to games/ootw/ootw_c4/graphics/l4_city/causeway2.png
diff --git a/games/ootw/ootw_graphics/l4city/hallway.png b/games/ootw/ootw_c4/graphics/l4_city/hallway.png
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/hallway.png
rename to games/ootw/ootw_c4/graphics/l4_city/hallway.png
diff --git a/games/ootw/ootw_graphics/l4city/ootw_c4_city.inc b/games/ootw/ootw_c4/graphics/l4_city/ootw_c4_city.inc
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/ootw_c4_city.inc
rename to games/ootw/ootw_c4/graphics/l4_city/ootw_c4_city.inc
diff --git a/games/ootw/ootw_graphics/l4city/pit.png b/games/ootw/ootw_c4/graphics/l4_city/pit.png
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/pit.png
rename to games/ootw/ootw_c4/graphics/l4_city/pit.png
diff --git a/games/ootw/ootw_graphics/l4city/recharge.png b/games/ootw/ootw_c4/graphics/l4_city/recharge.png
similarity index 100%
rename from games/ootw/ootw_graphics/l4city/recharge.png
rename to games/ootw/ootw_c4/graphics/l4_city/recharge.png
diff --git a/games/ootw/ootw_c4.s b/games/ootw/ootw_c4/ootw_c4.s
similarity index 59%
rename from games/ootw/ootw_c4.s
rename to games/ootw/ootw_c4/ootw_c4.s
index da2942c9..6b3cc207 100644
--- a/games/ootw/ootw_c4.s
+++ b/games/ootw/ootw_c4/ootw_c4.s
@@ -2,8 +2,8 @@
 
 ; by Vince "Deater" Weaver	<vince@deater.net>
 
-.include "zp.inc"
-.include "hardware.inc"
+.include "../zp.inc"
+.include "../hardware.inc"
 
 
 
@@ -85,39 +85,38 @@ end_message:
 .byte	11,20,"ACCESS CODE: RCHG",0
 
 .include "ootw_c4_city.s"
-.include "text_print.s"
-.include "gr_pageflip.s"
-.include "gr_unrle.s"
-.include "gr_fast_clear.s"
-.include "gr_copy.s"
-.include "gr_hlin.s"
-.include "gr_twoscreen_scroll.s"
-.include "gr_putsprite.s"
-.include "gr_putsprite_flipped.s"
-.include "gr_putsprite_crop.s"
-.include "gr_offsets.s"
-;.include "random16.s"
-.include "keyboard.s"
+.include "../text_print.s"
+.include "../gr_pageflip.s"
+.include "../gr_unrle.s"
+.include "../gr_fast_clear.s"
+.include "../gr_copy.s"
+.include "../gr_hlin.s"
+.include "../gr_twoscreen_scroll.s"
+.include "../gr_putsprite.s"
+.include "../gr_putsprite_flipped.s"
+.include "../gr_putsprite_crop.s"
+.include "../gr_offsets.s"
+.include "../keyboard.s"
 
-.include "physicist.s"
-.include "alien.s"
+.include "../physicist.s"
+.include "../alien.s"
 
-.include "door.s"
-.include "charger.s"
-.include "gun.s"
-.include "laser.s"
-.include "shield.s"
-.include "blast.s"
-.include "collision.s"
-.include "dummy_friend.s"
-.include "alien_laser.s"
+.include "../door.s"
+.include "../charger.s"
+.include "../gun.s"
+.include "../laser.s"
+.include "../shield.s"
+.include "../blast.s"
+.include "../collision.s"
+.include "../dummy_friend.s"
+.include "../alien_laser.s"
 
 .include "ootw_c4_action.s"
 
 ; room backgrounds
-.include "ootw_graphics/l4city/ootw_c4_city.inc"
+.include "graphics/l4_city/ootw_c4_city.inc"
 ; sprites
-.include "ootw_graphics/sprites/physicist.inc"
-.include "ootw_graphics/sprites/alien.inc"
+.include "../ootw_graphics/sprites/physicist.inc"
+.include "../ootw_graphics/sprites/alien.inc"
 
 
diff --git a/games/ootw/ootw_c4_action.s b/games/ootw/ootw_c4/ootw_c4_action.s
similarity index 100%
rename from games/ootw/ootw_c4_action.s
rename to games/ootw/ootw_c4/ootw_c4_action.s
diff --git a/games/ootw/ootw_c4_city.s b/games/ootw/ootw_c4/ootw_c4_city.s
similarity index 100%
rename from games/ootw/ootw_c4_city.s
rename to games/ootw/ootw_c4/ootw_c4_city.s