diff --git a/gldefs.txt b/gldefs.txt
index e4e213f..aa0b1f6 100644
--- a/gldefs.txt
+++ b/gldefs.txt
@@ -1,35 +1,35 @@
 brightmap sprite kgcma0
 {
-  map "sprites/bright_kgcma0.png"
+  map "sprites/gretchencounter/bright_kgcma0.png"
   disablefullbright
 }
 
 brightmap sprite kgcmb0
 {
-  map "sprites/bright_kgcmb0.png"
+  map "sprites/gretchencounter/bright_kgcmb0.png"
   disablefullbright
 }
 
 brightmap sprite kgcna0
 {
-  map "sprites/bright_kgcma0.png"
+  map "sprites/gretchencounter/bright_kgcma0.png"
   disablefullbright
 }
 
 brightmap sprite kgcnb0
 {
-  map "sprites/bright_kgcmb0.png"
+  map "sprites/gretchencounter/bright_kgcmb0.png"
   disablefullbright
 }
 
 brightmap sprite kgcpa0
 {
-  map "sprites/bright_kgcpa0.png"
+  map "sprites/gretchencounter/bright_kgcpa0.png"
   disablefullbright
 }
 
 brightmap sprite kgcpb0
 {
-  map "sprites/bright_kgcpb0.png"
+  map "sprites/gretchencounter/bright_kgcpb0.png"
   disablefullbright
 }
diff --git a/source_data/Makefile b/source_data/Makefile
index 6cd6a97..654f447 100644
--- a/source_data/Makefile
+++ b/source_data/Makefile
@@ -1,91 +1,91 @@
 all : \
-	../sprites/kgcmb0.png \
-	../sprites/kgcma0.png \
-	../sprites/kgcmc0.png \
-	../sprites/kgcna0.png \
-	../sprites/kgcnb0.png \
-	../sprites/bright_kgcma0.png \
-	../sprites/bright_kgcmb0.png \
+	../sprites/gretchencounter/kgcmb0.png \
+	../sprites/gretchencounter/kgcma0.png \
+	../sprites/gretchencounter/kgcmc0.png \
+	../sprites/gretchencounter/kgcna0.png \
+	../sprites/gretchencounter/kgcnb0.png \
+	../sprites/gretchencounter/bright_kgcma0.png \
+	../sprites/gretchencounter/bright_kgcmb0.png \
 	../sounds/kirigretchencounter_click.ogg \
 	../sounds/kirigretchencounter_blip.ogg \
 	../sounds/kirigretchencounter_onoff.ogg \
-	../sprites/kgcpa0.png \
-	../sprites/kgcpb0.png \
-	../sprites/bright_kgcpa0.png \
-	../sprites/bright_kgcpb0.png \
-	../sprites/bright_kgcmc0.png
+	../sprites/gretchencounter/kgcpa0.png \
+	../sprites/gretchencounter/kgcpb0.png \
+	../sprites/gretchencounter/bright_kgcpa0.png \
+	../sprites/gretchencounter/bright_kgcpb0.png \
+	../sprites/gretchencounter/bright_kgcmc0.png
 
 # Base frames
-../sprites/kgcma0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/kgcma0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--ignore-layer "brightmap" \
 		--frame-range 0,0 --save-as $@
 
-../sprites/kgcmb0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/kgcmb0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--ignore-layer "brightmap" \
 		--frame-range 1,1 --save-as $@
 
-../sprites/kgcmc0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/kgcmc0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--ignore-layer "brightmap" \
 		--frame-range 2,2 --save-as $@
 
 # Brightmaps
-../sprites/bright_kgcma0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/bright_kgcma0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "brightmap" \
 		--frame-range 0,0 --save-as $@
 
-../sprites/bright_kgcmb0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/bright_kgcmb0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "brightmap" \
 		--frame-range 1,1 --save-as $@
 
-../sprites/bright_kgcmc0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/bright_kgcmc0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "brightmap" \
 		--frame-range 2,2 --save-as $@
 
 # Needle
-../sprites/kgcna0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/kgcna0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "needle" \
 		--frame-range 0,0 --save-as $@
 
-../sprites/kgcnb0.png : gretchencounter_weaponsprite.aseprite
+../sprites/gretchencounter/kgcnb0.png : gretchencounter_weaponsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "needle" \
 		--frame-range 1,1 --save-as $@
 
 # Pickup sprite
-../sprites/kgcpa0.png : gretchencounter_pickupsprite.aseprite
+../sprites/gretchencounter/kgcpa0.png : gretchencounter_pickupsprite.aseprite
 	aseprite $^ \
 		-b \
 		--ignore-layer "brightmap" \
 		--frame-range 0,0 --save-as $@
 
-../sprites/kgcpb0.png : gretchencounter_pickupsprite.aseprite
+../sprites/gretchencounter/kgcpb0.png : gretchencounter_pickupsprite.aseprite
 	aseprite $^ \
 		-b \
 		--ignore-layer "brightmap" \
 		--frame-range 1,1 --save-as $@
 
-../sprites/bright_kgcpa0.png : gretchencounter_pickupsprite.aseprite
+../sprites/gretchencounter/bright_kgcpa0.png : gretchencounter_pickupsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "brightmap" \
 		--frame-range 0,0 --save-as $@
 
-../sprites/bright_kgcpb0.png : gretchencounter_pickupsprite.aseprite
+../sprites/gretchencounter/bright_kgcpb0.png : gretchencounter_pickupsprite.aseprite
 	aseprite $^ \
 		-b \
 		--layer "brightmap" \
diff --git a/sprites/bright_kgcma0.png b/sprites/gretchencounter/bright_kgcma0.png
similarity index 100%
rename from sprites/bright_kgcma0.png
rename to sprites/gretchencounter/bright_kgcma0.png
diff --git a/sprites/bright_kgcmb0.png b/sprites/gretchencounter/bright_kgcmb0.png
similarity index 100%
rename from sprites/bright_kgcmb0.png
rename to sprites/gretchencounter/bright_kgcmb0.png
diff --git a/sprites/bright_kgcmc0.png b/sprites/gretchencounter/bright_kgcmc0.png
similarity index 100%
rename from sprites/bright_kgcmc0.png
rename to sprites/gretchencounter/bright_kgcmc0.png
diff --git a/sprites/bright_kgcpa0.png b/sprites/gretchencounter/bright_kgcpa0.png
similarity index 100%
rename from sprites/bright_kgcpa0.png
rename to sprites/gretchencounter/bright_kgcpa0.png
diff --git a/sprites/bright_kgcpb0.png b/sprites/gretchencounter/bright_kgcpb0.png
similarity index 100%
rename from sprites/bright_kgcpb0.png
rename to sprites/gretchencounter/bright_kgcpb0.png
diff --git a/sprites/kgcma0.png b/sprites/gretchencounter/kgcma0.png
similarity index 100%
rename from sprites/kgcma0.png
rename to sprites/gretchencounter/kgcma0.png
diff --git a/sprites/kgcmb0.png b/sprites/gretchencounter/kgcmb0.png
similarity index 100%
rename from sprites/kgcmb0.png
rename to sprites/gretchencounter/kgcmb0.png
diff --git a/sprites/kgcmc0.png b/sprites/gretchencounter/kgcmc0.png
similarity index 100%
rename from sprites/kgcmc0.png
rename to sprites/gretchencounter/kgcmc0.png
diff --git a/sprites/kgcna0.png b/sprites/gretchencounter/kgcna0.png
similarity index 100%
rename from sprites/kgcna0.png
rename to sprites/gretchencounter/kgcna0.png
diff --git a/sprites/kgcnb0.png b/sprites/gretchencounter/kgcnb0.png
similarity index 100%
rename from sprites/kgcnb0.png
rename to sprites/gretchencounter/kgcnb0.png
diff --git a/sprites/kgcpa0.png b/sprites/gretchencounter/kgcpa0.png
similarity index 100%
rename from sprites/kgcpa0.png
rename to sprites/gretchencounter/kgcpa0.png
diff --git a/sprites/kgcpb0.png b/sprites/gretchencounter/kgcpb0.png
similarity index 100%
rename from sprites/kgcpb0.png
rename to sprites/gretchencounter/kgcpb0.png