diff --git a/vx-scheme/LICENSE b/LICENSE
similarity index 100%
rename from vx-scheme/LICENSE
rename to LICENSE
diff --git a/vx-scheme/README b/README
similarity index 100%
rename from vx-scheme/README
rename to README
diff --git a/vx-scheme/lib/.cvsignore b/lib/.cvsignore
similarity index 100%
rename from vx-scheme/lib/.cvsignore
rename to lib/.cvsignore
diff --git a/vx-scheme/lib/vx-scheme.init b/lib/vx-scheme.init
similarity index 100%
rename from vx-scheme/lib/vx-scheme.init
rename to lib/vx-scheme.init
diff --git a/vx-scheme/lib/vx-slib-test.scm b/lib/vx-slib-test.scm
similarity index 100%
rename from vx-scheme/lib/vx-slib-test.scm
rename to lib/vx-slib-test.scm
diff --git a/vx-scheme/src/.cvsignore b/src/.cvsignore
similarity index 100%
rename from vx-scheme/src/.cvsignore
rename to src/.cvsignore
diff --git a/vx-scheme/src/Makefile b/src/Makefile
similarity index 100%
rename from vx-scheme/src/Makefile
rename to src/Makefile
diff --git a/vx-scheme/src/Scheme.sln b/src/Scheme.sln
similarity index 100%
rename from vx-scheme/src/Scheme.sln
rename to src/Scheme.sln
diff --git a/vx-scheme/src/bootstrap.scm b/src/bootstrap.scm
similarity index 100%
rename from vx-scheme/src/bootstrap.scm
rename to src/bootstrap.scm
diff --git a/vx-scheme/src/cell.cpp b/src/cell.cpp
similarity index 100%
rename from vx-scheme/src/cell.cpp
rename to src/cell.cpp
diff --git a/vx-scheme/src/compile b/src/compile
similarity index 100%
rename from vx-scheme/src/compile
rename to src/compile
diff --git a/vx-scheme/src/compile-file.scm b/src/compile-file.scm
similarity index 100%
rename from vx-scheme/src/compile-file.scm
rename to src/compile-file.scm
diff --git a/vx-scheme/src/compiler.scm b/src/compiler.scm
similarity index 100%
rename from vx-scheme/src/compiler.scm
rename to src/compiler.scm
diff --git a/vx-scheme/src/cp-test.scm b/src/cp-test.scm
similarity index 100%
rename from vx-scheme/src/cp-test.scm
rename to src/cp-test.scm
diff --git a/vx-scheme/src/ctx.cpp b/src/ctx.cpp
similarity index 100%
rename from vx-scheme/src/ctx.cpp
rename to src/ctx.cpp
diff --git a/vx-scheme/src/interp.cpp b/src/interp.cpp
similarity index 100%
rename from vx-scheme/src/interp.cpp
rename to src/interp.cpp
diff --git a/vx-scheme/src/io.cpp b/src/io.cpp
similarity index 100%
rename from vx-scheme/src/io.cpp
rename to src/io.cpp
diff --git a/vx-scheme/src/lib.cpp b/src/lib.cpp
similarity index 100%
rename from vx-scheme/src/lib.cpp
rename to src/lib.cpp
diff --git a/vx-scheme/src/library.scm b/src/library.scm
similarity index 100%
rename from vx-scheme/src/library.scm
rename to src/library.scm
diff --git a/vx-scheme/src/simulator.scm b/src/simulator.scm
similarity index 100%
rename from vx-scheme/src/simulator.scm
rename to src/simulator.scm
diff --git a/vx-scheme/src/subr.cpp b/src/subr.cpp
similarity index 100%
rename from vx-scheme/src/subr.cpp
rename to src/subr.cpp
diff --git a/vx-scheme/src/symtab.cpp b/src/symtab.cpp
similarity index 100%
rename from vx-scheme/src/symtab.cpp
rename to src/symtab.cpp
diff --git a/vx-scheme/src/u-main.cpp b/src/u-main.cpp
similarity index 100%
rename from vx-scheme/src/u-main.cpp
rename to src/u-main.cpp
diff --git a/vx-scheme/src/vm.cpp b/src/vm.cpp
similarity index 100%
rename from vx-scheme/src/vm.cpp
rename to src/vm.cpp
diff --git a/vx-scheme/src/vx-main.cpp b/src/vx-main.cpp
similarity index 100%
rename from vx-scheme/src/vx-main.cpp
rename to src/vx-main.cpp
diff --git a/vx-scheme/src/vx-scheme.h b/src/vx-scheme.h
similarity index 100%
rename from vx-scheme/src/vx-scheme.h
rename to src/vx-scheme.h
diff --git a/vx-scheme/src/win32/vx-scheme/.cvsignore b/src/win32/vx-scheme/.cvsignore
similarity index 100%
rename from vx-scheme/src/win32/vx-scheme/.cvsignore
rename to src/win32/vx-scheme/.cvsignore
diff --git a/vx-scheme/src/win32/vx-scheme/vx-scheme.vcproj b/src/win32/vx-scheme/vx-scheme.vcproj
similarity index 100%
rename from vx-scheme/src/win32/vx-scheme/vx-scheme.vcproj
rename to src/win32/vx-scheme/vx-scheme.vcproj
diff --git a/vx-scheme/src/win32/vxs-bootstrap/.cvsignore b/src/win32/vxs-bootstrap/.cvsignore
similarity index 100%
rename from vx-scheme/src/win32/vxs-bootstrap/.cvsignore
rename to src/win32/vxs-bootstrap/.cvsignore
diff --git a/vx-scheme/src/win32/vxs-bootstrap/vxs-bootstrap.vcproj b/src/win32/vxs-bootstrap/vxs-bootstrap.vcproj
similarity index 100%
rename from vx-scheme/src/win32/vxs-bootstrap/vxs-bootstrap.vcproj
rename to src/win32/vxs-bootstrap/vxs-bootstrap.vcproj
diff --git a/vx-scheme/src/win32/vxs-interp/.cvsignore b/src/win32/vxs-interp/.cvsignore
similarity index 100%
rename from vx-scheme/src/win32/vxs-interp/.cvsignore
rename to src/win32/vxs-interp/.cvsignore
diff --git a/vx-scheme/src/win32/vxs-interp/vxs-interp.vcproj b/src/win32/vxs-interp/vxs-interp.vcproj
similarity index 100%
rename from vx-scheme/src/win32/vxs-interp/vxs-interp.vcproj
rename to src/win32/vxs-interp/vxs-interp.vcproj
diff --git a/vx-scheme/testcases/.cvsignore b/testcases/.cvsignore
similarity index 100%
rename from vx-scheme/testcases/.cvsignore
rename to testcases/.cvsignore
diff --git a/vx-scheme/testcases/ack.scm b/testcases/ack.scm
similarity index 100%
rename from vx-scheme/testcases/ack.scm
rename to testcases/ack.scm
diff --git a/vx-scheme/testcases/boyer.scm b/testcases/boyer.scm
similarity index 100%
rename from vx-scheme/testcases/boyer.scm
rename to testcases/boyer.scm
diff --git a/vx-scheme/testcases/c-good/ack.good b/testcases/c-good/ack.good
similarity index 100%
rename from vx-scheme/testcases/c-good/ack.good
rename to testcases/c-good/ack.good
diff --git a/vx-scheme/testcases/c-good/boyer.good b/testcases/c-good/boyer.good
similarity index 100%
rename from vx-scheme/testcases/c-good/boyer.good
rename to testcases/c-good/boyer.good
diff --git a/vx-scheme/testcases/c-good/cf.good b/testcases/c-good/cf.good
similarity index 100%
rename from vx-scheme/testcases/c-good/cf.good
rename to testcases/c-good/cf.good
diff --git a/vx-scheme/testcases/c-good/dderiv.good b/testcases/c-good/dderiv.good
similarity index 100%
rename from vx-scheme/testcases/c-good/dderiv.good
rename to testcases/c-good/dderiv.good
diff --git a/vx-scheme/testcases/c-good/dynamic.good b/testcases/c-good/dynamic.good
similarity index 100%
rename from vx-scheme/testcases/c-good/dynamic.good
rename to testcases/c-good/dynamic.good
diff --git a/vx-scheme/testcases/c-good/earley.good b/testcases/c-good/earley.good
similarity index 100%
rename from vx-scheme/testcases/c-good/earley.good
rename to testcases/c-good/earley.good
diff --git a/vx-scheme/testcases/c-good/maze.good b/testcases/c-good/maze.good
similarity index 100%
rename from vx-scheme/testcases/c-good/maze.good
rename to testcases/c-good/maze.good
diff --git a/vx-scheme/testcases/c-good/pi.good b/testcases/c-good/pi.good
similarity index 100%
rename from vx-scheme/testcases/c-good/pi.good
rename to testcases/c-good/pi.good
diff --git a/vx-scheme/testcases/c-good/puzzle.good b/testcases/c-good/puzzle.good
similarity index 100%
rename from vx-scheme/testcases/c-good/puzzle.good
rename to testcases/c-good/puzzle.good
diff --git a/vx-scheme/testcases/c-good/r4rstest.good b/testcases/c-good/r4rstest.good
similarity index 100%
rename from vx-scheme/testcases/c-good/r4rstest.good
rename to testcases/c-good/r4rstest.good
diff --git a/vx-scheme/testcases/c-good/scheme.good b/testcases/c-good/scheme.good
similarity index 100%
rename from vx-scheme/testcases/c-good/scheme.good
rename to testcases/c-good/scheme.good
diff --git a/vx-scheme/testcases/c-good/series.good b/testcases/c-good/series.good
similarity index 100%
rename from vx-scheme/testcases/c-good/series.good
rename to testcases/c-good/series.good
diff --git a/vx-scheme/testcases/c-good/sieve.good b/testcases/c-good/sieve.good
similarity index 100%
rename from vx-scheme/testcases/c-good/sieve.good
rename to testcases/c-good/sieve.good
diff --git a/vx-scheme/testcases/cf.scm b/testcases/cf.scm
similarity index 100%
rename from vx-scheme/testcases/cf.scm
rename to testcases/cf.scm
diff --git a/vx-scheme/testcases/cyclic.scm b/testcases/cyclic.scm
similarity index 100%
rename from vx-scheme/testcases/cyclic.scm
rename to testcases/cyclic.scm
diff --git a/vx-scheme/testcases/dderiv.scm b/testcases/dderiv.scm
similarity index 100%
rename from vx-scheme/testcases/dderiv.scm
rename to testcases/dderiv.scm
diff --git a/vx-scheme/testcases/dynamic.scm b/testcases/dynamic.scm
similarity index 100%
rename from vx-scheme/testcases/dynamic.scm
rename to testcases/dynamic.scm
diff --git a/vx-scheme/testcases/earley.scm b/testcases/earley.scm
similarity index 100%
rename from vx-scheme/testcases/earley.scm
rename to testcases/earley.scm
diff --git a/vx-scheme/testcases/good/ack.good b/testcases/good/ack.good
similarity index 100%
rename from vx-scheme/testcases/good/ack.good
rename to testcases/good/ack.good
diff --git a/vx-scheme/testcases/good/boyer.good b/testcases/good/boyer.good
similarity index 100%
rename from vx-scheme/testcases/good/boyer.good
rename to testcases/good/boyer.good
diff --git a/vx-scheme/testcases/good/cf.good b/testcases/good/cf.good
similarity index 100%
rename from vx-scheme/testcases/good/cf.good
rename to testcases/good/cf.good
diff --git a/vx-scheme/testcases/good/dderiv.good b/testcases/good/dderiv.good
similarity index 100%
rename from vx-scheme/testcases/good/dderiv.good
rename to testcases/good/dderiv.good
diff --git a/vx-scheme/testcases/good/dynamic.good b/testcases/good/dynamic.good
similarity index 100%
rename from vx-scheme/testcases/good/dynamic.good
rename to testcases/good/dynamic.good
diff --git a/vx-scheme/testcases/good/earley.good b/testcases/good/earley.good
similarity index 100%
rename from vx-scheme/testcases/good/earley.good
rename to testcases/good/earley.good
diff --git a/vx-scheme/testcases/good/maze.good b/testcases/good/maze.good
similarity index 100%
rename from vx-scheme/testcases/good/maze.good
rename to testcases/good/maze.good
diff --git a/vx-scheme/testcases/good/pi.good b/testcases/good/pi.good
similarity index 100%
rename from vx-scheme/testcases/good/pi.good
rename to testcases/good/pi.good
diff --git a/vx-scheme/testcases/good/puzzle.good b/testcases/good/puzzle.good
similarity index 100%
rename from vx-scheme/testcases/good/puzzle.good
rename to testcases/good/puzzle.good
diff --git a/vx-scheme/testcases/good/r4rstest.good b/testcases/good/r4rstest.good
similarity index 100%
rename from vx-scheme/testcases/good/r4rstest.good
rename to testcases/good/r4rstest.good
diff --git a/vx-scheme/testcases/good/scheme.good b/testcases/good/scheme.good
similarity index 100%
rename from vx-scheme/testcases/good/scheme.good
rename to testcases/good/scheme.good
diff --git a/vx-scheme/testcases/good/series.good b/testcases/good/series.good
similarity index 100%
rename from vx-scheme/testcases/good/series.good
rename to testcases/good/series.good
diff --git a/vx-scheme/testcases/good/sieve.good b/testcases/good/sieve.good
similarity index 100%
rename from vx-scheme/testcases/good/sieve.good
rename to testcases/good/sieve.good
diff --git a/vx-scheme/testcases/maze.scm b/testcases/maze.scm
similarity index 100%
rename from vx-scheme/testcases/maze.scm
rename to testcases/maze.scm
diff --git a/vx-scheme/testcases/pi.scm b/testcases/pi.scm
similarity index 100%
rename from vx-scheme/testcases/pi.scm
rename to testcases/pi.scm
diff --git a/vx-scheme/testcases/puzzle.scm b/testcases/puzzle.scm
similarity index 100%
rename from vx-scheme/testcases/puzzle.scm
rename to testcases/puzzle.scm
diff --git a/vx-scheme/testcases/q.scm b/testcases/q.scm
similarity index 100%
rename from vx-scheme/testcases/q.scm
rename to testcases/q.scm
diff --git a/vx-scheme/testcases/r4rstest.scm b/testcases/r4rstest.scm
similarity index 100%
rename from vx-scheme/testcases/r4rstest.scm
rename to testcases/r4rstest.scm
diff --git a/vx-scheme/testcases/scheme.scm b/testcases/scheme.scm
similarity index 100%
rename from vx-scheme/testcases/scheme.scm
rename to testcases/scheme.scm
diff --git a/vx-scheme/testcases/series.scm b/testcases/series.scm
similarity index 100%
rename from vx-scheme/testcases/series.scm
rename to testcases/series.scm
diff --git a/vx-scheme/testcases/sicp.scm b/testcases/sicp.scm
similarity index 100%
rename from vx-scheme/testcases/sicp.scm
rename to testcases/sicp.scm
diff --git a/vx-scheme/testcases/sieve.scm b/testcases/sieve.scm
similarity index 100%
rename from vx-scheme/testcases/sieve.scm
rename to testcases/sieve.scm
diff --git a/vx-scheme/testcases/stream.scm b/testcases/stream.scm
similarity index 100%
rename from vx-scheme/testcases/stream.scm
rename to testcases/stream.scm
diff --git a/vx-scheme/testcases/vx-good/ack.good b/testcases/vx-good/ack.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/ack.good
rename to testcases/vx-good/ack.good
diff --git a/vx-scheme/testcases/vx-good/boyer.good b/testcases/vx-good/boyer.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/boyer.good
rename to testcases/vx-good/boyer.good
diff --git a/vx-scheme/testcases/vx-good/cf.good b/testcases/vx-good/cf.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/cf.good
rename to testcases/vx-good/cf.good
diff --git a/vx-scheme/testcases/vx-good/dderiv.good b/testcases/vx-good/dderiv.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/dderiv.good
rename to testcases/vx-good/dderiv.good
diff --git a/vx-scheme/testcases/vx-good/dynamic.good b/testcases/vx-good/dynamic.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/dynamic.good
rename to testcases/vx-good/dynamic.good
diff --git a/vx-scheme/testcases/vx-good/earley.good b/testcases/vx-good/earley.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/earley.good
rename to testcases/vx-good/earley.good
diff --git a/vx-scheme/testcases/vx-good/maze.good b/testcases/vx-good/maze.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/maze.good
rename to testcases/vx-good/maze.good
diff --git a/vx-scheme/testcases/vx-good/pi.good b/testcases/vx-good/pi.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/pi.good
rename to testcases/vx-good/pi.good
diff --git a/vx-scheme/testcases/vx-good/puzzle.good b/testcases/vx-good/puzzle.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/puzzle.good
rename to testcases/vx-good/puzzle.good
diff --git a/vx-scheme/testcases/vx-good/r4rstest.good b/testcases/vx-good/r4rstest.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/r4rstest.good
rename to testcases/vx-good/r4rstest.good
diff --git a/vx-scheme/testcases/vx-good/scheme.good b/testcases/vx-good/scheme.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/scheme.good
rename to testcases/vx-good/scheme.good
diff --git a/vx-scheme/testcases/vx-good/series.good b/testcases/vx-good/series.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/series.good
rename to testcases/vx-good/series.good
diff --git a/vx-scheme/testcases/vx-good/sieve.good b/testcases/vx-good/sieve.good
similarity index 100%
rename from vx-scheme/testcases/vx-good/sieve.good
rename to testcases/vx-good/sieve.good
diff --git a/vx-scheme/testcases/vx-test.scm b/testcases/vx-test.scm
similarity index 100%
rename from vx-scheme/testcases/vx-test.scm
rename to testcases/vx-test.scm
diff --git a/vx-scheme/testcases/w32-good/ack.good b/testcases/w32-good/ack.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/ack.good
rename to testcases/w32-good/ack.good
diff --git a/vx-scheme/testcases/w32-good/boyer.good b/testcases/w32-good/boyer.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/boyer.good
rename to testcases/w32-good/boyer.good
diff --git a/vx-scheme/testcases/w32-good/cf.good b/testcases/w32-good/cf.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/cf.good
rename to testcases/w32-good/cf.good
diff --git a/vx-scheme/testcases/w32-good/dderiv.good b/testcases/w32-good/dderiv.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/dderiv.good
rename to testcases/w32-good/dderiv.good
diff --git a/vx-scheme/testcases/w32-good/dynamic.good b/testcases/w32-good/dynamic.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/dynamic.good
rename to testcases/w32-good/dynamic.good
diff --git a/vx-scheme/testcases/w32-good/earley.good b/testcases/w32-good/earley.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/earley.good
rename to testcases/w32-good/earley.good
diff --git a/vx-scheme/testcases/w32-good/maze.good b/testcases/w32-good/maze.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/maze.good
rename to testcases/w32-good/maze.good
diff --git a/vx-scheme/testcases/w32-good/pi.good b/testcases/w32-good/pi.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/pi.good
rename to testcases/w32-good/pi.good
diff --git a/vx-scheme/testcases/w32-good/puzzle.good b/testcases/w32-good/puzzle.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/puzzle.good
rename to testcases/w32-good/puzzle.good
diff --git a/vx-scheme/testcases/w32-good/r4rstest.good b/testcases/w32-good/r4rstest.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/r4rstest.good
rename to testcases/w32-good/r4rstest.good
diff --git a/vx-scheme/testcases/w32-good/scheme.good b/testcases/w32-good/scheme.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/scheme.good
rename to testcases/w32-good/scheme.good
diff --git a/vx-scheme/testcases/w32-good/series.good b/testcases/w32-good/series.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/series.good
rename to testcases/w32-good/series.good
diff --git a/vx-scheme/testcases/w32-good/sieve.good b/testcases/w32-good/sieve.good
similarity index 100%
rename from vx-scheme/testcases/w32-good/sieve.good
rename to testcases/w32-good/sieve.good
diff --git a/vx-scheme/tornado/target-shell/linkSyms.c b/tornado/target-shell/linkSyms.c
similarity index 100%
rename from vx-scheme/tornado/target-shell/linkSyms.c
rename to tornado/target-shell/linkSyms.c
diff --git a/vx-scheme/tornado/target-shell/prjComps.h b/tornado/target-shell/prjComps.h
similarity index 100%
rename from vx-scheme/tornado/target-shell/prjComps.h
rename to tornado/target-shell/prjComps.h
diff --git a/vx-scheme/tornado/target-shell/prjConfig.c b/tornado/target-shell/prjConfig.c
similarity index 100%
rename from vx-scheme/tornado/target-shell/prjConfig.c
rename to tornado/target-shell/prjConfig.c
diff --git a/vx-scheme/tornado/target-shell/prjObjs.lst b/tornado/target-shell/prjObjs.lst
similarity index 100%
rename from vx-scheme/tornado/target-shell/prjObjs.lst
rename to tornado/target-shell/prjObjs.lst
diff --git a/vx-scheme/tornado/target-shell/prjParams.h b/tornado/target-shell/prjParams.h
similarity index 100%
rename from vx-scheme/tornado/target-shell/prjParams.h
rename to tornado/target-shell/prjParams.h
diff --git a/vx-scheme/tornado/target-shell/startup b/tornado/target-shell/startup
similarity index 100%
rename from vx-scheme/tornado/target-shell/startup
rename to tornado/target-shell/startup
diff --git a/vx-scheme/tornado/target-shell/target-shell.wpj b/tornado/target-shell/target-shell.wpj
similarity index 100%
rename from vx-scheme/tornado/target-shell/target-shell.wpj
rename to tornado/target-shell/target-shell.wpj
diff --git a/vx-scheme/tornado/target-shell/usrAppInit.c b/tornado/target-shell/usrAppInit.c
similarity index 100%
rename from vx-scheme/tornado/target-shell/usrAppInit.c
rename to tornado/target-shell/usrAppInit.c
diff --git a/vx-scheme/tornado/vx-scheme.wsp b/tornado/vx-scheme.wsp
similarity index 100%
rename from vx-scheme/tornado/vx-scheme.wsp
rename to tornado/vx-scheme.wsp
diff --git a/vx-scheme/tornado/vx-scheme/prjObjs.lst b/tornado/vx-scheme/prjObjs.lst
similarity index 100%
rename from vx-scheme/tornado/vx-scheme/prjObjs.lst
rename to tornado/vx-scheme/prjObjs.lst
diff --git a/vx-scheme/tornado/vx-scheme/vx-scheme.wpj b/tornado/vx-scheme/vx-scheme.wpj
similarity index 100%
rename from vx-scheme/tornado/vx-scheme/vx-scheme.wpj
rename to tornado/vx-scheme/vx-scheme.wpj