diff --git a/appleiibot/Makefile b/appleiibot/Makefile
new file mode 100644
index 00000000..77f5f61a
--- /dev/null
+++ b/appleiibot/Makefile
@@ -0,0 +1,163 @@
+include ../Makefile.inc
+
+DOS33 = ../dos33fs-utils/dos33
+TOKENIZE = ../asoft_basic-utils/tokenize_asoft
+
+all:	appleiibot.dsk convert_to convert_back convert_qkumba
+
+appleiibot.dsk:	E2.BAS FLAME.BAS FLAME2.BAS \
+	CIRCLES.BAS AUTUMN.BAS QKUMBA.BAS ASTEROID.BAS PERSON.BAS SHIP.BAS \
+	CONCERT.BAS NYAN.BAS RASTER.BAS RASTER2.BAS RASTER3.BAS LOTS.BAS LOAD \
+	RASTER4.BAS RASTER5.BAS
+	cp empty.dsk appleiibot.dsk
+	$(DOS33) -y appleiibot.dsk BSAVE -a 0x0300 LOAD
+	$(DOS33) -y appleiibot.dsk SAVE A E2.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A FLAME.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A FLAME2.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A AUTUMN.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A CIRCLES.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A QKUMBA.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A ASTEROID.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A PERSON.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A SHIP.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A NYAN.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A CONCERT.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A RASTER.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A RASTER2.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A RASTER3.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A RASTER4.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A RASTER5.BAS
+	$(DOS33) -y appleiibot.dsk SAVE A LOTS.BAS
+
+###
+
+convert_to:	convert_to.o
+	$(CC) $(LFLAGS) -o convert_to convert_to.o
+
+convert_to.o:	convert_to.c
+	$(CC) $(CFLAGS) -c convert_to.c
+
+###
+
+convert_qkumba:	convert_qkumba.o
+	$(CC) $(LFLAGS) -o convert_qkumba convert_qkumba.o
+
+convert_qkumba.o:	convert_qkumba.c
+	$(CC) $(CFLAGS) -c convert_qkumba.c
+
+###
+
+convert_back:	convert_back.o
+	$(CC) $(LFLAGS) -o convert_back convert_back.o
+
+convert_back.o:	convert_back.c
+	$(CC) $(CFLAGS) -c convert_back.c
+
+
+###
+
+LOAD:	load.o
+	ld65 -o LOAD load.o -C ../linker_scripts/apple2_300.inc
+
+load.o:	load.s
+	ca65 -o load.o load.s -l load.lst
+
+####
+
+QKUMBA2.BAS:	qkumba_seasons.bas
+	$(TOKENIZE) < qkumba_seasons.bas > QKUMBA2.BAS
+
+####
+
+QKUMBA.BAS:	qkumba_autumn.bas
+	$(TOKENIZE) < qkumba_autumn.bas > QKUMBA.BAS
+
+####
+
+CONCERT.BAS:	concert.bas
+	$(TOKENIZE) < concert.bas > CONCERT.BAS
+
+####
+
+NYAN.BAS:	nyan.bas
+	$(TOKENIZE) < nyan.bas > NYAN.BAS
+
+####
+
+E2.BAS:	entropy_small.bas
+	$(TOKENIZE) < entropy_small.bas > E2.BAS
+
+
+####
+
+FLAME2.BAS:	flame2.bas
+	$(TOKENIZE) < flame2.bas > FLAME2.BAS
+
+
+####
+
+FLAME.BAS:	flame.bas
+	$(TOKENIZE) < flame.bas > FLAME.BAS
+
+####
+
+AUTUMN.BAS:	autumn.bas
+	$(TOKENIZE) < autumn.bas > AUTUMN.BAS
+
+####
+
+CIRCLES.BAS:	circles.bas
+	$(TOKENIZE) < circles.bas > CIRCLES.BAS
+
+####
+
+ASTEROID.BAS:	asteroid.bas
+	$(TOKENIZE) < asteroid.bas > ASTEROID.BAS
+
+####
+
+PERSON.BAS:	person.bas
+	$(TOKENIZE) < person.bas > PERSON.BAS
+
+####
+
+SHIP.BAS:	ship.bas
+	$(TOKENIZE) < ship.bas > SHIP.BAS
+
+####
+
+RASTER.BAS:	raster.bas
+	$(TOKENIZE) < raster.bas > RASTER.BAS
+
+####
+
+RASTER2.BAS:	raster2.bas
+	$(TOKENIZE) < raster2.bas > RASTER2.BAS
+
+####
+
+RASTER3.BAS:	raster3.bas
+	$(TOKENIZE) < raster3.bas > RASTER3.BAS
+
+####
+
+RASTER4.BAS:	raster4.bas
+	$(TOKENIZE) < raster4.bas > RASTER4.BAS
+
+
+####
+
+RASTER5.BAS:	raster5.bas
+	$(TOKENIZE) < raster5.bas > RASTER5.BAS
+
+
+####
+
+LOTS.BAS:	lots.bas
+	$(TOKENIZE) < lots.bas > LOTS.BAS
+
+
+####
+
+clean:
+	rm -f *~ *.o *.lst convert_to convert_from convert_qkumba convert_back LOAD *.BAS
diff --git a/two-liners/asteroid.bas b/appleiibot/asteroid.bas
similarity index 100%
rename from two-liners/asteroid.bas
rename to appleiibot/asteroid.bas
diff --git a/two-liners/asteroid.shape b/appleiibot/asteroid.shape
similarity index 100%
rename from two-liners/asteroid.shape
rename to appleiibot/asteroid.shape
diff --git a/two-liners/autumn.bas b/appleiibot/autumn.bas
similarity index 100%
rename from two-liners/autumn.bas
rename to appleiibot/autumn.bas
diff --git a/two-liners/circles.bas b/appleiibot/circles.bas
similarity index 100%
rename from two-liners/circles.bas
rename to appleiibot/circles.bas
diff --git a/two-liners/concert.bas b/appleiibot/concert.bas
similarity index 100%
rename from two-liners/concert.bas
rename to appleiibot/concert.bas
diff --git a/two-liners/convert4_4/autumn.bas b/appleiibot/convert4_4/autumn.bas
similarity index 100%
rename from two-liners/convert4_4/autumn.bas
rename to appleiibot/convert4_4/autumn.bas
diff --git a/two-liners/convert4_4/convert_to.c b/appleiibot/convert4_4/convert_to.c
similarity index 100%
rename from two-liners/convert4_4/convert_to.c
rename to appleiibot/convert4_4/convert_to.c
diff --git a/two-liners/convert6/autumn.bas b/appleiibot/convert6/autumn.bas
similarity index 100%
rename from two-liners/convert6/autumn.bas
rename to appleiibot/convert6/autumn.bas
diff --git a/two-liners/convert6/convert_to.c b/appleiibot/convert6/convert_to.c
similarity index 100%
rename from two-liners/convert6/convert_to.c
rename to appleiibot/convert6/convert_to.c
diff --git a/two-liners/convert6_2/convert_back.c b/appleiibot/convert6_2/convert_back.c
similarity index 100%
rename from two-liners/convert6_2/convert_back.c
rename to appleiibot/convert6_2/convert_back.c
diff --git a/two-liners/convert6_2/convert_to.c b/appleiibot/convert6_2/convert_to.c
similarity index 100%
rename from two-liners/convert6_2/convert_to.c
rename to appleiibot/convert6_2/convert_to.c
diff --git a/two-liners/convert6_2/load.good.s b/appleiibot/convert6_2/load.good.s
similarity index 100%
rename from two-liners/convert6_2/load.good.s
rename to appleiibot/convert6_2/load.good.s
diff --git a/two-liners/convert6_2/load.good2.s b/appleiibot/convert6_2/load.good2.s
similarity index 100%
rename from two-liners/convert6_2/load.good2.s
rename to appleiibot/convert6_2/load.good2.s
diff --git a/two-liners/convert6_2/load.s b/appleiibot/convert6_2/load.s
similarity index 100%
rename from two-liners/convert6_2/load.s
rename to appleiibot/convert6_2/load.s
diff --git a/two-liners/convert6_2/simple.s b/appleiibot/convert6_2/simple.s
similarity index 100%
rename from two-liners/convert6_2/simple.s
rename to appleiibot/convert6_2/simple.s
diff --git a/two-liners/convert_xor/convert_back.c b/appleiibot/convert_back.c
similarity index 94%
rename from two-liners/convert_xor/convert_back.c
rename to appleiibot/convert_back.c
index 3bbc0d56..9cef9a74 100644
--- a/two-liners/convert_xor/convert_back.c
+++ b/appleiibot/convert_back.c
@@ -3,7 +3,7 @@
 
 int main(int argc, char **argv) {
 
-	int i,a,x,len;
+	int i,a,len;
 	char buf[BUFSIZ];
 	char out[BUFSIZ];
 
diff --git a/two-liners/convert_qkumba.c b/appleiibot/convert_qkumba.c
similarity index 100%
rename from two-liners/convert_qkumba.c
rename to appleiibot/convert_qkumba.c
diff --git a/two-liners/convert_to.c b/appleiibot/convert_to.c
similarity index 100%
rename from two-liners/convert_to.c
rename to appleiibot/convert_to.c
diff --git a/two-liners/convert_back.c b/appleiibot/convert_xor/convert_back.c
similarity index 100%
rename from two-liners/convert_back.c
rename to appleiibot/convert_xor/convert_back.c
diff --git a/two-liners/convert_xor/convert_to.c b/appleiibot/convert_xor/convert_to.c
similarity index 100%
rename from two-liners/convert_xor/convert_to.c
rename to appleiibot/convert_xor/convert_to.c
diff --git a/two-liners/doc/autumn.jpg b/appleiibot/doc/autumn.jpg
similarity index 100%
rename from two-liners/doc/autumn.jpg
rename to appleiibot/doc/autumn.jpg
diff --git a/two-liners/doc/circles.png b/appleiibot/doc/circles.png
similarity index 100%
rename from two-liners/doc/circles.png
rename to appleiibot/doc/circles.png
diff --git a/two-liners/doc/dhgr.jpg b/appleiibot/doc/dhgr.jpg
similarity index 100%
rename from two-liners/doc/dhgr.jpg
rename to appleiibot/doc/dhgr.jpg
diff --git a/two-liners/doc/flame.png b/appleiibot/doc/flame.png
similarity index 100%
rename from two-liners/doc/flame.png
rename to appleiibot/doc/flame.png
diff --git a/two-liners/doc/index.html b/appleiibot/doc/index.html
similarity index 100%
rename from two-liners/doc/index.html
rename to appleiibot/doc/index.html
diff --git a/two-liners/doc/nyan.png b/appleiibot/doc/nyan.png
similarity index 100%
rename from two-liners/doc/nyan.png
rename to appleiibot/doc/nyan.png
diff --git a/two-liners/doc/rasterbars.png b/appleiibot/doc/rasterbars.png
similarity index 100%
rename from two-liners/doc/rasterbars.png
rename to appleiibot/doc/rasterbars.png
diff --git a/two-liners/doc/ship.png b/appleiibot/doc/ship.png
similarity index 100%
rename from two-liners/doc/ship.png
rename to appleiibot/doc/ship.png
diff --git a/appleiibot/empty.dsk b/appleiibot/empty.dsk
new file mode 100644
index 00000000..152a8ecb
Binary files /dev/null and b/appleiibot/empty.dsk differ
diff --git a/two-liners/entropy_small.bas b/appleiibot/entropy_small.bas
similarity index 100%
rename from two-liners/entropy_small.bas
rename to appleiibot/entropy_small.bas
diff --git a/two-liners/flame.bas b/appleiibot/flame.bas
similarity index 100%
rename from two-liners/flame.bas
rename to appleiibot/flame.bas
diff --git a/two-liners/flame2.bas b/appleiibot/flame2.bas
similarity index 100%
rename from two-liners/flame2.bas
rename to appleiibot/flame2.bas
diff --git a/two-liners/load.s b/appleiibot/load.s
similarity index 100%
rename from two-liners/load.s
rename to appleiibot/load.s
diff --git a/two-liners/lots.bas b/appleiibot/lots.bas
similarity index 100%
rename from two-liners/lots.bas
rename to appleiibot/lots.bas
diff --git a/two-liners/nyan.bas b/appleiibot/nyan.bas
similarity index 100%
rename from two-liners/nyan.bas
rename to appleiibot/nyan.bas
diff --git a/two-liners/person.bas b/appleiibot/person.bas
similarity index 100%
rename from two-liners/person.bas
rename to appleiibot/person.bas
diff --git a/two-liners/person.shape b/appleiibot/person.shape
similarity index 100%
rename from two-liners/person.shape
rename to appleiibot/person.shape
diff --git a/two-liners/person1.shape b/appleiibot/person1.shape
similarity index 100%
rename from two-liners/person1.shape
rename to appleiibot/person1.shape
diff --git a/two-liners/person2.bas b/appleiibot/person2.bas
similarity index 100%
rename from two-liners/person2.bas
rename to appleiibot/person2.bas
diff --git a/two-liners/qkumba_autumn.bas b/appleiibot/qkumba_autumn.bas
similarity index 100%
rename from two-liners/qkumba_autumn.bas
rename to appleiibot/qkumba_autumn.bas
diff --git a/two-liners/qkumba_seasons.bas b/appleiibot/qkumba_seasons.bas
similarity index 100%
rename from two-liners/qkumba_seasons.bas
rename to appleiibot/qkumba_seasons.bas
diff --git a/two-liners/raster.bas b/appleiibot/raster.bas
similarity index 100%
rename from two-liners/raster.bas
rename to appleiibot/raster.bas
diff --git a/two-liners/raster2.bas b/appleiibot/raster2.bas
similarity index 100%
rename from two-liners/raster2.bas
rename to appleiibot/raster2.bas
diff --git a/two-liners/raster3.bas b/appleiibot/raster3.bas
similarity index 100%
rename from two-liners/raster3.bas
rename to appleiibot/raster3.bas
diff --git a/two-liners/raster4.bas b/appleiibot/raster4.bas
similarity index 100%
rename from two-liners/raster4.bas
rename to appleiibot/raster4.bas
diff --git a/two-liners/raster5.bas b/appleiibot/raster5.bas
similarity index 100%
rename from two-liners/raster5.bas
rename to appleiibot/raster5.bas
diff --git a/two-liners/ship.bas b/appleiibot/ship.bas
similarity index 100%
rename from two-liners/ship.bas
rename to appleiibot/ship.bas
diff --git a/two-liners/ship.shape b/appleiibot/ship.shape
similarity index 100%
rename from two-liners/ship.shape
rename to appleiibot/ship.shape
diff --git a/two-liners/ENTROPY.BAS b/two-liners/ENTROPY.BAS
deleted file mode 100644
index d314dd8e..00000000
Binary files a/two-liners/ENTROPY.BAS and /dev/null differ
diff --git a/two-liners/Makefile b/two-liners/Makefile
index bfefa4df..6ab0c03b 100644
--- a/two-liners/Makefile
+++ b/two-liners/Makefile
@@ -3,57 +3,11 @@ include ../Makefile.inc
 DOS33 = ../dos33fs-utils/dos33
 TOKENIZE = ../asoft_basic-utils/tokenize_asoft
 
-all:	entropy.dsk convert_to convert_back convert_qkumba
+all:	entropy.dsk
 
-entropy.dsk:	ENTROPY ENTROPY.BAS E2.BAS FLAME.BAS FLAME2.BAS \
-	CIRCLES.BAS AUTUMN.BAS QKUMBA.BAS ASTEROID.BAS PERSON.BAS SHIP.BAS \
-	CONCERT.BAS NYAN.BAS RASTER.BAS RASTER2.BAS RASTER3.BAS LOTS.BAS LOAD \
-	RASTER4.BAS RASTER5.BAS
+entropy.dsk:	ENTROPY ENTROPY.BAS
 	$(DOS33) -y entropy.dsk BSAVE -a 0x0C00 ENTROPY
-	$(DOS33) -y entropy.dsk BSAVE -a 0x0300 LOAD
 	$(DOS33) -y entropy.dsk SAVE A ENTROPY.BAS
-	$(DOS33) -y entropy.dsk SAVE A E2.BAS
-	$(DOS33) -y entropy.dsk SAVE A FLAME.BAS
-	$(DOS33) -y entropy.dsk SAVE A FLAME2.BAS
-	$(DOS33) -y entropy.dsk SAVE A AUTUMN.BAS
-	$(DOS33) -y entropy.dsk SAVE A CIRCLES.BAS
-	$(DOS33) -y entropy.dsk SAVE A QKUMBA.BAS
-	$(DOS33) -y entropy.dsk SAVE A ASTEROID.BAS
-	$(DOS33) -y entropy.dsk SAVE A PERSON.BAS
-	$(DOS33) -y entropy.dsk SAVE A SHIP.BAS
-	$(DOS33) -y entropy.dsk SAVE A NYAN.BAS
-	$(DOS33) -y entropy.dsk SAVE A CONCERT.BAS
-	$(DOS33) -y entropy.dsk SAVE A RASTER.BAS
-	$(DOS33) -y entropy.dsk SAVE A RASTER2.BAS
-	$(DOS33) -y entropy.dsk SAVE A RASTER3.BAS
-	$(DOS33) -y entropy.dsk SAVE A RASTER4.BAS
-	$(DOS33) -y entropy.dsk SAVE A RASTER5.BAS
-	$(DOS33) -y entropy.dsk SAVE A LOTS.BAS
-
-###
-
-convert_to:	convert_to.o
-	$(CC) $(LFLAGS) -o convert_to convert_to.o
-
-convert_to.o:	convert_to.c
-	$(CC) $(CFLAGS) -c convert_to.c
-
-###
-
-convert_qkumba:	convert_qkumba.o
-	$(CC) $(LFLAGS) -o convert_qkumba convert_qkumba.o
-
-convert_qkumba.o:	convert_qkumba.c
-	$(CC) $(CFLAGS) -c convert_qkumba.c
-
-###
-
-convert_back:	convert_back.o
-	$(CC) $(LFLAGS) -o convert_back convert_back.o
-
-convert_back.o:	convert_back.c
-	$(CC) $(CFLAGS) -c convert_back.c
-
 
 ###
 
@@ -63,35 +17,6 @@ ENTROPY:	entropy.o
 entropy.o:	entropy.s
 	ca65 -o entropy.o entropy.s -l entropy.lst
 
-###
-
-LOAD:	load.o
-	ld65 -o LOAD load.o -C ../linker_scripts/apple2_300.inc
-
-load.o:	load.s
-	ca65 -o load.o load.s -l load.lst
-
-####
-
-QKUMBA2.BAS:	qkumba_seasons.bas
-	$(TOKENIZE) < qkumba_seasons.bas > QKUMBA2.BAS
-
-####
-
-QKUMBA.BAS:	qkumba_autumn.bas
-	$(TOKENIZE) < qkumba_autumn.bas > QKUMBA.BAS
-
-####
-
-CONCERT.BAS:	concert.bas
-	$(TOKENIZE) < concert.bas > CONCERT.BAS
-
-####
-
-NYAN.BAS:	nyan.bas
-	$(TOKENIZE) < nyan.bas > NYAN.BAS
-
-
 ####
 
 ENTROPY.BAS:	entropy.bas
@@ -99,80 +24,5 @@ ENTROPY.BAS:	entropy.bas
 
 ####
 
-E2.BAS:	entropy_small.bas
-	$(TOKENIZE) < entropy_small.bas > E2.BAS
-
-
-####
-
-FLAME2.BAS:	flame2.bas
-	$(TOKENIZE) < flame2.bas > FLAME2.BAS
-
-
-####
-
-FLAME.BAS:	flame.bas
-	$(TOKENIZE) < flame.bas > FLAME.BAS
-
-####
-
-AUTUMN.BAS:	autumn.bas
-	$(TOKENIZE) < autumn.bas > AUTUMN.BAS
-
-####
-
-CIRCLES.BAS:	circles.bas
-	$(TOKENIZE) < circles.bas > CIRCLES.BAS
-
-####
-
-ASTEROID.BAS:	asteroid.bas
-	$(TOKENIZE) < asteroid.bas > ASTEROID.BAS
-
-####
-
-PERSON.BAS:	person.bas
-	$(TOKENIZE) < person.bas > PERSON.BAS
-
-####
-
-SHIP.BAS:	ship.bas
-	$(TOKENIZE) < ship.bas > SHIP.BAS
-
-####
-
-RASTER.BAS:	raster.bas
-	$(TOKENIZE) < raster.bas > RASTER.BAS
-
-####
-
-RASTER2.BAS:	raster2.bas
-	$(TOKENIZE) < raster2.bas > RASTER2.BAS
-
-####
-
-RASTER3.BAS:	raster3.bas
-	$(TOKENIZE) < raster3.bas > RASTER3.BAS
-
-####
-
-RASTER4.BAS:	raster4.bas
-	$(TOKENIZE) < raster4.bas > RASTER4.BAS
-
-
-####
-
-RASTER5.BAS:	raster5.bas
-	$(TOKENIZE) < raster5.bas > RASTER5.BAS
-
-
-####
-
-LOTS.BAS:	lots.bas
-	$(TOKENIZE) < lots.bas > LOTS.BAS
-
-
-####
-
 clean:	
-	rm -f *~ *.o *.lst convert_to convert_from convert_qkumba ENTROPY LOAD
+	rm -f *~ *.o *.lst ENTROPY ENTROPY.BAS