diff --git a/bin/Makefile b/bin/Makefile
deleted file mode 100644
index 7853155..0000000
--- a/bin/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-CFLAGS = -I/opt/local/include -Wall -DNDEBUG -O3 
-#CFLAGS = -I/opt/local/include -Wall -g
-LDFLAGS = -L/opt/local/lib -g -ldl -lgmp -lm
-CC = gcc
-
-ifeq ("$(shell uname)", "Linux")
-  LDFLAGS += -rdynamic # dlsym(local_symbol) won't work otherwise
-endif
-
-objects = ikarus-collect.o ikarus-runtime.o ikarus-main.o ikarus-fasl.o \
-  ikarus-exec.o ikarus-print.o ikarus-enter.o ikarus-symbol-table.o  \
-  ikarus-weak-pairs.o ikarus-numerics.o ikarus-flonums.o \
-  ikarus-verify-integrity.o ikarus-winmmap.o
-
-all: ikarus
-
-ikarus: $(objects)
-	$(CC) -o ikarus $(objects) $(LDFLAGS)
-
-ikarus-main.o: ikarus-main.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-main.c
-
-ikarus-enter.o: ikarus-enter.s ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-enter.s
-
-ikarus-runtime.o: ikarus-runtime.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-runtime.c
-
-ikarus-fasl.o: ikarus-fasl.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-fasl.c
-
-ikarus-verify-integrity.o: ikarus-verify-integrity.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-verify-integrity.c
-
-ikarus-exec.o: ikarus-exec.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-exec.c
-
-ikarus-print.o: ikarus-print.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-print.c
-
-ikarus-collect.o: ikarus-collect.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-collect.c
-
-ikarus-weak-pairs.o: ikarus-weak-pairs.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-weak-pairs.c
-
-ikarus-symbol-table.o: ikarus-symbol-table.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-symbol-table.c
-
-ikarus-numerics.o: ikarus-numerics.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-numerics.c
-
-ikarus-flonums.o: ikarus-flonums.c ikarus-data.h
-	$(CC) $(CFLAGS) -c ikarus-flonums.c
-
-ikarus-winmmap.o: ikarus-winmmap.c ikarus-winmmap.h
-	$(CC) $(CFLAGS) -c ikarus-winmmap.c
-
-clean:
-	rm -f $(objects)
-
-realclean:
-	rm -f $(objects) ikarus
diff --git a/bin/collect.ss b/bin/collect.ss
deleted file mode 100644
index ff32da4..0000000
--- a/bin/collect.ss
+++ /dev/null
@@ -1,5 +0,0 @@
-
-(define (f)
-  (collect)
-  (f))
-(f)
diff --git a/bin/hash-tests.ss b/bin/hash-tests.ss
deleted file mode 100644
index e655017..0000000
--- a/bin/hash-tests.ss
+++ /dev/null
@@ -1,56 +0,0 @@
-
-(define collect void)
-
-(define test
-  (lambda (name x1 x2)
-    (unless (equal? x1 x2)
-      (error 'test "test ~s failed: expected ~s, got ~s" name x1 x2))
-    (printf "~a ok\n" name)))
-
-(test 1
-      '(12 17 yes)
-      (let ([h (make-hash-table)])
-        (put-hash-table! h 'foo 12)
-        (put-hash-table! h 'bar 17)
-        (collect)
-        (list
-          (get-hash-table h 'foo 'no)
-          (get-hash-table h 'bar 'no)
-          (get-hash-table h 'baz 'yes))))
-
-
-(define iota
-  (lambda (i n)
-    (cond
-      [(fx= i n) '()]
-      [else (cons i (iota (fx+ 1 i) n))])))
-
-(test 2
-      (iota 1 10001)
-      (let ([h (make-hash-table)])
-        (for-each
-          (lambda (i) (put-hash-table! h i (fx+ 1 i)))
-          (iota 0 10000))
-        (collect)
-        (map
-          (lambda (i) (get-hash-table h i #f))
-          (iota 0 10000))))
-
-(test 3
-      (iota 2 10002)
-      (let ([h (make-hash-table)])
-        (for-each
-          (lambda (i) (put-hash-table! h i (fx+ 1 i)))
-          (iota 0 10000))
-        (for-each
-          (lambda (i) (put-hash-table! h i 
-                        (fx+ 1 
-                          (get-hash-table h i -1000))))
-          (iota 0 10000))
-        (collect)
-        (map
-          (lambda (i) (get-hash-table h i #f))
-          (iota 0 10000))))
-
-
-
diff --git a/bin/ikarus b/bin/ikarus
deleted file mode 100755
index cd3ce14..0000000
Binary files a/bin/ikarus and /dev/null differ
diff --git a/bin/tags.txt b/src/tags.txt
similarity index 100%
rename from bin/tags.txt
rename to src/tags.txt