diff --git a/benchmarks/README b/benchmarks.larceny/README
similarity index 100%
rename from benchmarks/README
rename to benchmarks.larceny/README
diff --git a/benchmarks/analyse-results.scm b/benchmarks.larceny/analyse-results.scm
similarity index 100%
rename from benchmarks/analyse-results.scm
rename to benchmarks.larceny/analyse-results.scm
diff --git a/benchmarks/bench b/benchmarks.larceny/bench
similarity index 100%
rename from benchmarks/bench
rename to benchmarks.larceny/bench
diff --git a/benchmarks/evaluate b/benchmarks.larceny/evaluate
similarity index 100%
rename from benchmarks/evaluate
rename to benchmarks.larceny/evaluate
diff --git a/benchmarks/generate-html-from-all-results.scm b/benchmarks.larceny/generate-html-from-all-results.scm
similarity index 100%
rename from benchmarks/generate-html-from-all-results.scm
rename to benchmarks.larceny/generate-html-from-all-results.scm
diff --git a/benchmarks/num-iters/num-iters-1.scm b/benchmarks.larceny/num-iters/num-iters-1.scm
similarity index 100%
rename from benchmarks/num-iters/num-iters-1.scm
rename to benchmarks.larceny/num-iters/num-iters-1.scm
diff --git a/benchmarks/num-iters/num-iters-int.scm b/benchmarks.larceny/num-iters/num-iters-int.scm
similarity index 100%
rename from benchmarks/num-iters/num-iters-int.scm
rename to benchmarks.larceny/num-iters/num-iters-int.scm
diff --git a/benchmarks/num-iters/num-iters.scm b/benchmarks.larceny/num-iters/num-iters.scm
similarity index 100%
rename from benchmarks/num-iters/num-iters.scm
rename to benchmarks.larceny/num-iters/num-iters.scm
diff --git a/benchmarks/num-iters/one-iter.scm b/benchmarks.larceny/num-iters/one-iter.scm
similarity index 100%
rename from benchmarks/num-iters/one-iter.scm
rename to benchmarks.larceny/num-iters/one-iter.scm
diff --git a/benchmarks/optimize-gcc-options.scm b/benchmarks.larceny/optimize-gcc-options.scm
similarity index 100%
rename from benchmarks/optimize-gcc-options.scm
rename to benchmarks.larceny/optimize-gcc-options.scm
diff --git a/benchmarks/prefix/prefix-bigloo-int.scm b/benchmarks.larceny/prefix/prefix-bigloo-int.scm
similarity index 100%
rename from benchmarks/prefix/prefix-bigloo-int.scm
rename to benchmarks.larceny/prefix/prefix-bigloo-int.scm
diff --git a/benchmarks/prefix/prefix-bigloo.scm b/benchmarks.larceny/prefix/prefix-bigloo.scm
similarity index 100%
rename from benchmarks/prefix/prefix-bigloo.scm
rename to benchmarks.larceny/prefix/prefix-bigloo.scm
diff --git a/benchmarks/prefix/prefix-chez.scm b/benchmarks.larceny/prefix/prefix-chez.scm
similarity index 100%
rename from benchmarks/prefix/prefix-chez.scm
rename to benchmarks.larceny/prefix/prefix-chez.scm
diff --git a/benchmarks/prefix/prefix-chicken.scm b/benchmarks.larceny/prefix/prefix-chicken.scm
similarity index 100%
rename from benchmarks/prefix/prefix-chicken.scm
rename to benchmarks.larceny/prefix/prefix-chicken.scm
diff --git a/benchmarks/prefix/prefix-gambit-int.scm b/benchmarks.larceny/prefix/prefix-gambit-int.scm
similarity index 100%
rename from benchmarks/prefix/prefix-gambit-int.scm
rename to benchmarks.larceny/prefix/prefix-gambit-int.scm
diff --git a/benchmarks/prefix/prefix-gambit-sp.scm b/benchmarks.larceny/prefix/prefix-gambit-sp.scm
similarity index 100%
rename from benchmarks/prefix/prefix-gambit-sp.scm
rename to benchmarks.larceny/prefix/prefix-gambit-sp.scm
diff --git a/benchmarks/prefix/prefix-gambit.scm b/benchmarks.larceny/prefix/prefix-gambit.scm
similarity index 100%
rename from benchmarks/prefix/prefix-gambit.scm
rename to benchmarks.larceny/prefix/prefix-gambit.scm
diff --git a/benchmarks/prefix/prefix-henchman.scm b/benchmarks.larceny/prefix/prefix-henchman.scm
similarity index 100%
rename from benchmarks/prefix/prefix-henchman.scm
rename to benchmarks.larceny/prefix/prefix-henchman.scm
diff --git a/benchmarks/prefix/prefix-ikarus.scm b/benchmarks.larceny/prefix/prefix-ikarus.scm
similarity index 100%
rename from benchmarks/prefix/prefix-ikarus.scm
rename to benchmarks.larceny/prefix/prefix-ikarus.scm
diff --git a/benchmarks/prefix/prefix-larceny.scm b/benchmarks.larceny/prefix/prefix-larceny.scm
similarity index 100%
rename from benchmarks/prefix/prefix-larceny.scm
rename to benchmarks.larceny/prefix/prefix-larceny.scm
diff --git a/benchmarks/prefix/prefix-mit-int.scm b/benchmarks.larceny/prefix/prefix-mit-int.scm
similarity index 100%
rename from benchmarks/prefix/prefix-mit-int.scm
rename to benchmarks.larceny/prefix/prefix-mit-int.scm
diff --git a/benchmarks/prefix/prefix-mit.scm b/benchmarks.larceny/prefix/prefix-mit.scm
similarity index 100%
rename from benchmarks/prefix/prefix-mit.scm
rename to benchmarks.larceny/prefix/prefix-mit.scm
diff --git a/benchmarks/prefix/prefix-mzscheme.scm b/benchmarks.larceny/prefix/prefix-mzscheme.scm
similarity index 100%
rename from benchmarks/prefix/prefix-mzscheme.scm
rename to benchmarks.larceny/prefix/prefix-mzscheme.scm
diff --git a/benchmarks/prefix/prefix-petite-chez.scm b/benchmarks.larceny/prefix/prefix-petite-chez.scm
similarity index 100%
rename from benchmarks/prefix/prefix-petite-chez.scm
rename to benchmarks.larceny/prefix/prefix-petite-chez.scm
diff --git a/benchmarks/prefix/prefix-scheme48.scm b/benchmarks.larceny/prefix/prefix-scheme48.scm
similarity index 100%
rename from benchmarks/prefix/prefix-scheme48.scm
rename to benchmarks.larceny/prefix/prefix-scheme48.scm
diff --git a/benchmarks/readme.original b/benchmarks.larceny/readme.original
similarity index 100%
rename from benchmarks/readme.original
rename to benchmarks.larceny/readme.original
diff --git a/benchmarks/results.Larceny-r6rs b/benchmarks.larceny/results.Larceny-r6rs
similarity index 100%
rename from benchmarks/results.Larceny-r6rs
rename to benchmarks.larceny/results.Larceny-r6rs
diff --git a/benchmarks/results.Petite-Chez-Scheme-r5rs b/benchmarks.larceny/results.Petite-Chez-Scheme-r5rs
similarity index 100%
rename from benchmarks/results.Petite-Chez-Scheme-r5rs
rename to benchmarks.larceny/results.Petite-Chez-Scheme-r5rs
diff --git a/benchmarks/src/README.flonum-benchmarks b/benchmarks.larceny/src/README.flonum-benchmarks
similarity index 100%
rename from benchmarks/src/README.flonum-benchmarks
rename to benchmarks.larceny/src/README.flonum-benchmarks
diff --git a/benchmarks/src/ack.awk b/benchmarks.larceny/src/ack.awk
similarity index 100%
rename from benchmarks/src/ack.awk
rename to benchmarks.larceny/src/ack.awk
diff --git a/benchmarks/src/ack.c b/benchmarks.larceny/src/ack.c
similarity index 100%
rename from benchmarks/src/ack.c
rename to benchmarks.larceny/src/ack.c
diff --git a/benchmarks/src/ack.scm b/benchmarks.larceny/src/ack.scm
similarity index 100%
rename from benchmarks/src/ack.scm
rename to benchmarks.larceny/src/ack.scm
diff --git a/benchmarks/src/array1.awk b/benchmarks.larceny/src/array1.awk
similarity index 100%
rename from benchmarks/src/array1.awk
rename to benchmarks.larceny/src/array1.awk
diff --git a/benchmarks/src/array1.c b/benchmarks.larceny/src/array1.c
similarity index 100%
rename from benchmarks/src/array1.c
rename to benchmarks.larceny/src/array1.c
diff --git a/benchmarks/src/array1.scm b/benchmarks.larceny/src/array1.scm
similarity index 100%
rename from benchmarks/src/array1.scm
rename to benchmarks.larceny/src/array1.scm
diff --git a/benchmarks/new/bib b/benchmarks.larceny/src/bib
similarity index 100%
rename from benchmarks/new/bib
rename to benchmarks.larceny/src/bib
diff --git a/benchmarks/src/boyer.scm b/benchmarks.larceny/src/boyer.scm
similarity index 100%
rename from benchmarks/src/boyer.scm
rename to benchmarks.larceny/src/boyer.scm
diff --git a/benchmarks/src/browse.scm b/benchmarks.larceny/src/browse.scm
similarity index 100%
rename from benchmarks/src/browse.scm
rename to benchmarks.larceny/src/browse.scm
diff --git a/benchmarks/src/cat.awk b/benchmarks.larceny/src/cat.awk
similarity index 100%
rename from benchmarks/src/cat.awk
rename to benchmarks.larceny/src/cat.awk
diff --git a/benchmarks/src/cat.c b/benchmarks.larceny/src/cat.c
similarity index 100%
rename from benchmarks/src/cat.c
rename to benchmarks.larceny/src/cat.c
diff --git a/benchmarks/src/cat.scm b/benchmarks.larceny/src/cat.scm
similarity index 100%
rename from benchmarks/src/cat.scm
rename to benchmarks.larceny/src/cat.scm
diff --git a/benchmarks/src/compiler.scm b/benchmarks.larceny/src/compiler.scm
similarity index 100%
rename from benchmarks/src/compiler.scm
rename to benchmarks.larceny/src/compiler.scm
diff --git a/benchmarks/src/conform.scm b/benchmarks.larceny/src/conform.scm
similarity index 100%
rename from benchmarks/src/conform.scm
rename to benchmarks.larceny/src/conform.scm
diff --git a/benchmarks/src/cpstak.scm b/benchmarks.larceny/src/cpstak.scm
similarity index 100%
rename from benchmarks/src/cpstak.scm
rename to benchmarks.larceny/src/cpstak.scm
diff --git a/benchmarks/src/cpstak.sml b/benchmarks.larceny/src/cpstak.sml
similarity index 100%
rename from benchmarks/src/cpstak.sml
rename to benchmarks.larceny/src/cpstak.sml
diff --git a/benchmarks/src/crash.scm b/benchmarks.larceny/src/crash.scm
similarity index 100%
rename from benchmarks/src/crash.scm
rename to benchmarks.larceny/src/crash.scm
diff --git a/benchmarks/src/ctak.scm b/benchmarks.larceny/src/ctak.scm
similarity index 100%
rename from benchmarks/src/ctak.scm
rename to benchmarks.larceny/src/ctak.scm
diff --git a/benchmarks/src/ctak.sml b/benchmarks.larceny/src/ctak.sml
similarity index 100%
rename from benchmarks/src/ctak.sml
rename to benchmarks.larceny/src/ctak.sml
diff --git a/benchmarks/src/dderiv.scm b/benchmarks.larceny/src/dderiv.scm
similarity index 100%
rename from benchmarks/src/dderiv.scm
rename to benchmarks.larceny/src/dderiv.scm
diff --git a/benchmarks/src/deriv.scm b/benchmarks.larceny/src/deriv.scm
similarity index 100%
rename from benchmarks/src/deriv.scm
rename to benchmarks.larceny/src/deriv.scm
diff --git a/benchmarks/src/destruc.scm b/benchmarks.larceny/src/destruc.scm
similarity index 100%
rename from benchmarks/src/destruc.scm
rename to benchmarks.larceny/src/destruc.scm
diff --git a/benchmarks/src/diviter.c b/benchmarks.larceny/src/diviter.c
similarity index 100%
rename from benchmarks/src/diviter.c
rename to benchmarks.larceny/src/diviter.c
diff --git a/benchmarks/src/diviter.java b/benchmarks.larceny/src/diviter.java
similarity index 100%
rename from benchmarks/src/diviter.java
rename to benchmarks.larceny/src/diviter.java
diff --git a/benchmarks/src/diviter.scm b/benchmarks.larceny/src/diviter.scm
similarity index 100%
rename from benchmarks/src/diviter.scm
rename to benchmarks.larceny/src/diviter.scm
diff --git a/benchmarks/src/diviter.sml b/benchmarks.larceny/src/diviter.sml
similarity index 100%
rename from benchmarks/src/diviter.sml
rename to benchmarks.larceny/src/diviter.sml
diff --git a/benchmarks/src/divrec.c b/benchmarks.larceny/src/divrec.c
similarity index 100%
rename from benchmarks/src/divrec.c
rename to benchmarks.larceny/src/divrec.c
diff --git a/benchmarks/src/divrec.java b/benchmarks.larceny/src/divrec.java
similarity index 100%
rename from benchmarks/src/divrec.java
rename to benchmarks.larceny/src/divrec.java
diff --git a/benchmarks/src/divrec.scm b/benchmarks.larceny/src/divrec.scm
similarity index 100%
rename from benchmarks/src/divrec.scm
rename to benchmarks.larceny/src/divrec.scm
diff --git a/benchmarks/src/divrec.sml b/benchmarks.larceny/src/divrec.sml
similarity index 100%
rename from benchmarks/src/divrec.sml
rename to benchmarks.larceny/src/divrec.sml
diff --git a/benchmarks/src/dynamic.scm b/benchmarks.larceny/src/dynamic.scm
similarity index 100%
rename from benchmarks/src/dynamic.scm
rename to benchmarks.larceny/src/dynamic.scm
diff --git a/benchmarks/src/earley.scm b/benchmarks.larceny/src/earley.scm
similarity index 100%
rename from benchmarks/src/earley.scm
rename to benchmarks.larceny/src/earley.scm
diff --git a/benchmarks/src/fail.scm b/benchmarks.larceny/src/fail.scm
similarity index 100%
rename from benchmarks/src/fail.scm
rename to benchmarks.larceny/src/fail.scm
diff --git a/benchmarks/src/fft.c b/benchmarks.larceny/src/fft.c
similarity index 100%
rename from benchmarks/src/fft.c
rename to benchmarks.larceny/src/fft.c
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/fft.scm b/benchmarks.larceny/src/fft.scm
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/fft.scm
rename to benchmarks.larceny/src/fft.scm
diff --git a/benchmarks/src/fib.c b/benchmarks.larceny/src/fib.c
similarity index 100%
rename from benchmarks/src/fib.c
rename to benchmarks.larceny/src/fib.c
diff --git a/benchmarks/src/fib.java b/benchmarks.larceny/src/fib.java
similarity index 100%
rename from benchmarks/src/fib.java
rename to benchmarks.larceny/src/fib.java
diff --git a/benchmarks/src/fib.scm b/benchmarks.larceny/src/fib.scm
similarity index 100%
rename from benchmarks/src/fib.scm
rename to benchmarks.larceny/src/fib.scm
diff --git a/benchmarks/src/fib.sml b/benchmarks.larceny/src/fib.sml
similarity index 100%
rename from benchmarks/src/fib.sml
rename to benchmarks.larceny/src/fib.sml
diff --git a/benchmarks/src/fibc.scm b/benchmarks.larceny/src/fibc.scm
similarity index 100%
rename from benchmarks/src/fibc.scm
rename to benchmarks.larceny/src/fibc.scm
diff --git a/benchmarks/src/fibfp.c b/benchmarks.larceny/src/fibfp.c
similarity index 100%
rename from benchmarks/src/fibfp.c
rename to benchmarks.larceny/src/fibfp.c
diff --git a/benchmarks/src/fibfp.java b/benchmarks.larceny/src/fibfp.java
similarity index 100%
rename from benchmarks/src/fibfp.java
rename to benchmarks.larceny/src/fibfp.java
diff --git a/benchmarks/src/fibfp.scm b/benchmarks.larceny/src/fibfp.scm
similarity index 100%
rename from benchmarks/src/fibfp.scm
rename to benchmarks.larceny/src/fibfp.scm
diff --git a/benchmarks/src/fibfp.sml b/benchmarks.larceny/src/fibfp.sml
similarity index 100%
rename from benchmarks/src/fibfp.sml
rename to benchmarks.larceny/src/fibfp.sml
diff --git a/benchmarks/src/fpsum.scm b/benchmarks.larceny/src/fpsum.scm
similarity index 100%
rename from benchmarks/src/fpsum.scm
rename to benchmarks.larceny/src/fpsum.scm
diff --git a/benchmarks/src/gcbench.c b/benchmarks.larceny/src/gcbench.c
similarity index 100%
rename from benchmarks/src/gcbench.c
rename to benchmarks.larceny/src/gcbench.c
diff --git a/benchmarks/src/gcbench.java b/benchmarks.larceny/src/gcbench.java
similarity index 100%
rename from benchmarks/src/gcbench.java
rename to benchmarks.larceny/src/gcbench.java
diff --git a/benchmarks/src/gcbench.scm b/benchmarks.larceny/src/gcbench.scm
similarity index 100%
rename from benchmarks/src/gcbench.scm
rename to benchmarks.larceny/src/gcbench.scm
diff --git a/benchmarks/src/gcbench.sml b/benchmarks.larceny/src/gcbench.sml
similarity index 100%
rename from benchmarks/src/gcbench.sml
rename to benchmarks.larceny/src/gcbench.sml
diff --git a/benchmarks/src/gcold.scm b/benchmarks.larceny/src/gcold.scm
similarity index 100%
rename from benchmarks/src/gcold.scm
rename to benchmarks.larceny/src/gcold.scm
diff --git a/benchmarks/src/graphs.scm b/benchmarks.larceny/src/graphs.scm
similarity index 100%
rename from benchmarks/src/graphs.scm
rename to benchmarks.larceny/src/graphs.scm
diff --git a/benchmarks/src/lattice.scm b/benchmarks.larceny/src/lattice.scm
similarity index 100%
rename from benchmarks/src/lattice.scm
rename to benchmarks.larceny/src/lattice.scm
diff --git a/benchmarks/src/matrix.scm b/benchmarks.larceny/src/matrix.scm
similarity index 100%
rename from benchmarks/src/matrix.scm
rename to benchmarks.larceny/src/matrix.scm
diff --git a/benchmarks/src/maze.scm b/benchmarks.larceny/src/maze.scm
similarity index 100%
rename from benchmarks/src/maze.scm
rename to benchmarks.larceny/src/maze.scm
diff --git a/benchmarks/src/mazefun.scm b/benchmarks.larceny/src/mazefun.scm
similarity index 100%
rename from benchmarks/src/mazefun.scm
rename to benchmarks.larceny/src/mazefun.scm
diff --git a/benchmarks/src/mbrot.c b/benchmarks.larceny/src/mbrot.c
similarity index 100%
rename from benchmarks/src/mbrot.c
rename to benchmarks.larceny/src/mbrot.c
diff --git a/benchmarks/src/mbrot.scm b/benchmarks.larceny/src/mbrot.scm
similarity index 100%
rename from benchmarks/src/mbrot.scm
rename to benchmarks.larceny/src/mbrot.scm
diff --git a/benchmarks/src/nbody.scm b/benchmarks.larceny/src/nbody.scm
similarity index 100%
rename from benchmarks/src/nbody.scm
rename to benchmarks.larceny/src/nbody.scm
diff --git a/benchmarks/src/nboyer.sch b/benchmarks.larceny/src/nboyer.sch
similarity index 100%
rename from benchmarks/src/nboyer.sch
rename to benchmarks.larceny/src/nboyer.sch
diff --git a/benchmarks/src/nboyer.scm b/benchmarks.larceny/src/nboyer.scm
similarity index 100%
rename from benchmarks/src/nboyer.scm
rename to benchmarks.larceny/src/nboyer.scm
diff --git a/benchmarks/src/nqueens.scm b/benchmarks.larceny/src/nqueens.scm
similarity index 100%
rename from benchmarks/src/nqueens.scm
rename to benchmarks.larceny/src/nqueens.scm
diff --git a/benchmarks/src/ntakl.c b/benchmarks.larceny/src/ntakl.c
similarity index 100%
rename from benchmarks/src/ntakl.c
rename to benchmarks.larceny/src/ntakl.c
diff --git a/benchmarks/src/ntakl.java b/benchmarks.larceny/src/ntakl.java
similarity index 100%
rename from benchmarks/src/ntakl.java
rename to benchmarks.larceny/src/ntakl.java
diff --git a/benchmarks/src/ntakl.scm b/benchmarks.larceny/src/ntakl.scm
similarity index 100%
rename from benchmarks/src/ntakl.scm
rename to benchmarks.larceny/src/ntakl.scm
diff --git a/benchmarks/src/ntakl.sml b/benchmarks.larceny/src/ntakl.sml
similarity index 100%
rename from benchmarks/src/ntakl.sml
rename to benchmarks.larceny/src/ntakl.sml
diff --git a/benchmarks/src/nucleic.c b/benchmarks.larceny/src/nucleic.c
similarity index 100%
rename from benchmarks/src/nucleic.c
rename to benchmarks.larceny/src/nucleic.c
diff --git a/benchmarks/src/nucleic.scm b/benchmarks.larceny/src/nucleic.scm
similarity index 100%
rename from benchmarks/src/nucleic.scm
rename to benchmarks.larceny/src/nucleic.scm
diff --git a/benchmarks/src/num-iters-int.scm b/benchmarks.larceny/src/num-iters-int.scm
similarity index 100%
rename from benchmarks/src/num-iters-int.scm
rename to benchmarks.larceny/src/num-iters-int.scm
diff --git a/benchmarks/src/num-iters.java b/benchmarks.larceny/src/num-iters.java
similarity index 100%
rename from benchmarks/src/num-iters.java
rename to benchmarks.larceny/src/num-iters.java
diff --git a/benchmarks/src/num-iters.scm b/benchmarks.larceny/src/num-iters.scm
similarity index 100%
rename from benchmarks/src/num-iters.scm
rename to benchmarks.larceny/src/num-iters.scm
diff --git a/benchmarks/src/num-iters.sml b/benchmarks.larceny/src/num-iters.sml
similarity index 100%
rename from benchmarks/src/num-iters.sml
rename to benchmarks.larceny/src/num-iters.sml
diff --git a/benchmarks/src/one-iter.scm b/benchmarks.larceny/src/one-iter.scm
similarity index 100%
rename from benchmarks/src/one-iter.scm
rename to benchmarks.larceny/src/one-iter.scm
diff --git a/benchmarks/src/paraffins.scm b/benchmarks.larceny/src/paraffins.scm
similarity index 100%
rename from benchmarks/src/paraffins.scm
rename to benchmarks.larceny/src/paraffins.scm
diff --git a/benchmarks/src/parsing.scm b/benchmarks.larceny/src/parsing.scm
similarity index 100%
rename from benchmarks/src/parsing.scm
rename to benchmarks.larceny/src/parsing.scm
diff --git a/benchmarks/src/perm9.c b/benchmarks.larceny/src/perm9.c
similarity index 100%
rename from benchmarks/src/perm9.c
rename to benchmarks.larceny/src/perm9.c
diff --git a/benchmarks/src/perm9.java b/benchmarks.larceny/src/perm9.java
similarity index 100%
rename from benchmarks/src/perm9.java
rename to benchmarks.larceny/src/perm9.java
diff --git a/benchmarks/src/perm9.scm b/benchmarks.larceny/src/perm9.scm
similarity index 100%
rename from benchmarks/src/perm9.scm
rename to benchmarks.larceny/src/perm9.scm
diff --git a/benchmarks/src/perm9.sml b/benchmarks.larceny/src/perm9.sml
similarity index 100%
rename from benchmarks/src/perm9.sml
rename to benchmarks.larceny/src/perm9.sml
diff --git a/benchmarks/src/peval.scm b/benchmarks.larceny/src/peval.scm
similarity index 100%
rename from benchmarks/src/peval.scm
rename to benchmarks.larceny/src/peval.scm
diff --git a/benchmarks/src/pi.scm b/benchmarks.larceny/src/pi.scm
similarity index 100%
rename from benchmarks/src/pi.scm
rename to benchmarks.larceny/src/pi.scm
diff --git a/benchmarks/src/pnpoly.c b/benchmarks.larceny/src/pnpoly.c
similarity index 100%
rename from benchmarks/src/pnpoly.c
rename to benchmarks.larceny/src/pnpoly.c
diff --git a/benchmarks/src/pnpoly.scm b/benchmarks.larceny/src/pnpoly.scm
similarity index 100%
rename from benchmarks/src/pnpoly.scm
rename to benchmarks.larceny/src/pnpoly.scm
diff --git a/benchmarks/src/primes.scm b/benchmarks.larceny/src/primes.scm
similarity index 100%
rename from benchmarks/src/primes.scm
rename to benchmarks.larceny/src/primes.scm
diff --git a/benchmarks/src/puzzle.c b/benchmarks.larceny/src/puzzle.c
similarity index 100%
rename from benchmarks/src/puzzle.c
rename to benchmarks.larceny/src/puzzle.c
diff --git a/benchmarks/src/puzzle.scm b/benchmarks.larceny/src/puzzle.scm
similarity index 100%
rename from benchmarks/src/puzzle.scm
rename to benchmarks.larceny/src/puzzle.scm
diff --git a/benchmarks/src/puzzle.sml b/benchmarks.larceny/src/puzzle.sml
similarity index 100%
rename from benchmarks/src/puzzle.sml
rename to benchmarks.larceny/src/puzzle.sml
diff --git a/benchmarks/src/quicksort.scm b/benchmarks.larceny/src/quicksort.scm
similarity index 100%
rename from benchmarks/src/quicksort.scm
rename to benchmarks.larceny/src/quicksort.scm
diff --git a/benchmarks/src/ray.scm b/benchmarks.larceny/src/ray.scm
similarity index 100%
rename from benchmarks/src/ray.scm
rename to benchmarks.larceny/src/ray.scm
diff --git a/benchmarks/new/rn100 b/benchmarks.larceny/src/rn100
similarity index 100%
rename from benchmarks/new/rn100
rename to benchmarks.larceny/src/rn100
diff --git a/benchmarks/src/sboyer.scm b/benchmarks.larceny/src/sboyer.scm
similarity index 100%
rename from benchmarks/src/sboyer.scm
rename to benchmarks.larceny/src/sboyer.scm
diff --git a/benchmarks/src/scheme.scm b/benchmarks.larceny/src/scheme.scm
similarity index 100%
rename from benchmarks/src/scheme.scm
rename to benchmarks.larceny/src/scheme.scm
diff --git a/benchmarks/src/simplex.scm b/benchmarks.larceny/src/simplex.scm
similarity index 100%
rename from benchmarks/src/simplex.scm
rename to benchmarks.larceny/src/simplex.scm
diff --git a/benchmarks/src/slatex.scm b/benchmarks.larceny/src/slatex.scm
similarity index 100%
rename from benchmarks/src/slatex.scm
rename to benchmarks.larceny/src/slatex.scm
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/slatex.sty b/benchmarks.larceny/src/slatex.sty
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/slatex.sty
rename to benchmarks.larceny/src/slatex.sty
diff --git a/benchmarks/src/smlboyer.scm b/benchmarks.larceny/src/smlboyer.scm
similarity index 100%
rename from benchmarks/src/smlboyer.scm
rename to benchmarks.larceny/src/smlboyer.scm
diff --git a/benchmarks/src/smlboyer.sml b/benchmarks.larceny/src/smlboyer.sml
similarity index 100%
rename from benchmarks/src/smlboyer.sml
rename to benchmarks.larceny/src/smlboyer.sml
diff --git a/benchmarks/src/string.awk b/benchmarks.larceny/src/string.awk
similarity index 100%
rename from benchmarks/src/string.awk
rename to benchmarks.larceny/src/string.awk
diff --git a/benchmarks/src/string.c b/benchmarks.larceny/src/string.c
similarity index 100%
rename from benchmarks/src/string.c
rename to benchmarks.larceny/src/string.c
diff --git a/benchmarks/src/string.scm b/benchmarks.larceny/src/string.scm
similarity index 100%
rename from benchmarks/src/string.scm
rename to benchmarks.larceny/src/string.scm
diff --git a/benchmarks/src/succeed.scm b/benchmarks.larceny/src/succeed.scm
similarity index 100%
rename from benchmarks/src/succeed.scm
rename to benchmarks.larceny/src/succeed.scm
diff --git a/benchmarks/src/sum.c b/benchmarks.larceny/src/sum.c
similarity index 100%
rename from benchmarks/src/sum.c
rename to benchmarks.larceny/src/sum.c
diff --git a/benchmarks/src/sum.java b/benchmarks.larceny/src/sum.java
similarity index 100%
rename from benchmarks/src/sum.java
rename to benchmarks.larceny/src/sum.java
diff --git a/benchmarks/src/sum.scm b/benchmarks.larceny/src/sum.scm
similarity index 100%
rename from benchmarks/src/sum.scm
rename to benchmarks.larceny/src/sum.scm
diff --git a/benchmarks/src/sum.sml b/benchmarks.larceny/src/sum.sml
similarity index 100%
rename from benchmarks/src/sum.sml
rename to benchmarks.larceny/src/sum.sml
diff --git a/benchmarks/src/sum1.awk b/benchmarks.larceny/src/sum1.awk
similarity index 100%
rename from benchmarks/src/sum1.awk
rename to benchmarks.larceny/src/sum1.awk
diff --git a/benchmarks/src/sum1.c b/benchmarks.larceny/src/sum1.c
similarity index 100%
rename from benchmarks/src/sum1.c
rename to benchmarks.larceny/src/sum1.c
diff --git a/benchmarks/src/sum1.scm b/benchmarks.larceny/src/sum1.scm
similarity index 100%
rename from benchmarks/src/sum1.scm
rename to benchmarks.larceny/src/sum1.scm
diff --git a/benchmarks/src/sumfp.c b/benchmarks.larceny/src/sumfp.c
similarity index 100%
rename from benchmarks/src/sumfp.c
rename to benchmarks.larceny/src/sumfp.c
diff --git a/benchmarks/src/sumfp.java b/benchmarks.larceny/src/sumfp.java
similarity index 100%
rename from benchmarks/src/sumfp.java
rename to benchmarks.larceny/src/sumfp.java
diff --git a/benchmarks/src/sumfp.scm b/benchmarks.larceny/src/sumfp.scm
similarity index 100%
rename from benchmarks/src/sumfp.scm
rename to benchmarks.larceny/src/sumfp.scm
diff --git a/benchmarks/src/sumfp.sml b/benchmarks.larceny/src/sumfp.sml
similarity index 100%
rename from benchmarks/src/sumfp.sml
rename to benchmarks.larceny/src/sumfp.sml
diff --git a/benchmarks/src/sumloop.awk b/benchmarks.larceny/src/sumloop.awk
similarity index 100%
rename from benchmarks/src/sumloop.awk
rename to benchmarks.larceny/src/sumloop.awk
diff --git a/benchmarks/src/sumloop.c b/benchmarks.larceny/src/sumloop.c
similarity index 100%
rename from benchmarks/src/sumloop.c
rename to benchmarks.larceny/src/sumloop.c
diff --git a/benchmarks/src/sumloop.scm b/benchmarks.larceny/src/sumloop.scm
similarity index 100%
rename from benchmarks/src/sumloop.scm
rename to benchmarks.larceny/src/sumloop.scm
diff --git a/benchmarks/src/tail.awk b/benchmarks.larceny/src/tail.awk
similarity index 100%
rename from benchmarks/src/tail.awk
rename to benchmarks.larceny/src/tail.awk
diff --git a/benchmarks/src/tail.c b/benchmarks.larceny/src/tail.c
similarity index 100%
rename from benchmarks/src/tail.c
rename to benchmarks.larceny/src/tail.c
diff --git a/benchmarks/src/tail.scm b/benchmarks.larceny/src/tail.scm
similarity index 100%
rename from benchmarks/src/tail.scm
rename to benchmarks.larceny/src/tail.scm
diff --git a/benchmarks/src/tak.c b/benchmarks.larceny/src/tak.c
similarity index 100%
rename from benchmarks/src/tak.c
rename to benchmarks.larceny/src/tak.c
diff --git a/benchmarks/src/tak.java b/benchmarks.larceny/src/tak.java
similarity index 100%
rename from benchmarks/src/tak.java
rename to benchmarks.larceny/src/tak.java
diff --git a/benchmarks/src/tak.scm b/benchmarks.larceny/src/tak.scm
similarity index 100%
rename from benchmarks/src/tak.scm
rename to benchmarks.larceny/src/tak.scm
diff --git a/benchmarks/src/tak.sml b/benchmarks.larceny/src/tak.sml
similarity index 100%
rename from benchmarks/src/tak.sml
rename to benchmarks.larceny/src/tak.sml
diff --git a/benchmarks/src/takl.c b/benchmarks.larceny/src/takl.c
similarity index 100%
rename from benchmarks/src/takl.c
rename to benchmarks.larceny/src/takl.c
diff --git a/benchmarks/src/takl.java b/benchmarks.larceny/src/takl.java
similarity index 100%
rename from benchmarks/src/takl.java
rename to benchmarks.larceny/src/takl.java
diff --git a/benchmarks/src/takl.scm b/benchmarks.larceny/src/takl.scm
similarity index 100%
rename from benchmarks/src/takl.scm
rename to benchmarks.larceny/src/takl.scm
diff --git a/benchmarks/src/takl.sml b/benchmarks.larceny/src/takl.sml
similarity index 100%
rename from benchmarks/src/takl.sml
rename to benchmarks.larceny/src/takl.sml
diff --git a/benchmarks/src/temp.java b/benchmarks.larceny/src/temp.java
similarity index 100%
rename from benchmarks/src/temp.java
rename to benchmarks.larceny/src/temp.java
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/temp.scm b/benchmarks.larceny/src/temp.scm
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/temp.scm
rename to benchmarks.larceny/src/temp.scm
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/temp2.scm b/benchmarks.larceny/src/temp2.scm
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/temp2.scm
rename to benchmarks.larceny/src/temp2.scm
diff --git a/benchmarks/src/test.sch b/benchmarks.larceny/src/test.sch
similarity index 100%
rename from benchmarks/src/test.sch
rename to benchmarks.larceny/src/test.sch
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/test.scm b/benchmarks.larceny/src/test.scm
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/test.scm
rename to benchmarks.larceny/src/test.scm
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/test.tex b/benchmarks.larceny/src/test.tex
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/test.tex
rename to benchmarks.larceny/src/test.tex
diff --git a/benchmarks/src/tfib.c b/benchmarks.larceny/src/tfib.c
similarity index 100%
rename from benchmarks/src/tfib.c
rename to benchmarks.larceny/src/tfib.c
diff --git a/benchmarks/src/tfib.java b/benchmarks.larceny/src/tfib.java
similarity index 100%
rename from benchmarks/src/tfib.java
rename to benchmarks.larceny/src/tfib.java
diff --git a/benchmarks/src/tfib.scm b/benchmarks.larceny/src/tfib.scm
similarity index 100%
rename from benchmarks/src/tfib.scm
rename to benchmarks.larceny/src/tfib.scm
diff --git a/benchmarks/src/trav1.scm b/benchmarks.larceny/src/trav1.scm
similarity index 100%
rename from benchmarks/src/trav1.scm
rename to benchmarks.larceny/src/trav1.scm
diff --git a/benchmarks/src/trav2.scm b/benchmarks.larceny/src/trav2.scm
similarity index 100%
rename from benchmarks/src/trav2.scm
rename to benchmarks.larceny/src/trav2.scm
diff --git a/benchmarks/src/triangl.c b/benchmarks.larceny/src/triangl.c
similarity index 100%
rename from benchmarks/src/triangl.c
rename to benchmarks.larceny/src/triangl.c
diff --git a/benchmarks/src/triangl.scm b/benchmarks.larceny/src/triangl.scm
similarity index 100%
rename from benchmarks/src/triangl.scm
rename to benchmarks.larceny/src/triangl.scm
diff --git a/benchmarks/src/wc.awk b/benchmarks.larceny/src/wc.awk
similarity index 100%
rename from benchmarks/src/wc.awk
rename to benchmarks.larceny/src/wc.awk
diff --git a/benchmarks/src/wc.c b/benchmarks.larceny/src/wc.c
similarity index 100%
rename from benchmarks/src/wc.c
rename to benchmarks.larceny/src/wc.c
diff --git a/benchmarks/src/wc.scm b/benchmarks.larceny/src/wc.scm
similarity index 100%
rename from benchmarks/src/wc.scm
rename to benchmarks.larceny/src/wc.scm
diff --git a/benchmarks/suffix/suffix-bigloo-int.scm b/benchmarks.larceny/suffix/suffix-bigloo-int.scm
similarity index 100%
rename from benchmarks/suffix/suffix-bigloo-int.scm
rename to benchmarks.larceny/suffix/suffix-bigloo-int.scm
diff --git a/benchmarks/suffix/suffix-bigloo.scm b/benchmarks.larceny/suffix/suffix-bigloo.scm
similarity index 100%
rename from benchmarks/suffix/suffix-bigloo.scm
rename to benchmarks.larceny/suffix/suffix-bigloo.scm
diff --git a/benchmarks/suffix/suffix-chez.scm b/benchmarks.larceny/suffix/suffix-chez.scm
similarity index 100%
rename from benchmarks/suffix/suffix-chez.scm
rename to benchmarks.larceny/suffix/suffix-chez.scm
diff --git a/benchmarks/suffix/suffix-chicken.scm b/benchmarks.larceny/suffix/suffix-chicken.scm
similarity index 100%
rename from benchmarks/suffix/suffix-chicken.scm
rename to benchmarks.larceny/suffix/suffix-chicken.scm
diff --git a/benchmarks/suffix/suffix-gambit-int.scm b/benchmarks.larceny/suffix/suffix-gambit-int.scm
similarity index 100%
rename from benchmarks/suffix/suffix-gambit-int.scm
rename to benchmarks.larceny/suffix/suffix-gambit-int.scm
diff --git a/benchmarks/suffix/suffix-gambit-sp.scm b/benchmarks.larceny/suffix/suffix-gambit-sp.scm
similarity index 100%
rename from benchmarks/suffix/suffix-gambit-sp.scm
rename to benchmarks.larceny/suffix/suffix-gambit-sp.scm
diff --git a/benchmarks/suffix/suffix-gambit.scm b/benchmarks.larceny/suffix/suffix-gambit.scm
similarity index 100%
rename from benchmarks/suffix/suffix-gambit.scm
rename to benchmarks.larceny/suffix/suffix-gambit.scm
diff --git a/benchmarks/suffix/suffix-henchman.scm b/benchmarks.larceny/suffix/suffix-henchman.scm
similarity index 100%
rename from benchmarks/suffix/suffix-henchman.scm
rename to benchmarks.larceny/suffix/suffix-henchman.scm
diff --git a/benchmarks/suffix/suffix-ikarus.scm b/benchmarks.larceny/suffix/suffix-ikarus.scm
similarity index 100%
rename from benchmarks/suffix/suffix-ikarus.scm
rename to benchmarks.larceny/suffix/suffix-ikarus.scm
diff --git a/benchmarks/suffix/suffix-larceny.scm b/benchmarks.larceny/suffix/suffix-larceny.scm
similarity index 100%
rename from benchmarks/suffix/suffix-larceny.scm
rename to benchmarks.larceny/suffix/suffix-larceny.scm
diff --git a/benchmarks/suffix/suffix-mit-int.scm b/benchmarks.larceny/suffix/suffix-mit-int.scm
similarity index 100%
rename from benchmarks/suffix/suffix-mit-int.scm
rename to benchmarks.larceny/suffix/suffix-mit-int.scm
diff --git a/benchmarks/suffix/suffix-mit.scm b/benchmarks.larceny/suffix/suffix-mit.scm
similarity index 100%
rename from benchmarks/suffix/suffix-mit.scm
rename to benchmarks.larceny/suffix/suffix-mit.scm
diff --git a/benchmarks/suffix/suffix-mzscheme.scm b/benchmarks.larceny/suffix/suffix-mzscheme.scm
similarity index 100%
rename from benchmarks/suffix/suffix-mzscheme.scm
rename to benchmarks.larceny/suffix/suffix-mzscheme.scm
diff --git a/benchmarks/suffix/suffix-petite-chez.scm b/benchmarks.larceny/suffix/suffix-petite-chez.scm
similarity index 100%
rename from benchmarks/suffix/suffix-petite-chez.scm
rename to benchmarks.larceny/suffix/suffix-petite-chez.scm
diff --git a/benchmarks/suffix/suffix-scheme48.scm b/benchmarks.larceny/suffix/suffix-scheme48.scm
similarity index 100%
rename from benchmarks/suffix/suffix-scheme48.scm
rename to benchmarks.larceny/suffix/suffix-scheme48.scm
diff --git a/benchmarks/summarize b/benchmarks.larceny/summarize
similarity index 100%
rename from benchmarks/summarize
rename to benchmarks.larceny/summarize
diff --git a/benchmarks/summarize.sch b/benchmarks.larceny/summarize.sch
similarity index 100%
rename from benchmarks/summarize.sch
rename to benchmarks.larceny/summarize.sch
diff --git a/benchmarks/summarize2.sch b/benchmarks.larceny/summarize2.sch
similarity index 100%
rename from benchmarks/summarize2.sch
rename to benchmarks.larceny/summarize2.sch
diff --git a/benchmarks/table b/benchmarks.larceny/table
similarity index 100%
rename from benchmarks/table
rename to benchmarks.larceny/table
diff --git a/benchmarks/todo.update b/benchmarks.larceny/todo.update
similarity index 100%
rename from benchmarks/todo.update
rename to benchmarks.larceny/todo.update
diff --git a/benchmarks/new/bench.ss b/benchmarks/bench.ss
similarity index 100%
rename from benchmarks/new/bench.ss
rename to benchmarks/bench.ss
diff --git a/benchmarks/src/bib b/benchmarks/bib
similarity index 100%
rename from benchmarks/src/bib
rename to benchmarks/bib
diff --git a/benchmarks/new/parsing-data.ss b/benchmarks/parsing-data.ss
similarity index 100%
rename from benchmarks/new/parsing-data.ss
rename to benchmarks/parsing-data.ss
diff --git a/benchmarks/new/r6rs-benchmarks.ss b/benchmarks/r6rs-benchmarks.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks.ss
rename to benchmarks/r6rs-benchmarks.ss
diff --git a/benchmarks/new/r6rs-benchmarks/BUGS b/benchmarks/r6rs-benchmarks/BUGS
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/BUGS
rename to benchmarks/r6rs-benchmarks/BUGS
diff --git a/benchmarks/new/r6rs-benchmarks/ack.ss b/benchmarks/r6rs-benchmarks/ack.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/ack.ss
rename to benchmarks/r6rs-benchmarks/ack.ss
diff --git a/benchmarks/new/r6rs-benchmarks/array1.ss b/benchmarks/r6rs-benchmarks/array1.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/array1.ss
rename to benchmarks/r6rs-benchmarks/array1.ss
diff --git a/benchmarks/new/r6rs-benchmarks/boyer.ss b/benchmarks/r6rs-benchmarks/boyer.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/boyer.ss
rename to benchmarks/r6rs-benchmarks/boyer.ss
diff --git a/benchmarks/new/r6rs-benchmarks/browse.ss b/benchmarks/r6rs-benchmarks/browse.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/browse.ss
rename to benchmarks/r6rs-benchmarks/browse.ss
diff --git a/benchmarks/new/r6rs-benchmarks/cat.ss b/benchmarks/r6rs-benchmarks/cat.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/cat.ss
rename to benchmarks/r6rs-benchmarks/cat.ss
diff --git a/benchmarks/new/r6rs-benchmarks/compiler.ss b/benchmarks/r6rs-benchmarks/compiler.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/compiler.ss
rename to benchmarks/r6rs-benchmarks/compiler.ss
diff --git a/benchmarks/new/r6rs-benchmarks/conform.ss b/benchmarks/r6rs-benchmarks/conform.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/conform.ss
rename to benchmarks/r6rs-benchmarks/conform.ss
diff --git a/benchmarks/new/r6rs-benchmarks/cpstak.ss b/benchmarks/r6rs-benchmarks/cpstak.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/cpstak.ss
rename to benchmarks/r6rs-benchmarks/cpstak.ss
diff --git a/benchmarks/new/r6rs-benchmarks/ctak.ss b/benchmarks/r6rs-benchmarks/ctak.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/ctak.ss
rename to benchmarks/r6rs-benchmarks/ctak.ss
diff --git a/benchmarks/new/r6rs-benchmarks/dderiv.ss b/benchmarks/r6rs-benchmarks/dderiv.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/dderiv.ss
rename to benchmarks/r6rs-benchmarks/dderiv.ss
diff --git a/benchmarks/new/r6rs-benchmarks/deriv.ss b/benchmarks/r6rs-benchmarks/deriv.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/deriv.ss
rename to benchmarks/r6rs-benchmarks/deriv.ss
diff --git a/benchmarks/new/r6rs-benchmarks/destruc.ss b/benchmarks/r6rs-benchmarks/destruc.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/destruc.ss
rename to benchmarks/r6rs-benchmarks/destruc.ss
diff --git a/benchmarks/new/r6rs-benchmarks/diviter.ss b/benchmarks/r6rs-benchmarks/diviter.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/diviter.ss
rename to benchmarks/r6rs-benchmarks/diviter.ss
diff --git a/benchmarks/new/r6rs-benchmarks/divrec.ss b/benchmarks/r6rs-benchmarks/divrec.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/divrec.ss
rename to benchmarks/r6rs-benchmarks/divrec.ss
diff --git a/benchmarks/new/r6rs-benchmarks/dynamic.src.ss b/benchmarks/r6rs-benchmarks/dynamic.src.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/dynamic.src.ss
rename to benchmarks/r6rs-benchmarks/dynamic.src.ss
diff --git a/benchmarks/new/r6rs-benchmarks/dynamic.ss b/benchmarks/r6rs-benchmarks/dynamic.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/dynamic.ss
rename to benchmarks/r6rs-benchmarks/dynamic.ss
diff --git a/benchmarks/new/r6rs-benchmarks/earley.ss b/benchmarks/r6rs-benchmarks/earley.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/earley.ss
rename to benchmarks/r6rs-benchmarks/earley.ss
diff --git a/benchmarks/new/r6rs-benchmarks/fib.ss b/benchmarks/r6rs-benchmarks/fib.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/fib.ss
rename to benchmarks/r6rs-benchmarks/fib.ss
diff --git a/benchmarks/new/r6rs-benchmarks/fibc.ss b/benchmarks/r6rs-benchmarks/fibc.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/fibc.ss
rename to benchmarks/r6rs-benchmarks/fibc.ss
diff --git a/benchmarks/new/r6rs-benchmarks/fibfp.ss b/benchmarks/r6rs-benchmarks/fibfp.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/fibfp.ss
rename to benchmarks/r6rs-benchmarks/fibfp.ss
diff --git a/benchmarks/new/r6rs-benchmarks/fpsum.ss b/benchmarks/r6rs-benchmarks/fpsum.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/fpsum.ss
rename to benchmarks/r6rs-benchmarks/fpsum.ss
diff --git a/benchmarks/new/r6rs-benchmarks/gcbench.ss b/benchmarks/r6rs-benchmarks/gcbench.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/gcbench.ss
rename to benchmarks/r6rs-benchmarks/gcbench.ss
diff --git a/benchmarks/new/r6rs-benchmarks/gcold.ss b/benchmarks/r6rs-benchmarks/gcold.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/gcold.ss
rename to benchmarks/r6rs-benchmarks/gcold.ss
diff --git a/benchmarks/new/r6rs-benchmarks/graphs.ss b/benchmarks/r6rs-benchmarks/graphs.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/graphs.ss
rename to benchmarks/r6rs-benchmarks/graphs.ss
diff --git a/benchmarks/new/r6rs-benchmarks/lattice.ss b/benchmarks/r6rs-benchmarks/lattice.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/lattice.ss
rename to benchmarks/r6rs-benchmarks/lattice.ss
diff --git a/benchmarks/new/r6rs-benchmarks/matrix.ss b/benchmarks/r6rs-benchmarks/matrix.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/matrix.ss
rename to benchmarks/r6rs-benchmarks/matrix.ss
diff --git a/benchmarks/new/r6rs-benchmarks/maze.ss b/benchmarks/r6rs-benchmarks/maze.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/maze.ss
rename to benchmarks/r6rs-benchmarks/maze.ss
diff --git a/benchmarks/new/r6rs-benchmarks/mazefun.ss b/benchmarks/r6rs-benchmarks/mazefun.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/mazefun.ss
rename to benchmarks/r6rs-benchmarks/mazefun.ss
diff --git a/benchmarks/new/r6rs-benchmarks/mbrot.ss b/benchmarks/r6rs-benchmarks/mbrot.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/mbrot.ss
rename to benchmarks/r6rs-benchmarks/mbrot.ss
diff --git a/benchmarks/new/r6rs-benchmarks/nbody.ss b/benchmarks/r6rs-benchmarks/nbody.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/nbody.ss
rename to benchmarks/r6rs-benchmarks/nbody.ss
diff --git a/benchmarks/new/r6rs-benchmarks/nboyer.ss b/benchmarks/r6rs-benchmarks/nboyer.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/nboyer.ss
rename to benchmarks/r6rs-benchmarks/nboyer.ss
diff --git a/benchmarks/new/r6rs-benchmarks/nqueens.ss b/benchmarks/r6rs-benchmarks/nqueens.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/nqueens.ss
rename to benchmarks/r6rs-benchmarks/nqueens.ss
diff --git a/benchmarks/new/r6rs-benchmarks/ntakl.ss b/benchmarks/r6rs-benchmarks/ntakl.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/ntakl.ss
rename to benchmarks/r6rs-benchmarks/ntakl.ss
diff --git a/benchmarks/new/r6rs-benchmarks/nucleic.ss b/benchmarks/r6rs-benchmarks/nucleic.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/nucleic.ss
rename to benchmarks/r6rs-benchmarks/nucleic.ss
diff --git a/benchmarks/new/r6rs-benchmarks/paraffins.ss b/benchmarks/r6rs-benchmarks/paraffins.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/paraffins.ss
rename to benchmarks/r6rs-benchmarks/paraffins.ss
diff --git a/benchmarks/new/r6rs-benchmarks/parsing.ss b/benchmarks/r6rs-benchmarks/parsing.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/parsing.ss
rename to benchmarks/r6rs-benchmarks/parsing.ss
diff --git a/benchmarks/new/r6rs-benchmarks/perm9.ss b/benchmarks/r6rs-benchmarks/perm9.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/perm9.ss
rename to benchmarks/r6rs-benchmarks/perm9.ss
diff --git a/benchmarks/new/r6rs-benchmarks/peval.ss b/benchmarks/r6rs-benchmarks/peval.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/peval.ss
rename to benchmarks/r6rs-benchmarks/peval.ss
diff --git a/benchmarks/new/r6rs-benchmarks/pi.ss b/benchmarks/r6rs-benchmarks/pi.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/pi.ss
rename to benchmarks/r6rs-benchmarks/pi.ss
diff --git a/benchmarks/new/r6rs-benchmarks/pnpoly.ss b/benchmarks/r6rs-benchmarks/pnpoly.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/pnpoly.ss
rename to benchmarks/r6rs-benchmarks/pnpoly.ss
diff --git a/benchmarks/new/r6rs-benchmarks/primes.ss b/benchmarks/r6rs-benchmarks/primes.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/primes.ss
rename to benchmarks/r6rs-benchmarks/primes.ss
diff --git a/benchmarks/new/r6rs-benchmarks/puzzle.ss b/benchmarks/r6rs-benchmarks/puzzle.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/puzzle.ss
rename to benchmarks/r6rs-benchmarks/puzzle.ss
diff --git a/benchmarks/new/r6rs-benchmarks/quicksort.ss b/benchmarks/r6rs-benchmarks/quicksort.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/quicksort.ss
rename to benchmarks/r6rs-benchmarks/quicksort.ss
diff --git a/benchmarks/new/r6rs-benchmarks/ray.ss b/benchmarks/r6rs-benchmarks/ray.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/ray.ss
rename to benchmarks/r6rs-benchmarks/ray.ss
diff --git a/benchmarks/new/r6rs-benchmarks/sboyer.ss b/benchmarks/r6rs-benchmarks/sboyer.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/sboyer.ss
rename to benchmarks/r6rs-benchmarks/sboyer.ss
diff --git a/benchmarks/new/r6rs-benchmarks/scheme.ss b/benchmarks/r6rs-benchmarks/scheme.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/scheme.ss
rename to benchmarks/r6rs-benchmarks/scheme.ss
diff --git a/benchmarks/new/r6rs-benchmarks/simplex.ss b/benchmarks/r6rs-benchmarks/simplex.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/simplex.ss
rename to benchmarks/r6rs-benchmarks/simplex.ss
diff --git a/benchmarks/new/r6rs-benchmarks/slatex.ss b/benchmarks/r6rs-benchmarks/slatex.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/slatex.ss
rename to benchmarks/r6rs-benchmarks/slatex.ss
diff --git a/benchmarks/new/r6rs-benchmarks/string.ss b/benchmarks/r6rs-benchmarks/string.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/string.ss
rename to benchmarks/r6rs-benchmarks/string.ss
diff --git a/benchmarks/new/r6rs-benchmarks/sum.ss b/benchmarks/r6rs-benchmarks/sum.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/sum.ss
rename to benchmarks/r6rs-benchmarks/sum.ss
diff --git a/benchmarks/new/r6rs-benchmarks/sum1.ss b/benchmarks/r6rs-benchmarks/sum1.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/sum1.ss
rename to benchmarks/r6rs-benchmarks/sum1.ss
diff --git a/benchmarks/new/r6rs-benchmarks/sumfp.ss b/benchmarks/r6rs-benchmarks/sumfp.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/sumfp.ss
rename to benchmarks/r6rs-benchmarks/sumfp.ss
diff --git a/benchmarks/new/r6rs-benchmarks/sumloop.ss b/benchmarks/r6rs-benchmarks/sumloop.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/sumloop.ss
rename to benchmarks/r6rs-benchmarks/sumloop.ss
diff --git a/benchmarks/new/r6rs-benchmarks/tail.ss b/benchmarks/r6rs-benchmarks/tail.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/tail.ss
rename to benchmarks/r6rs-benchmarks/tail.ss
diff --git a/benchmarks/new/r6rs-benchmarks/tak.ss b/benchmarks/r6rs-benchmarks/tak.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/tak.ss
rename to benchmarks/r6rs-benchmarks/tak.ss
diff --git a/benchmarks/new/r6rs-benchmarks/takl.ss b/benchmarks/r6rs-benchmarks/takl.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/takl.ss
rename to benchmarks/r6rs-benchmarks/takl.ss
diff --git a/benchmarks/new/r6rs-benchmarks/todo-src/README.flonum-benchmarks b/benchmarks/r6rs-benchmarks/todo-src/README.flonum-benchmarks
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/todo-src/README.flonum-benchmarks
rename to benchmarks/r6rs-benchmarks/todo-src/README.flonum-benchmarks
diff --git a/benchmarks/src/fft.scm b/benchmarks/r6rs-benchmarks/todo-src/fft.scm
similarity index 100%
rename from benchmarks/src/fft.scm
rename to benchmarks/r6rs-benchmarks/todo-src/fft.scm
diff --git a/benchmarks/src/slatex.sty b/benchmarks/r6rs-benchmarks/todo-src/slatex.sty
similarity index 100%
rename from benchmarks/src/slatex.sty
rename to benchmarks/r6rs-benchmarks/todo-src/slatex.sty
diff --git a/benchmarks/src/temp.scm b/benchmarks/r6rs-benchmarks/todo-src/temp.scm
similarity index 100%
rename from benchmarks/src/temp.scm
rename to benchmarks/r6rs-benchmarks/todo-src/temp.scm
diff --git a/benchmarks/src/temp2.scm b/benchmarks/r6rs-benchmarks/todo-src/temp2.scm
similarity index 100%
rename from benchmarks/src/temp2.scm
rename to benchmarks/r6rs-benchmarks/todo-src/temp2.scm
diff --git a/benchmarks/src/test.scm b/benchmarks/r6rs-benchmarks/todo-src/test.scm
similarity index 100%
rename from benchmarks/src/test.scm
rename to benchmarks/r6rs-benchmarks/todo-src/test.scm
diff --git a/benchmarks/src/test.tex b/benchmarks/r6rs-benchmarks/todo-src/test.tex
similarity index 100%
rename from benchmarks/src/test.tex
rename to benchmarks/r6rs-benchmarks/todo-src/test.tex
diff --git a/benchmarks/new/r6rs-benchmarks/trav1.ss b/benchmarks/r6rs-benchmarks/trav1.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/trav1.ss
rename to benchmarks/r6rs-benchmarks/trav1.ss
diff --git a/benchmarks/new/r6rs-benchmarks/trav2.ss b/benchmarks/r6rs-benchmarks/trav2.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/trav2.ss
rename to benchmarks/r6rs-benchmarks/trav2.ss
diff --git a/benchmarks/new/r6rs-benchmarks/triangl.ss b/benchmarks/r6rs-benchmarks/triangl.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/triangl.ss
rename to benchmarks/r6rs-benchmarks/triangl.ss
diff --git a/benchmarks/new/r6rs-benchmarks/wc.ss b/benchmarks/r6rs-benchmarks/wc.ss
similarity index 100%
rename from benchmarks/new/r6rs-benchmarks/wc.ss
rename to benchmarks/r6rs-benchmarks/wc.ss
diff --git a/benchmarks/src/rn100 b/benchmarks/rn100
similarity index 100%
rename from benchmarks/src/rn100
rename to benchmarks/rn100
diff --git a/src/ikarus.numerics.ss b/src/ikarus.numerics.ss
index 8ebbf63..6fcf560 100644
--- a/src/ikarus.numerics.ss
+++ b/src/ikarus.numerics.ss
@@ -334,8 +334,6 @@
           [(4)  (bignum/4->flonum x)]
           [(8)  (bignum/8->flonum x)]
           [else (bignum/n->flonum x bytes)]))))
-  ;(define (bignum->flonum x)
-  ;  (foreign-call "ikrt_bignum_to_flonum" x))
   (define (ratnum->flonum x) 
     (binary/ (exact->inexact ($ratnum-n x)) 
              (exact->inexact ($ratnum-d x))))
@@ -572,8 +570,7 @@
     (case-lambda
       [(x y) (binary- x y)]
       [(x y z) (binary- (binary- x y) z)]
-      [(a)
-       (binary- 0 a)]
+      [(a) (binary- 0 a)]
       [(a b c d . e*)
        (let f ([ac (binary- (binary- (binary- a b) c) d)]
                [e* e*])