diff --git a/src/ikarus.boot b/src/ikarus.boot
index 01e1687..6b59112 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/libtoplevel.ss b/src/libtoplevel.ss
index 127976d..ac9a89e 100644
--- a/src/libtoplevel.ss
+++ b/src/libtoplevel.ss
@@ -96,6 +96,7 @@
      (display "Copyright (c) 2006 Abdulaziz Ghuloum\n\n")
      (command-line-arguments args)
      (for-each load files)
-     (new-cafe)]))
+     (new-cafe)
+     (exit 0)]))
 
 
diff --git a/src/makefile.ss b/src/makefile.ss
index 7e5ab1c..1f188bb 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -1,4 +1,4 @@
-#!/Users/aghuloum/.opt/bin/ikarus --script
+#!../bin/ikarus -b ikarus.boot --script
 
 ;;; 9.1: * starting with libnumerics
 ;;; 9.0: * graph marks for both reader and writer 
@@ -275,5 +275,5 @@
   (format "cat ~a > ikarus.boot"
           (join " " (map caddr scheme-library-files))))
 
-(#%compiler-giveup-tally)
+;(#%compiler-giveup-tally)
 ; vim:syntax=scheme
diff --git a/src/tests-1.1-req.scm b/src/tests/tests-1.1-req.scm
similarity index 100%
rename from src/tests-1.1-req.scm
rename to src/tests/tests-1.1-req.scm
diff --git a/src/tests-1.2-req.scm b/src/tests/tests-1.2-req.scm
similarity index 100%
rename from src/tests-1.2-req.scm
rename to src/tests/tests-1.2-req.scm
diff --git a/src/tests-1.3-req.scm b/src/tests/tests-1.3-req.scm
similarity index 100%
rename from src/tests-1.3-req.scm
rename to src/tests/tests-1.3-req.scm
diff --git a/src/tests-1.4-req.scm b/src/tests/tests-1.4-req.scm
similarity index 100%
rename from src/tests-1.4-req.scm
rename to src/tests/tests-1.4-req.scm
diff --git a/src/tests-1.5-req.scm b/src/tests/tests-1.5-req.scm
similarity index 100%
rename from src/tests-1.5-req.scm
rename to src/tests/tests-1.5-req.scm
diff --git a/src/tests-1.6-req.scm b/src/tests/tests-1.6-req.scm
similarity index 100%
rename from src/tests-1.6-req.scm
rename to src/tests/tests-1.6-req.scm
diff --git a/src/tests-1.7-req.scm b/src/tests/tests-1.7-req.scm
similarity index 100%
rename from src/tests-1.7-req.scm
rename to src/tests/tests-1.7-req.scm
diff --git a/src/tests-1.8-req.scm b/src/tests/tests-1.8-req.scm
similarity index 100%
rename from src/tests-1.8-req.scm
rename to src/tests/tests-1.8-req.scm
diff --git a/src/tests-1.9-req.scm b/src/tests/tests-1.9-req.scm
similarity index 100%
rename from src/tests-1.9-req.scm
rename to src/tests/tests-1.9-req.scm
diff --git a/src/tests-2.1-req.scm b/src/tests/tests-2.1-req.scm
similarity index 100%
rename from src/tests-2.1-req.scm
rename to src/tests/tests-2.1-req.scm
diff --git a/src/tests-2.2-req.scm b/src/tests/tests-2.2-req.scm
similarity index 100%
rename from src/tests-2.2-req.scm
rename to src/tests/tests-2.2-req.scm
diff --git a/src/tests-2.3-req.scm b/src/tests/tests-2.3-req.scm
similarity index 100%
rename from src/tests-2.3-req.scm
rename to src/tests/tests-2.3-req.scm
diff --git a/src/tests-2.4-req.scm b/src/tests/tests-2.4-req.scm
similarity index 100%
rename from src/tests-2.4-req.scm
rename to src/tests/tests-2.4-req.scm
diff --git a/src/tests-2.6-req.scm b/src/tests/tests-2.6-req.scm
similarity index 100%
rename from src/tests-2.6-req.scm
rename to src/tests/tests-2.6-req.scm
diff --git a/src/tests-2.8-req.scm b/src/tests/tests-2.8-req.scm
similarity index 100%
rename from src/tests-2.8-req.scm
rename to src/tests/tests-2.8-req.scm
diff --git a/src/tests-2.9-req.scm b/src/tests/tests-2.9-req.scm
similarity index 100%
rename from src/tests-2.9-req.scm
rename to src/tests/tests-2.9-req.scm
diff --git a/src/tests-3.1-req.scm b/src/tests/tests-3.1-req.scm
similarity index 100%
rename from src/tests-3.1-req.scm
rename to src/tests/tests-3.1-req.scm
diff --git a/src/tests-3.2-req.scm b/src/tests/tests-3.2-req.scm
similarity index 100%
rename from src/tests-3.2-req.scm
rename to src/tests/tests-3.2-req.scm
diff --git a/src/tests-3.3-req.scm b/src/tests/tests-3.3-req.scm
similarity index 100%
rename from src/tests-3.3-req.scm
rename to src/tests/tests-3.3-req.scm
diff --git a/src/tests-3.4-req.scm b/src/tests/tests-3.4-req.scm
similarity index 100%
rename from src/tests-3.4-req.scm
rename to src/tests/tests-3.4-req.scm
diff --git a/src/tests-4.1-req.scm b/src/tests/tests-4.1-req.scm
similarity index 100%
rename from src/tests-4.1-req.scm
rename to src/tests/tests-4.1-req.scm
diff --git a/src/tests-4.2-req.scm b/src/tests/tests-4.2-req.scm
similarity index 100%
rename from src/tests-4.2-req.scm
rename to src/tests/tests-4.2-req.scm
diff --git a/src/tests-4.3-req.scm b/src/tests/tests-4.3-req.scm
similarity index 100%
rename from src/tests-4.3-req.scm
rename to src/tests/tests-4.3-req.scm
diff --git a/src/tests-5.1-req.scm b/src/tests/tests-5.1-req.scm
similarity index 100%
rename from src/tests-5.1-req.scm
rename to src/tests/tests-5.1-req.scm
diff --git a/src/tests-5.2-req.scm b/src/tests/tests-5.2-req.scm
similarity index 100%
rename from src/tests-5.2-req.scm
rename to src/tests/tests-5.2-req.scm
diff --git a/src/tests-5.3-req.scm b/src/tests/tests-5.3-req.scm
similarity index 100%
rename from src/tests-5.3-req.scm
rename to src/tests/tests-5.3-req.scm
diff --git a/src/tests-5.6-req.scm b/src/tests/tests-5.6-req.scm
similarity index 100%
rename from src/tests-5.6-req.scm
rename to src/tests/tests-5.6-req.scm