diff --git a/ootw/Makefile b/ootw/Makefile
index b913a779..8c954a3a 100644
--- a/ootw/Makefile
+++ b/ootw/Makefile
@@ -28,7 +28,7 @@ ootw.o:	ootw.s \
 	ootw_rope.s earthquake.s ootw_mesa.s \
 	ootw_pool.s ootw_cavern.s physicist.s random16.s \
 	cutscene_slug.s cutscene_beast.s \
-	ootw_pool.inc \
+	ootw_graphics/pool/ootw_pool.inc \
 	ootw_cavern.inc ootw_cavern2.inc ootw_cavern3.inc ootw_underwater.inc \
 	ootw_rope.inc \
 	sprites_physicist.inc sprites_slugs.inc \
@@ -168,9 +168,6 @@ HELLO:  hello.bas
 
 #####
 
-ootw_pool.inc:	$(PNG2RLE) another.png
-	$(PNG2RLE) asm another.png pool_rle > ootw_pool.inc
-
 ootw_cavern.inc:	$(PNG2RLE) another_cave.png
 	$(PNG2RLE) asm another_cave.png cavern_rle > ootw_cavern.inc
 
diff --git a/ootw/ootw.s b/ootw/ootw.s
index 063aaa17..8e5b2cb6 100644
--- a/ootw/ootw.s
+++ b/ootw/ootw.s
@@ -94,7 +94,7 @@ end_message:
 .include "random16.s"
 .include "keyboard.s"
 ; room backgrounds
-.include "ootw_pool.inc"
+.include "ootw_graphics/pool/ootw_pool.inc"
 .include "ootw_cavern.inc"
 .include "ootw_cavern2.inc"
 .include "ootw_cavern3.inc"
diff --git a/ootw/sprite_graphics/Apple II Lores.gpl b/ootw/ootw_graphics/Apple II Lores.gpl
similarity index 100%
rename from ootw/sprite_graphics/Apple II Lores.gpl
rename to ootw/ootw_graphics/Apple II Lores.gpl
diff --git a/ootw/sprite_graphics/beast-20190126-142310.piskel b/ootw/ootw_graphics/beast/beast-20190126-142310.piskel
similarity index 100%
rename from ootw/sprite_graphics/beast-20190126-142310.piskel
rename to ootw/ootw_graphics/beast/beast-20190126-142310.piskel
diff --git a/ootw/ootw_graphics/pool/Makefile b/ootw/ootw_graphics/pool/Makefile
new file mode 100644
index 00000000..943b691b
--- /dev/null
+++ b/ootw/ootw_graphics/pool/Makefile
@@ -0,0 +1,17 @@
+include ../../../Makefile.inc
+
+PNG2RLE = ../../../gr-utils/png2rle
+PNG2LZ4 = ../../../gr-utils/png2lz4
+
+all:	ootw_pool.inc
+
+#####
+
+ootw_pool.inc:	$(PNG2RLE) another_pool.png
+	$(PNG2RLE) asm another_pool.png pool_rle > ootw_pool.inc
+
+#####
+
+clean:		
+		rm -f *~ *.o *.lst *.lzz *.inc
+
diff --git a/ootw/another.png b/ootw/ootw_graphics/pool/another_pool.png
similarity index 100%
rename from ootw/another.png
rename to ootw/ootw_graphics/pool/another_pool.png
diff --git a/ootw/ootw_pool.inc b/ootw/ootw_graphics/pool/ootw_pool.inc
similarity index 100%
rename from ootw/ootw_pool.inc
rename to ootw/ootw_graphics/pool/ootw_pool.inc