diff --git a/.gitignore b/.gitignore
index cfa0b43..ecb6bf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 out/
-bin/
 *~
 #*#
 .#*
\ No newline at end of file
diff --git a/000.trackdisk/bin/test.adf b/000.trackdisk/bin/test.adf
new file mode 100644
index 0000000..bae9af5
Binary files /dev/null and b/000.trackdisk/bin/test.adf differ
diff --git a/001.simple_image/Makefile b/001.simple_image/Makefile
index bc7bf74..79c9ced 100644
--- a/001.simple_image/Makefile
+++ b/001.simple_image/Makefile
@@ -1,4 +1,3 @@
-MAKEADF=../tools/makeadf
 FLOPPY=bin/image.adf
 EXTRA=out/image-copper-list.s out/image.bin
 IMAGEFILE=../assets/mission-beach.png
diff --git a/002.sprite_display/Makefile b/002.sprite_display/Makefile
index 73c354c..665fdaa 100644
--- a/002.sprite_display/Makefile
+++ b/002.sprite_display/Makefile
@@ -1,4 +1,3 @@
-MAKEADF=../tools/makeadf
 FLOPPY=bin/image.adf
 MODULE=sprite.s
 
diff --git a/002.sprite_display/bin/image.adf b/002.sprite_display/bin/image.adf
new file mode 100644
index 0000000..ca53ad5
Binary files /dev/null and b/002.sprite_display/bin/image.adf differ
diff --git a/003.music/Makefile b/003.music/Makefile
index 7fbf6a1..13ce9ca 100644
--- a/003.music/Makefile
+++ b/003.music/Makefile
@@ -1,4 +1,3 @@
-MAKEADF=../tools/makeadf
 FLOPPY=bin/image.adf
 EXTRA=out/image-copper-list.s out/image.bin
 IMAGEFILE=../assets/mission-beach.png
diff --git a/003.music/bin/image.adf b/003.music/bin/image.adf
new file mode 100644
index 0000000..de629ab
Binary files /dev/null and b/003.music/bin/image.adf differ
diff --git a/004.copper_bars/Makefile b/004.copper_bars/Makefile
index 31e6f34..c6c4f1f 100644
--- a/004.copper_bars/Makefile
+++ b/004.copper_bars/Makefile
@@ -1,4 +1,3 @@
-MAKEADF=../tools/makeadf
 FLOPPY=bin/copper_bars.adf
 EXTRA=out/copper-list.s
 
diff --git a/004.copper_bars/bin/copper_bars.adf b/004.copper_bars/bin/copper_bars.adf
new file mode 100644
index 0000000..2fe5f97
Binary files /dev/null and b/004.copper_bars/bin/copper_bars.adf differ
diff --git a/005.copper_vert/Makefile b/005.copper_vert/Makefile
index 5a4071b..d2d9405 100644
--- a/005.copper_vert/Makefile
+++ b/005.copper_vert/Makefile
@@ -1,4 +1,3 @@
-MAKEADF=../tools/makeadf
 FLOPPY=bin/copper_vert.adf
 EXTRA=out/copper-list.s
 
diff --git a/005.copper_vert/bin/copper_vert.adf b/005.copper_vert/bin/copper_vert.adf
new file mode 100644
index 0000000..1028a93
Binary files /dev/null and b/005.copper_vert/bin/copper_vert.adf differ
diff --git a/base.mk b/base.mk
index 7d80d2c..1f6b13a 100644
--- a/base.mk
+++ b/base.mk
@@ -1,9 +1,9 @@
 MAKEADFDIR=../tools/makeadf/
-MAKEADF=$(MAKEADFDIR)/bin/makeadf
+MAKEADF=$(MAKEADFDIR)/out/makeadf
 HOST_WARNINGS=-pedantic-errors -Wfatal-errors -Wall -Werror -Wextra -Wno-unused-parameter -Wshadow
 HOST_CFLAGS=-g $(HOST_WARNINGS)
 IMAGECONDIR=../tools/imagecon
-IMAGECON=$(IMAGECONDIR)/bin/imagecon
+IMAGECON=$(IMAGECONDIR)/out/imagecon
 
 all: bin out $(MAKEADF) $(FLOPPY)
 
@@ -47,4 +47,4 @@ out/main.bin: out/main.o
 	vlink -brawbin1 $< -o $@
 
 clean:
-	rm -rf out bin *~
+	rm -rf out *~
diff --git a/tools/imagecon/Makefile b/tools/imagecon/Makefile
index 12fb172..da65afd 100644
--- a/tools/imagecon/Makefile
+++ b/tools/imagecon/Makefile
@@ -1,4 +1,4 @@
-IMAGECON=./bin/imagecon
+IMAGECON=./out/imagecon
 SRCS=imagecon.c
 HOST_WARNINGS=-pedantic-errors -Wfatal-errors -Wall -Werror -Wextra -Wno-unused-parameter -Wshadow -limagequant
 HOST_CFLAGS=$(HOST_WARNINGS)
diff --git a/tools/makeadf/Makefile b/tools/makeadf/Makefile
index 167c1f7..8cbb045 100644
--- a/tools/makeadf/Makefile
+++ b/tools/makeadf/Makefile
@@ -1,4 +1,4 @@
-MAKEADF=./bin/makeadf
+MAKEADF=./out/makeadf
 SRCS=makeadf.c
 HOST_WARNINGS=-pedantic-errors -Wfatal-errors -Wall -Werror -Wextra -Wno-unused-parameter -Wshadow
 HOST_CFLAGS=$(HOST_WARNINGS)