diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/COPYING b/COPYING
old mode 100755
new mode 100644
diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index e5ef638..7c5558a
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,19 @@
 LINUX_CC	:= cc
-LINUX_SRC	:= gol_linux.c
+LINUX_SRC	:= src/gol_linux.c
 LINUX_CFLAGS	:= -Wall -Wextra -pedantic-errors -ansi -std=gnu99 -lncurses -lm -O3
-LINUX_OUT	:= gol.out
+LINUX_OUT	:= bin/gol.out
 
 APPLE2_CL	:= $(CC65_HOME)/bin/cl65
 APPLE2_CC	:= $(CC65_HOME)/bin/cc65
-APPLE2_SRC	:= gol_apple2.c gol_apple2_optimized.asm gfx.asm rnd_colors.asm file_io.c mli.asm
+APPLE2_SRC	:= src/gol_apple2.c src/gol_apple2_optimized.asm src/gfx.asm src/rnd_colors.asm src/file_io.c src/mli.asm
 APPLE2_MAP  := gol_apple2.map
 APPLE2_CFLAGS	:= -Oirs -v -t apple2
-APPLE2_OUT	:= gol.a2
+APPLE2_OUT	:= bin/gol.a2
 
-all:	linux apple2
+all:	directories linux apple2
+
+directories:
+	    mkdir -p bin
 
 linux:	$(LINUX_SRC)
 	$(LINUX_CC) -o $(LINUX_OUT) $? $(LINUX_CFLAGS)
@@ -22,4 +25,4 @@ apple2-asm: $(APPLE2_SRC)
 				$(APPLE2_CC) $(APPLE2_CFLAGS) -r -T $?
 
 clean:	$(SRC)
-	rm -f $(LINUX_OUT) $(APPLE2_OUT) $(APPLE2_MAP) *.o *.s gmon.out
+	rm -f $(APPLE2_MAP) src/*.o src/*.s gmon.out & rm -r bin/
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/benchs.txt b/benchs.txt
old mode 100755
new mode 100644
diff --git a/disk.dsk b/disk.dsk
old mode 100755
new mode 100644
index fa877ea..29b6ae2
Binary files a/disk.dsk and b/disk.dsk differ
diff --git a/add-to-disk.sh b/scripts/add-to-disk.sh
old mode 100755
new mode 100644
similarity index 100%
rename from add-to-disk.sh
rename to scripts/add-to-disk.sh
diff --git a/file_io.c b/src/file_io.c
old mode 100755
new mode 100644
similarity index 100%
rename from file_io.c
rename to src/file_io.c
diff --git a/file_io.h b/src/file_io.h
old mode 100755
new mode 100644
similarity index 100%
rename from file_io.h
rename to src/file_io.h
diff --git a/gfx.asm b/src/gfx.asm
old mode 100755
new mode 100644
similarity index 100%
rename from gfx.asm
rename to src/gfx.asm
diff --git a/gfx.h b/src/gfx.h
old mode 100755
new mode 100644
similarity index 100%
rename from gfx.h
rename to src/gfx.h
diff --git a/gol_apple2.c b/src/gol_apple2.c
old mode 100755
new mode 100644
similarity index 100%
rename from gol_apple2.c
rename to src/gol_apple2.c
diff --git a/gol_apple2_optimized.asm b/src/gol_apple2_optimized.asm
old mode 100755
new mode 100644
similarity index 100%
rename from gol_apple2_optimized.asm
rename to src/gol_apple2_optimized.asm
diff --git a/gol_linux.c b/src/gol_linux.c
old mode 100755
new mode 100644
similarity index 100%
rename from gol_linux.c
rename to src/gol_linux.c
diff --git a/mli.asm b/src/mli.asm
old mode 100755
new mode 100644
similarity index 100%
rename from mli.asm
rename to src/mli.asm
diff --git a/rnd_colors.asm b/src/rnd_colors.asm
old mode 100755
new mode 100644
similarity index 100%
rename from rnd_colors.asm
rename to src/rnd_colors.asm
diff --git a/rnd_colors.h b/src/rnd_colors.h
old mode 100755
new mode 100644
similarity index 100%
rename from rnd_colors.h
rename to src/rnd_colors.h