Eliminate v7 directory, moving subdirs up one level.

diff --git a/v7/dist/Makefile b/dist/Makefile
similarity index 100%
rename from v7/dist/Makefile
rename to dist/Makefile

diff --git a/v7/dist/copyright.c b/dist/copyright.c
similarity index 100%
rename from v7/dist/copyright.c
rename to dist/copyright.c

diff --git a/v7/dist/copyright.scm b/dist/copyright.scm
similarity index 100%
rename from v7/dist/copyright.scm
rename to dist/copyright.scm

diff --git a/v7/dist/index.html b/dist/index.html
similarity index 100%
rename from v7/dist/index.html
rename to dist/index.html

diff --git a/v7/dist/make-c-files b/dist/make-c-files
similarity index 100%
rename from v7/dist/make-c-files
rename to dist/make-c-files

diff --git a/v7/dist/make-dist-files b/dist/make-dist-files
similarity index 100%
rename from v7/dist/make-dist-files
rename to dist/make-dist-files

diff --git a/v7/dist/make-scmutils b/dist/make-scmutils
similarity index 100%
rename from v7/dist/make-scmutils
rename to dist/make-scmutils

diff --git a/v7/dist/make-src-files b/dist/make-src-files
similarity index 100%
rename from v7/dist/make-src-files
rename to dist/make-src-files

diff --git a/v7/dist/release-prefix b/dist/release-prefix
similarity index 100%
rename from v7/dist/release-prefix
rename to dist/release-prefix

diff --git a/v7/doc/Makefile.in b/doc/Makefile.in
similarity index 100%
rename from v7/doc/Makefile.in
rename to doc/Makefile.in

diff --git a/v7/doc/configure.ac b/doc/configure.ac
similarity index 100%
rename from v7/doc/configure.ac
rename to doc/configure.ac

diff --git a/v7/doc/imail/Makefile.in b/doc/imail/Makefile.in
similarity index 100%
rename from v7/doc/imail/Makefile.in
rename to doc/imail/Makefile.in

diff --git a/v7/doc/imail/imail.texinfo b/doc/imail/imail.texinfo
similarity index 100%
rename from v7/doc/imail/imail.texinfo
rename to doc/imail/imail.texinfo

diff --git a/v7/doc/index.html b/doc/index.html
similarity index 100%
rename from v7/doc/index.html
rename to doc/index.html

diff --git a/v7/doc/info-dir b/doc/info-dir
similarity index 100%
rename from v7/doc/info-dir
rename to doc/info-dir

diff --git a/v7/doc/install-sh b/doc/install-sh
similarity index 100%
rename from v7/doc/install-sh
rename to doc/install-sh

diff --git a/v7/doc/make-common.in b/doc/make-common.in
similarity index 100%
rename from v7/doc/make-common.in
rename to doc/make-common.in

diff --git a/v7/doc/mkinstalldirs b/doc/mkinstalldirs
similarity index 100%
rename from v7/doc/mkinstalldirs
rename to doc/mkinstalldirs

diff --git a/v7/doc/ref-manual/Makefile.in b/doc/ref-manual/Makefile.in
similarity index 100%
rename from v7/doc/ref-manual/Makefile.in
rename to doc/ref-manual/Makefile.in

diff --git a/v7/doc/ref-manual/acknowledgements.texi b/doc/ref-manual/acknowledgements.texi
similarity index 100%
rename from v7/doc/ref-manual/acknowledgements.texi
rename to doc/ref-manual/acknowledgements.texi

diff --git a/v7/doc/ref-manual/associations.texi b/doc/ref-manual/associations.texi
similarity index 100%
rename from v7/doc/ref-manual/associations.texi
rename to doc/ref-manual/associations.texi

diff --git a/v7/doc/ref-manual/binding-index.texi b/doc/ref-manual/binding-index.texi
similarity index 100%
rename from v7/doc/ref-manual/binding-index.texi
rename to doc/ref-manual/binding-index.texi

diff --git a/v7/doc/ref-manual/bit-strings.texi b/doc/ref-manual/bit-strings.texi
similarity index 100%
rename from v7/doc/ref-manual/bit-strings.texi
rename to doc/ref-manual/bit-strings.texi

diff --git a/v7/doc/ref-manual/characters.texi b/doc/ref-manual/characters.texi
similarity index 100%
rename from v7/doc/ref-manual/characters.texi
rename to doc/ref-manual/characters.texi

diff --git a/v7/doc/ref-manual/concept-index.texi b/doc/ref-manual/concept-index.texi
similarity index 100%
rename from v7/doc/ref-manual/concept-index.texi
rename to doc/ref-manual/concept-index.texi

diff --git a/v7/doc/ref-manual/environments.texi b/doc/ref-manual/environments.texi
similarity index 100%
rename from v7/doc/ref-manual/environments.texi
rename to doc/ref-manual/environments.texi

diff --git a/v7/doc/ref-manual/equivalence.texi b/doc/ref-manual/equivalence.texi
similarity index 100%
rename from v7/doc/ref-manual/equivalence.texi
rename to doc/ref-manual/equivalence.texi

diff --git a/v7/doc/ref-manual/error.texi b/doc/ref-manual/error.texi
similarity index 100%
rename from v7/doc/ref-manual/error.texi
rename to doc/ref-manual/error.texi

diff --git a/v7/doc/ref-manual/gfdl.texinfo b/doc/ref-manual/gfdl.texinfo
similarity index 100%
rename from v7/doc/ref-manual/gfdl.texinfo
rename to doc/ref-manual/gfdl.texinfo

diff --git a/v7/doc/ref-manual/graphics.texi b/doc/ref-manual/graphics.texi
similarity index 100%
rename from v7/doc/ref-manual/graphics.texi
rename to doc/ref-manual/graphics.texi

diff --git a/v7/doc/ref-manual/io.texi b/doc/ref-manual/io.texi
similarity index 100%
rename from v7/doc/ref-manual/io.texi
rename to doc/ref-manual/io.texi

diff --git a/v7/doc/ref-manual/lists.texi b/doc/ref-manual/lists.texi
similarity index 100%
rename from v7/doc/ref-manual/lists.texi
rename to doc/ref-manual/lists.texi

diff --git a/v7/doc/ref-manual/misc-datatypes.texi b/doc/ref-manual/misc-datatypes.texi
similarity index 100%
rename from v7/doc/ref-manual/misc-datatypes.texi
rename to doc/ref-manual/misc-datatypes.texi

diff --git a/v7/doc/ref-manual/numbers.texi b/doc/ref-manual/numbers.texi
similarity index 100%
rename from v7/doc/ref-manual/numbers.texi
rename to doc/ref-manual/numbers.texi

diff --git a/v7/doc/ref-manual/os-interface.texi b/doc/ref-manual/os-interface.texi
similarity index 100%
rename from v7/doc/ref-manual/os-interface.texi
rename to doc/ref-manual/os-interface.texi

diff --git a/v7/doc/ref-manual/overview.texi b/doc/ref-manual/overview.texi
similarity index 100%
rename from v7/doc/ref-manual/overview.texi
rename to doc/ref-manual/overview.texi

diff --git a/v7/doc/ref-manual/procedures.texi b/doc/ref-manual/procedures.texi
similarity index 100%
rename from v7/doc/ref-manual/procedures.texi
rename to doc/ref-manual/procedures.texi

diff --git a/v7/doc/ref-manual/scheme.texinfo b/doc/ref-manual/scheme.texinfo
similarity index 100%
rename from v7/doc/ref-manual/scheme.texinfo
rename to doc/ref-manual/scheme.texinfo

diff --git a/v7/doc/ref-manual/special-forms.texi b/doc/ref-manual/special-forms.texi
similarity index 100%
rename from v7/doc/ref-manual/special-forms.texi
rename to doc/ref-manual/special-forms.texi

diff --git a/v7/doc/ref-manual/strings.texi b/doc/ref-manual/strings.texi
similarity index 100%
rename from v7/doc/ref-manual/strings.texi
rename to doc/ref-manual/strings.texi

diff --git a/v7/doc/ref-manual/vectors.texi b/doc/ref-manual/vectors.texi
similarity index 100%
rename from v7/doc/ref-manual/vectors.texi
rename to doc/ref-manual/vectors.texi

diff --git a/v7/doc/ref-manual/win32-packaging.texi b/doc/ref-manual/win32-packaging.texi
similarity index 100%
rename from v7/doc/ref-manual/win32-packaging.texi
rename to doc/ref-manual/win32-packaging.texi

diff --git a/v7/doc/scheme.1 b/doc/scheme.1
similarity index 100%
rename from v7/doc/scheme.1
rename to doc/scheme.1

diff --git a/v7/doc/sos/Makefile.in b/doc/sos/Makefile.in
similarity index 100%
rename from v7/doc/sos/Makefile.in
rename to doc/sos/Makefile.in

diff --git a/v7/doc/sos/sos.texinfo b/doc/sos/sos.texinfo
similarity index 100%
rename from v7/doc/sos/sos.texinfo
rename to doc/sos/sos.texinfo

diff --git a/v7/doc/user-manual/Makefile.in b/doc/user-manual/Makefile.in
similarity index 100%
rename from v7/doc/user-manual/Makefile.in
rename to doc/user-manual/Makefile.in

diff --git a/v7/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo
similarity index 100%
rename from v7/doc/user-manual/user.texinfo
rename to doc/user-manual/user.texinfo

diff --git a/v7/src/6001/6001.cbf b/src/6001/6001.cbf
similarity index 100%
rename from v7/src/6001/6001.cbf
rename to src/6001/6001.cbf

diff --git a/v7/src/6001/6001.pkg b/src/6001/6001.pkg
similarity index 100%
rename from v7/src/6001/6001.pkg
rename to src/6001/6001.pkg

diff --git a/v7/src/6001/6001.sf b/src/6001/6001.sf
similarity index 100%
rename from v7/src/6001/6001.sf
rename to src/6001/6001.sf

diff --git a/v7/src/6001/Makefile-fragment b/src/6001/Makefile-fragment
similarity index 100%
rename from v7/src/6001/Makefile-fragment
rename to src/6001/Makefile-fragment

diff --git a/v7/src/6001/arith.scm b/src/6001/arith.scm
similarity index 100%
rename from v7/src/6001/arith.scm
rename to src/6001/arith.scm

diff --git a/v7/src/6001/edextra.scm b/src/6001/edextra.scm
similarity index 100%
rename from v7/src/6001/edextra.scm
rename to src/6001/edextra.scm

diff --git a/v7/src/6001/floppy.scm b/src/6001/floppy.scm
similarity index 100%
rename from v7/src/6001/floppy.scm
rename to src/6001/floppy.scm

diff --git a/v7/src/6001/make.scm b/src/6001/make.scm
similarity index 100%
rename from v7/src/6001/make.scm
rename to src/6001/make.scm

diff --git a/v7/src/6001/nodefs.scm b/src/6001/nodefs.scm
similarity index 100%
rename from v7/src/6001/nodefs.scm
rename to src/6001/nodefs.scm

diff --git a/v7/src/6001/pic-imag.scm b/src/6001/pic-imag.scm
similarity index 100%
rename from v7/src/6001/pic-imag.scm
rename to src/6001/pic-imag.scm

diff --git a/v7/src/6001/pic-ops.scm b/src/6001/pic-ops.scm
similarity index 100%
rename from v7/src/6001/pic-ops.scm
rename to src/6001/pic-ops.scm

diff --git a/v7/src/6001/pic-read.scm b/src/6001/pic-read.scm
similarity index 100%
rename from v7/src/6001/pic-read.scm
rename to src/6001/pic-read.scm

diff --git a/v7/src/6001/pic-reco.scm b/src/6001/pic-reco.scm
similarity index 100%
rename from v7/src/6001/pic-reco.scm
rename to src/6001/pic-reco.scm

diff --git a/v7/src/6001/picture.scm b/src/6001/picture.scm
similarity index 100%
rename from v7/src/6001/picture.scm
rename to src/6001/picture.scm

diff --git a/v7/src/COPYING b/src/COPYING
similarity index 100%
rename from v7/src/COPYING
rename to src/COPYING

diff --git a/v7/src/Clean.sh b/src/Clean.sh
similarity index 100%
rename from v7/src/Clean.sh
rename to src/Clean.sh

diff --git a/v7/src/Makefile.in b/src/Makefile.in
similarity index 100%
rename from v7/src/Makefile.in
rename to src/Makefile.in

diff --git a/v7/src/README.txt b/src/README.txt
similarity index 100%
rename from v7/src/README.txt
rename to src/README.txt

diff --git a/v7/src/Setup.sh b/src/Setup.sh
similarity index 100%
rename from v7/src/Setup.sh
rename to src/Setup.sh

diff --git a/v7/src/TAGS b/src/TAGS
similarity index 100%
rename from v7/src/TAGS
rename to src/TAGS

diff --git a/v7/src/Tags.sh b/src/Tags.sh
similarity index 100%
rename from v7/src/Tags.sh
rename to src/Tags.sh

diff --git a/v7/src/compiler/Clean.sh b/src/compiler/Clean.sh
similarity index 100%
rename from v7/src/compiler/Clean.sh
rename to src/compiler/Clean.sh

diff --git a/v7/src/compiler/Makefile-fragment b/src/compiler/Makefile-fragment
similarity index 100%
rename from v7/src/compiler/Makefile-fragment
rename to src/compiler/Makefile-fragment

diff --git a/v7/src/compiler/README b/src/compiler/README
similarity index 100%
rename from v7/src/compiler/README
rename to src/compiler/README

diff --git a/v7/src/compiler/Setup.sh b/src/compiler/Setup.sh
similarity index 100%
rename from v7/src/compiler/Setup.sh
rename to src/compiler/Setup.sh

diff --git a/v7/src/compiler/Stage.sh b/src/compiler/Stage.sh
similarity index 100%
rename from v7/src/compiler/Stage.sh
rename to src/compiler/Stage.sh

diff --git a/v7/src/compiler/Tags.sh b/src/compiler/Tags.sh
similarity index 100%
rename from v7/src/compiler/Tags.sh
rename to src/compiler/Tags.sh

diff --git a/v7/src/compiler/back/asmmac.scm b/src/compiler/back/asmmac.scm
similarity index 100%
rename from v7/src/compiler/back/asmmac.scm
rename to src/compiler/back/asmmac.scm

diff --git a/v7/src/compiler/back/asutl.scm b/src/compiler/back/asutl.scm
similarity index 100%
rename from v7/src/compiler/back/asutl.scm
rename to src/compiler/back/asutl.scm

diff --git a/v7/src/compiler/back/bittop.scm b/src/compiler/back/bittop.scm
similarity index 100%
rename from v7/src/compiler/back/bittop.scm
rename to src/compiler/back/bittop.scm

diff --git a/v7/src/compiler/back/bitutl.scm b/src/compiler/back/bitutl.scm
similarity index 100%
rename from v7/src/compiler/back/bitutl.scm
rename to src/compiler/back/bitutl.scm

diff --git a/v7/src/compiler/back/insseq.scm b/src/compiler/back/insseq.scm
similarity index 100%
rename from v7/src/compiler/back/insseq.scm
rename to src/compiler/back/insseq.scm

diff --git a/v7/src/compiler/back/lapgn1.scm b/src/compiler/back/lapgn1.scm
similarity index 100%
rename from v7/src/compiler/back/lapgn1.scm
rename to src/compiler/back/lapgn1.scm

diff --git a/v7/src/compiler/back/lapgn2.scm b/src/compiler/back/lapgn2.scm
similarity index 100%
rename from v7/src/compiler/back/lapgn2.scm
rename to src/compiler/back/lapgn2.scm

diff --git a/v7/src/compiler/back/lapgn3.scm b/src/compiler/back/lapgn3.scm
similarity index 100%
rename from v7/src/compiler/back/lapgn3.scm
rename to src/compiler/back/lapgn3.scm

diff --git a/v7/src/compiler/back/linear.scm b/src/compiler/back/linear.scm
similarity index 100%
rename from v7/src/compiler/back/linear.scm
rename to src/compiler/back/linear.scm

diff --git a/v7/src/compiler/back/mermap.scm b/src/compiler/back/mermap.scm
similarity index 100%
rename from v7/src/compiler/back/mermap.scm
rename to src/compiler/back/mermap.scm

diff --git a/v7/src/compiler/back/regmap.scm b/src/compiler/back/regmap.scm
similarity index 100%
rename from v7/src/compiler/back/regmap.scm
rename to src/compiler/back/regmap.scm

diff --git a/v7/src/compiler/back/syerly.scm b/src/compiler/back/syerly.scm
similarity index 100%
rename from v7/src/compiler/back/syerly.scm
rename to src/compiler/back/syerly.scm

diff --git a/v7/src/compiler/back/symtab.scm b/src/compiler/back/symtab.scm
similarity index 100%
rename from v7/src/compiler/back/symtab.scm
rename to src/compiler/back/symtab.scm

diff --git a/v7/src/compiler/back/syntax.scm b/src/compiler/back/syntax.scm
similarity index 100%
rename from v7/src/compiler/back/syntax.scm
rename to src/compiler/back/syntax.scm

diff --git a/v7/src/compiler/base/asstop.scm b/src/compiler/base/asstop.scm
similarity index 100%
rename from v7/src/compiler/base/asstop.scm
rename to src/compiler/base/asstop.scm

diff --git a/v7/src/compiler/base/blocks.scm b/src/compiler/base/blocks.scm
similarity index 100%
rename from v7/src/compiler/base/blocks.scm
rename to src/compiler/base/blocks.scm

diff --git a/v7/src/compiler/base/cfg1.scm b/src/compiler/base/cfg1.scm
similarity index 100%
rename from v7/src/compiler/base/cfg1.scm
rename to src/compiler/base/cfg1.scm

diff --git a/v7/src/compiler/base/cfg2.scm b/src/compiler/base/cfg2.scm
similarity index 100%
rename from v7/src/compiler/base/cfg2.scm
rename to src/compiler/base/cfg2.scm

diff --git a/v7/src/compiler/base/cfg3.scm b/src/compiler/base/cfg3.scm
similarity index 100%
rename from v7/src/compiler/base/cfg3.scm
rename to src/compiler/base/cfg3.scm

diff --git a/v7/src/compiler/base/constr.scm b/src/compiler/base/constr.scm
similarity index 100%
rename from v7/src/compiler/base/constr.scm
rename to src/compiler/base/constr.scm

diff --git a/v7/src/compiler/base/contin.scm b/src/compiler/base/contin.scm
similarity index 100%
rename from v7/src/compiler/base/contin.scm
rename to src/compiler/base/contin.scm

diff --git a/v7/src/compiler/base/crsend.scm b/src/compiler/base/crsend.scm
similarity index 100%
rename from v7/src/compiler/base/crsend.scm
rename to src/compiler/base/crsend.scm

diff --git a/v7/src/compiler/base/crstop.scm b/src/compiler/base/crstop.scm
similarity index 100%
rename from v7/src/compiler/base/crstop.scm
rename to src/compiler/base/crstop.scm

diff --git a/v7/src/compiler/base/ctypes.scm b/src/compiler/base/ctypes.scm
similarity index 100%
rename from v7/src/compiler/base/ctypes.scm
rename to src/compiler/base/ctypes.scm

diff --git a/v7/src/compiler/base/debug.scm b/src/compiler/base/debug.scm
similarity index 100%
rename from v7/src/compiler/base/debug.scm
rename to src/compiler/base/debug.scm

diff --git a/v7/src/compiler/base/enumer.scm b/src/compiler/base/enumer.scm
similarity index 100%
rename from v7/src/compiler/base/enumer.scm
rename to src/compiler/base/enumer.scm

diff --git a/v7/src/compiler/base/infnew.scm b/src/compiler/base/infnew.scm
similarity index 100%
rename from v7/src/compiler/base/infnew.scm
rename to src/compiler/base/infnew.scm

diff --git a/v7/src/compiler/base/lvalue.scm b/src/compiler/base/lvalue.scm
similarity index 100%
rename from v7/src/compiler/base/lvalue.scm
rename to src/compiler/base/lvalue.scm

diff --git a/v7/src/compiler/base/macros.scm b/src/compiler/base/macros.scm
similarity index 100%
rename from v7/src/compiler/base/macros.scm
rename to src/compiler/base/macros.scm

diff --git a/v7/src/compiler/base/make.scm b/src/compiler/base/make.scm
similarity index 100%
rename from v7/src/compiler/base/make.scm
rename to src/compiler/base/make.scm

diff --git a/v7/src/compiler/base/mvalue.scm b/src/compiler/base/mvalue.scm
similarity index 100%
rename from v7/src/compiler/base/mvalue.scm
rename to src/compiler/base/mvalue.scm

diff --git a/v7/src/compiler/base/object.scm b/src/compiler/base/object.scm
similarity index 100%
rename from v7/src/compiler/base/object.scm
rename to src/compiler/base/object.scm

diff --git a/v7/src/compiler/base/pmerly.scm b/src/compiler/base/pmerly.scm
similarity index 100%
rename from v7/src/compiler/base/pmerly.scm
rename to src/compiler/base/pmerly.scm

diff --git a/v7/src/compiler/base/pmlook.scm b/src/compiler/base/pmlook.scm
similarity index 100%
rename from v7/src/compiler/base/pmlook.scm
rename to src/compiler/base/pmlook.scm

diff --git a/v7/src/compiler/base/pmpars.scm b/src/compiler/base/pmpars.scm
similarity index 100%
rename from v7/src/compiler/base/pmpars.scm
rename to src/compiler/base/pmpars.scm

diff --git a/v7/src/compiler/base/proced.scm b/src/compiler/base/proced.scm
similarity index 100%
rename from v7/src/compiler/base/proced.scm
rename to src/compiler/base/proced.scm

diff --git a/v7/src/compiler/base/refctx.scm b/src/compiler/base/refctx.scm
similarity index 100%
rename from v7/src/compiler/base/refctx.scm
rename to src/compiler/base/refctx.scm

diff --git a/v7/src/compiler/base/rvalue.scm b/src/compiler/base/rvalue.scm
similarity index 100%
rename from v7/src/compiler/base/rvalue.scm
rename to src/compiler/base/rvalue.scm

diff --git a/v7/src/compiler/base/scode.scm b/src/compiler/base/scode.scm
similarity index 100%
rename from v7/src/compiler/base/scode.scm
rename to src/compiler/base/scode.scm

diff --git a/v7/src/compiler/base/sets.scm b/src/compiler/base/sets.scm
similarity index 100%
rename from v7/src/compiler/base/sets.scm
rename to src/compiler/base/sets.scm

diff --git a/v7/src/compiler/base/subprb.scm b/src/compiler/base/subprb.scm
similarity index 100%
rename from v7/src/compiler/base/subprb.scm
rename to src/compiler/base/subprb.scm

diff --git a/v7/src/compiler/base/switch.scm b/src/compiler/base/switch.scm
similarity index 100%
rename from v7/src/compiler/base/switch.scm
rename to src/compiler/base/switch.scm

diff --git a/v7/src/compiler/base/toplev.scm b/src/compiler/base/toplev.scm
similarity index 100%
rename from v7/src/compiler/base/toplev.scm
rename to src/compiler/base/toplev.scm

diff --git a/v7/src/compiler/base/utils.scm b/src/compiler/base/utils.scm
similarity index 100%
rename from v7/src/compiler/base/utils.scm
rename to src/compiler/base/utils.scm

diff --git a/v7/src/compiler/choose-machine.sh b/src/compiler/choose-machine.sh
similarity index 100%
rename from v7/src/compiler/choose-machine.sh
rename to src/compiler/choose-machine.sh

diff --git a/v7/src/compiler/config.guess b/src/compiler/config.guess
similarity index 100%
rename from v7/src/compiler/config.guess
rename to src/compiler/config.guess

diff --git a/v7/src/compiler/configure b/src/compiler/configure
similarity index 100%
rename from v7/src/compiler/configure
rename to src/compiler/configure

diff --git a/v7/src/compiler/documentation/INSTALL b/src/compiler/documentation/INSTALL
similarity index 100%
rename from v7/src/compiler/documentation/INSTALL
rename to src/compiler/documentation/INSTALL

diff --git a/v7/src/compiler/documentation/TASKS b/src/compiler/documentation/TASKS
similarity index 100%
rename from v7/src/compiler/documentation/TASKS
rename to src/compiler/documentation/TASKS

diff --git a/v7/src/compiler/documentation/cmpaux.txt b/src/compiler/documentation/cmpaux.txt
similarity index 100%
rename from v7/src/compiler/documentation/cmpaux.txt
rename to src/compiler/documentation/cmpaux.txt

diff --git a/v7/src/compiler/documentation/cmpint.txt b/src/compiler/documentation/cmpint.txt
similarity index 100%
rename from v7/src/compiler/documentation/cmpint.txt
rename to src/compiler/documentation/cmpint.txt

diff --git a/v7/src/compiler/documentation/facts.txt b/src/compiler/documentation/facts.txt
similarity index 100%
rename from v7/src/compiler/documentation/facts.txt
rename to src/compiler/documentation/facts.txt

diff --git a/v7/src/compiler/documentation/files.txt b/src/compiler/documentation/files.txt
similarity index 100%
rename from v7/src/compiler/documentation/files.txt
rename to src/compiler/documentation/files.txt

diff --git a/v7/src/compiler/documentation/notes.txt b/src/compiler/documentation/notes.txt
similarity index 100%
rename from v7/src/compiler/documentation/notes.txt
rename to src/compiler/documentation/notes.txt

diff --git a/v7/src/compiler/documentation/porting.guide b/src/compiler/documentation/porting.guide
similarity index 100%
rename from v7/src/compiler/documentation/porting.guide
rename to src/compiler/documentation/porting.guide

diff --git a/v7/src/compiler/documentation/safety.txt b/src/compiler/documentation/safety.txt
similarity index 100%
rename from v7/src/compiler/documentation/safety.txt
rename to src/compiler/documentation/safety.txt

diff --git a/v7/src/compiler/documentation/test-c.c b/src/compiler/documentation/test-c.c
similarity index 100%
rename from v7/src/compiler/documentation/test-c.c
rename to src/compiler/documentation/test-c.c

diff --git a/v7/src/compiler/documentation/todo.txt b/src/compiler/documentation/todo.txt
similarity index 100%
rename from v7/src/compiler/documentation/todo.txt
rename to src/compiler/documentation/todo.txt

diff --git a/v7/src/compiler/etc/asm.scm b/src/compiler/etc/asm.scm
similarity index 100%
rename from v7/src/compiler/etc/asm.scm
rename to src/compiler/etc/asm.scm

diff --git a/v7/src/compiler/etc/comcmp.scm b/src/compiler/etc/comcmp.scm
similarity index 100%
rename from v7/src/compiler/etc/comcmp.scm
rename to src/compiler/etc/comcmp.scm

diff --git a/v7/src/compiler/etc/comfiles.scm b/src/compiler/etc/comfiles.scm
similarity index 100%
rename from v7/src/compiler/etc/comfiles.scm
rename to src/compiler/etc/comfiles.scm

diff --git a/v7/src/compiler/etc/disload.scm b/src/compiler/etc/disload.scm
similarity index 100%
rename from v7/src/compiler/etc/disload.scm
rename to src/compiler/etc/disload.scm

diff --git a/v7/src/compiler/etc/stackp.scm b/src/compiler/etc/stackp.scm
similarity index 100%
rename from v7/src/compiler/etc/stackp.scm
rename to src/compiler/etc/stackp.scm

diff --git a/v7/src/compiler/etc/xcbfdir.scm b/src/compiler/etc/xcbfdir.scm
similarity index 100%
rename from v7/src/compiler/etc/xcbfdir.scm
rename to src/compiler/etc/xcbfdir.scm

diff --git a/v7/src/compiler/fggen/canon.scm b/src/compiler/fggen/canon.scm
similarity index 100%
rename from v7/src/compiler/fggen/canon.scm
rename to src/compiler/fggen/canon.scm

diff --git a/v7/src/compiler/fggen/declar.scm b/src/compiler/fggen/declar.scm
similarity index 100%
rename from v7/src/compiler/fggen/declar.scm
rename to src/compiler/fggen/declar.scm

diff --git a/v7/src/compiler/fggen/fggen.scm b/src/compiler/fggen/fggen.scm
similarity index 100%
rename from v7/src/compiler/fggen/fggen.scm
rename to src/compiler/fggen/fggen.scm

diff --git a/v7/src/compiler/fgopt/blktyp.scm b/src/compiler/fgopt/blktyp.scm
similarity index 100%
rename from v7/src/compiler/fgopt/blktyp.scm
rename to src/compiler/fgopt/blktyp.scm

diff --git a/v7/src/compiler/fgopt/closan.scm b/src/compiler/fgopt/closan.scm
similarity index 100%
rename from v7/src/compiler/fgopt/closan.scm
rename to src/compiler/fgopt/closan.scm

diff --git a/v7/src/compiler/fgopt/conect.scm b/src/compiler/fgopt/conect.scm
similarity index 100%
rename from v7/src/compiler/fgopt/conect.scm
rename to src/compiler/fgopt/conect.scm

diff --git a/v7/src/compiler/fgopt/contan.scm b/src/compiler/fgopt/contan.scm
similarity index 100%
rename from v7/src/compiler/fgopt/contan.scm
rename to src/compiler/fgopt/contan.scm

diff --git a/v7/src/compiler/fgopt/delint.scm b/src/compiler/fgopt/delint.scm
similarity index 100%
rename from v7/src/compiler/fgopt/delint.scm
rename to src/compiler/fgopt/delint.scm

diff --git a/v7/src/compiler/fgopt/desenv.scm b/src/compiler/fgopt/desenv.scm
similarity index 100%
rename from v7/src/compiler/fgopt/desenv.scm
rename to src/compiler/fgopt/desenv.scm

diff --git a/v7/src/compiler/fgopt/envopt.scm b/src/compiler/fgopt/envopt.scm
similarity index 100%
rename from v7/src/compiler/fgopt/envopt.scm
rename to src/compiler/fgopt/envopt.scm

diff --git a/v7/src/compiler/fgopt/folcon.scm b/src/compiler/fgopt/folcon.scm
similarity index 100%
rename from v7/src/compiler/fgopt/folcon.scm
rename to src/compiler/fgopt/folcon.scm

diff --git a/v7/src/compiler/fgopt/offset.scm b/src/compiler/fgopt/offset.scm
similarity index 100%
rename from v7/src/compiler/fgopt/offset.scm
rename to src/compiler/fgopt/offset.scm

diff --git a/v7/src/compiler/fgopt/operan.scm b/src/compiler/fgopt/operan.scm
similarity index 100%
rename from v7/src/compiler/fgopt/operan.scm
rename to src/compiler/fgopt/operan.scm

diff --git a/v7/src/compiler/fgopt/order.scm b/src/compiler/fgopt/order.scm
similarity index 100%
rename from v7/src/compiler/fgopt/order.scm
rename to src/compiler/fgopt/order.scm

diff --git a/v7/src/compiler/fgopt/outer.scm b/src/compiler/fgopt/outer.scm
similarity index 100%
rename from v7/src/compiler/fgopt/outer.scm
rename to src/compiler/fgopt/outer.scm

diff --git a/v7/src/compiler/fgopt/param.scm b/src/compiler/fgopt/param.scm
similarity index 100%
rename from v7/src/compiler/fgopt/param.scm
rename to src/compiler/fgopt/param.scm

diff --git a/v7/src/compiler/fgopt/reord.scm b/src/compiler/fgopt/reord.scm
similarity index 100%
rename from v7/src/compiler/fgopt/reord.scm
rename to src/compiler/fgopt/reord.scm

diff --git a/v7/src/compiler/fgopt/reteqv.scm b/src/compiler/fgopt/reteqv.scm
similarity index 100%
rename from v7/src/compiler/fgopt/reteqv.scm
rename to src/compiler/fgopt/reteqv.scm

diff --git a/v7/src/compiler/fgopt/reuse.scm b/src/compiler/fgopt/reuse.scm
similarity index 100%
rename from v7/src/compiler/fgopt/reuse.scm
rename to src/compiler/fgopt/reuse.scm

diff --git a/v7/src/compiler/fgopt/sideff.scm b/src/compiler/fgopt/sideff.scm
similarity index 100%
rename from v7/src/compiler/fgopt/sideff.scm
rename to src/compiler/fgopt/sideff.scm

diff --git a/v7/src/compiler/fgopt/simapp.scm b/src/compiler/fgopt/simapp.scm
similarity index 100%
rename from v7/src/compiler/fgopt/simapp.scm
rename to src/compiler/fgopt/simapp.scm

diff --git a/v7/src/compiler/fgopt/simple.scm b/src/compiler/fgopt/simple.scm
similarity index 100%
rename from v7/src/compiler/fgopt/simple.scm
rename to src/compiler/fgopt/simple.scm

diff --git a/v7/src/compiler/fgopt/subfre.scm b/src/compiler/fgopt/subfre.scm
similarity index 100%
rename from v7/src/compiler/fgopt/subfre.scm
rename to src/compiler/fgopt/subfre.scm

diff --git a/v7/src/compiler/fgopt/varind.scm b/src/compiler/fgopt/varind.scm
similarity index 100%
rename from v7/src/compiler/fgopt/varind.scm
rename to src/compiler/fgopt/varind.scm

diff --git a/v7/src/compiler/improvements/comcon.scm b/src/compiler/improvements/comcon.scm
similarity index 100%
rename from v7/src/compiler/improvements/comcon.scm
rename to src/compiler/improvements/comcon.scm

diff --git a/v7/src/compiler/improvements/gasn.scm b/src/compiler/improvements/gasn.scm
similarity index 100%
rename from v7/src/compiler/improvements/gasn.scm
rename to src/compiler/improvements/gasn.scm

diff --git a/v7/src/compiler/improvements/rewsub.scm b/src/compiler/improvements/rewsub.scm
similarity index 100%
rename from v7/src/compiler/improvements/rewsub.scm
rename to src/compiler/improvements/rewsub.scm

diff --git a/v7/src/compiler/machines/C/TODO b/src/compiler/machines/C/TODO
similarity index 100%
rename from v7/src/compiler/machines/C/TODO
rename to src/compiler/machines/C/TODO

diff --git a/v7/src/compiler/machines/C/compiler.cbf b/src/compiler/machines/C/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/C/compiler.cbf
rename to src/compiler/machines/C/compiler.cbf

diff --git a/v7/src/compiler/machines/C/compiler.pkg b/src/compiler/machines/C/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/C/compiler.pkg
rename to src/compiler/machines/C/compiler.pkg

diff --git a/v7/src/compiler/machines/C/compiler.sf b/src/compiler/machines/C/compiler.sf
similarity index 100%
rename from v7/src/compiler/machines/C/compiler.sf
rename to src/compiler/machines/C/compiler.sf

diff --git a/v7/src/compiler/machines/C/cout.scm b/src/compiler/machines/C/cout.scm
similarity index 100%
rename from v7/src/compiler/machines/C/cout.scm
rename to src/compiler/machines/C/cout.scm

diff --git a/v7/src/compiler/machines/C/ctop.scm b/src/compiler/machines/C/ctop.scm
similarity index 100%
rename from v7/src/compiler/machines/C/ctop.scm
rename to src/compiler/machines/C/ctop.scm

diff --git a/v7/src/compiler/machines/C/cutl.scm b/src/compiler/machines/C/cutl.scm
similarity index 100%
rename from v7/src/compiler/machines/C/cutl.scm
rename to src/compiler/machines/C/cutl.scm

diff --git a/v7/src/compiler/machines/C/decls.scm b/src/compiler/machines/C/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/C/decls.scm
rename to src/compiler/machines/C/decls.scm

diff --git a/v7/src/compiler/machines/C/lapgen.scm b/src/compiler/machines/C/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/C/lapgen.scm
rename to src/compiler/machines/C/lapgen.scm

diff --git a/v7/src/compiler/machines/C/machin.scm b/src/compiler/machines/C/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/C/machin.scm
rename to src/compiler/machines/C/machin.scm

diff --git a/v7/src/compiler/machines/C/make.scm b/src/compiler/machines/C/make.scm
similarity index 100%
rename from v7/src/compiler/machines/C/make.scm
rename to src/compiler/machines/C/make.scm

diff --git a/v7/src/compiler/machines/C/rgspcm.scm b/src/compiler/machines/C/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rgspcm.scm
rename to src/compiler/machines/C/rgspcm.scm

diff --git a/v7/src/compiler/machines/C/rules1.scm b/src/compiler/machines/C/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rules1.scm
rename to src/compiler/machines/C/rules1.scm

diff --git a/v7/src/compiler/machines/C/rules2.scm b/src/compiler/machines/C/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rules2.scm
rename to src/compiler/machines/C/rules2.scm

diff --git a/v7/src/compiler/machines/C/rules3.scm b/src/compiler/machines/C/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rules3.scm
rename to src/compiler/machines/C/rules3.scm

diff --git a/v7/src/compiler/machines/C/rules4.scm b/src/compiler/machines/C/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rules4.scm
rename to src/compiler/machines/C/rules4.scm

diff --git a/v7/src/compiler/machines/C/rulfix.scm b/src/compiler/machines/C/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rulfix.scm
rename to src/compiler/machines/C/rulfix.scm

diff --git a/v7/src/compiler/machines/C/rulflo.scm b/src/compiler/machines/C/rulflo.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rulflo.scm
rename to src/compiler/machines/C/rulflo.scm

diff --git a/v7/src/compiler/machines/C/rulrew.scm b/src/compiler/machines/C/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/C/rulrew.scm
rename to src/compiler/machines/C/rulrew.scm

diff --git a/v7/src/compiler/machines/C/stackify.scm b/src/compiler/machines/C/stackify.scm
similarity index 100%
rename from v7/src/compiler/machines/C/stackify.scm
rename to src/compiler/machines/C/stackify.scm

diff --git a/v7/src/compiler/machines/C/stackops.scm b/src/compiler/machines/C/stackops.scm
similarity index 100%
rename from v7/src/compiler/machines/C/stackops.scm
rename to src/compiler/machines/C/stackops.scm

diff --git a/v7/src/compiler/machines/C/traditional.scm b/src/compiler/machines/C/traditional.scm
similarity index 100%
rename from v7/src/compiler/machines/C/traditional.scm
rename to src/compiler/machines/C/traditional.scm

diff --git a/v7/src/compiler/machines/alpha/TODO b/src/compiler/machines/alpha/TODO
similarity index 100%
rename from v7/src/compiler/machines/alpha/TODO
rename to src/compiler/machines/alpha/TODO

diff --git a/v7/src/compiler/machines/alpha/assmd.scm b/src/compiler/machines/alpha/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/assmd.scm
rename to src/compiler/machines/alpha/assmd.scm

diff --git a/v7/src/compiler/machines/alpha/coerce.scm b/src/compiler/machines/alpha/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/coerce.scm
rename to src/compiler/machines/alpha/coerce.scm

diff --git a/v7/src/compiler/machines/alpha/compiler.cbf b/src/compiler/machines/alpha/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/alpha/compiler.cbf
rename to src/compiler/machines/alpha/compiler.cbf

diff --git a/v7/src/compiler/machines/alpha/compiler.pkg b/src/compiler/machines/alpha/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/alpha/compiler.pkg
rename to src/compiler/machines/alpha/compiler.pkg

diff --git a/v7/src/compiler/machines/alpha/compiler.sf b/src/compiler/machines/alpha/compiler.sf
similarity index 100%
rename from v7/src/compiler/machines/alpha/compiler.sf
rename to src/compiler/machines/alpha/compiler.sf

diff --git a/v7/src/compiler/machines/alpha/dassm1.scm b/src/compiler/machines/alpha/dassm1.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/dassm1.scm
rename to src/compiler/machines/alpha/dassm1.scm

diff --git a/v7/src/compiler/machines/alpha/dassm2.scm b/src/compiler/machines/alpha/dassm2.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/dassm2.scm
rename to src/compiler/machines/alpha/dassm2.scm

diff --git a/v7/src/compiler/machines/alpha/dassm3.scm b/src/compiler/machines/alpha/dassm3.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/dassm3.scm
rename to src/compiler/machines/alpha/dassm3.scm

diff --git a/v7/src/compiler/machines/alpha/decls.scm b/src/compiler/machines/alpha/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/decls.scm
rename to src/compiler/machines/alpha/decls.scm

diff --git a/v7/src/compiler/machines/alpha/inerly.scm b/src/compiler/machines/alpha/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/inerly.scm
rename to src/compiler/machines/alpha/inerly.scm

diff --git a/v7/src/compiler/machines/alpha/insmac.scm b/src/compiler/machines/alpha/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/insmac.scm
rename to src/compiler/machines/alpha/insmac.scm

diff --git a/v7/src/compiler/machines/alpha/instr1.scm b/src/compiler/machines/alpha/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/instr1.scm
rename to src/compiler/machines/alpha/instr1.scm

diff --git a/v7/src/compiler/machines/alpha/instr2.scm b/src/compiler/machines/alpha/instr2.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/instr2.scm
rename to src/compiler/machines/alpha/instr2.scm

diff --git a/v7/src/compiler/machines/alpha/instr3.scm b/src/compiler/machines/alpha/instr3.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/instr3.scm
rename to src/compiler/machines/alpha/instr3.scm

diff --git a/v7/src/compiler/machines/alpha/lapgen.scm b/src/compiler/machines/alpha/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/lapgen.scm
rename to src/compiler/machines/alpha/lapgen.scm

diff --git a/v7/src/compiler/machines/alpha/lapopt.scm b/src/compiler/machines/alpha/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/lapopt.scm
rename to src/compiler/machines/alpha/lapopt.scm

diff --git a/v7/src/compiler/machines/alpha/machin.scm b/src/compiler/machines/alpha/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/machin.scm
rename to src/compiler/machines/alpha/machin.scm

diff --git a/v7/src/compiler/machines/alpha/make.scm b/src/compiler/machines/alpha/make.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/make.scm
rename to src/compiler/machines/alpha/make.scm

diff --git a/v7/src/compiler/machines/alpha/rgspcm.scm b/src/compiler/machines/alpha/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rgspcm.scm
rename to src/compiler/machines/alpha/rgspcm.scm

diff --git a/v7/src/compiler/machines/alpha/rules1.scm b/src/compiler/machines/alpha/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rules1.scm
rename to src/compiler/machines/alpha/rules1.scm

diff --git a/v7/src/compiler/machines/alpha/rules2.scm b/src/compiler/machines/alpha/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rules2.scm
rename to src/compiler/machines/alpha/rules2.scm

diff --git a/v7/src/compiler/machines/alpha/rules3.scm b/src/compiler/machines/alpha/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rules3.scm
rename to src/compiler/machines/alpha/rules3.scm

diff --git a/v7/src/compiler/machines/alpha/rules4.scm b/src/compiler/machines/alpha/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rules4.scm
rename to src/compiler/machines/alpha/rules4.scm

diff --git a/v7/src/compiler/machines/alpha/rulfix.scm b/src/compiler/machines/alpha/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rulfix.scm
rename to src/compiler/machines/alpha/rulfix.scm

diff --git a/v7/src/compiler/machines/alpha/rulflo.scm b/src/compiler/machines/alpha/rulflo.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rulflo.scm
rename to src/compiler/machines/alpha/rulflo.scm

diff --git a/v7/src/compiler/machines/alpha/rulrew.scm b/src/compiler/machines/alpha/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/alpha/rulrew.scm
rename to src/compiler/machines/alpha/rulrew.scm

diff --git a/v7/src/compiler/machines/bobcat/assmd.scm b/src/compiler/machines/bobcat/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/assmd.scm
rename to src/compiler/machines/bobcat/assmd.scm

diff --git a/v7/src/compiler/machines/bobcat/coerce.scm b/src/compiler/machines/bobcat/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/coerce.scm
rename to src/compiler/machines/bobcat/coerce.scm

diff --git a/v7/src/compiler/machines/bobcat/compiler.cbf b/src/compiler/machines/bobcat/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/bobcat/compiler.cbf
rename to src/compiler/machines/bobcat/compiler.cbf

diff --git a/v7/src/compiler/machines/bobcat/compiler.pkg b/src/compiler/machines/bobcat/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/bobcat/compiler.pkg
rename to src/compiler/machines/bobcat/compiler.pkg

diff --git a/v7/src/compiler/machines/bobcat/compiler.sf b/src/compiler/machines/bobcat/compiler.sf
similarity index 100%
rename from v7/src/compiler/machines/bobcat/compiler.sf
rename to src/compiler/machines/bobcat/compiler.sf

diff --git a/v7/src/compiler/machines/bobcat/dassm1.scm b/src/compiler/machines/bobcat/dassm1.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/dassm1.scm
rename to src/compiler/machines/bobcat/dassm1.scm

diff --git a/v7/src/compiler/machines/bobcat/dassm2.scm b/src/compiler/machines/bobcat/dassm2.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/dassm2.scm
rename to src/compiler/machines/bobcat/dassm2.scm

diff --git a/v7/src/compiler/machines/bobcat/dassm3.scm b/src/compiler/machines/bobcat/dassm3.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/dassm3.scm
rename to src/compiler/machines/bobcat/dassm3.scm

diff --git a/v7/src/compiler/machines/bobcat/decls.scm b/src/compiler/machines/bobcat/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/decls.scm
rename to src/compiler/machines/bobcat/decls.scm

diff --git a/v7/src/compiler/machines/bobcat/flinstr1.scm b/src/compiler/machines/bobcat/flinstr1.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/flinstr1.scm
rename to src/compiler/machines/bobcat/flinstr1.scm

diff --git a/v7/src/compiler/machines/bobcat/flinstr2.scm b/src/compiler/machines/bobcat/flinstr2.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/flinstr2.scm
rename to src/compiler/machines/bobcat/flinstr2.scm

diff --git a/v7/src/compiler/machines/bobcat/inerly.scm b/src/compiler/machines/bobcat/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/inerly.scm
rename to src/compiler/machines/bobcat/inerly.scm

diff --git a/v7/src/compiler/machines/bobcat/insmac.scm b/src/compiler/machines/bobcat/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/insmac.scm
rename to src/compiler/machines/bobcat/insmac.scm

diff --git a/v7/src/compiler/machines/bobcat/instr1.scm b/src/compiler/machines/bobcat/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/instr1.scm
rename to src/compiler/machines/bobcat/instr1.scm

diff --git a/v7/src/compiler/machines/bobcat/instr2.scm b/src/compiler/machines/bobcat/instr2.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/instr2.scm
rename to src/compiler/machines/bobcat/instr2.scm

diff --git a/v7/src/compiler/machines/bobcat/instr3.scm b/src/compiler/machines/bobcat/instr3.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/instr3.scm
rename to src/compiler/machines/bobcat/instr3.scm

diff --git a/v7/src/compiler/machines/bobcat/instr4.scm b/src/compiler/machines/bobcat/instr4.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/instr4.scm
rename to src/compiler/machines/bobcat/instr4.scm

diff --git a/v7/src/compiler/machines/bobcat/insutl.scm b/src/compiler/machines/bobcat/insutl.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/insutl.scm
rename to src/compiler/machines/bobcat/insutl.scm

diff --git a/v7/src/compiler/machines/bobcat/lapgen.scm b/src/compiler/machines/bobcat/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/lapgen.scm
rename to src/compiler/machines/bobcat/lapgen.scm

diff --git a/v7/src/compiler/machines/bobcat/lapopt.scm b/src/compiler/machines/bobcat/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/lapopt.scm
rename to src/compiler/machines/bobcat/lapopt.scm

diff --git a/v7/src/compiler/machines/bobcat/machin.scm b/src/compiler/machines/bobcat/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/machin.scm
rename to src/compiler/machines/bobcat/machin.scm

diff --git a/v7/src/compiler/machines/bobcat/make.scm-68020 b/src/compiler/machines/bobcat/make.scm-68020
similarity index 100%
rename from v7/src/compiler/machines/bobcat/make.scm-68020
rename to src/compiler/machines/bobcat/make.scm-68020

diff --git a/v7/src/compiler/machines/bobcat/make.scm-68040 b/src/compiler/machines/bobcat/make.scm-68040
similarity index 100%
rename from v7/src/compiler/machines/bobcat/make.scm-68040
rename to src/compiler/machines/bobcat/make.scm-68040

diff --git a/v7/src/compiler/machines/bobcat/mc68ktgl.scm b/src/compiler/machines/bobcat/mc68ktgl.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/mc68ktgl.scm
rename to src/compiler/machines/bobcat/mc68ktgl.scm

diff --git a/v7/src/compiler/machines/bobcat/rgspcm.scm b/src/compiler/machines/bobcat/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/rgspcm.scm
rename to src/compiler/machines/bobcat/rgspcm.scm

diff --git a/v7/src/compiler/machines/bobcat/rules1.scm b/src/compiler/machines/bobcat/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/rules1.scm
rename to src/compiler/machines/bobcat/rules1.scm

diff --git a/v7/src/compiler/machines/bobcat/rules2.scm b/src/compiler/machines/bobcat/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/rules2.scm
rename to src/compiler/machines/bobcat/rules2.scm

diff --git a/v7/src/compiler/machines/bobcat/rules3.scm b/src/compiler/machines/bobcat/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/rules3.scm
rename to src/compiler/machines/bobcat/rules3.scm

diff --git a/v7/src/compiler/machines/bobcat/rules4.scm b/src/compiler/machines/bobcat/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/rules4.scm
rename to src/compiler/machines/bobcat/rules4.scm

diff --git a/v7/src/compiler/machines/bobcat/rulrew.scm b/src/compiler/machines/bobcat/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/bobcat/rulrew.scm
rename to src/compiler/machines/bobcat/rulrew.scm

diff --git a/v7/src/compiler/machines/i386/assmd.scm b/src/compiler/machines/i386/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/assmd.scm
rename to src/compiler/machines/i386/assmd.scm

diff --git a/v7/src/compiler/machines/i386/coerce.scm b/src/compiler/machines/i386/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/coerce.scm
rename to src/compiler/machines/i386/coerce.scm

diff --git a/v7/src/compiler/machines/i386/compiler.cbf b/src/compiler/machines/i386/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/i386/compiler.cbf
rename to src/compiler/machines/i386/compiler.cbf

diff --git a/v7/src/compiler/machines/i386/compiler.pkg b/src/compiler/machines/i386/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/i386/compiler.pkg
rename to src/compiler/machines/i386/compiler.pkg

diff --git a/v7/src/compiler/machines/i386/compiler.sf b/src/compiler/machines/i386/compiler.sf
similarity index 100%
rename from v7/src/compiler/machines/i386/compiler.sf
rename to src/compiler/machines/i386/compiler.sf

diff --git a/v7/src/compiler/machines/i386/dassm1.scm b/src/compiler/machines/i386/dassm1.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/dassm1.scm
rename to src/compiler/machines/i386/dassm1.scm

diff --git a/v7/src/compiler/machines/i386/dassm2.scm b/src/compiler/machines/i386/dassm2.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/dassm2.scm
rename to src/compiler/machines/i386/dassm2.scm

diff --git a/v7/src/compiler/machines/i386/dassm3.scm b/src/compiler/machines/i386/dassm3.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/dassm3.scm
rename to src/compiler/machines/i386/dassm3.scm

diff --git a/v7/src/compiler/machines/i386/decls.scm b/src/compiler/machines/i386/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/decls.scm
rename to src/compiler/machines/i386/decls.scm

diff --git a/v7/src/compiler/machines/i386/inerly.scm b/src/compiler/machines/i386/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/inerly.scm
rename to src/compiler/machines/i386/inerly.scm

diff --git a/v7/src/compiler/machines/i386/insmac.scm b/src/compiler/machines/i386/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/insmac.scm
rename to src/compiler/machines/i386/insmac.scm

diff --git a/v7/src/compiler/machines/i386/instr1.scm b/src/compiler/machines/i386/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/instr1.scm
rename to src/compiler/machines/i386/instr1.scm

diff --git a/v7/src/compiler/machines/i386/instr2.scm b/src/compiler/machines/i386/instr2.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/instr2.scm
rename to src/compiler/machines/i386/instr2.scm

diff --git a/v7/src/compiler/machines/i386/instrf.scm b/src/compiler/machines/i386/instrf.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/instrf.scm
rename to src/compiler/machines/i386/instrf.scm

diff --git a/v7/src/compiler/machines/i386/insutl.scm b/src/compiler/machines/i386/insutl.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/insutl.scm
rename to src/compiler/machines/i386/insutl.scm

diff --git a/v7/src/compiler/machines/i386/lapgen.scm b/src/compiler/machines/i386/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/lapgen.scm
rename to src/compiler/machines/i386/lapgen.scm

diff --git a/v7/src/compiler/machines/i386/lapopt.scm b/src/compiler/machines/i386/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/lapopt.scm
rename to src/compiler/machines/i386/lapopt.scm

diff --git a/v7/src/compiler/machines/i386/machin.scm b/src/compiler/machines/i386/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/machin.scm
rename to src/compiler/machines/i386/machin.scm

diff --git a/v7/src/compiler/machines/i386/make.scm b/src/compiler/machines/i386/make.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/make.scm
rename to src/compiler/machines/i386/make.scm

diff --git a/v7/src/compiler/machines/i386/pc-make.scm b/src/compiler/machines/i386/pc-make.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/pc-make.scm
rename to src/compiler/machines/i386/pc-make.scm

diff --git a/v7/src/compiler/machines/i386/rgspcm.scm b/src/compiler/machines/i386/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rgspcm.scm
rename to src/compiler/machines/i386/rgspcm.scm

diff --git a/v7/src/compiler/machines/i386/rules1.scm b/src/compiler/machines/i386/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rules1.scm
rename to src/compiler/machines/i386/rules1.scm

diff --git a/v7/src/compiler/machines/i386/rules2.scm b/src/compiler/machines/i386/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rules2.scm
rename to src/compiler/machines/i386/rules2.scm

diff --git a/v7/src/compiler/machines/i386/rules3.scm b/src/compiler/machines/i386/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rules3.scm
rename to src/compiler/machines/i386/rules3.scm

diff --git a/v7/src/compiler/machines/i386/rules4.scm b/src/compiler/machines/i386/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rules4.scm
rename to src/compiler/machines/i386/rules4.scm

diff --git a/v7/src/compiler/machines/i386/rulfix.scm b/src/compiler/machines/i386/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rulfix.scm
rename to src/compiler/machines/i386/rulfix.scm

diff --git a/v7/src/compiler/machines/i386/rulflo.scm b/src/compiler/machines/i386/rulflo.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rulflo.scm
rename to src/compiler/machines/i386/rulflo.scm

diff --git a/v7/src/compiler/machines/i386/rulrew.scm b/src/compiler/machines/i386/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/i386/rulrew.scm
rename to src/compiler/machines/i386/rulrew.scm

diff --git a/v7/src/compiler/machines/mips/assmd.scm b/src/compiler/machines/mips/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/assmd.scm
rename to src/compiler/machines/mips/assmd.scm

diff --git a/v7/src/compiler/machines/mips/coerce.scm b/src/compiler/machines/mips/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/coerce.scm
rename to src/compiler/machines/mips/coerce.scm

diff --git a/v7/src/compiler/machines/mips/compiler.cbf b/src/compiler/machines/mips/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/mips/compiler.cbf
rename to src/compiler/machines/mips/compiler.cbf

diff --git a/v7/src/compiler/machines/mips/compiler.pkg b/src/compiler/machines/mips/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/mips/compiler.pkg
rename to src/compiler/machines/mips/compiler.pkg

diff --git a/v7/src/compiler/machines/mips/compiler.sf-big b/src/compiler/machines/mips/compiler.sf-big
similarity index 100%
rename from v7/src/compiler/machines/mips/compiler.sf-big
rename to src/compiler/machines/mips/compiler.sf-big

diff --git a/v7/src/compiler/machines/mips/compiler.sf-little b/src/compiler/machines/mips/compiler.sf-little
similarity index 100%
rename from v7/src/compiler/machines/mips/compiler.sf-little
rename to src/compiler/machines/mips/compiler.sf-little

diff --git a/v7/src/compiler/machines/mips/dassm1.scm b/src/compiler/machines/mips/dassm1.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/dassm1.scm
rename to src/compiler/machines/mips/dassm1.scm

diff --git a/v7/src/compiler/machines/mips/dassm2.scm b/src/compiler/machines/mips/dassm2.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/dassm2.scm
rename to src/compiler/machines/mips/dassm2.scm

diff --git a/v7/src/compiler/machines/mips/dassm3.scm b/src/compiler/machines/mips/dassm3.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/dassm3.scm
rename to src/compiler/machines/mips/dassm3.scm

diff --git a/v7/src/compiler/machines/mips/decls.scm b/src/compiler/machines/mips/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/decls.scm
rename to src/compiler/machines/mips/decls.scm

diff --git a/v7/src/compiler/machines/mips/inerly.scm b/src/compiler/machines/mips/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/inerly.scm
rename to src/compiler/machines/mips/inerly.scm

diff --git a/v7/src/compiler/machines/mips/insmac.scm b/src/compiler/machines/mips/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/insmac.scm
rename to src/compiler/machines/mips/insmac.scm

diff --git a/v7/src/compiler/machines/mips/instr1.scm b/src/compiler/machines/mips/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/instr1.scm
rename to src/compiler/machines/mips/instr1.scm

diff --git a/v7/src/compiler/machines/mips/instr2a.scm b/src/compiler/machines/mips/instr2a.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/instr2a.scm
rename to src/compiler/machines/mips/instr2a.scm

diff --git a/v7/src/compiler/machines/mips/instr2b.scm b/src/compiler/machines/mips/instr2b.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/instr2b.scm
rename to src/compiler/machines/mips/instr2b.scm

diff --git a/v7/src/compiler/machines/mips/instr3.scm b/src/compiler/machines/mips/instr3.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/instr3.scm
rename to src/compiler/machines/mips/instr3.scm

diff --git a/v7/src/compiler/machines/mips/lapgen.scm b/src/compiler/machines/mips/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/lapgen.scm
rename to src/compiler/machines/mips/lapgen.scm

diff --git a/v7/src/compiler/machines/mips/lapopt.scm b/src/compiler/machines/mips/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/lapopt.scm
rename to src/compiler/machines/mips/lapopt.scm

diff --git a/v7/src/compiler/machines/mips/machin.scm b/src/compiler/machines/mips/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/machin.scm
rename to src/compiler/machines/mips/machin.scm

diff --git a/v7/src/compiler/machines/mips/make.scm-big b/src/compiler/machines/mips/make.scm-big
similarity index 100%
rename from v7/src/compiler/machines/mips/make.scm-big
rename to src/compiler/machines/mips/make.scm-big

diff --git a/v7/src/compiler/machines/mips/make.scm-little b/src/compiler/machines/mips/make.scm-little
similarity index 100%
rename from v7/src/compiler/machines/mips/make.scm-little
rename to src/compiler/machines/mips/make.scm-little

diff --git a/v7/src/compiler/machines/mips/mips.scm b/src/compiler/machines/mips/mips.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/mips.scm
rename to src/compiler/machines/mips/mips.scm

diff --git a/v7/src/compiler/machines/mips/rgspcm.scm b/src/compiler/machines/mips/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rgspcm.scm
rename to src/compiler/machines/mips/rgspcm.scm

diff --git a/v7/src/compiler/machines/mips/rules1.scm b/src/compiler/machines/mips/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rules1.scm
rename to src/compiler/machines/mips/rules1.scm

diff --git a/v7/src/compiler/machines/mips/rules2.scm b/src/compiler/machines/mips/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rules2.scm
rename to src/compiler/machines/mips/rules2.scm

diff --git a/v7/src/compiler/machines/mips/rules3.scm b/src/compiler/machines/mips/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rules3.scm
rename to src/compiler/machines/mips/rules3.scm

diff --git a/v7/src/compiler/machines/mips/rules4.scm b/src/compiler/machines/mips/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rules4.scm
rename to src/compiler/machines/mips/rules4.scm

diff --git a/v7/src/compiler/machines/mips/rulfix.scm b/src/compiler/machines/mips/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rulfix.scm
rename to src/compiler/machines/mips/rulfix.scm

diff --git a/v7/src/compiler/machines/mips/rulflo.scm b/src/compiler/machines/mips/rulflo.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rulflo.scm
rename to src/compiler/machines/mips/rulflo.scm

diff --git a/v7/src/compiler/machines/mips/rulrew.scm b/src/compiler/machines/mips/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/mips/rulrew.scm
rename to src/compiler/machines/mips/rulrew.scm

diff --git a/v7/src/compiler/machines/sparc/assmd.scm b/src/compiler/machines/sparc/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/assmd.scm
rename to src/compiler/machines/sparc/assmd.scm

diff --git a/v7/src/compiler/machines/sparc/cf.h-sparc b/src/compiler/machines/sparc/cf.h-sparc
similarity index 100%
rename from v7/src/compiler/machines/sparc/cf.h-sparc
rename to src/compiler/machines/sparc/cf.h-sparc

diff --git a/v7/src/compiler/machines/sparc/cmpaux-sparc.m4 b/src/compiler/machines/sparc/cmpaux-sparc.m4
similarity index 100%
rename from v7/src/compiler/machines/sparc/cmpaux-sparc.m4
rename to src/compiler/machines/sparc/cmpaux-sparc.m4

diff --git a/v7/src/compiler/machines/sparc/cmpint-sparc.h b/src/compiler/machines/sparc/cmpint-sparc.h
similarity index 100%
rename from v7/src/compiler/machines/sparc/cmpint-sparc.h
rename to src/compiler/machines/sparc/cmpint-sparc.h

diff --git a/v7/src/compiler/machines/sparc/coerce.scm b/src/compiler/machines/sparc/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/coerce.scm
rename to src/compiler/machines/sparc/coerce.scm

diff --git a/v7/src/compiler/machines/sparc/decls.scm b/src/compiler/machines/sparc/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/decls.scm
rename to src/compiler/machines/sparc/decls.scm

diff --git a/v7/src/compiler/machines/sparc/inerly.scm b/src/compiler/machines/sparc/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/inerly.scm
rename to src/compiler/machines/sparc/inerly.scm

diff --git a/v7/src/compiler/machines/sparc/insmac.scm b/src/compiler/machines/sparc/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/insmac.scm
rename to src/compiler/machines/sparc/insmac.scm

diff --git a/v7/src/compiler/machines/sparc/instr1.scm b/src/compiler/machines/sparc/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/instr1.scm
rename to src/compiler/machines/sparc/instr1.scm

diff --git a/v7/src/compiler/machines/sparc/instr2a.scm b/src/compiler/machines/sparc/instr2a.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/instr2a.scm
rename to src/compiler/machines/sparc/instr2a.scm

diff --git a/v7/src/compiler/machines/sparc/instr2b.scm b/src/compiler/machines/sparc/instr2b.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/instr2b.scm
rename to src/compiler/machines/sparc/instr2b.scm

diff --git a/v7/src/compiler/machines/sparc/instr3.scm b/src/compiler/machines/sparc/instr3.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/instr3.scm
rename to src/compiler/machines/sparc/instr3.scm

diff --git a/v7/src/compiler/machines/sparc/lapgen.scm b/src/compiler/machines/sparc/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/lapgen.scm
rename to src/compiler/machines/sparc/lapgen.scm

diff --git a/v7/src/compiler/machines/sparc/lapopt.scm b/src/compiler/machines/sparc/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/lapopt.scm
rename to src/compiler/machines/sparc/lapopt.scm

diff --git a/v7/src/compiler/machines/sparc/machin.scm b/src/compiler/machines/sparc/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/machin.scm
rename to src/compiler/machines/sparc/machin.scm

diff --git a/v7/src/compiler/machines/sparc/make.scm b/src/compiler/machines/sparc/make.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/make.scm
rename to src/compiler/machines/sparc/make.scm

diff --git a/v7/src/compiler/machines/sparc/rgspcm.scm b/src/compiler/machines/sparc/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rgspcm.scm
rename to src/compiler/machines/sparc/rgspcm.scm

diff --git a/v7/src/compiler/machines/sparc/rules1.scm b/src/compiler/machines/sparc/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rules1.scm
rename to src/compiler/machines/sparc/rules1.scm

diff --git a/v7/src/compiler/machines/sparc/rules2.scm b/src/compiler/machines/sparc/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rules2.scm
rename to src/compiler/machines/sparc/rules2.scm

diff --git a/v7/src/compiler/machines/sparc/rules3.scm b/src/compiler/machines/sparc/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rules3.scm
rename to src/compiler/machines/sparc/rules3.scm

diff --git a/v7/src/compiler/machines/sparc/rules4.scm b/src/compiler/machines/sparc/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rules4.scm
rename to src/compiler/machines/sparc/rules4.scm

diff --git a/v7/src/compiler/machines/sparc/rulfix.scm b/src/compiler/machines/sparc/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rulfix.scm
rename to src/compiler/machines/sparc/rulfix.scm

diff --git a/v7/src/compiler/machines/sparc/rulflo.scm b/src/compiler/machines/sparc/rulflo.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rulflo.scm
rename to src/compiler/machines/sparc/rulflo.scm

diff --git a/v7/src/compiler/machines/sparc/rulrew.scm b/src/compiler/machines/sparc/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/sparc/rulrew.scm
rename to src/compiler/machines/sparc/rulrew.scm

diff --git a/v7/src/compiler/machines/spectrum/TODO b/src/compiler/machines/spectrum/TODO
similarity index 100%
rename from v7/src/compiler/machines/spectrum/TODO
rename to src/compiler/machines/spectrum/TODO

diff --git a/v7/src/compiler/machines/spectrum/assmd.scm b/src/compiler/machines/spectrum/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/assmd.scm
rename to src/compiler/machines/spectrum/assmd.scm

diff --git a/v7/src/compiler/machines/spectrum/coerce.scm b/src/compiler/machines/spectrum/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/coerce.scm
rename to src/compiler/machines/spectrum/coerce.scm

diff --git a/v7/src/compiler/machines/spectrum/compiler.cbf b/src/compiler/machines/spectrum/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/spectrum/compiler.cbf
rename to src/compiler/machines/spectrum/compiler.cbf

diff --git a/v7/src/compiler/machines/spectrum/compiler.pkg b/src/compiler/machines/spectrum/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/spectrum/compiler.pkg
rename to src/compiler/machines/spectrum/compiler.pkg

diff --git a/v7/src/compiler/machines/spectrum/compiler.sf b/src/compiler/machines/spectrum/compiler.sf
similarity index 100%
rename from v7/src/compiler/machines/spectrum/compiler.sf
rename to src/compiler/machines/spectrum/compiler.sf

diff --git a/v7/src/compiler/machines/spectrum/dassm1.scm b/src/compiler/machines/spectrum/dassm1.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/dassm1.scm
rename to src/compiler/machines/spectrum/dassm1.scm

diff --git a/v7/src/compiler/machines/spectrum/dassm2.scm b/src/compiler/machines/spectrum/dassm2.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/dassm2.scm
rename to src/compiler/machines/spectrum/dassm2.scm

diff --git a/v7/src/compiler/machines/spectrum/dassm3.scm b/src/compiler/machines/spectrum/dassm3.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/dassm3.scm
rename to src/compiler/machines/spectrum/dassm3.scm

diff --git a/v7/src/compiler/machines/spectrum/decls.scm b/src/compiler/machines/spectrum/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/decls.scm
rename to src/compiler/machines/spectrum/decls.scm

diff --git a/v7/src/compiler/machines/spectrum/inerly.scm b/src/compiler/machines/spectrum/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/inerly.scm
rename to src/compiler/machines/spectrum/inerly.scm

diff --git a/v7/src/compiler/machines/spectrum/insmac.scm b/src/compiler/machines/spectrum/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/insmac.scm
rename to src/compiler/machines/spectrum/insmac.scm

diff --git a/v7/src/compiler/machines/spectrum/instr1.scm b/src/compiler/machines/spectrum/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/instr1.scm
rename to src/compiler/machines/spectrum/instr1.scm

diff --git a/v7/src/compiler/machines/spectrum/instr2.scm b/src/compiler/machines/spectrum/instr2.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/instr2.scm
rename to src/compiler/machines/spectrum/instr2.scm

diff --git a/v7/src/compiler/machines/spectrum/instr3.scm b/src/compiler/machines/spectrum/instr3.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/instr3.scm
rename to src/compiler/machines/spectrum/instr3.scm

diff --git a/v7/src/compiler/machines/spectrum/lapgen.scm b/src/compiler/machines/spectrum/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/lapgen.scm
rename to src/compiler/machines/spectrum/lapgen.scm

diff --git a/v7/src/compiler/machines/spectrum/lapopt.scm b/src/compiler/machines/spectrum/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/lapopt.scm
rename to src/compiler/machines/spectrum/lapopt.scm

diff --git a/v7/src/compiler/machines/spectrum/machin.scm b/src/compiler/machines/spectrum/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/machin.scm
rename to src/compiler/machines/spectrum/machin.scm

diff --git a/v7/src/compiler/machines/spectrum/make.scm b/src/compiler/machines/spectrum/make.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/make.scm
rename to src/compiler/machines/spectrum/make.scm

diff --git a/v7/src/compiler/machines/spectrum/rgspcm.scm b/src/compiler/machines/spectrum/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rgspcm.scm
rename to src/compiler/machines/spectrum/rgspcm.scm

diff --git a/v7/src/compiler/machines/spectrum/rules1.scm b/src/compiler/machines/spectrum/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rules1.scm
rename to src/compiler/machines/spectrum/rules1.scm

diff --git a/v7/src/compiler/machines/spectrum/rules2.scm b/src/compiler/machines/spectrum/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rules2.scm
rename to src/compiler/machines/spectrum/rules2.scm

diff --git a/v7/src/compiler/machines/spectrum/rules3.scm b/src/compiler/machines/spectrum/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rules3.scm
rename to src/compiler/machines/spectrum/rules3.scm

diff --git a/v7/src/compiler/machines/spectrum/rules4.scm b/src/compiler/machines/spectrum/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rules4.scm
rename to src/compiler/machines/spectrum/rules4.scm

diff --git a/v7/src/compiler/machines/spectrum/rulfix.scm b/src/compiler/machines/spectrum/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rulfix.scm
rename to src/compiler/machines/spectrum/rulfix.scm

diff --git a/v7/src/compiler/machines/spectrum/rulflo.scm b/src/compiler/machines/spectrum/rulflo.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rulflo.scm
rename to src/compiler/machines/spectrum/rulflo.scm

diff --git a/v7/src/compiler/machines/spectrum/rulrew.scm b/src/compiler/machines/spectrum/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/spectrum/rulrew.scm
rename to src/compiler/machines/spectrum/rulrew.scm

diff --git a/v7/src/compiler/machines/vax/assmd.scm b/src/compiler/machines/vax/assmd.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/assmd.scm
rename to src/compiler/machines/vax/assmd.scm

diff --git a/v7/src/compiler/machines/vax/coerce.scm b/src/compiler/machines/vax/coerce.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/coerce.scm
rename to src/compiler/machines/vax/coerce.scm

diff --git a/v7/src/compiler/machines/vax/compiler.cbf b/src/compiler/machines/vax/compiler.cbf
similarity index 100%
rename from v7/src/compiler/machines/vax/compiler.cbf
rename to src/compiler/machines/vax/compiler.cbf

diff --git a/v7/src/compiler/machines/vax/compiler.pkg b/src/compiler/machines/vax/compiler.pkg
similarity index 100%
rename from v7/src/compiler/machines/vax/compiler.pkg
rename to src/compiler/machines/vax/compiler.pkg

diff --git a/v7/src/compiler/machines/vax/compiler.sf b/src/compiler/machines/vax/compiler.sf
similarity index 100%
rename from v7/src/compiler/machines/vax/compiler.sf
rename to src/compiler/machines/vax/compiler.sf

diff --git a/v7/src/compiler/machines/vax/dassm1.scm b/src/compiler/machines/vax/dassm1.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/dassm1.scm
rename to src/compiler/machines/vax/dassm1.scm

diff --git a/v7/src/compiler/machines/vax/dassm2.scm b/src/compiler/machines/vax/dassm2.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/dassm2.scm
rename to src/compiler/machines/vax/dassm2.scm

diff --git a/v7/src/compiler/machines/vax/dassm3.scm b/src/compiler/machines/vax/dassm3.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/dassm3.scm
rename to src/compiler/machines/vax/dassm3.scm

diff --git a/v7/src/compiler/machines/vax/decls.scm b/src/compiler/machines/vax/decls.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/decls.scm
rename to src/compiler/machines/vax/decls.scm

diff --git a/v7/src/compiler/machines/vax/dsyn.scm b/src/compiler/machines/vax/dsyn.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/dsyn.scm
rename to src/compiler/machines/vax/dsyn.scm

diff --git a/v7/src/compiler/machines/vax/inerly.scm b/src/compiler/machines/vax/inerly.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/inerly.scm
rename to src/compiler/machines/vax/inerly.scm

diff --git a/v7/src/compiler/machines/vax/insmac.scm b/src/compiler/machines/vax/insmac.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/insmac.scm
rename to src/compiler/machines/vax/insmac.scm

diff --git a/v7/src/compiler/machines/vax/instr1.scm b/src/compiler/machines/vax/instr1.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/instr1.scm
rename to src/compiler/machines/vax/instr1.scm

diff --git a/v7/src/compiler/machines/vax/instr2.scm b/src/compiler/machines/vax/instr2.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/instr2.scm
rename to src/compiler/machines/vax/instr2.scm

diff --git a/v7/src/compiler/machines/vax/instr3.scm b/src/compiler/machines/vax/instr3.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/instr3.scm
rename to src/compiler/machines/vax/instr3.scm

diff --git a/v7/src/compiler/machines/vax/insutl.scm b/src/compiler/machines/vax/insutl.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/insutl.scm
rename to src/compiler/machines/vax/insutl.scm

diff --git a/v7/src/compiler/machines/vax/lapgen.scm b/src/compiler/machines/vax/lapgen.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/lapgen.scm
rename to src/compiler/machines/vax/lapgen.scm

diff --git a/v7/src/compiler/machines/vax/lapopt.scm b/src/compiler/machines/vax/lapopt.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/lapopt.scm
rename to src/compiler/machines/vax/lapopt.scm

diff --git a/v7/src/compiler/machines/vax/machin.scm b/src/compiler/machines/vax/machin.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/machin.scm
rename to src/compiler/machines/vax/machin.scm

diff --git a/v7/src/compiler/machines/vax/make.scm b/src/compiler/machines/vax/make.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/make.scm
rename to src/compiler/machines/vax/make.scm

diff --git a/v7/src/compiler/machines/vax/rgspcm.scm b/src/compiler/machines/vax/rgspcm.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rgspcm.scm
rename to src/compiler/machines/vax/rgspcm.scm

diff --git a/v7/src/compiler/machines/vax/rules1.scm b/src/compiler/machines/vax/rules1.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rules1.scm
rename to src/compiler/machines/vax/rules1.scm

diff --git a/v7/src/compiler/machines/vax/rules2.scm b/src/compiler/machines/vax/rules2.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rules2.scm
rename to src/compiler/machines/vax/rules2.scm

diff --git a/v7/src/compiler/machines/vax/rules3.scm b/src/compiler/machines/vax/rules3.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rules3.scm
rename to src/compiler/machines/vax/rules3.scm

diff --git a/v7/src/compiler/machines/vax/rules4.scm b/src/compiler/machines/vax/rules4.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rules4.scm
rename to src/compiler/machines/vax/rules4.scm

diff --git a/v7/src/compiler/machines/vax/rulfix.scm b/src/compiler/machines/vax/rulfix.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rulfix.scm
rename to src/compiler/machines/vax/rulfix.scm

diff --git a/v7/src/compiler/machines/vax/rulrew.scm b/src/compiler/machines/vax/rulrew.scm
similarity index 100%
rename from v7/src/compiler/machines/vax/rulrew.scm
rename to src/compiler/machines/vax/rulrew.scm

diff --git a/v7/src/compiler/rtlbase/regset.scm b/src/compiler/rtlbase/regset.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/regset.scm
rename to src/compiler/rtlbase/regset.scm

diff --git a/v7/src/compiler/rtlbase/rgraph.scm b/src/compiler/rtlbase/rgraph.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rgraph.scm
rename to src/compiler/rtlbase/rgraph.scm

diff --git a/v7/src/compiler/rtlbase/rtlcfg.scm b/src/compiler/rtlbase/rtlcfg.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlcfg.scm
rename to src/compiler/rtlbase/rtlcfg.scm

diff --git a/v7/src/compiler/rtlbase/rtlcon.scm b/src/compiler/rtlbase/rtlcon.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlcon.scm
rename to src/compiler/rtlbase/rtlcon.scm

diff --git a/v7/src/compiler/rtlbase/rtlexp.scm b/src/compiler/rtlbase/rtlexp.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlexp.scm
rename to src/compiler/rtlbase/rtlexp.scm

diff --git a/v7/src/compiler/rtlbase/rtline.scm b/src/compiler/rtlbase/rtline.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtline.scm
rename to src/compiler/rtlbase/rtline.scm

diff --git a/v7/src/compiler/rtlbase/rtlobj.scm b/src/compiler/rtlbase/rtlobj.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlobj.scm
rename to src/compiler/rtlbase/rtlobj.scm

diff --git a/v7/src/compiler/rtlbase/rtlreg.scm b/src/compiler/rtlbase/rtlreg.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlreg.scm
rename to src/compiler/rtlbase/rtlreg.scm

diff --git a/v7/src/compiler/rtlbase/rtlty1.scm b/src/compiler/rtlbase/rtlty1.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlty1.scm
rename to src/compiler/rtlbase/rtlty1.scm

diff --git a/v7/src/compiler/rtlbase/rtlty2.scm b/src/compiler/rtlbase/rtlty2.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/rtlty2.scm
rename to src/compiler/rtlbase/rtlty2.scm

diff --git a/v7/src/compiler/rtlbase/valclass.scm b/src/compiler/rtlbase/valclass.scm
similarity index 100%
rename from v7/src/compiler/rtlbase/valclass.scm
rename to src/compiler/rtlbase/valclass.scm

diff --git a/v7/src/compiler/rtlgen/fndblk.scm b/src/compiler/rtlgen/fndblk.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/fndblk.scm
rename to src/compiler/rtlgen/fndblk.scm

diff --git a/v7/src/compiler/rtlgen/fndvar.scm b/src/compiler/rtlgen/fndvar.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/fndvar.scm
rename to src/compiler/rtlgen/fndvar.scm

diff --git a/v7/src/compiler/rtlgen/opncod.scm b/src/compiler/rtlgen/opncod.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/opncod.scm
rename to src/compiler/rtlgen/opncod.scm

diff --git a/v7/src/compiler/rtlgen/rgcomb.scm b/src/compiler/rtlgen/rgcomb.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/rgcomb.scm
rename to src/compiler/rtlgen/rgcomb.scm

diff --git a/v7/src/compiler/rtlgen/rgproc.scm b/src/compiler/rtlgen/rgproc.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/rgproc.scm
rename to src/compiler/rtlgen/rgproc.scm

diff --git a/v7/src/compiler/rtlgen/rgretn.scm b/src/compiler/rtlgen/rgretn.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/rgretn.scm
rename to src/compiler/rtlgen/rgretn.scm

diff --git a/v7/src/compiler/rtlgen/rgrval.scm b/src/compiler/rtlgen/rgrval.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/rgrval.scm
rename to src/compiler/rtlgen/rgrval.scm

diff --git a/v7/src/compiler/rtlgen/rgstmt.scm b/src/compiler/rtlgen/rgstmt.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/rgstmt.scm
rename to src/compiler/rtlgen/rgstmt.scm

diff --git a/v7/src/compiler/rtlgen/rtlgen.scm b/src/compiler/rtlgen/rtlgen.scm
similarity index 100%
rename from v7/src/compiler/rtlgen/rtlgen.scm
rename to src/compiler/rtlgen/rtlgen.scm

diff --git a/v7/src/compiler/rtlopt/ralloc.scm b/src/compiler/rtlopt/ralloc.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/ralloc.scm
rename to src/compiler/rtlopt/ralloc.scm

diff --git a/v7/src/compiler/rtlopt/rcompr.scm b/src/compiler/rtlopt/rcompr.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcompr.scm
rename to src/compiler/rtlopt/rcompr.scm

diff --git a/v7/src/compiler/rtlopt/rcse1.scm b/src/compiler/rtlopt/rcse1.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcse1.scm
rename to src/compiler/rtlopt/rcse1.scm

diff --git a/v7/src/compiler/rtlopt/rcse2.scm b/src/compiler/rtlopt/rcse2.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcse2.scm
rename to src/compiler/rtlopt/rcse2.scm

diff --git a/v7/src/compiler/rtlopt/rcseep.scm b/src/compiler/rtlopt/rcseep.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcseep.scm
rename to src/compiler/rtlopt/rcseep.scm

diff --git a/v7/src/compiler/rtlopt/rcseht.scm b/src/compiler/rtlopt/rcseht.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcseht.scm
rename to src/compiler/rtlopt/rcseht.scm

diff --git a/v7/src/compiler/rtlopt/rcserq.scm b/src/compiler/rtlopt/rcserq.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcserq.scm
rename to src/compiler/rtlopt/rcserq.scm

diff --git a/v7/src/compiler/rtlopt/rcsesr.scm b/src/compiler/rtlopt/rcsesr.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rcsesr.scm
rename to src/compiler/rtlopt/rcsesr.scm

diff --git a/v7/src/compiler/rtlopt/rdebug.scm b/src/compiler/rtlopt/rdebug.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rdebug.scm
rename to src/compiler/rtlopt/rdebug.scm

diff --git a/v7/src/compiler/rtlopt/rdflow.scm b/src/compiler/rtlopt/rdflow.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rdflow.scm
rename to src/compiler/rtlopt/rdflow.scm

diff --git a/v7/src/compiler/rtlopt/rerite.scm b/src/compiler/rtlopt/rerite.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rerite.scm
rename to src/compiler/rtlopt/rerite.scm

diff --git a/v7/src/compiler/rtlopt/rinvex.scm b/src/compiler/rtlopt/rinvex.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rinvex.scm
rename to src/compiler/rtlopt/rinvex.scm

diff --git a/v7/src/compiler/rtlopt/rlife.scm b/src/compiler/rtlopt/rlife.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rlife.scm
rename to src/compiler/rtlopt/rlife.scm

diff --git a/v7/src/compiler/rtlopt/rtlcsm.scm b/src/compiler/rtlopt/rtlcsm.scm
similarity index 100%
rename from v7/src/compiler/rtlopt/rtlcsm.scm
rename to src/compiler/rtlopt/rtlcsm.scm

diff --git a/v7/src/configure.ac b/src/configure.ac
similarity index 100%
rename from v7/src/configure.ac
rename to src/configure.ac

diff --git a/v7/src/cref/Makefile-fragment b/src/cref/Makefile-fragment
similarity index 100%
rename from v7/src/cref/Makefile-fragment
rename to src/cref/Makefile-fragment

diff --git a/v7/src/cref/anfile.scm b/src/cref/anfile.scm
similarity index 100%
rename from v7/src/cref/anfile.scm
rename to src/cref/anfile.scm

diff --git a/v7/src/cref/conpkg.scm b/src/cref/conpkg.scm
similarity index 100%
rename from v7/src/cref/conpkg.scm
rename to src/cref/conpkg.scm

diff --git a/v7/src/cref/cref.cbf b/src/cref/cref.cbf
similarity index 100%
rename from v7/src/cref/cref.cbf
rename to src/cref/cref.cbf

diff --git a/v7/src/cref/cref.pkg b/src/cref/cref.pkg
similarity index 100%
rename from v7/src/cref/cref.pkg
rename to src/cref/cref.pkg

diff --git a/v7/src/cref/cref.sf b/src/cref/cref.sf
similarity index 100%
rename from v7/src/cref/cref.sf
rename to src/cref/cref.sf

diff --git a/v7/src/cref/forpkg.scm b/src/cref/forpkg.scm
similarity index 100%
rename from v7/src/cref/forpkg.scm
rename to src/cref/forpkg.scm

diff --git a/v7/src/cref/make.scm b/src/cref/make.scm
similarity index 100%
rename from v7/src/cref/make.scm
rename to src/cref/make.scm

diff --git a/v7/src/cref/mset.scm b/src/cref/mset.scm
similarity index 100%
rename from v7/src/cref/mset.scm
rename to src/cref/mset.scm

diff --git a/v7/src/cref/object.scm b/src/cref/object.scm
similarity index 100%
rename from v7/src/cref/object.scm
rename to src/cref/object.scm

diff --git a/v7/src/cref/redpkg.scm b/src/cref/redpkg.scm
similarity index 100%
rename from v7/src/cref/redpkg.scm
rename to src/cref/redpkg.scm

diff --git a/v7/src/cref/toplev.scm b/src/cref/toplev.scm
similarity index 100%
rename from v7/src/cref/toplev.scm
rename to src/cref/toplev.scm

diff --git a/v7/src/cref/triv.pkg b/src/cref/triv.pkg
similarity index 100%
rename from v7/src/cref/triv.pkg
rename to src/cref/triv.pkg

diff --git a/v7/src/edwin/Clean.sh b/src/edwin/Clean.sh
similarity index 100%
rename from v7/src/edwin/Clean.sh
rename to src/edwin/Clean.sh

diff --git a/v7/src/edwin/Makefile-fragment b/src/edwin/Makefile-fragment
similarity index 100%
rename from v7/src/edwin/Makefile-fragment
rename to src/edwin/Makefile-fragment

diff --git a/v7/src/edwin/README b/src/edwin/README
similarity index 100%
rename from v7/src/edwin/README
rename to src/edwin/README

diff --git a/v7/src/edwin/abbrev.scm b/src/edwin/abbrev.scm
similarity index 100%
rename from v7/src/edwin/abbrev.scm
rename to src/edwin/abbrev.scm

diff --git a/v7/src/edwin/ansi.scm b/src/edwin/ansi.scm
similarity index 100%
rename from v7/src/edwin/ansi.scm
rename to src/edwin/ansi.scm

diff --git a/v7/src/edwin/argred.scm b/src/edwin/argred.scm
similarity index 100%
rename from v7/src/edwin/argred.scm
rename to src/edwin/argred.scm

diff --git a/v7/src/edwin/artdebug.scm b/src/edwin/artdebug.scm
similarity index 100%
rename from v7/src/edwin/artdebug.scm
rename to src/edwin/artdebug.scm

diff --git a/v7/src/edwin/autold.scm b/src/edwin/autold.scm
similarity index 100%
rename from v7/src/edwin/autold.scm
rename to src/edwin/autold.scm

diff --git a/v7/src/edwin/autosv.scm b/src/edwin/autosv.scm
similarity index 100%
rename from v7/src/edwin/autosv.scm
rename to src/edwin/autosv.scm

diff --git a/v7/src/edwin/basic.scm b/src/edwin/basic.scm
similarity index 100%
rename from v7/src/edwin/basic.scm
rename to src/edwin/basic.scm

diff --git a/v7/src/edwin/bios.scm b/src/edwin/bios.scm
similarity index 100%
rename from v7/src/edwin/bios.scm
rename to src/edwin/bios.scm

diff --git a/v7/src/edwin/bufcom.scm b/src/edwin/bufcom.scm
similarity index 100%
rename from v7/src/edwin/bufcom.scm
rename to src/edwin/bufcom.scm

diff --git a/v7/src/edwin/buffer.scm b/src/edwin/buffer.scm
similarity index 100%
rename from v7/src/edwin/buffer.scm
rename to src/edwin/buffer.scm

diff --git a/v7/src/edwin/buffrm.scm b/src/edwin/buffrm.scm
similarity index 100%
rename from v7/src/edwin/buffrm.scm
rename to src/edwin/buffrm.scm

diff --git a/v7/src/edwin/bufinp.scm b/src/edwin/bufinp.scm
similarity index 100%
rename from v7/src/edwin/bufinp.scm
rename to src/edwin/bufinp.scm

diff --git a/v7/src/edwin/bufmnu.scm b/src/edwin/bufmnu.scm
similarity index 100%
rename from v7/src/edwin/bufmnu.scm
rename to src/edwin/bufmnu.scm

diff --git a/v7/src/edwin/bufout.scm b/src/edwin/bufout.scm
similarity index 100%
rename from v7/src/edwin/bufout.scm
rename to src/edwin/bufout.scm

diff --git a/v7/src/edwin/bufset.scm b/src/edwin/bufset.scm
similarity index 100%
rename from v7/src/edwin/bufset.scm
rename to src/edwin/bufset.scm

diff --git a/v7/src/edwin/bufwfs.scm b/src/edwin/bufwfs.scm
similarity index 100%
rename from v7/src/edwin/bufwfs.scm
rename to src/edwin/bufwfs.scm

diff --git a/v7/src/edwin/bufwin.scm b/src/edwin/bufwin.scm
similarity index 100%
rename from v7/src/edwin/bufwin.scm
rename to src/edwin/bufwin.scm

diff --git a/v7/src/edwin/bufwiu.scm b/src/edwin/bufwiu.scm
similarity index 100%
rename from v7/src/edwin/bufwiu.scm
rename to src/edwin/bufwiu.scm

diff --git a/v7/src/edwin/bufwmc.scm b/src/edwin/bufwmc.scm
similarity index 100%
rename from v7/src/edwin/bufwmc.scm
rename to src/edwin/bufwmc.scm

diff --git a/v7/src/edwin/c-mode.scm b/src/edwin/c-mode.scm
similarity index 100%
rename from v7/src/edwin/c-mode.scm
rename to src/edwin/c-mode.scm

diff --git a/v7/src/edwin/calias.scm b/src/edwin/calias.scm
similarity index 100%
rename from v7/src/edwin/calias.scm
rename to src/edwin/calias.scm

diff --git a/v7/src/edwin/cinden.scm b/src/edwin/cinden.scm
similarity index 100%
rename from v7/src/edwin/cinden.scm
rename to src/edwin/cinden.scm

diff --git a/v7/src/edwin/class.scm b/src/edwin/class.scm
similarity index 100%
rename from v7/src/edwin/class.scm
rename to src/edwin/class.scm

diff --git a/v7/src/edwin/clscon.scm b/src/edwin/clscon.scm
similarity index 100%
rename from v7/src/edwin/clscon.scm
rename to src/edwin/clscon.scm

diff --git a/v7/src/edwin/clsmac.scm b/src/edwin/clsmac.scm
similarity index 100%
rename from v7/src/edwin/clsmac.scm
rename to src/edwin/clsmac.scm

diff --git a/v7/src/edwin/comatch.scm b/src/edwin/comatch.scm
similarity index 100%
rename from v7/src/edwin/comatch.scm
rename to src/edwin/comatch.scm

diff --git a/v7/src/edwin/comhst.scm b/src/edwin/comhst.scm
similarity index 100%
rename from v7/src/edwin/comhst.scm
rename to src/edwin/comhst.scm

diff --git a/v7/src/edwin/comint.scm b/src/edwin/comint.scm
similarity index 100%
rename from v7/src/edwin/comint.scm
rename to src/edwin/comint.scm

diff --git a/v7/src/edwin/comman.scm b/src/edwin/comman.scm
similarity index 100%
rename from v7/src/edwin/comman.scm
rename to src/edwin/comman.scm

diff --git a/v7/src/edwin/compile.scm b/src/edwin/compile.scm
similarity index 100%
rename from v7/src/edwin/compile.scm
rename to src/edwin/compile.scm

diff --git a/v7/src/edwin/comred.scm b/src/edwin/comred.scm
similarity index 100%
rename from v7/src/edwin/comred.scm
rename to src/edwin/comred.scm

diff --git a/v7/src/edwin/comtab.scm b/src/edwin/comtab.scm
similarity index 100%
rename from v7/src/edwin/comtab.scm
rename to src/edwin/comtab.scm

diff --git a/v7/src/edwin/comwin.scm b/src/edwin/comwin.scm
similarity index 100%
rename from v7/src/edwin/comwin.scm
rename to src/edwin/comwin.scm

diff --git a/v7/src/edwin/curren.scm b/src/edwin/curren.scm
similarity index 100%
rename from v7/src/edwin/curren.scm
rename to src/edwin/curren.scm

diff --git a/v7/src/edwin/dabbrev.scm b/src/edwin/dabbrev.scm
similarity index 100%
rename from v7/src/edwin/dabbrev.scm
rename to src/edwin/dabbrev.scm

diff --git a/v7/src/edwin/debian-changelog.scm b/src/edwin/debian-changelog.scm
similarity index 100%
rename from v7/src/edwin/debian-changelog.scm
rename to src/edwin/debian-changelog.scm

diff --git a/v7/src/edwin/debug.scm b/src/edwin/debug.scm
similarity index 100%
rename from v7/src/edwin/debug.scm
rename to src/edwin/debug.scm

diff --git a/v7/src/edwin/debuge.scm b/src/edwin/debuge.scm
similarity index 100%
rename from v7/src/edwin/debuge.scm
rename to src/edwin/debuge.scm

diff --git a/v7/src/edwin/decls.scm b/src/edwin/decls.scm
similarity index 100%
rename from v7/src/edwin/decls.scm
rename to src/edwin/decls.scm

diff --git a/v7/src/edwin/diff.scm b/src/edwin/diff.scm
similarity index 100%
rename from v7/src/edwin/diff.scm
rename to src/edwin/diff.scm

diff --git a/v7/src/edwin/dired.scm b/src/edwin/dired.scm
similarity index 100%
rename from v7/src/edwin/dired.scm
rename to src/edwin/dired.scm

diff --git a/v7/src/edwin/diros2.scm b/src/edwin/diros2.scm
similarity index 100%
rename from v7/src/edwin/diros2.scm
rename to src/edwin/diros2.scm

diff --git a/v7/src/edwin/dirunx.scm b/src/edwin/dirunx.scm
similarity index 100%
rename from v7/src/edwin/dirunx.scm
rename to src/edwin/dirunx.scm

diff --git a/v7/src/edwin/dirw32.scm b/src/edwin/dirw32.scm
similarity index 100%
rename from v7/src/edwin/dirw32.scm
rename to src/edwin/dirw32.scm

diff --git a/v7/src/edwin/display.scm b/src/edwin/display.scm
similarity index 100%
rename from v7/src/edwin/display.scm
rename to src/edwin/display.scm

diff --git a/v7/src/edwin/docstr.scm b/src/edwin/docstr.scm
similarity index 100%
rename from v7/src/edwin/docstr.scm
rename to src/edwin/docstr.scm

diff --git a/v7/src/edwin/dos.scm b/src/edwin/dos.scm
similarity index 100%
rename from v7/src/edwin/dos.scm
rename to src/edwin/dos.scm

diff --git a/v7/src/edwin/doscom.scm b/src/edwin/doscom.scm
similarity index 100%
rename from v7/src/edwin/doscom.scm
rename to src/edwin/doscom.scm

diff --git a/v7/src/edwin/dosfile.scm b/src/edwin/dosfile.scm
similarity index 100%
rename from v7/src/edwin/dosfile.scm
rename to src/edwin/dosfile.scm

diff --git a/v7/src/edwin/dosproc.scm b/src/edwin/dosproc.scm
similarity index 100%
rename from v7/src/edwin/dosproc.scm
rename to src/edwin/dosproc.scm

diff --git a/v7/src/edwin/dosshell.scm b/src/edwin/dosshell.scm
similarity index 100%
rename from v7/src/edwin/dosshell.scm
rename to src/edwin/dosshell.scm

diff --git a/v7/src/edwin/ed-ffi.scm b/src/edwin/ed-ffi.scm
similarity index 100%
rename from v7/src/edwin/ed-ffi.scm
rename to src/edwin/ed-ffi.scm

diff --git a/v7/src/edwin/editor.scm b/src/edwin/editor.scm
similarity index 100%
rename from v7/src/edwin/editor.scm
rename to src/edwin/editor.scm

diff --git a/v7/src/edwin/edtfrm.scm b/src/edwin/edtfrm.scm
similarity index 100%
rename from v7/src/edwin/edtfrm.scm
rename to src/edwin/edtfrm.scm

diff --git a/v7/src/edwin/edtstr.scm b/src/edwin/edtstr.scm
similarity index 100%
rename from v7/src/edwin/edtstr.scm
rename to src/edwin/edtstr.scm

diff --git a/v7/src/edwin/edwin.cbf b/src/edwin/edwin.cbf
similarity index 100%
rename from v7/src/edwin/edwin.cbf
rename to src/edwin/edwin.cbf

diff --git a/v7/src/edwin/edwin.ldr b/src/edwin/edwin.ldr
similarity index 100%
rename from v7/src/edwin/edwin.ldr
rename to src/edwin/edwin.ldr

diff --git a/v7/src/edwin/edwin.pkg b/src/edwin/edwin.pkg
similarity index 100%
rename from v7/src/edwin/edwin.pkg
rename to src/edwin/edwin.pkg

diff --git a/v7/src/edwin/edwin.sf b/src/edwin/edwin.sf
similarity index 100%
rename from v7/src/edwin/edwin.sf
rename to src/edwin/edwin.sf

diff --git a/v7/src/edwin/evlcom.scm b/src/edwin/evlcom.scm
similarity index 100%
rename from v7/src/edwin/evlcom.scm
rename to src/edwin/evlcom.scm

diff --git a/v7/src/edwin/eystep.scm b/src/edwin/eystep.scm
similarity index 100%
rename from v7/src/edwin/eystep.scm
rename to src/edwin/eystep.scm

diff --git a/v7/src/edwin/filcom.scm b/src/edwin/filcom.scm
similarity index 100%
rename from v7/src/edwin/filcom.scm
rename to src/edwin/filcom.scm

diff --git a/v7/src/edwin/fileio.scm b/src/edwin/fileio.scm
similarity index 100%
rename from v7/src/edwin/fileio.scm
rename to src/edwin/fileio.scm

diff --git a/v7/src/edwin/fill.scm b/src/edwin/fill.scm
similarity index 100%
rename from v7/src/edwin/fill.scm
rename to src/edwin/fill.scm

diff --git a/v7/src/edwin/grpops.scm b/src/edwin/grpops.scm
similarity index 100%
rename from v7/src/edwin/grpops.scm
rename to src/edwin/grpops.scm

diff --git a/v7/src/edwin/hlpcom.scm b/src/edwin/hlpcom.scm
similarity index 100%
rename from v7/src/edwin/hlpcom.scm
rename to src/edwin/hlpcom.scm

diff --git a/v7/src/edwin/htmlmode.scm b/src/edwin/htmlmode.scm
similarity index 100%
rename from v7/src/edwin/htmlmode.scm
rename to src/edwin/htmlmode.scm

diff --git a/v7/src/edwin/image.scm b/src/edwin/image.scm
similarity index 100%
rename from v7/src/edwin/image.scm
rename to src/edwin/image.scm

diff --git a/v7/src/edwin/info.scm b/src/edwin/info.scm
similarity index 100%
rename from v7/src/edwin/info.scm
rename to src/edwin/info.scm

diff --git a/v7/src/edwin/input.scm b/src/edwin/input.scm
similarity index 100%
rename from v7/src/edwin/input.scm
rename to src/edwin/input.scm

diff --git a/v7/src/edwin/intmod.scm b/src/edwin/intmod.scm
similarity index 100%
rename from v7/src/edwin/intmod.scm
rename to src/edwin/intmod.scm

diff --git a/v7/src/edwin/iserch.scm b/src/edwin/iserch.scm
similarity index 100%
rename from v7/src/edwin/iserch.scm
rename to src/edwin/iserch.scm

diff --git a/v7/src/edwin/javamode.scm b/src/edwin/javamode.scm
similarity index 100%
rename from v7/src/edwin/javamode.scm
rename to src/edwin/javamode.scm

diff --git a/v7/src/edwin/key-w32.scm b/src/edwin/key-w32.scm
similarity index 100%
rename from v7/src/edwin/key-w32.scm
rename to src/edwin/key-w32.scm

diff --git a/v7/src/edwin/key-x11.scm b/src/edwin/key-x11.scm
similarity index 100%
rename from v7/src/edwin/key-x11.scm
rename to src/edwin/key-x11.scm

diff --git a/v7/src/edwin/keymap.scm b/src/edwin/keymap.scm
similarity index 100%
rename from v7/src/edwin/keymap.scm
rename to src/edwin/keymap.scm

diff --git a/v7/src/edwin/keyparse.scm b/src/edwin/keyparse.scm
similarity index 100%
rename from v7/src/edwin/keyparse.scm
rename to src/edwin/keyparse.scm

diff --git a/v7/src/edwin/kilcom.scm b/src/edwin/kilcom.scm
similarity index 100%
rename from v7/src/edwin/kilcom.scm
rename to src/edwin/kilcom.scm

diff --git a/v7/src/edwin/kmacro.scm b/src/edwin/kmacro.scm
similarity index 100%
rename from v7/src/edwin/kmacro.scm
rename to src/edwin/kmacro.scm

diff --git a/v7/src/edwin/lincom.scm b/src/edwin/lincom.scm
similarity index 100%
rename from v7/src/edwin/lincom.scm
rename to src/edwin/lincom.scm

diff --git a/v7/src/edwin/linden.scm b/src/edwin/linden.scm
similarity index 100%
rename from v7/src/edwin/linden.scm
rename to src/edwin/linden.scm

diff --git a/v7/src/edwin/lisppaste.scm b/src/edwin/lisppaste.scm
similarity index 100%
rename from v7/src/edwin/lisppaste.scm
rename to src/edwin/lisppaste.scm

diff --git a/v7/src/edwin/loadef.scm b/src/edwin/loadef.scm
similarity index 100%
rename from v7/src/edwin/loadef.scm
rename to src/edwin/loadef.scm

diff --git a/v7/src/edwin/lspcom.scm b/src/edwin/lspcom.scm
similarity index 100%
rename from v7/src/edwin/lspcom.scm
rename to src/edwin/lspcom.scm

diff --git a/v7/src/edwin/macros.scm b/src/edwin/macros.scm
similarity index 100%
rename from v7/src/edwin/macros.scm
rename to src/edwin/macros.scm

diff --git a/v7/src/edwin/make.scm b/src/edwin/make.scm
similarity index 100%
rename from v7/src/edwin/make.scm
rename to src/edwin/make.scm

diff --git a/v7/src/edwin/malias.scm b/src/edwin/malias.scm
similarity index 100%
rename from v7/src/edwin/malias.scm
rename to src/edwin/malias.scm

diff --git a/v7/src/edwin/manual.scm b/src/edwin/manual.scm
similarity index 100%
rename from v7/src/edwin/manual.scm
rename to src/edwin/manual.scm

diff --git a/v7/src/edwin/midas.scm b/src/edwin/midas.scm
similarity index 100%
rename from v7/src/edwin/midas.scm
rename to src/edwin/midas.scm

diff --git a/v7/src/edwin/modefs.scm b/src/edwin/modefs.scm
similarity index 100%
rename from v7/src/edwin/modefs.scm
rename to src/edwin/modefs.scm

diff --git a/v7/src/edwin/modes.scm b/src/edwin/modes.scm
similarity index 100%
rename from v7/src/edwin/modes.scm
rename to src/edwin/modes.scm

diff --git a/v7/src/edwin/modlin.scm b/src/edwin/modlin.scm
similarity index 100%
rename from v7/src/edwin/modlin.scm
rename to src/edwin/modlin.scm

diff --git a/v7/src/edwin/modwin.scm b/src/edwin/modwin.scm
similarity index 100%
rename from v7/src/edwin/modwin.scm
rename to src/edwin/modwin.scm

diff --git a/v7/src/edwin/motcom.scm b/src/edwin/motcom.scm
similarity index 100%
rename from v7/src/edwin/motcom.scm
rename to src/edwin/motcom.scm

diff --git a/v7/src/edwin/motion.scm b/src/edwin/motion.scm
similarity index 100%
rename from v7/src/edwin/motion.scm
rename to src/edwin/motion.scm

diff --git a/v7/src/edwin/mousecom.scm b/src/edwin/mousecom.scm
similarity index 100%
rename from v7/src/edwin/mousecom.scm
rename to src/edwin/mousecom.scm

diff --git a/v7/src/edwin/nntp.scm b/src/edwin/nntp.scm
similarity index 100%
rename from v7/src/edwin/nntp.scm
rename to src/edwin/nntp.scm

diff --git a/v7/src/edwin/notify.scm b/src/edwin/notify.scm
similarity index 100%
rename from v7/src/edwin/notify.scm
rename to src/edwin/notify.scm

diff --git a/v7/src/edwin/nvector.scm b/src/edwin/nvector.scm
similarity index 100%
rename from v7/src/edwin/nvector.scm
rename to src/edwin/nvector.scm

diff --git a/v7/src/edwin/occur.scm b/src/edwin/occur.scm
similarity index 100%
rename from v7/src/edwin/occur.scm
rename to src/edwin/occur.scm

diff --git a/v7/src/edwin/os2.scm b/src/edwin/os2.scm
similarity index 100%
rename from v7/src/edwin/os2.scm
rename to src/edwin/os2.scm

diff --git a/v7/src/edwin/os2com.scm b/src/edwin/os2com.scm
similarity index 100%
rename from v7/src/edwin/os2com.scm
rename to src/edwin/os2com.scm

diff --git a/v7/src/edwin/os2term.scm b/src/edwin/os2term.scm
similarity index 100%
rename from v7/src/edwin/os2term.scm
rename to src/edwin/os2term.scm

diff --git a/v7/src/edwin/outline.scm b/src/edwin/outline.scm
similarity index 100%
rename from v7/src/edwin/outline.scm
rename to src/edwin/outline.scm

diff --git a/v7/src/edwin/paredit.scm b/src/edwin/paredit.scm
similarity index 100%
rename from v7/src/edwin/paredit.scm
rename to src/edwin/paredit.scm

diff --git a/v7/src/edwin/pasmod.scm b/src/edwin/pasmod.scm
similarity index 100%
rename from v7/src/edwin/pasmod.scm
rename to src/edwin/pasmod.scm

diff --git a/v7/src/edwin/paths.scm b/src/edwin/paths.scm
similarity index 100%
rename from v7/src/edwin/paths.scm
rename to src/edwin/paths.scm

diff --git a/v7/src/edwin/print.scm b/src/edwin/print.scm
similarity index 100%
rename from v7/src/edwin/print.scm
rename to src/edwin/print.scm

diff --git a/v7/src/edwin/process.scm b/src/edwin/process.scm
similarity index 100%
rename from v7/src/edwin/process.scm
rename to src/edwin/process.scm

diff --git a/v7/src/edwin/prompt.scm b/src/edwin/prompt.scm
similarity index 100%
rename from v7/src/edwin/prompt.scm
rename to src/edwin/prompt.scm

diff --git a/v7/src/edwin/pwedit.scm b/src/edwin/pwedit.scm
similarity index 100%
rename from v7/src/edwin/pwedit.scm
rename to src/edwin/pwedit.scm

diff --git a/v7/src/edwin/pwparse.scm b/src/edwin/pwparse.scm
similarity index 100%
rename from v7/src/edwin/pwparse.scm
rename to src/edwin/pwparse.scm

diff --git a/v7/src/edwin/rcsparse.scm b/src/edwin/rcsparse.scm
similarity index 100%
rename from v7/src/edwin/rcsparse.scm
rename to src/edwin/rcsparse.scm

diff --git a/v7/src/edwin/reccom.scm b/src/edwin/reccom.scm
similarity index 100%
rename from v7/src/edwin/reccom.scm
rename to src/edwin/reccom.scm

diff --git a/v7/src/edwin/regcom.scm b/src/edwin/regcom.scm
similarity index 100%
rename from v7/src/edwin/regcom.scm
rename to src/edwin/regcom.scm

diff --git a/v7/src/edwin/regexp.scm b/src/edwin/regexp.scm
similarity index 100%
rename from v7/src/edwin/regexp.scm
rename to src/edwin/regexp.scm

diff --git a/v7/src/edwin/regops.scm b/src/edwin/regops.scm
similarity index 100%
rename from v7/src/edwin/regops.scm
rename to src/edwin/regops.scm

diff --git a/v7/src/edwin/rename.scm b/src/edwin/rename.scm
similarity index 100%
rename from v7/src/edwin/rename.scm
rename to src/edwin/rename.scm

diff --git a/v7/src/edwin/replaz.scm b/src/edwin/replaz.scm
similarity index 100%
rename from v7/src/edwin/replaz.scm
rename to src/edwin/replaz.scm

diff --git a/v7/src/edwin/rfc822.scm b/src/edwin/rfc822.scm
similarity index 100%
rename from v7/src/edwin/rfc822.scm
rename to src/edwin/rfc822.scm

diff --git a/v7/src/edwin/ring.scm b/src/edwin/ring.scm
similarity index 100%
rename from v7/src/edwin/ring.scm
rename to src/edwin/ring.scm

diff --git a/v7/src/edwin/rmail.scm b/src/edwin/rmail.scm
similarity index 100%
rename from v7/src/edwin/rmail.scm
rename to src/edwin/rmail.scm

diff --git a/v7/src/edwin/rmailsrt.scm b/src/edwin/rmailsrt.scm
similarity index 100%
rename from v7/src/edwin/rmailsrt.scm
rename to src/edwin/rmailsrt.scm

diff --git a/v7/src/edwin/rmailsum.scm b/src/edwin/rmailsum.scm
similarity index 100%
rename from v7/src/edwin/rmailsum.scm
rename to src/edwin/rmailsum.scm

diff --git a/v7/src/edwin/schmod.scm b/src/edwin/schmod.scm
similarity index 100%
rename from v7/src/edwin/schmod.scm
rename to src/edwin/schmod.scm

diff --git a/v7/src/edwin/scrcom.scm b/src/edwin/scrcom.scm
similarity index 100%
rename from v7/src/edwin/scrcom.scm
rename to src/edwin/scrcom.scm

diff --git a/v7/src/edwin/screen.scm b/src/edwin/screen.scm
similarity index 100%
rename from v7/src/edwin/screen.scm
rename to src/edwin/screen.scm

diff --git a/v7/src/edwin/search.scm b/src/edwin/search.scm
similarity index 100%
rename from v7/src/edwin/search.scm
rename to src/edwin/search.scm

diff --git a/v7/src/edwin/sendmail.scm b/src/edwin/sendmail.scm
similarity index 100%
rename from v7/src/edwin/sendmail.scm
rename to src/edwin/sendmail.scm

diff --git a/v7/src/edwin/sercom.scm b/src/edwin/sercom.scm
similarity index 100%
rename from v7/src/edwin/sercom.scm
rename to src/edwin/sercom.scm

diff --git a/v7/src/edwin/shell.scm b/src/edwin/shell.scm
similarity index 100%
rename from v7/src/edwin/shell.scm
rename to src/edwin/shell.scm

diff --git a/v7/src/edwin/simple.scm b/src/edwin/simple.scm
similarity index 100%
rename from v7/src/edwin/simple.scm
rename to src/edwin/simple.scm

diff --git a/v7/src/edwin/snr.scm b/src/edwin/snr.scm
similarity index 100%
rename from v7/src/edwin/snr.scm
rename to src/edwin/snr.scm

diff --git a/v7/src/edwin/sort.scm b/src/edwin/sort.scm
similarity index 100%
rename from v7/src/edwin/sort.scm
rename to src/edwin/sort.scm

diff --git a/v7/src/edwin/strpad.scm b/src/edwin/strpad.scm
similarity index 100%
rename from v7/src/edwin/strpad.scm
rename to src/edwin/strpad.scm

diff --git a/v7/src/edwin/strtab.scm b/src/edwin/strtab.scm
similarity index 100%
rename from v7/src/edwin/strtab.scm
rename to src/edwin/strtab.scm

diff --git a/v7/src/edwin/struct.scm b/src/edwin/struct.scm
similarity index 100%
rename from v7/src/edwin/struct.scm
rename to src/edwin/struct.scm

diff --git a/v7/src/edwin/syntax.scm b/src/edwin/syntax.scm
similarity index 100%
rename from v7/src/edwin/syntax.scm
rename to src/edwin/syntax.scm

diff --git a/v7/src/edwin/tagutl.scm b/src/edwin/tagutl.scm
similarity index 100%
rename from v7/src/edwin/tagutl.scm
rename to src/edwin/tagutl.scm

diff --git a/v7/src/edwin/techinfo.scm b/src/edwin/techinfo.scm
similarity index 100%
rename from v7/src/edwin/techinfo.scm
rename to src/edwin/techinfo.scm

diff --git a/v7/src/edwin/telnet.scm b/src/edwin/telnet.scm
similarity index 100%
rename from v7/src/edwin/telnet.scm
rename to src/edwin/telnet.scm

diff --git a/v7/src/edwin/termcap.scm b/src/edwin/termcap.scm
similarity index 100%
rename from v7/src/edwin/termcap.scm
rename to src/edwin/termcap.scm

diff --git a/v7/src/edwin/texcom.scm b/src/edwin/texcom.scm
similarity index 100%
rename from v7/src/edwin/texcom.scm
rename to src/edwin/texcom.scm

diff --git a/v7/src/edwin/things.scm b/src/edwin/things.scm
similarity index 100%
rename from v7/src/edwin/things.scm
rename to src/edwin/things.scm

diff --git a/v7/src/edwin/tparse.scm b/src/edwin/tparse.scm
similarity index 100%
rename from v7/src/edwin/tparse.scm
rename to src/edwin/tparse.scm

diff --git a/v7/src/edwin/tterm.scm b/src/edwin/tterm.scm
similarity index 100%
rename from v7/src/edwin/tterm.scm
rename to src/edwin/tterm.scm

diff --git a/v7/src/edwin/tximod.scm b/src/edwin/tximod.scm
similarity index 100%
rename from v7/src/edwin/tximod.scm
rename to src/edwin/tximod.scm

diff --git a/v7/src/edwin/txtprp.scm b/src/edwin/txtprp.scm
similarity index 100%
rename from v7/src/edwin/txtprp.scm
rename to src/edwin/txtprp.scm

diff --git a/v7/src/edwin/undo.scm b/src/edwin/undo.scm
similarity index 100%
rename from v7/src/edwin/undo.scm
rename to src/edwin/undo.scm

diff --git a/v7/src/edwin/unix.scm b/src/edwin/unix.scm
similarity index 100%
rename from v7/src/edwin/unix.scm
rename to src/edwin/unix.scm

diff --git a/v7/src/edwin/utils.scm b/src/edwin/utils.scm
similarity index 100%
rename from v7/src/edwin/utils.scm
rename to src/edwin/utils.scm

diff --git a/v7/src/edwin/utlwin.scm b/src/edwin/utlwin.scm
similarity index 100%
rename from v7/src/edwin/utlwin.scm
rename to src/edwin/utlwin.scm

diff --git a/v7/src/edwin/vc.scm b/src/edwin/vc.scm
similarity index 100%
rename from v7/src/edwin/vc.scm
rename to src/edwin/vc.scm

diff --git a/v7/src/edwin/verilog.scm b/src/edwin/verilog.scm
similarity index 100%
rename from v7/src/edwin/verilog.scm
rename to src/edwin/verilog.scm

diff --git a/v7/src/edwin/vhdl.scm b/src/edwin/vhdl.scm
similarity index 100%
rename from v7/src/edwin/vhdl.scm
rename to src/edwin/vhdl.scm

diff --git a/v7/src/edwin/webster.scm b/src/edwin/webster.scm
similarity index 100%
rename from v7/src/edwin/webster.scm
rename to src/edwin/webster.scm

diff --git a/v7/src/edwin/win32.scm b/src/edwin/win32.scm
similarity index 100%
rename from v7/src/edwin/win32.scm
rename to src/edwin/win32.scm

diff --git a/v7/src/edwin/win32com.scm b/src/edwin/win32com.scm
similarity index 100%
rename from v7/src/edwin/win32com.scm
rename to src/edwin/win32com.scm

diff --git a/v7/src/edwin/wincom.scm b/src/edwin/wincom.scm
similarity index 100%
rename from v7/src/edwin/wincom.scm
rename to src/edwin/wincom.scm

diff --git a/v7/src/edwin/window.scm b/src/edwin/window.scm
similarity index 100%
rename from v7/src/edwin/window.scm
rename to src/edwin/window.scm

diff --git a/v7/src/edwin/winout.scm b/src/edwin/winout.scm
similarity index 100%
rename from v7/src/edwin/winout.scm
rename to src/edwin/winout.scm

diff --git a/v7/src/edwin/winren.scm b/src/edwin/winren.scm
similarity index 100%
rename from v7/src/edwin/winren.scm
rename to src/edwin/winren.scm

diff --git a/v7/src/edwin/xcom.scm b/src/edwin/xcom.scm
similarity index 100%
rename from v7/src/edwin/xcom.scm
rename to src/edwin/xcom.scm

diff --git a/v7/src/edwin/xform.scm b/src/edwin/xform.scm
similarity index 100%
rename from v7/src/edwin/xform.scm
rename to src/edwin/xform.scm

diff --git a/v7/src/edwin/xmodef.scm b/src/edwin/xmodef.scm
similarity index 100%
rename from v7/src/edwin/xmodef.scm
rename to src/edwin/xmodef.scm

diff --git a/v7/src/edwin/xterm.scm b/src/edwin/xterm.scm
similarity index 100%
rename from v7/src/edwin/xterm.scm
rename to src/edwin/xterm.scm

diff --git a/v7/src/etc/Clean.sh b/src/etc/Clean.sh
similarity index 100%
rename from v7/src/etc/Clean.sh
rename to src/etc/Clean.sh

diff --git a/v7/src/etc/Setup.sh b/src/etc/Setup.sh
similarity index 100%
rename from v7/src/etc/Setup.sh
rename to src/etc/Setup.sh

diff --git a/v7/src/etc/Stage.sh b/src/etc/Stage.sh
similarity index 100%
rename from v7/src/etc/Stage.sh
rename to src/etc/Stage.sh

diff --git a/v7/src/etc/TUTORIAL b/src/etc/TUTORIAL
similarity index 100%
rename from v7/src/etc/TUTORIAL
rename to src/etc/TUTORIAL

diff --git a/v7/src/etc/Tags.sh b/src/etc/Tags.sh
similarity index 100%
rename from v7/src/etc/Tags.sh
rename to src/etc/Tags.sh

diff --git a/v7/src/etc/build-bands.sh b/src/etc/build-bands.sh
similarity index 100%
rename from v7/src/etc/build-bands.sh
rename to src/etc/build-bands.sh

diff --git a/v7/src/etc/build-boot-compiler.sh b/src/etc/build-boot-compiler.sh
similarity index 100%
rename from v7/src/etc/build-boot-compiler.sh
rename to src/etc/build-boot-compiler.sh

diff --git a/v7/src/etc/c-bundle.sh b/src/etc/c-bundle.sh
similarity index 100%
rename from v7/src/etc/c-bundle.sh
rename to src/etc/c-bundle.sh

diff --git a/v7/src/etc/c-compile.sh b/src/etc/c-compile.sh
similarity index 100%
rename from v7/src/etc/c-compile.sh
rename to src/etc/c-compile.sh

diff --git a/v7/src/etc/c-prepare.sh b/src/etc/c-prepare.sh
similarity index 100%
rename from v7/src/etc/c-prepare.sh
rename to src/etc/c-prepare.sh

diff --git a/v7/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
similarity index 100%
rename from v7/src/etc/compile-boot-compiler.sh
rename to src/etc/compile-boot-compiler.sh

diff --git a/v7/src/etc/compile.scm b/src/etc/compile.scm
similarity index 100%
rename from v7/src/etc/compile.scm
rename to src/etc/compile.scm

diff --git a/v7/src/etc/compile.sh b/src/etc/compile.sh
similarity index 100%
rename from v7/src/etc/compile.sh
rename to src/etc/compile.sh

diff --git a/v7/src/etc/create-makefiles.sh b/src/etc/create-makefiles.sh
similarity index 100%
rename from v7/src/etc/create-makefiles.sh
rename to src/etc/create-makefiles.sh

diff --git a/v7/src/etc/functions.sh b/src/etc/functions.sh
similarity index 100%
rename from v7/src/etc/functions.sh
rename to src/etc/functions.sh

diff --git a/v7/src/etc/install-bin-symlinks.sh b/src/etc/install-bin-symlinks.sh
similarity index 100%
rename from v7/src/etc/install-bin-symlinks.sh
rename to src/etc/install-bin-symlinks.sh

diff --git a/v7/src/etc/make-in-subdirs.sh b/src/etc/make-in-subdirs.sh
similarity index 100%
rename from v7/src/etc/make-in-subdirs.sh
rename to src/etc/make-in-subdirs.sh

diff --git a/v7/src/etc/make-liarc-dist.sh b/src/etc/make-liarc-dist.sh
similarity index 100%
rename from v7/src/etc/make-liarc-dist.sh
rename to src/etc/make-liarc-dist.sh

diff --git a/v7/src/etc/make-liarc.sh b/src/etc/make-liarc.sh
similarity index 100%
rename from v7/src/etc/make-liarc.sh
rename to src/etc/make-liarc.sh

diff --git a/v7/src/etc/make-native.sh b/src/etc/make-native.sh
similarity index 100%
rename from v7/src/etc/make-native.sh
rename to src/etc/make-native.sh

diff --git a/v7/src/etc/mime.types b/src/etc/mime.types
similarity index 100%
rename from v7/src/etc/mime.types
rename to src/etc/mime.types

diff --git a/v7/src/etc/native-prepare.sh b/src/etc/native-prepare.sh
similarity index 100%
rename from v7/src/etc/native-prepare.sh
rename to src/etc/native-prepare.sh

diff --git a/v7/src/etc/optiondb.scm b/src/etc/optiondb.scm
similarity index 100%
rename from v7/src/etc/optiondb.scm
rename to src/etc/optiondb.scm

diff --git a/v7/src/etc/std-makefile-prefix b/src/etc/std-makefile-prefix
similarity index 100%
rename from v7/src/etc/std-makefile-prefix
rename to src/etc/std-makefile-prefix

diff --git a/v7/src/etc/std-makefile-suffix b/src/etc/std-makefile-suffix
similarity index 100%
rename from v7/src/etc/std-makefile-suffix
rename to src/etc/std-makefile-suffix

diff --git a/v7/src/etc/usermap b/src/etc/usermap
similarity index 100%
rename from v7/src/etc/usermap
rename to src/etc/usermap

diff --git a/v7/src/etc/utilities.scm b/src/etc/utilities.scm
similarity index 100%
rename from v7/src/etc/utilities.scm
rename to src/etc/utilities.scm

diff --git a/v7/src/imail/Makefile-fragment b/src/imail/Makefile-fragment
similarity index 100%
rename from v7/src/imail/Makefile-fragment
rename to src/imail/Makefile-fragment

diff --git a/v7/src/imail/compile.scm b/src/imail/compile.scm
similarity index 100%
rename from v7/src/imail/compile.scm
rename to src/imail/compile.scm

diff --git a/v7/src/imail/ed-ffi.scm b/src/imail/ed-ffi.scm
similarity index 100%
rename from v7/src/imail/ed-ffi.scm
rename to src/imail/ed-ffi.scm

diff --git a/v7/src/imail/fake-env.scm b/src/imail/fake-env.scm
similarity index 100%
rename from v7/src/imail/fake-env.scm
rename to src/imail/fake-env.scm

diff --git a/v7/src/imail/imail-browser.scm b/src/imail/imail-browser.scm
similarity index 100%
rename from v7/src/imail/imail-browser.scm
rename to src/imail/imail-browser.scm

diff --git a/v7/src/imail/imail-core.scm b/src/imail/imail-core.scm
similarity index 100%
rename from v7/src/imail/imail-core.scm
rename to src/imail/imail-core.scm

diff --git a/v7/src/imail/imail-file.scm b/src/imail/imail-file.scm
similarity index 100%
rename from v7/src/imail/imail-file.scm
rename to src/imail/imail-file.scm

diff --git a/v7/src/imail/imail-imap.scm b/src/imail/imail-imap.scm
similarity index 100%
rename from v7/src/imail/imail-imap.scm
rename to src/imail/imail-imap.scm

diff --git a/v7/src/imail/imail-mime.scm b/src/imail/imail-mime.scm
similarity index 100%
rename from v7/src/imail/imail-mime.scm
rename to src/imail/imail-mime.scm

diff --git a/v7/src/imail/imail-rmail.scm b/src/imail/imail-rmail.scm
similarity index 100%
rename from v7/src/imail/imail-rmail.scm
rename to src/imail/imail-rmail.scm

diff --git a/v7/src/imail/imail-summary.scm b/src/imail/imail-summary.scm
similarity index 100%
rename from v7/src/imail/imail-summary.scm
rename to src/imail/imail-summary.scm

diff --git a/v7/src/imail/imail-top.scm b/src/imail/imail-top.scm
similarity index 100%
rename from v7/src/imail/imail-top.scm
rename to src/imail/imail-top.scm

diff --git a/v7/src/imail/imail-umail.scm b/src/imail/imail-umail.scm
similarity index 100%
rename from v7/src/imail/imail-umail.scm
rename to src/imail/imail-umail.scm

diff --git a/v7/src/imail/imail-util.scm b/src/imail/imail-util.scm
similarity index 100%
rename from v7/src/imail/imail-util.scm
rename to src/imail/imail-util.scm

diff --git a/v7/src/imail/imail.pkg b/src/imail/imail.pkg
similarity index 100%
rename from v7/src/imail/imail.pkg
rename to src/imail/imail.pkg

diff --git a/v7/src/imail/imap-response.scm b/src/imail/imap-response.scm
similarity index 100%
rename from v7/src/imail/imap-response.scm
rename to src/imail/imap-response.scm

diff --git a/v7/src/imail/imap-response.txt b/src/imail/imap-response.txt
similarity index 100%
rename from v7/src/imail/imap-response.txt
rename to src/imail/imap-response.txt

diff --git a/v7/src/imail/imap-syntax.scm b/src/imail/imap-syntax.scm
similarity index 100%
rename from v7/src/imail/imap-syntax.scm
rename to src/imail/imap-syntax.scm

diff --git a/v7/src/imail/install.sh b/src/imail/install.sh
similarity index 100%
rename from v7/src/imail/install.sh
rename to src/imail/install.sh

diff --git a/v7/src/imail/load.scm b/src/imail/load.scm
similarity index 100%
rename from v7/src/imail/load.scm
rename to src/imail/load.scm

diff --git a/v7/src/imail/print.sh b/src/imail/print.sh
similarity index 100%
rename from v7/src/imail/print.sh
rename to src/imail/print.sh

diff --git a/v7/src/imail/todo.txt b/src/imail/todo.txt
similarity index 100%
rename from v7/src/imail/todo.txt
rename to src/imail/todo.txt

diff --git a/v7/src/install-sh b/src/install-sh
similarity index 100%
rename from v7/src/install-sh
rename to src/install-sh

diff --git a/v7/src/microcode/Clean.sh b/src/microcode/Clean.sh
similarity index 100%
rename from v7/src/microcode/Clean.sh
rename to src/microcode/Clean.sh

diff --git a/v7/src/microcode/Setup.sh b/src/microcode/Setup.sh
similarity index 100%
rename from v7/src/microcode/Setup.sh
rename to src/microcode/Setup.sh

diff --git a/v7/src/microcode/TODO b/src/microcode/TODO
similarity index 100%
rename from v7/src/microcode/TODO
rename to src/microcode/TODO

diff --git a/v7/src/microcode/artutl.c b/src/microcode/artutl.c
similarity index 100%
rename from v7/src/microcode/artutl.c
rename to src/microcode/artutl.c

diff --git a/v7/src/microcode/avltree.c b/src/microcode/avltree.c
similarity index 100%
rename from v7/src/microcode/avltree.c
rename to src/microcode/avltree.c

diff --git a/v7/src/microcode/avltree.h b/src/microcode/avltree.h
similarity index 100%
rename from v7/src/microcode/avltree.h
rename to src/microcode/avltree.h

diff --git a/v7/src/microcode/bignmint.h b/src/microcode/bignmint.h
similarity index 100%
rename from v7/src/microcode/bignmint.h
rename to src/microcode/bignmint.h

diff --git a/v7/src/microcode/bignum.c b/src/microcode/bignum.c
similarity index 100%
rename from v7/src/microcode/bignum.c
rename to src/microcode/bignum.c

diff --git a/v7/src/microcode/bignum.h b/src/microcode/bignum.h
similarity index 100%
rename from v7/src/microcode/bignum.h
rename to src/microcode/bignum.h

diff --git a/v7/src/microcode/bigprm.c b/src/microcode/bigprm.c
similarity index 100%
rename from v7/src/microcode/bigprm.c
rename to src/microcode/bigprm.c

diff --git a/v7/src/microcode/bitstr.c b/src/microcode/bitstr.c
similarity index 100%
rename from v7/src/microcode/bitstr.c
rename to src/microcode/bitstr.c

diff --git a/v7/src/microcode/bitstr.h b/src/microcode/bitstr.h
similarity index 100%
rename from v7/src/microcode/bitstr.h
rename to src/microcode/bitstr.h

diff --git a/v7/src/microcode/bkpt.c b/src/microcode/bkpt.c
similarity index 100%
rename from v7/src/microcode/bkpt.c
rename to src/microcode/bkpt.c

diff --git a/v7/src/microcode/bkpt.h b/src/microcode/bkpt.h
similarity index 100%
rename from v7/src/microcode/bkpt.h
rename to src/microcode/bkpt.h

diff --git a/v7/src/microcode/boot.c b/src/microcode/boot.c
similarity index 100%
rename from v7/src/microcode/boot.c
rename to src/microcode/boot.c

diff --git a/v7/src/microcode/char.c b/src/microcode/char.c
similarity index 100%
rename from v7/src/microcode/char.c
rename to src/microcode/char.c

diff --git a/v7/src/microcode/cmpauxmd/alpha.m4 b/src/microcode/cmpauxmd/alpha.m4
similarity index 100%
rename from v7/src/microcode/cmpauxmd/alpha.m4
rename to src/microcode/cmpauxmd/alpha.m4

diff --git a/v7/src/microcode/cmpauxmd/asmcvt.c b/src/microcode/cmpauxmd/asmcvt.c
similarity index 100%
rename from v7/src/microcode/cmpauxmd/asmcvt.c
rename to src/microcode/cmpauxmd/asmcvt.c

diff --git a/v7/src/microcode/cmpauxmd/c.c b/src/microcode/cmpauxmd/c.c
similarity index 100%
rename from v7/src/microcode/cmpauxmd/c.c
rename to src/microcode/cmpauxmd/c.c

diff --git a/v7/src/microcode/cmpauxmd/hppa.m4 b/src/microcode/cmpauxmd/hppa.m4
similarity index 100%
rename from v7/src/microcode/cmpauxmd/hppa.m4
rename to src/microcode/cmpauxmd/hppa.m4

diff --git a/v7/src/microcode/cmpauxmd/i386.m4 b/src/microcode/cmpauxmd/i386.m4
similarity index 100%
rename from v7/src/microcode/cmpauxmd/i386.m4
rename to src/microcode/cmpauxmd/i386.m4

diff --git a/v7/src/microcode/cmpauxmd/m4-dos b/src/microcode/cmpauxmd/m4-dos
similarity index 100%
rename from v7/src/microcode/cmpauxmd/m4-dos
rename to src/microcode/cmpauxmd/m4-dos

diff --git a/v7/src/microcode/cmpauxmd/makefile b/src/microcode/cmpauxmd/makefile
similarity index 100%
rename from v7/src/microcode/cmpauxmd/makefile
rename to src/microcode/cmpauxmd/makefile

diff --git a/v7/src/microcode/cmpauxmd/mc68k.m4 b/src/microcode/cmpauxmd/mc68k.m4
similarity index 100%
rename from v7/src/microcode/cmpauxmd/mc68k.m4
rename to src/microcode/cmpauxmd/mc68k.m4

diff --git a/v7/src/microcode/cmpauxmd/mips.m4 b/src/microcode/cmpauxmd/mips.m4
similarity index 100%
rename from v7/src/microcode/cmpauxmd/mips.m4
rename to src/microcode/cmpauxmd/mips.m4

diff --git a/v7/src/microcode/cmpauxmd/sun3-gcc.s b/src/microcode/cmpauxmd/sun3-gcc.s
similarity index 100%
rename from v7/src/microcode/cmpauxmd/sun3-gcc.s
rename to src/microcode/cmpauxmd/sun3-gcc.s

diff --git a/v7/src/microcode/cmpauxmd/sun3-nfp.s b/src/microcode/cmpauxmd/sun3-nfp.s
similarity index 100%
rename from v7/src/microcode/cmpauxmd/sun3-nfp.s
rename to src/microcode/cmpauxmd/sun3-nfp.s

diff --git a/v7/src/microcode/cmpauxmd/sun3.s b/src/microcode/cmpauxmd/sun3.s
similarity index 100%
rename from v7/src/microcode/cmpauxmd/sun3.s
rename to src/microcode/cmpauxmd/sun3.s

diff --git a/v7/src/microcode/cmpauxmd/vax.m4 b/src/microcode/cmpauxmd/vax.m4
similarity index 100%
rename from v7/src/microcode/cmpauxmd/vax.m4
rename to src/microcode/cmpauxmd/vax.m4

diff --git a/v7/src/microcode/cmpgc.h b/src/microcode/cmpgc.h
similarity index 100%
rename from v7/src/microcode/cmpgc.h
rename to src/microcode/cmpgc.h

diff --git a/v7/src/microcode/cmpint.c b/src/microcode/cmpint.c
similarity index 100%
rename from v7/src/microcode/cmpint.c
rename to src/microcode/cmpint.c

diff --git a/v7/src/microcode/cmpint.h b/src/microcode/cmpint.h
similarity index 100%
rename from v7/src/microcode/cmpint.h
rename to src/microcode/cmpint.h

diff --git a/v7/src/microcode/cmpintmd/alpha.h b/src/microcode/cmpintmd/alpha.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/alpha.h
rename to src/microcode/cmpintmd/alpha.h

diff --git a/v7/src/microcode/cmpintmd/c-config.h b/src/microcode/cmpintmd/c-config.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/c-config.h
rename to src/microcode/cmpintmd/c-config.h

diff --git a/v7/src/microcode/cmpintmd/c.c b/src/microcode/cmpintmd/c.c
similarity index 100%
rename from v7/src/microcode/cmpintmd/c.c
rename to src/microcode/cmpintmd/c.c

diff --git a/v7/src/microcode/cmpintmd/c.h b/src/microcode/cmpintmd/c.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/c.h
rename to src/microcode/cmpintmd/c.h

diff --git a/v7/src/microcode/cmpintmd/hppa.h b/src/microcode/cmpintmd/hppa.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/hppa.h
rename to src/microcode/cmpintmd/hppa.h

diff --git a/v7/src/microcode/cmpintmd/i386-config.h b/src/microcode/cmpintmd/i386-config.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/i386-config.h
rename to src/microcode/cmpintmd/i386-config.h

diff --git a/v7/src/microcode/cmpintmd/i386.c b/src/microcode/cmpintmd/i386.c
similarity index 100%
rename from v7/src/microcode/cmpintmd/i386.c
rename to src/microcode/cmpintmd/i386.c

diff --git a/v7/src/microcode/cmpintmd/i386.h b/src/microcode/cmpintmd/i386.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/i386.h
rename to src/microcode/cmpintmd/i386.h

diff --git a/v7/src/microcode/cmpintmd/mc68k.h b/src/microcode/cmpintmd/mc68k.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/mc68k.h
rename to src/microcode/cmpintmd/mc68k.h

diff --git a/v7/src/microcode/cmpintmd/mips.h b/src/microcode/cmpintmd/mips.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/mips.h
rename to src/microcode/cmpintmd/mips.h

diff --git a/v7/src/microcode/cmpintmd/none-config.h b/src/microcode/cmpintmd/none-config.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/none-config.h
rename to src/microcode/cmpintmd/none-config.h

diff --git a/v7/src/microcode/cmpintmd/none.c b/src/microcode/cmpintmd/none.c
similarity index 100%
rename from v7/src/microcode/cmpintmd/none.c
rename to src/microcode/cmpintmd/none.c

diff --git a/v7/src/microcode/cmpintmd/none.h b/src/microcode/cmpintmd/none.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/none.h
rename to src/microcode/cmpintmd/none.h

diff --git a/v7/src/microcode/cmpintmd/svm1-config.h b/src/microcode/cmpintmd/svm1-config.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/svm1-config.h
rename to src/microcode/cmpintmd/svm1-config.h

diff --git a/v7/src/microcode/cmpintmd/svm1.c b/src/microcode/cmpintmd/svm1.c
similarity index 100%
rename from v7/src/microcode/cmpintmd/svm1.c
rename to src/microcode/cmpintmd/svm1.c

diff --git a/v7/src/microcode/cmpintmd/svm1.h b/src/microcode/cmpintmd/svm1.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/svm1.h
rename to src/microcode/cmpintmd/svm1.h

diff --git a/v7/src/microcode/cmpintmd/vax.h b/src/microcode/cmpintmd/vax.h
similarity index 100%
rename from v7/src/microcode/cmpintmd/vax.h
rename to src/microcode/cmpintmd/vax.h

diff --git a/v7/src/microcode/comlin.c b/src/microcode/comlin.c
similarity index 100%
rename from v7/src/microcode/comlin.c
rename to src/microcode/comlin.c

diff --git a/v7/src/microcode/comlin.h b/src/microcode/comlin.h
similarity index 100%
rename from v7/src/microcode/comlin.h
rename to src/microcode/comlin.h

diff --git a/v7/src/microcode/comutl.c b/src/microcode/comutl.c
similarity index 100%
rename from v7/src/microcode/comutl.c
rename to src/microcode/comutl.c

diff --git a/v7/src/microcode/config.guess b/src/microcode/config.guess
similarity index 100%
rename from v7/src/microcode/config.guess
rename to src/microcode/config.guess

diff --git a/v7/src/microcode/config.sub b/src/microcode/config.sub
similarity index 100%
rename from v7/src/microcode/config.sub
rename to src/microcode/config.sub

diff --git a/v7/src/microcode/configure.ac b/src/microcode/configure.ac
similarity index 100%
rename from v7/src/microcode/configure.ac
rename to src/microcode/configure.ac

diff --git a/v7/src/microcode/confshared.h b/src/microcode/confshared.h
similarity index 100%
rename from v7/src/microcode/confshared.h
rename to src/microcode/confshared.h

diff --git a/v7/src/microcode/const.h b/src/microcode/const.h
similarity index 100%
rename from v7/src/microcode/const.h
rename to src/microcode/const.h

diff --git a/v7/src/microcode/copyrigh.c b/src/microcode/copyrigh.c
similarity index 100%
rename from v7/src/microcode/copyrigh.c
rename to src/microcode/copyrigh.c

diff --git a/v7/src/microcode/critsec.h b/src/microcode/critsec.h
similarity index 100%
rename from v7/src/microcode/critsec.h
rename to src/microcode/critsec.h

diff --git a/v7/src/microcode/daemon.c b/src/microcode/daemon.c
similarity index 100%
rename from v7/src/microcode/daemon.c
rename to src/microcode/daemon.c

diff --git a/v7/src/microcode/debug.c b/src/microcode/debug.c
similarity index 100%
rename from v7/src/microcode/debug.c
rename to src/microcode/debug.c

diff --git a/v7/src/microcode/dfloat.c b/src/microcode/dfloat.c
similarity index 100%
rename from v7/src/microcode/dfloat.c
rename to src/microcode/dfloat.c

diff --git a/v7/src/microcode/dstack.h b/src/microcode/dstack.h
similarity index 100%
rename from v7/src/microcode/dstack.h
rename to src/microcode/dstack.h

diff --git a/v7/src/microcode/edwin.h b/src/microcode/edwin.h
similarity index 100%
rename from v7/src/microcode/edwin.h
rename to src/microcode/edwin.h

diff --git a/v7/src/microcode/error.c b/src/microcode/error.c
similarity index 100%
rename from v7/src/microcode/error.c
rename to src/microcode/error.c

diff --git a/v7/src/microcode/errors.h b/src/microcode/errors.h
similarity index 100%
rename from v7/src/microcode/errors.h
rename to src/microcode/errors.h

diff --git a/v7/src/microcode/extern.c b/src/microcode/extern.c
similarity index 100%
rename from v7/src/microcode/extern.c
rename to src/microcode/extern.c

diff --git a/v7/src/microcode/extern.h b/src/microcode/extern.h
similarity index 100%
rename from v7/src/microcode/extern.h
rename to src/microcode/extern.h

diff --git a/v7/src/microcode/extract-liarc-decls.c b/src/microcode/extract-liarc-decls.c
similarity index 100%
rename from v7/src/microcode/extract-liarc-decls.c
rename to src/microcode/extract-liarc-decls.c

diff --git a/v7/src/microcode/fasdump.c b/src/microcode/fasdump.c
similarity index 100%
rename from v7/src/microcode/fasdump.c
rename to src/microcode/fasdump.c

diff --git a/v7/src/microcode/fasl.c b/src/microcode/fasl.c
similarity index 100%
rename from v7/src/microcode/fasl.c
rename to src/microcode/fasl.c

diff --git a/v7/src/microcode/fasl.h b/src/microcode/fasl.h
similarity index 100%
rename from v7/src/microcode/fasl.h
rename to src/microcode/fasl.h

diff --git a/v7/src/microcode/fasload.c b/src/microcode/fasload.c
similarity index 100%
rename from v7/src/microcode/fasload.c
rename to src/microcode/fasload.c

diff --git a/v7/src/microcode/findprim.c b/src/microcode/findprim.c
similarity index 100%
rename from v7/src/microcode/findprim.c
rename to src/microcode/findprim.c

diff --git a/v7/src/microcode/fixnum.c b/src/microcode/fixnum.c
similarity index 100%
rename from v7/src/microcode/fixnum.c
rename to src/microcode/fixnum.c

diff --git a/v7/src/microcode/fixobj.h b/src/microcode/fixobj.h
similarity index 100%
rename from v7/src/microcode/fixobj.h
rename to src/microcode/fixobj.h

diff --git a/v7/src/microcode/flonum.c b/src/microcode/flonum.c
similarity index 100%
rename from v7/src/microcode/flonum.c
rename to src/microcode/flonum.c

diff --git a/v7/src/microcode/gc.h b/src/microcode/gc.h
similarity index 100%
rename from v7/src/microcode/gc.h
rename to src/microcode/gc.h

diff --git a/v7/src/microcode/gccode.h b/src/microcode/gccode.h
similarity index 100%
rename from v7/src/microcode/gccode.h
rename to src/microcode/gccode.h

diff --git a/v7/src/microcode/gcloop.c b/src/microcode/gcloop.c
similarity index 100%
rename from v7/src/microcode/gcloop.c
rename to src/microcode/gcloop.c

diff --git a/v7/src/microcode/gen-nonce.c b/src/microcode/gen-nonce.c
similarity index 100%
rename from v7/src/microcode/gen-nonce.c
rename to src/microcode/gen-nonce.c

diff --git a/v7/src/microcode/generic.c b/src/microcode/generic.c
similarity index 100%
rename from v7/src/microcode/generic.c
rename to src/microcode/generic.c

diff --git a/v7/src/microcode/history.h b/src/microcode/history.h
similarity index 100%
rename from v7/src/microcode/history.h
rename to src/microcode/history.h

diff --git a/v7/src/microcode/hooks.c b/src/microcode/hooks.c
similarity index 100%
rename from v7/src/microcode/hooks.c
rename to src/microcode/hooks.c

diff --git a/v7/src/microcode/hppacach.c b/src/microcode/hppacach.c
similarity index 100%
rename from v7/src/microcode/hppacach.c
rename to src/microcode/hppacach.c

diff --git a/v7/src/microcode/hppacach.h b/src/microcode/hppacach.h
similarity index 100%
rename from v7/src/microcode/hppacach.h
rename to src/microcode/hppacach.h

diff --git a/v7/src/microcode/hppacach.mc b/src/microcode/hppacach.mc
similarity index 100%
rename from v7/src/microcode/hppacach.mc
rename to src/microcode/hppacach.mc

diff --git a/v7/src/microcode/hppanwca.c b/src/microcode/hppanwca.c
similarity index 100%
rename from v7/src/microcode/hppanwca.c
rename to src/microcode/hppanwca.c

diff --git a/v7/src/microcode/hunk.c b/src/microcode/hunk.c
similarity index 100%
rename from v7/src/microcode/hunk.c
rename to src/microcode/hunk.c

diff --git a/v7/src/microcode/install-sh b/src/microcode/install-sh
similarity index 100%
rename from v7/src/microcode/install-sh
rename to src/microcode/install-sh

diff --git a/v7/src/microcode/intern.c b/src/microcode/intern.c
similarity index 100%
rename from v7/src/microcode/intern.c
rename to src/microcode/intern.c

diff --git a/v7/src/microcode/interp.c b/src/microcode/interp.c
similarity index 100%
rename from v7/src/microcode/interp.c
rename to src/microcode/interp.c

diff --git a/v7/src/microcode/interp.h b/src/microcode/interp.h
similarity index 100%
rename from v7/src/microcode/interp.h
rename to src/microcode/interp.h

diff --git a/v7/src/microcode/intext.c b/src/microcode/intext.c
similarity index 100%
rename from v7/src/microcode/intext.c
rename to src/microcode/intext.c

diff --git a/v7/src/microcode/intext.h b/src/microcode/intext.h
similarity index 100%
rename from v7/src/microcode/intext.h
rename to src/microcode/intext.h

diff --git a/v7/src/microcode/intprm.c b/src/microcode/intprm.c
similarity index 100%
rename from v7/src/microcode/intprm.c
rename to src/microcode/intprm.c

diff --git a/v7/src/microcode/intrpt.h b/src/microcode/intrpt.h
similarity index 100%
rename from v7/src/microcode/intrpt.h
rename to src/microcode/intrpt.h

diff --git a/v7/src/microcode/liarc-cc.in b/src/microcode/liarc-cc.in
similarity index 100%
rename from v7/src/microcode/liarc-cc.in
rename to src/microcode/liarc-cc.in

diff --git a/v7/src/microcode/liarc-gendeps.c b/src/microcode/liarc-gendeps.c
similarity index 100%
rename from v7/src/microcode/liarc-gendeps.c
rename to src/microcode/liarc-gendeps.c

diff --git a/v7/src/microcode/liarc-ld.in b/src/microcode/liarc-ld.in
similarity index 100%
rename from v7/src/microcode/liarc-ld.in
rename to src/microcode/liarc-ld.in

diff --git a/v7/src/microcode/liarc.h b/src/microcode/liarc.h
similarity index 100%
rename from v7/src/microcode/liarc.h
rename to src/microcode/liarc.h

diff --git a/v7/src/microcode/list.c b/src/microcode/list.c
similarity index 100%
rename from v7/src/microcode/list.c
rename to src/microcode/list.c

diff --git a/v7/src/microcode/lookprm.c b/src/microcode/lookprm.c
similarity index 100%
rename from v7/src/microcode/lookprm.c
rename to src/microcode/lookprm.c

diff --git a/v7/src/microcode/lookup.c b/src/microcode/lookup.c
similarity index 100%
rename from v7/src/microcode/lookup.c
rename to src/microcode/lookup.c

diff --git a/v7/src/microcode/lookup.h b/src/microcode/lookup.h
similarity index 100%
rename from v7/src/microcode/lookup.h
rename to src/microcode/lookup.h

diff --git a/v7/src/microcode/makegen/Makefile.in.in b/src/microcode/makegen/Makefile.in.in
similarity index 100%
rename from v7/src/microcode/makegen/Makefile.in.in
rename to src/microcode/makegen/Makefile.in.in

diff --git a/v7/src/microcode/makegen/bundles-liarc.scm b/src/microcode/makegen/bundles-liarc.scm
similarity index 100%
rename from v7/src/microcode/makegen/bundles-liarc.scm
rename to src/microcode/makegen/bundles-liarc.scm

diff --git a/v7/src/microcode/makegen/dirs-liarc.scm b/src/microcode/makegen/dirs-liarc.scm
similarity index 100%
rename from v7/src/microcode/makegen/dirs-liarc.scm
rename to src/microcode/makegen/dirs-liarc.scm

diff --git a/v7/src/microcode/makegen/files-core.scm b/src/microcode/makegen/files-core.scm
similarity index 100%
rename from v7/src/microcode/makegen/files-core.scm
rename to src/microcode/makegen/files-core.scm

diff --git a/v7/src/microcode/makegen/files-optional.scm b/src/microcode/makegen/files-optional.scm
similarity index 100%
rename from v7/src/microcode/makegen/files-optional.scm
rename to src/microcode/makegen/files-optional.scm

diff --git a/v7/src/microcode/makegen/files-os-prim.scm b/src/microcode/makegen/files-os-prim.scm
similarity index 100%
rename from v7/src/microcode/makegen/files-os-prim.scm
rename to src/microcode/makegen/files-os-prim.scm

diff --git a/v7/src/microcode/makegen/files-other.scm b/src/microcode/makegen/files-other.scm
similarity index 100%
rename from v7/src/microcode/makegen/files-other.scm
rename to src/microcode/makegen/files-other.scm

diff --git a/v7/src/microcode/makegen/files-unix.scm b/src/microcode/makegen/files-unix.scm
similarity index 100%
rename from v7/src/microcode/makegen/files-unix.scm
rename to src/microcode/makegen/files-unix.scm

diff --git a/v7/src/microcode/makegen/liarc-base-rules b/src/microcode/makegen/liarc-base-rules
similarity index 100%
rename from v7/src/microcode/makegen/liarc-base-rules
rename to src/microcode/makegen/liarc-base-rules

diff --git a/v7/src/microcode/makegen/m4.sh b/src/microcode/makegen/m4.sh
similarity index 100%
rename from v7/src/microcode/makegen/m4.sh
rename to src/microcode/makegen/m4.sh

diff --git a/v7/src/microcode/makegen/makegen.scm b/src/microcode/makegen/makegen.scm
similarity index 100%
rename from v7/src/microcode/makegen/makegen.scm
rename to src/microcode/makegen/makegen.scm

diff --git a/v7/src/microcode/makegen/makeinit.sh b/src/microcode/makegen/makeinit.sh
similarity index 100%
rename from v7/src/microcode/makegen/makeinit.sh
rename to src/microcode/makegen/makeinit.sh

diff --git a/v7/src/microcode/makegen/pkds-liarc.scm b/src/microcode/makegen/pkds-liarc.scm
similarity index 100%
rename from v7/src/microcode/makegen/pkds-liarc.scm
rename to src/microcode/makegen/pkds-liarc.scm

diff --git a/v7/src/microcode/memmag.c b/src/microcode/memmag.c
similarity index 100%
rename from v7/src/microcode/memmag.c
rename to src/microcode/memmag.c

diff --git a/v7/src/microcode/memmag.h b/src/microcode/memmag.h
similarity index 100%
rename from v7/src/microcode/memmag.h
rename to src/microcode/memmag.h

diff --git a/v7/src/microcode/missing.c b/src/microcode/missing.c
similarity index 100%
rename from v7/src/microcode/missing.c
rename to src/microcode/missing.c

diff --git a/v7/src/microcode/mkinstalldirs b/src/microcode/mkinstalldirs
similarity index 100%
rename from v7/src/microcode/mkinstalldirs
rename to src/microcode/mkinstalldirs

diff --git a/v7/src/microcode/mul.c b/src/microcode/mul.c
similarity index 100%
rename from v7/src/microcode/mul.c
rename to src/microcode/mul.c

diff --git a/v7/src/microcode/nt.h b/src/microcode/nt.h
similarity index 100%
rename from v7/src/microcode/nt.h
rename to src/microcode/nt.h

diff --git a/v7/src/microcode/ntapi.h b/src/microcode/ntapi.h
similarity index 100%
rename from v7/src/microcode/ntapi.h
rename to src/microcode/ntapi.h

diff --git a/v7/src/microcode/ntasutl.asm b/src/microcode/ntasutl.asm
similarity index 100%
rename from v7/src/microcode/ntasutl.asm
rename to src/microcode/ntasutl.asm

diff --git a/v7/src/microcode/ntenv.c b/src/microcode/ntenv.c
similarity index 100%
rename from v7/src/microcode/ntenv.c
rename to src/microcode/ntenv.c

diff --git a/v7/src/microcode/ntfile.c b/src/microcode/ntfile.c
similarity index 100%
rename from v7/src/microcode/ntfile.c
rename to src/microcode/ntfile.c

diff --git a/v7/src/microcode/ntfs.c b/src/microcode/ntfs.c
similarity index 100%
rename from v7/src/microcode/ntfs.c
rename to src/microcode/ntfs.c

diff --git a/v7/src/microcode/ntfs.h b/src/microcode/ntfs.h
similarity index 100%
rename from v7/src/microcode/ntfs.h
rename to src/microcode/ntfs.h

diff --git a/v7/src/microcode/ntgui.c b/src/microcode/ntgui.c
similarity index 100%
rename from v7/src/microcode/ntgui.c
rename to src/microcode/ntgui.c

diff --git a/v7/src/microcode/ntgui.h b/src/microcode/ntgui.h
similarity index 100%
rename from v7/src/microcode/ntgui.h
rename to src/microcode/ntgui.h

diff --git a/v7/src/microcode/ntio.c b/src/microcode/ntio.c
similarity index 100%
rename from v7/src/microcode/ntio.c
rename to src/microcode/ntio.c

diff --git a/v7/src/microcode/ntio.h b/src/microcode/ntio.h
similarity index 100%
rename from v7/src/microcode/ntio.h
rename to src/microcode/ntio.h

diff --git a/v7/src/microcode/ntproc.c b/src/microcode/ntproc.c
similarity index 100%
rename from v7/src/microcode/ntproc.c
rename to src/microcode/ntproc.c

diff --git a/v7/src/microcode/ntproc.h b/src/microcode/ntproc.h
similarity index 100%
rename from v7/src/microcode/ntproc.h
rename to src/microcode/ntproc.h

diff --git a/v7/src/microcode/ntscmlib.h b/src/microcode/ntscmlib.h
similarity index 100%
rename from v7/src/microcode/ntscmlib.h
rename to src/microcode/ntscmlib.h

diff --git a/v7/src/microcode/ntscreen.c b/src/microcode/ntscreen.c
similarity index 100%
rename from v7/src/microcode/ntscreen.c
rename to src/microcode/ntscreen.c

diff --git a/v7/src/microcode/ntscreen.h b/src/microcode/ntscreen.h
similarity index 100%
rename from v7/src/microcode/ntscreen.h
rename to src/microcode/ntscreen.h

diff --git a/v7/src/microcode/ntsig.c b/src/microcode/ntsig.c
similarity index 100%
rename from v7/src/microcode/ntsig.c
rename to src/microcode/ntsig.c

diff --git a/v7/src/microcode/ntsock.c b/src/microcode/ntsock.c
similarity index 100%
rename from v7/src/microcode/ntsock.c
rename to src/microcode/ntsock.c

diff --git a/v7/src/microcode/ntsys.c b/src/microcode/ntsys.c
similarity index 100%
rename from v7/src/microcode/ntsys.c
rename to src/microcode/ntsys.c

diff --git a/v7/src/microcode/ntsys.h b/src/microcode/ntsys.h
similarity index 100%
rename from v7/src/microcode/ntsys.h
rename to src/microcode/ntsys.h

diff --git a/v7/src/microcode/ntterm.h b/src/microcode/ntterm.h
similarity index 100%
rename from v7/src/microcode/ntterm.h
rename to src/microcode/ntterm.h

diff --git a/v7/src/microcode/nttop.c b/src/microcode/nttop.c
similarity index 100%
rename from v7/src/microcode/nttop.c
rename to src/microcode/nttop.c

diff --git a/v7/src/microcode/nttop.h b/src/microcode/nttop.h
similarity index 100%
rename from v7/src/microcode/nttop.h
rename to src/microcode/nttop.h

diff --git a/v7/src/microcode/nttrap.c b/src/microcode/nttrap.c
similarity index 100%
rename from v7/src/microcode/nttrap.c
rename to src/microcode/nttrap.c

diff --git a/v7/src/microcode/nttrap.h b/src/microcode/nttrap.h
similarity index 100%
rename from v7/src/microcode/nttrap.h
rename to src/microcode/nttrap.h

diff --git a/v7/src/microcode/nttterm.c b/src/microcode/nttterm.c
similarity index 100%
rename from v7/src/microcode/nttterm.c
rename to src/microcode/nttterm.c

diff --git a/v7/src/microcode/nttty.c b/src/microcode/nttty.c
similarity index 100%
rename from v7/src/microcode/nttty.c
rename to src/microcode/nttty.c

diff --git a/v7/src/microcode/ntutl/bch-cl3.lst b/src/microcode/ntutl/bch-cl3.lst
similarity index 100%
rename from v7/src/microcode/ntutl/bch-cl3.lst
rename to src/microcode/ntutl/bch-cl3.lst

diff --git a/v7/src/microcode/ntutl/bch-p-nt.lst b/src/microcode/ntutl/bch-p-nt.lst
similarity index 100%
rename from v7/src/microcode/ntutl/bch-p-nt.lst
rename to src/microcode/ntutl/bch-p-nt.lst

diff --git a/v7/src/microcode/ntutl/bch.ico b/src/microcode/ntutl/bch.ico
similarity index 100%
rename from v7/src/microcode/ntutl/bch.ico
rename to src/microcode/ntutl/bch.ico

diff --git a/v7/src/microcode/ntutl/coffee.ico b/src/microcode/ntutl/coffee.ico
similarity index 100%
rename from v7/src/microcode/ntutl/coffee.ico
rename to src/microcode/ntutl/coffee.ico

diff --git a/v7/src/microcode/ntutl/config.bat b/src/microcode/ntutl/config.bat
similarity index 100%
rename from v7/src/microcode/ntutl/config.bat
rename to src/microcode/ntutl/config.bat

diff --git a/v7/src/microcode/ntutl/config.h b/src/microcode/ntutl/config.h
similarity index 100%
rename from v7/src/microcode/ntutl/config.h
rename to src/microcode/ntutl/config.h

diff --git a/v7/src/microcode/ntutl/conses.ico b/src/microcode/ntutl/conses.ico
similarity index 100%
rename from v7/src/microcode/ntutl/conses.ico
rename to src/microcode/ntutl/conses.ico

diff --git a/v7/src/microcode/ntutl/edwin.ico b/src/microcode/ntutl/edwin.ico
similarity index 100%
rename from v7/src/microcode/ntutl/edwin.ico
rename to src/microcode/ntutl/edwin.ico

diff --git a/v7/src/microcode/ntutl/envir1.ico b/src/microcode/ntutl/envir1.ico
similarity index 100%
rename from v7/src/microcode/ntutl/envir1.ico
rename to src/microcode/ntutl/envir1.ico

diff --git a/v7/src/microcode/ntutl/float.h b/src/microcode/ntutl/float.h
similarity index 100%
rename from v7/src/microcode/ntutl/float.h
rename to src/microcode/ntutl/float.h

diff --git a/v7/src/microcode/ntutl/gc.cur b/src/microcode/ntutl/gc.cur
similarity index 100%
rename from v7/src/microcode/ntutl/gc.cur
rename to src/microcode/ntutl/gc.cur

diff --git a/v7/src/microcode/ntutl/graphics.ico b/src/microcode/ntutl/graphics.ico
similarity index 100%
rename from v7/src/microcode/ntutl/graphics.ico
rename to src/microcode/ntutl/graphics.ico

diff --git a/v7/src/microcode/ntutl/lambda.ico b/src/microcode/ntutl/lambda.ico
similarity index 100%
rename from v7/src/microcode/ntutl/lambda.ico
rename to src/microcode/ntutl/lambda.ico

diff --git a/v7/src/microcode/ntutl/lambda2.ico b/src/microcode/ntutl/lambda2.ico
similarity index 100%
rename from v7/src/microcode/ntutl/lambda2.ico
rename to src/microcode/ntutl/lambda2.ico

diff --git a/v7/src/microcode/ntutl/liar1.ico b/src/microcode/ntutl/liar1.ico
similarity index 100%
rename from v7/src/microcode/ntutl/liar1.ico
rename to src/microcode/ntutl/liar1.ico

diff --git a/v7/src/microcode/ntutl/liar2.ico b/src/microcode/ntutl/liar2.ico
similarity index 100%
rename from v7/src/microcode/ntutl/liar2.ico
rename to src/microcode/ntutl/liar2.ico

diff --git a/v7/src/microcode/ntutl/liar3.ico b/src/microcode/ntutl/liar3.ico
similarity index 100%
rename from v7/src/microcode/ntutl/liar3.ico
rename to src/microcode/ntutl/liar3.ico

diff --git a/v7/src/microcode/ntutl/limits.h b/src/microcode/ntutl/limits.h
similarity index 100%
rename from v7/src/microcode/ntutl/limits.h
rename to src/microcode/ntutl/limits.h

diff --git a/v7/src/microcode/ntutl/makefile b/src/microcode/ntutl/makefile
similarity index 100%
rename from v7/src/microcode/ntutl/makefile
rename to src/microcode/ntutl/makefile

diff --git a/v7/src/microcode/ntutl/makefile.wcc b/src/microcode/ntutl/makefile.wcc
similarity index 100%
rename from v7/src/microcode/ntutl/makefile.wcc
rename to src/microcode/ntutl/makefile.wcc

diff --git a/v7/src/microcode/ntutl/mincer.ico b/src/microcode/ntutl/mincer.ico
similarity index 100%
rename from v7/src/microcode/ntutl/mincer.ico
rename to src/microcode/ntutl/mincer.ico

diff --git a/v7/src/microcode/ntutl/ntdialog.dlg b/src/microcode/ntutl/ntdialog.dlg
similarity index 100%
rename from v7/src/microcode/ntutl/ntdialog.dlg
rename to src/microcode/ntutl/ntdialog.dlg

diff --git a/v7/src/microcode/ntutl/ntdialog.h b/src/microcode/ntutl/ntdialog.h
similarity index 100%
rename from v7/src/microcode/ntutl/ntdialog.h
rename to src/microcode/ntutl/ntdialog.h

diff --git a/v7/src/microcode/ntutl/ntgui.rc b/src/microcode/ntutl/ntgui.rc
similarity index 100%
rename from v7/src/microcode/ntutl/ntgui.rc
rename to src/microcode/ntutl/ntgui.rc

diff --git a/v7/src/microcode/ntutl/scheme16.c b/src/microcode/ntutl/scheme16.c
similarity index 100%
rename from v7/src/microcode/ntutl/scheme16.c
rename to src/microcode/ntutl/scheme16.c

diff --git a/v7/src/microcode/ntutl/scheme16.def b/src/microcode/ntutl/scheme16.def
similarity index 100%
rename from v7/src/microcode/ntutl/scheme16.def
rename to src/microcode/ntutl/scheme16.def

diff --git a/v7/src/microcode/ntutl/scheme16.mak b/src/microcode/ntutl/scheme16.mak
similarity index 100%
rename from v7/src/microcode/ntutl/scheme16.mak
rename to src/microcode/ntutl/scheme16.mak

diff --git a/v7/src/microcode/ntutl/scheme31.c b/src/microcode/ntutl/scheme31.c
similarity index 100%
rename from v7/src/microcode/ntutl/scheme31.c
rename to src/microcode/ntutl/scheme31.c

diff --git a/v7/src/microcode/ntutl/scheme31.def b/src/microcode/ntutl/scheme31.def
similarity index 100%
rename from v7/src/microcode/ntutl/scheme31.def
rename to src/microcode/ntutl/scheme31.def

diff --git a/v7/src/microcode/ntutl/scheme32.c b/src/microcode/ntutl/scheme32.c
similarity index 100%
rename from v7/src/microcode/ntutl/scheme32.c
rename to src/microcode/ntutl/scheme32.c

diff --git a/v7/src/microcode/ntutl/scheme32.def b/src/microcode/ntutl/scheme32.def
similarity index 100%
rename from v7/src/microcode/ntutl/scheme32.def
rename to src/microcode/ntutl/scheme32.def

diff --git a/v7/src/microcode/ntutl/scheme32.lbc b/src/microcode/ntutl/scheme32.lbc
similarity index 100%
rename from v7/src/microcode/ntutl/scheme32.lbc
rename to src/microcode/ntutl/scheme32.lbc

diff --git a/v7/src/microcode/ntutl/scheme32.lnk b/src/microcode/ntutl/scheme32.lnk
similarity index 100%
rename from v7/src/microcode/ntutl/scheme32.lnk
rename to src/microcode/ntutl/scheme32.lnk

diff --git a/v7/src/microcode/ntutl/scm-cl3.lst b/src/microcode/ntutl/scm-cl3.lst
similarity index 100%
rename from v7/src/microcode/ntutl/scm-cl3.lst
rename to src/microcode/ntutl/scm-cl3.lst

diff --git a/v7/src/microcode/ntutl/scm-p-nt.lst b/src/microcode/ntutl/scm-p-nt.lst
similarity index 100%
rename from v7/src/microcode/ntutl/scm-p-nt.lst
rename to src/microcode/ntutl/scm-p-nt.lst

diff --git a/v7/src/microcode/ntutl/setenv.bat b/src/microcode/ntutl/setenv.bat
similarity index 100%
rename from v7/src/microcode/ntutl/setenv.bat
rename to src/microcode/ntutl/setenv.bat

diff --git a/v7/src/microcode/ntutl/shield1.ico b/src/microcode/ntutl/shield1.ico
similarity index 100%
rename from v7/src/microcode/ntutl/shield1.ico
rename to src/microcode/ntutl/shield1.ico

diff --git a/v7/src/microcode/ntutl/shield2.ico b/src/microcode/ntutl/shield2.ico
similarity index 100%
rename from v7/src/microcode/ntutl/shield2.ico
rename to src/microcode/ntutl/shield2.ico

diff --git a/v7/src/microcode/ntutl/shield3.ico b/src/microcode/ntutl/shield3.ico
similarity index 100%
rename from v7/src/microcode/ntutl/shield3.ico
rename to src/microcode/ntutl/shield3.ico

diff --git a/v7/src/microcode/ntutl/shield4.ico b/src/microcode/ntutl/shield4.ico
similarity index 100%
rename from v7/src/microcode/ntutl/shield4.ico
rename to src/microcode/ntutl/shield4.ico

diff --git a/v7/src/microcode/ntutl/wconfig.bat b/src/microcode/ntutl/wconfig.bat
similarity index 100%
rename from v7/src/microcode/ntutl/wconfig.bat
rename to src/microcode/ntutl/wconfig.bat

diff --git a/v7/src/microcode/ntutl/win31.bat b/src/microcode/ntutl/win31.bat
similarity index 100%
rename from v7/src/microcode/ntutl/win31.bat
rename to src/microcode/ntutl/win31.bat

diff --git a/v7/src/microcode/ntutl/winnt.bat b/src/microcode/ntutl/winnt.bat
similarity index 100%
rename from v7/src/microcode/ntutl/winnt.bat
rename to src/microcode/ntutl/winnt.bat

diff --git a/v7/src/microcode/object.h b/src/microcode/object.h
similarity index 100%
rename from v7/src/microcode/object.h
rename to src/microcode/object.h

diff --git a/v7/src/microcode/obstack.c b/src/microcode/obstack.c
similarity index 100%
rename from v7/src/microcode/obstack.c
rename to src/microcode/obstack.c

diff --git a/v7/src/microcode/obstack.h b/src/microcode/obstack.h
similarity index 100%
rename from v7/src/microcode/obstack.h
rename to src/microcode/obstack.h

diff --git a/v7/src/microcode/option.c b/src/microcode/option.c
similarity index 100%
rename from v7/src/microcode/option.c
rename to src/microcode/option.c

diff --git a/v7/src/microcode/option.h b/src/microcode/option.h
similarity index 100%
rename from v7/src/microcode/option.h
rename to src/microcode/option.h

diff --git a/v7/src/microcode/os.h b/src/microcode/os.h
similarity index 100%
rename from v7/src/microcode/os.h
rename to src/microcode/os.h

diff --git a/v7/src/microcode/os2.c b/src/microcode/os2.c
similarity index 100%
rename from v7/src/microcode/os2.c
rename to src/microcode/os2.c

diff --git a/v7/src/microcode/os2.h b/src/microcode/os2.h
similarity index 100%
rename from v7/src/microcode/os2.h
rename to src/microcode/os2.h

diff --git a/v7/src/microcode/os2api.h b/src/microcode/os2api.h
similarity index 100%
rename from v7/src/microcode/os2api.h
rename to src/microcode/os2api.h

diff --git a/v7/src/microcode/os2conio.c b/src/microcode/os2conio.c
similarity index 100%
rename from v7/src/microcode/os2conio.c
rename to src/microcode/os2conio.c

diff --git a/v7/src/microcode/os2cthrd.c b/src/microcode/os2cthrd.c
similarity index 100%
rename from v7/src/microcode/os2cthrd.c
rename to src/microcode/os2cthrd.c

diff --git a/v7/src/microcode/os2cthrd.h b/src/microcode/os2cthrd.h
similarity index 100%
rename from v7/src/microcode/os2cthrd.h
rename to src/microcode/os2cthrd.h

diff --git a/v7/src/microcode/os2ctty.c b/src/microcode/os2ctty.c
similarity index 100%
rename from v7/src/microcode/os2ctty.c
rename to src/microcode/os2ctty.c

diff --git a/v7/src/microcode/os2ctty.h b/src/microcode/os2ctty.h
similarity index 100%
rename from v7/src/microcode/os2ctty.h
rename to src/microcode/os2ctty.h

diff --git a/v7/src/microcode/os2env.c b/src/microcode/os2env.c
similarity index 100%
rename from v7/src/microcode/os2env.c
rename to src/microcode/os2env.c

diff --git a/v7/src/microcode/os2file.c b/src/microcode/os2file.c
similarity index 100%
rename from v7/src/microcode/os2file.c
rename to src/microcode/os2file.c

diff --git a/v7/src/microcode/os2fs.c b/src/microcode/os2fs.c
similarity index 100%
rename from v7/src/microcode/os2fs.c
rename to src/microcode/os2fs.c

diff --git a/v7/src/microcode/os2io.c b/src/microcode/os2io.c
similarity index 100%
rename from v7/src/microcode/os2io.c
rename to src/microcode/os2io.c

diff --git a/v7/src/microcode/os2io.h b/src/microcode/os2io.h
similarity index 100%
rename from v7/src/microcode/os2io.h
rename to src/microcode/os2io.h

diff --git a/v7/src/microcode/os2msg.c b/src/microcode/os2msg.c
similarity index 100%
rename from v7/src/microcode/os2msg.c
rename to src/microcode/os2msg.c

diff --git a/v7/src/microcode/os2msg.h b/src/microcode/os2msg.h
similarity index 100%
rename from v7/src/microcode/os2msg.h
rename to src/microcode/os2msg.h

diff --git a/v7/src/microcode/os2pipe.c b/src/microcode/os2pipe.c
similarity index 100%
rename from v7/src/microcode/os2pipe.c
rename to src/microcode/os2pipe.c

diff --git a/v7/src/microcode/os2pm.c b/src/microcode/os2pm.c
similarity index 100%
rename from v7/src/microcode/os2pm.c
rename to src/microcode/os2pm.c

diff --git a/v7/src/microcode/os2pm.h b/src/microcode/os2pm.h
similarity index 100%
rename from v7/src/microcode/os2pm.h
rename to src/microcode/os2pm.h

diff --git a/v7/src/microcode/os2pm.scm b/src/microcode/os2pm.scm
similarity index 100%
rename from v7/src/microcode/os2pm.scm
rename to src/microcode/os2pm.scm

diff --git a/v7/src/microcode/os2pmcon.c b/src/microcode/os2pmcon.c
similarity index 100%
rename from v7/src/microcode/os2pmcon.c
rename to src/microcode/os2pmcon.c

diff --git a/v7/src/microcode/os2pmcon.h b/src/microcode/os2pmcon.h
similarity index 100%
rename from v7/src/microcode/os2pmcon.h
rename to src/microcode/os2pmcon.h

diff --git a/v7/src/microcode/os2pmcon.rc b/src/microcode/os2pmcon.rc
similarity index 100%
rename from v7/src/microcode/os2pmcon.rc
rename to src/microcode/os2pmcon.rc

diff --git a/v7/src/microcode/os2proc.c b/src/microcode/os2proc.c
similarity index 100%
rename from v7/src/microcode/os2proc.c
rename to src/microcode/os2proc.c

diff --git a/v7/src/microcode/os2proc.h b/src/microcode/os2proc.h
similarity index 100%
rename from v7/src/microcode/os2proc.h
rename to src/microcode/os2proc.h

diff --git a/v7/src/microcode/os2sock.c b/src/microcode/os2sock.c
similarity index 100%
rename from v7/src/microcode/os2sock.c
rename to src/microcode/os2sock.c

diff --git a/v7/src/microcode/os2term.c b/src/microcode/os2term.c
similarity index 100%
rename from v7/src/microcode/os2term.c
rename to src/microcode/os2term.c

diff --git a/v7/src/microcode/os2thrd.c b/src/microcode/os2thrd.c
similarity index 100%
rename from v7/src/microcode/os2thrd.c
rename to src/microcode/os2thrd.c

diff --git a/v7/src/microcode/os2thrd.h b/src/microcode/os2thrd.h
similarity index 100%
rename from v7/src/microcode/os2thrd.h
rename to src/microcode/os2thrd.h

diff --git a/v7/src/microcode/os2top.c b/src/microcode/os2top.c
similarity index 100%
rename from v7/src/microcode/os2top.c
rename to src/microcode/os2top.c

diff --git a/v7/src/microcode/os2tty.c b/src/microcode/os2tty.c
similarity index 100%
rename from v7/src/microcode/os2tty.c
rename to src/microcode/os2tty.c

diff --git a/v7/src/microcode/os2utl/bch.ico b/src/microcode/os2utl/bch.ico
similarity index 100%
rename from v7/src/microcode/os2utl/bch.ico
rename to src/microcode/os2utl/bch.ico

diff --git a/v7/src/microcode/os2utl/coffee.ico b/src/microcode/os2utl/coffee.ico
similarity index 100%
rename from v7/src/microcode/os2utl/coffee.ico
rename to src/microcode/os2utl/coffee.ico

diff --git a/v7/src/microcode/os2utl/config.cmd b/src/microcode/os2utl/config.cmd
similarity index 100%
rename from v7/src/microcode/os2utl/config.cmd
rename to src/microcode/os2utl/config.cmd

diff --git a/v7/src/microcode/os2utl/config.h b/src/microcode/os2utl/config.h
similarity index 100%
rename from v7/src/microcode/os2utl/config.h
rename to src/microcode/os2utl/config.h

diff --git a/v7/src/microcode/os2utl/conses.ico b/src/microcode/os2utl/conses.ico
similarity index 100%
rename from v7/src/microcode/os2utl/conses.ico
rename to src/microcode/os2utl/conses.ico

diff --git a/v7/src/microcode/os2utl/edwin.ico b/src/microcode/os2utl/edwin.ico
similarity index 100%
rename from v7/src/microcode/os2utl/edwin.ico
rename to src/microcode/os2utl/edwin.ico

diff --git a/v7/src/microcode/os2utl/envir1.ico b/src/microcode/os2utl/envir1.ico
similarity index 100%
rename from v7/src/microcode/os2utl/envir1.ico
rename to src/microcode/os2utl/envir1.ico

diff --git a/v7/src/microcode/os2utl/graphics.ico b/src/microcode/os2utl/graphics.ico
similarity index 100%
rename from v7/src/microcode/os2utl/graphics.ico
rename to src/microcode/os2utl/graphics.ico

diff --git a/v7/src/microcode/os2utl/lambda.ico b/src/microcode/os2utl/lambda.ico
similarity index 100%
rename from v7/src/microcode/os2utl/lambda.ico
rename to src/microcode/os2utl/lambda.ico

diff --git a/v7/src/microcode/os2utl/lambda2.ico b/src/microcode/os2utl/lambda2.ico
similarity index 100%
rename from v7/src/microcode/os2utl/lambda2.ico
rename to src/microcode/os2utl/lambda2.ico

diff --git a/v7/src/microcode/os2utl/liar1.ico b/src/microcode/os2utl/liar1.ico
similarity index 100%
rename from v7/src/microcode/os2utl/liar1.ico
rename to src/microcode/os2utl/liar1.ico

diff --git a/v7/src/microcode/os2utl/liar2.ico b/src/microcode/os2utl/liar2.ico
similarity index 100%
rename from v7/src/microcode/os2utl/liar2.ico
rename to src/microcode/os2utl/liar2.ico

diff --git a/v7/src/microcode/os2utl/liar3.ico b/src/microcode/os2utl/liar3.ico
similarity index 100%
rename from v7/src/microcode/os2utl/liar3.ico
rename to src/microcode/os2utl/liar3.ico

diff --git a/v7/src/microcode/os2utl/makefile b/src/microcode/os2utl/makefile
similarity index 100%
rename from v7/src/microcode/os2utl/makefile
rename to src/microcode/os2utl/makefile

diff --git a/v7/src/microcode/os2utl/makefile.cmn b/src/microcode/os2utl/makefile.cmn
similarity index 100%
rename from v7/src/microcode/os2utl/makefile.cmn
rename to src/microcode/os2utl/makefile.cmn

diff --git a/v7/src/microcode/os2utl/makefile.emx b/src/microcode/os2utl/makefile.emx
similarity index 100%
rename from v7/src/microcode/os2utl/makefile.emx
rename to src/microcode/os2utl/makefile.emx

diff --git a/v7/src/microcode/os2utl/makefile.gcc b/src/microcode/os2utl/makefile.gcc
similarity index 100%
rename from v7/src/microcode/os2utl/makefile.gcc
rename to src/microcode/os2utl/makefile.gcc

diff --git a/v7/src/microcode/os2utl/makefile.vac b/src/microcode/os2utl/makefile.vac
similarity index 100%
rename from v7/src/microcode/os2utl/makefile.vac
rename to src/microcode/os2utl/makefile.vac

diff --git a/v7/src/microcode/os2utl/makefile.wcc b/src/microcode/os2utl/makefile.wcc
similarity index 100%
rename from v7/src/microcode/os2utl/makefile.wcc
rename to src/microcode/os2utl/makefile.wcc

diff --git a/v7/src/microcode/os2utl/mincer.ico b/src/microcode/os2utl/mincer.ico
similarity index 100%
rename from v7/src/microcode/os2utl/mincer.ico
rename to src/microcode/os2utl/mincer.ico

diff --git a/v7/src/microcode/os2utl/mkos2pm.scm b/src/microcode/os2utl/mkos2pm.scm
similarity index 100%
rename from v7/src/microcode/os2utl/mkos2pm.scm
rename to src/microcode/os2utl/mkos2pm.scm

diff --git a/v7/src/microcode/os2utl/shield1.ico b/src/microcode/os2utl/shield1.ico
similarity index 100%
rename from v7/src/microcode/os2utl/shield1.ico
rename to src/microcode/os2utl/shield1.ico

diff --git a/v7/src/microcode/os2utl/shield2.ico b/src/microcode/os2utl/shield2.ico
similarity index 100%
rename from v7/src/microcode/os2utl/shield2.ico
rename to src/microcode/os2utl/shield2.ico

diff --git a/v7/src/microcode/os2utl/shield3.ico b/src/microcode/os2utl/shield3.ico
similarity index 100%
rename from v7/src/microcode/os2utl/shield3.ico
rename to src/microcode/os2utl/shield3.ico

diff --git a/v7/src/microcode/os2utl/shield4.ico b/src/microcode/os2utl/shield4.ico
similarity index 100%
rename from v7/src/microcode/os2utl/shield4.ico
rename to src/microcode/os2utl/shield4.ico

diff --git a/v7/src/microcode/os2xcpt.c b/src/microcode/os2xcpt.c
similarity index 100%
rename from v7/src/microcode/os2xcpt.c
rename to src/microcode/os2xcpt.c

diff --git a/v7/src/microcode/osctty.h b/src/microcode/osctty.h
similarity index 100%
rename from v7/src/microcode/osctty.h
rename to src/microcode/osctty.h

diff --git a/v7/src/microcode/osenv.h b/src/microcode/osenv.h
similarity index 100%
rename from v7/src/microcode/osenv.h
rename to src/microcode/osenv.h

diff --git a/v7/src/microcode/osfile.h b/src/microcode/osfile.h
similarity index 100%
rename from v7/src/microcode/osfile.h
rename to src/microcode/osfile.h

diff --git a/v7/src/microcode/osfs.h b/src/microcode/osfs.h
similarity index 100%
rename from v7/src/microcode/osfs.h
rename to src/microcode/osfs.h

diff --git a/v7/src/microcode/osio.h b/src/microcode/osio.h
similarity index 100%
rename from v7/src/microcode/osio.h
rename to src/microcode/osio.h

diff --git a/v7/src/microcode/osproc.h b/src/microcode/osproc.h
similarity index 100%
rename from v7/src/microcode/osproc.h
rename to src/microcode/osproc.h

diff --git a/v7/src/microcode/ospty.h b/src/microcode/ospty.h
similarity index 100%
rename from v7/src/microcode/ospty.h
rename to src/microcode/ospty.h

diff --git a/v7/src/microcode/osscheme.c b/src/microcode/osscheme.c
similarity index 100%
rename from v7/src/microcode/osscheme.c
rename to src/microcode/osscheme.c

diff --git a/v7/src/microcode/osscheme.h b/src/microcode/osscheme.h
similarity index 100%
rename from v7/src/microcode/osscheme.h
rename to src/microcode/osscheme.h

diff --git a/v7/src/microcode/ossig.h b/src/microcode/ossig.h
similarity index 100%
rename from v7/src/microcode/ossig.h
rename to src/microcode/ossig.h

diff --git a/v7/src/microcode/osterm.h b/src/microcode/osterm.h
similarity index 100%
rename from v7/src/microcode/osterm.h
rename to src/microcode/osterm.h

diff --git a/v7/src/microcode/ostop.h b/src/microcode/ostop.h
similarity index 100%
rename from v7/src/microcode/ostop.h
rename to src/microcode/ostop.h

diff --git a/v7/src/microcode/ostty.c b/src/microcode/ostty.c
similarity index 100%
rename from v7/src/microcode/ostty.c
rename to src/microcode/ostty.c

diff --git a/v7/src/microcode/ostty.h b/src/microcode/ostty.h
similarity index 100%
rename from v7/src/microcode/ostty.h
rename to src/microcode/ostty.h

diff --git a/v7/src/microcode/outf.c b/src/microcode/outf.c
similarity index 100%
rename from v7/src/microcode/outf.c
rename to src/microcode/outf.c

diff --git a/v7/src/microcode/outf.h b/src/microcode/outf.h
similarity index 100%
rename from v7/src/microcode/outf.h
rename to src/microcode/outf.h

diff --git a/v7/src/microcode/prbfish.c b/src/microcode/prbfish.c
similarity index 100%
rename from v7/src/microcode/prbfish.c
rename to src/microcode/prbfish.c

diff --git a/v7/src/microcode/prdb4.c b/src/microcode/prdb4.c
similarity index 100%
rename from v7/src/microcode/prdb4.c
rename to src/microcode/prdb4.c

diff --git a/v7/src/microcode/prdb4.scm b/src/microcode/prdb4.scm
similarity index 100%
rename from v7/src/microcode/prdb4.scm
rename to src/microcode/prdb4.scm

diff --git a/v7/src/microcode/prename.h b/src/microcode/prename.h
similarity index 100%
rename from v7/src/microcode/prename.h
rename to src/microcode/prename.h

diff --git a/v7/src/microcode/prgdbm.c b/src/microcode/prgdbm.c
similarity index 100%
rename from v7/src/microcode/prgdbm.c
rename to src/microcode/prgdbm.c

diff --git a/v7/src/microcode/prim.c b/src/microcode/prim.c
similarity index 100%
rename from v7/src/microcode/prim.c
rename to src/microcode/prim.c

diff --git a/v7/src/microcode/prim.h b/src/microcode/prim.h
similarity index 100%
rename from v7/src/microcode/prim.h
rename to src/microcode/prim.h

diff --git a/v7/src/microcode/prims.h b/src/microcode/prims.h
similarity index 100%
rename from v7/src/microcode/prims.h
rename to src/microcode/prims.h

diff --git a/v7/src/microcode/primutl.c b/src/microcode/primutl.c
similarity index 100%
rename from v7/src/microcode/primutl.c
rename to src/microcode/primutl.c

diff --git a/v7/src/microcode/prmcrypt.c b/src/microcode/prmcrypt.c
similarity index 100%
rename from v7/src/microcode/prmcrypt.c
rename to src/microcode/prmcrypt.c

diff --git a/v7/src/microcode/prmd5.c b/src/microcode/prmd5.c
similarity index 100%
rename from v7/src/microcode/prmd5.c
rename to src/microcode/prmd5.c

diff --git a/v7/src/microcode/prmhash.c b/src/microcode/prmhash.c
similarity index 100%
rename from v7/src/microcode/prmhash.c
rename to src/microcode/prmhash.c

diff --git a/v7/src/microcode/prntenv.c b/src/microcode/prntenv.c
similarity index 100%
rename from v7/src/microcode/prntenv.c
rename to src/microcode/prntenv.c

diff --git a/v7/src/microcode/prntfs.c b/src/microcode/prntfs.c
similarity index 100%
rename from v7/src/microcode/prntfs.c
rename to src/microcode/prntfs.c

diff --git a/v7/src/microcode/prntio.c b/src/microcode/prntio.c
similarity index 100%
rename from v7/src/microcode/prntio.c
rename to src/microcode/prntio.c

diff --git a/v7/src/microcode/pros2fs.c b/src/microcode/pros2fs.c
similarity index 100%
rename from v7/src/microcode/pros2fs.c
rename to src/microcode/pros2fs.c

diff --git a/v7/src/microcode/pros2io.c b/src/microcode/pros2io.c
similarity index 100%
rename from v7/src/microcode/pros2io.c
rename to src/microcode/pros2io.c

diff --git a/v7/src/microcode/pros2pm.c b/src/microcode/pros2pm.c
similarity index 100%
rename from v7/src/microcode/pros2pm.c
rename to src/microcode/pros2pm.c

diff --git a/v7/src/microcode/prosenv.c b/src/microcode/prosenv.c
similarity index 100%
rename from v7/src/microcode/prosenv.c
rename to src/microcode/prosenv.c

diff --git a/v7/src/microcode/prosfile.c b/src/microcode/prosfile.c
similarity index 100%
rename from v7/src/microcode/prosfile.c
rename to src/microcode/prosfile.c

diff --git a/v7/src/microcode/prosfs.c b/src/microcode/prosfs.c
similarity index 100%
rename from v7/src/microcode/prosfs.c
rename to src/microcode/prosfs.c

diff --git a/v7/src/microcode/prosio.c b/src/microcode/prosio.c
similarity index 100%
rename from v7/src/microcode/prosio.c
rename to src/microcode/prosio.c

diff --git a/v7/src/microcode/prosproc.c b/src/microcode/prosproc.c
similarity index 100%
rename from v7/src/microcode/prosproc.c
rename to src/microcode/prosproc.c

diff --git a/v7/src/microcode/prospty.c b/src/microcode/prospty.c
similarity index 100%
rename from v7/src/microcode/prospty.c
rename to src/microcode/prospty.c

diff --git a/v7/src/microcode/prosterm.c b/src/microcode/prosterm.c
similarity index 100%
rename from v7/src/microcode/prosterm.c
rename to src/microcode/prosterm.c

diff --git a/v7/src/microcode/prostty.c b/src/microcode/prostty.c
similarity index 100%
rename from v7/src/microcode/prostty.c
rename to src/microcode/prostty.c

diff --git a/v7/src/microcode/prpgsql.c b/src/microcode/prpgsql.c
similarity index 100%
rename from v7/src/microcode/prpgsql.c
rename to src/microcode/prpgsql.c

diff --git a/v7/src/microcode/pruxdld.c b/src/microcode/pruxdld.c
similarity index 100%
rename from v7/src/microcode/pruxdld.c
rename to src/microcode/pruxdld.c

diff --git a/v7/src/microcode/pruxenv.c b/src/microcode/pruxenv.c
similarity index 100%
rename from v7/src/microcode/pruxenv.c
rename to src/microcode/pruxenv.c

diff --git a/v7/src/microcode/pruxfs.c b/src/microcode/pruxfs.c
similarity index 100%
rename from v7/src/microcode/pruxfs.c
rename to src/microcode/pruxfs.c

diff --git a/v7/src/microcode/pruxio.c b/src/microcode/pruxio.c
similarity index 100%
rename from v7/src/microcode/pruxio.c
rename to src/microcode/pruxio.c

diff --git a/v7/src/microcode/pruxsock.c b/src/microcode/pruxsock.c
similarity index 100%
rename from v7/src/microcode/pruxsock.c
rename to src/microcode/pruxsock.c

diff --git a/v7/src/microcode/ptrvec.c b/src/microcode/ptrvec.c
similarity index 100%
rename from v7/src/microcode/ptrvec.c
rename to src/microcode/ptrvec.c

diff --git a/v7/src/microcode/purify.c b/src/microcode/purify.c
similarity index 100%
rename from v7/src/microcode/purify.c
rename to src/microcode/purify.c

diff --git a/v7/src/microcode/purutl.c b/src/microcode/purutl.c
similarity index 100%
rename from v7/src/microcode/purutl.c
rename to src/microcode/purutl.c

diff --git a/v7/src/microcode/regex.c b/src/microcode/regex.c
similarity index 100%
rename from v7/src/microcode/regex.c
rename to src/microcode/regex.c

diff --git a/v7/src/microcode/regex.h b/src/microcode/regex.h
similarity index 100%
rename from v7/src/microcode/regex.h
rename to src/microcode/regex.h

diff --git a/v7/src/microcode/returns.h b/src/microcode/returns.h
similarity index 100%
rename from v7/src/microcode/returns.h
rename to src/microcode/returns.h

diff --git a/v7/src/microcode/rgxprim.c b/src/microcode/rgxprim.c
similarity index 100%
rename from v7/src/microcode/rgxprim.c
rename to src/microcode/rgxprim.c

diff --git a/v7/src/microcode/sample.c b/src/microcode/sample.c
similarity index 100%
rename from v7/src/microcode/sample.c
rename to src/microcode/sample.c

diff --git a/v7/src/microcode/scheme.h b/src/microcode/scheme.h
similarity index 100%
rename from v7/src/microcode/scheme.h
rename to src/microcode/scheme.h

diff --git a/v7/src/microcode/scode.h b/src/microcode/scode.h
similarity index 100%
rename from v7/src/microcode/scode.h
rename to src/microcode/scode.h

diff --git a/v7/src/microcode/sdata.h b/src/microcode/sdata.h
similarity index 100%
rename from v7/src/microcode/sdata.h
rename to src/microcode/sdata.h

diff --git a/v7/src/microcode/stack.h b/src/microcode/stack.h
similarity index 100%
rename from v7/src/microcode/stack.h
rename to src/microcode/stack.h

diff --git a/v7/src/microcode/stackops.h b/src/microcode/stackops.h
similarity index 100%
rename from v7/src/microcode/stackops.h
rename to src/microcode/stackops.h

diff --git a/v7/src/microcode/step.c b/src/microcode/step.c
similarity index 100%
rename from v7/src/microcode/step.c
rename to src/microcode/step.c

diff --git a/v7/src/microcode/storage.c b/src/microcode/storage.c
similarity index 100%
rename from v7/src/microcode/storage.c
rename to src/microcode/storage.c

diff --git a/v7/src/microcode/string.c b/src/microcode/string.c
similarity index 100%
rename from v7/src/microcode/string.c
rename to src/microcode/string.c

diff --git a/v7/src/microcode/svm1-defns.h b/src/microcode/svm1-defns.h
similarity index 100%
rename from v7/src/microcode/svm1-defns.h
rename to src/microcode/svm1-defns.h

diff --git a/v7/src/microcode/svm1-interp.c b/src/microcode/svm1-interp.c
similarity index 100%
rename from v7/src/microcode/svm1-interp.c
rename to src/microcode/svm1-interp.c

diff --git a/v7/src/microcode/syntax.c b/src/microcode/syntax.c
similarity index 100%
rename from v7/src/microcode/syntax.c
rename to src/microcode/syntax.c

diff --git a/v7/src/microcode/syntax.h b/src/microcode/syntax.h
similarity index 100%
rename from v7/src/microcode/syntax.h
rename to src/microcode/syntax.h

diff --git a/v7/src/microcode/syscall.h b/src/microcode/syscall.h
similarity index 100%
rename from v7/src/microcode/syscall.h
rename to src/microcode/syscall.h

diff --git a/v7/src/microcode/sysprim.c b/src/microcode/sysprim.c
similarity index 100%
rename from v7/src/microcode/sysprim.c
rename to src/microcode/sysprim.c

diff --git a/v7/src/microcode/term.c b/src/microcode/term.c
similarity index 100%
rename from v7/src/microcode/term.c
rename to src/microcode/term.c

diff --git a/v7/src/microcode/termcap.c b/src/microcode/termcap.c
similarity index 100%
rename from v7/src/microcode/termcap.c
rename to src/microcode/termcap.c

diff --git a/v7/src/microcode/terminfo.c b/src/microcode/terminfo.c
similarity index 100%
rename from v7/src/microcode/terminfo.c
rename to src/microcode/terminfo.c

diff --git a/v7/src/microcode/tparam.c b/src/microcode/tparam.c
similarity index 100%
rename from v7/src/microcode/tparam.c
rename to src/microcode/tparam.c

diff --git a/v7/src/microcode/transact.c b/src/microcode/transact.c
similarity index 100%
rename from v7/src/microcode/transact.c
rename to src/microcode/transact.c

diff --git a/v7/src/microcode/trap.h b/src/microcode/trap.h
similarity index 100%
rename from v7/src/microcode/trap.h
rename to src/microcode/trap.h

diff --git a/v7/src/microcode/tterm.c b/src/microcode/tterm.c
similarity index 100%
rename from v7/src/microcode/tterm.c
rename to src/microcode/tterm.c

diff --git a/v7/src/microcode/typename.txt b/src/microcode/typename.txt
similarity index 100%
rename from v7/src/microcode/typename.txt
rename to src/microcode/typename.txt

diff --git a/v7/src/microcode/types.h b/src/microcode/types.h
similarity index 100%
rename from v7/src/microcode/types.h
rename to src/microcode/types.h

diff --git a/v7/src/microcode/unstackify.c b/src/microcode/unstackify.c
similarity index 100%
rename from v7/src/microcode/unstackify.c
rename to src/microcode/unstackify.c

diff --git a/v7/src/microcode/usrdef.h b/src/microcode/usrdef.h
similarity index 100%
rename from v7/src/microcode/usrdef.h
rename to src/microcode/usrdef.h

diff --git a/v7/src/microcode/utabmd.scm b/src/microcode/utabmd.scm
similarity index 100%
rename from v7/src/microcode/utabmd.scm
rename to src/microcode/utabmd.scm

diff --git a/v7/src/microcode/utabmd.sh b/src/microcode/utabmd.sh
similarity index 100%
rename from v7/src/microcode/utabmd.sh
rename to src/microcode/utabmd.sh

diff --git a/v7/src/microcode/utils.c b/src/microcode/utils.c
similarity index 100%
rename from v7/src/microcode/utils.c
rename to src/microcode/utils.c

diff --git a/v7/src/microcode/ux.c b/src/microcode/ux.c
similarity index 100%
rename from v7/src/microcode/ux.c
rename to src/microcode/ux.c

diff --git a/v7/src/microcode/ux.h b/src/microcode/ux.h
similarity index 100%
rename from v7/src/microcode/ux.h
rename to src/microcode/ux.h

diff --git a/v7/src/microcode/uxctty.c b/src/microcode/uxctty.c
similarity index 100%
rename from v7/src/microcode/uxctty.c
rename to src/microcode/uxctty.c

diff --git a/v7/src/microcode/uxenv.c b/src/microcode/uxenv.c
similarity index 100%
rename from v7/src/microcode/uxenv.c
rename to src/microcode/uxenv.c

diff --git a/v7/src/microcode/uxfile.c b/src/microcode/uxfile.c
similarity index 100%
rename from v7/src/microcode/uxfile.c
rename to src/microcode/uxfile.c

diff --git a/v7/src/microcode/uxfs.c b/src/microcode/uxfs.c
similarity index 100%
rename from v7/src/microcode/uxfs.c
rename to src/microcode/uxfs.c

diff --git a/v7/src/microcode/uxio.c b/src/microcode/uxio.c
similarity index 100%
rename from v7/src/microcode/uxio.c
rename to src/microcode/uxio.c

diff --git a/v7/src/microcode/uxio.h b/src/microcode/uxio.h
similarity index 100%
rename from v7/src/microcode/uxio.h
rename to src/microcode/uxio.h

diff --git a/v7/src/microcode/uxproc.c b/src/microcode/uxproc.c
similarity index 100%
rename from v7/src/microcode/uxproc.c
rename to src/microcode/uxproc.c

diff --git a/v7/src/microcode/uxproc.h b/src/microcode/uxproc.h
similarity index 100%
rename from v7/src/microcode/uxproc.h
rename to src/microcode/uxproc.h

diff --git a/v7/src/microcode/uxselect.h b/src/microcode/uxselect.h
similarity index 100%
rename from v7/src/microcode/uxselect.h
rename to src/microcode/uxselect.h

diff --git a/v7/src/microcode/uxsig.c b/src/microcode/uxsig.c
similarity index 100%
rename from v7/src/microcode/uxsig.c
rename to src/microcode/uxsig.c

diff --git a/v7/src/microcode/uxsig.h b/src/microcode/uxsig.h
similarity index 100%
rename from v7/src/microcode/uxsig.h
rename to src/microcode/uxsig.h

diff --git a/v7/src/microcode/uxsock.c b/src/microcode/uxsock.c
similarity index 100%
rename from v7/src/microcode/uxsock.c
rename to src/microcode/uxsock.c

diff --git a/v7/src/microcode/uxsock.h b/src/microcode/uxsock.h
similarity index 100%
rename from v7/src/microcode/uxsock.h
rename to src/microcode/uxsock.h

diff --git a/v7/src/microcode/uxterm.c b/src/microcode/uxterm.c
similarity index 100%
rename from v7/src/microcode/uxterm.c
rename to src/microcode/uxterm.c

diff --git a/v7/src/microcode/uxterm.h b/src/microcode/uxterm.h
similarity index 100%
rename from v7/src/microcode/uxterm.h
rename to src/microcode/uxterm.h

diff --git a/v7/src/microcode/uxtop.c b/src/microcode/uxtop.c
similarity index 100%
rename from v7/src/microcode/uxtop.c
rename to src/microcode/uxtop.c

diff --git a/v7/src/microcode/uxtop.h b/src/microcode/uxtop.h
similarity index 100%
rename from v7/src/microcode/uxtop.h
rename to src/microcode/uxtop.h

diff --git a/v7/src/microcode/uxtrap.c b/src/microcode/uxtrap.c
similarity index 100%
rename from v7/src/microcode/uxtrap.c
rename to src/microcode/uxtrap.c

diff --git a/v7/src/microcode/uxtrap.h b/src/microcode/uxtrap.h
similarity index 100%
rename from v7/src/microcode/uxtrap.h
rename to src/microcode/uxtrap.h

diff --git a/v7/src/microcode/uxtty.c b/src/microcode/uxtty.c
similarity index 100%
rename from v7/src/microcode/uxtty.c
rename to src/microcode/uxtty.c

diff --git a/v7/src/microcode/uxutil.c b/src/microcode/uxutil.c
similarity index 100%
rename from v7/src/microcode/uxutil.c
rename to src/microcode/uxutil.c

diff --git a/v7/src/microcode/uxutil.h b/src/microcode/uxutil.h
similarity index 100%
rename from v7/src/microcode/uxutil.h
rename to src/microcode/uxutil.h

diff --git a/v7/src/microcode/vector.c b/src/microcode/vector.c
similarity index 100%
rename from v7/src/microcode/vector.c
rename to src/microcode/vector.c

diff --git a/v7/src/microcode/wind.c b/src/microcode/wind.c
similarity index 100%
rename from v7/src/microcode/wind.c
rename to src/microcode/wind.c

diff --git a/v7/src/microcode/winder.h b/src/microcode/winder.h
similarity index 100%
rename from v7/src/microcode/winder.h
rename to src/microcode/winder.h

diff --git a/v7/src/microcode/x11.h b/src/microcode/x11.h
similarity index 100%
rename from v7/src/microcode/x11.h
rename to src/microcode/x11.h

diff --git a/v7/src/microcode/x11base.c b/src/microcode/x11base.c
similarity index 100%
rename from v7/src/microcode/x11base.c
rename to src/microcode/x11base.c

diff --git a/v7/src/microcode/x11color.c b/src/microcode/x11color.c
similarity index 100%
rename from v7/src/microcode/x11color.c
rename to src/microcode/x11color.c

diff --git a/v7/src/microcode/x11graph.c b/src/microcode/x11graph.c
similarity index 100%
rename from v7/src/microcode/x11graph.c
rename to src/microcode/x11graph.c

diff --git a/v7/src/microcode/x11term.c b/src/microcode/x11term.c
similarity index 100%
rename from v7/src/microcode/x11term.c
rename to src/microcode/x11term.c

diff --git a/v7/src/microcode/xdebug.c b/src/microcode/xdebug.c
similarity index 100%
rename from v7/src/microcode/xdebug.c
rename to src/microcode/xdebug.c

diff --git a/v7/src/mkinstalldirs b/src/mkinstalldirs
similarity index 100%
rename from v7/src/mkinstalldirs
rename to src/mkinstalldirs

diff --git a/v7/src/pcsample/Makefile b/src/pcsample/Makefile
similarity index 100%
rename from v7/src/pcsample/Makefile
rename to src/pcsample/Makefile

diff --git a/v7/src/pcsample/load.scm b/src/pcsample/load.scm
similarity index 100%
rename from v7/src/pcsample/load.scm
rename to src/pcsample/load.scm

diff --git a/v7/src/pcsample/pcs.cbf b/src/pcsample/pcs.cbf
similarity index 100%
rename from v7/src/pcsample/pcs.cbf
rename to src/pcsample/pcs.cbf

diff --git a/v7/src/pcsample/pcs.pkg b/src/pcsample/pcs.pkg
similarity index 100%
rename from v7/src/pcsample/pcs.pkg
rename to src/pcsample/pcs.pkg

diff --git a/v7/src/pcsample/pcs.sf b/src/pcsample/pcs.sf
similarity index 100%
rename from v7/src/pcsample/pcs.sf
rename to src/pcsample/pcs.sf

diff --git a/v7/src/pcsample/pcsample.c b/src/pcsample/pcsample.c
similarity index 100%
rename from v7/src/pcsample/pcsample.c
rename to src/pcsample/pcsample.c

diff --git a/v7/src/pcsample/pcsample.scm b/src/pcsample/pcsample.scm
similarity index 100%
rename from v7/src/pcsample/pcsample.scm
rename to src/pcsample/pcsample.scm

diff --git a/v7/src/pcsample/pcsboot.scm b/src/pcsample/pcsboot.scm
similarity index 100%
rename from v7/src/pcsample/pcsboot.scm
rename to src/pcsample/pcsboot.scm

diff --git a/v7/src/pcsample/pcscobl.c b/src/pcsample/pcscobl.c
similarity index 100%
rename from v7/src/pcsample/pcscobl.c
rename to src/pcsample/pcscobl.c

diff --git a/v7/src/pcsample/pcscobl.scm b/src/pcsample/pcscobl.scm
similarity index 100%
rename from v7/src/pcsample/pcscobl.scm
rename to src/pcsample/pcscobl.scm

diff --git a/v7/src/pcsample/pcsdisp.scm b/src/pcsample/pcsdisp.scm
similarity index 100%
rename from v7/src/pcsample/pcsdisp.scm
rename to src/pcsample/pcsdisp.scm

diff --git a/v7/src/pcsample/pcsdld.c b/src/pcsample/pcsdld.c
similarity index 100%
rename from v7/src/pcsample/pcsdld.c
rename to src/pcsample/pcsdld.c

diff --git a/v7/src/pcsample/pcsintrp.scm b/src/pcsample/pcsintrp.scm
similarity index 100%
rename from v7/src/pcsample/pcsintrp.scm
rename to src/pcsample/pcsintrp.scm

diff --git a/v7/src/pcsample/pcsiproc.c b/src/pcsample/pcsiproc.c
similarity index 100%
rename from v7/src/pcsample/pcsiproc.c
rename to src/pcsample/pcsiproc.c

diff --git a/v7/src/pcsample/pcsiproc.scm b/src/pcsample/pcsiproc.scm
similarity index 100%
rename from v7/src/pcsample/pcsiproc.scm
rename to src/pcsample/pcsiproc.scm

diff --git a/v7/src/pcsample/pribinut.scm b/src/pcsample/pribinut.scm
similarity index 100%
rename from v7/src/pcsample/pribinut.scm
rename to src/pcsample/pribinut.scm

diff --git a/v7/src/pcsample/zones.scm b/src/pcsample/zones.scm
similarity index 100%
rename from v7/src/pcsample/zones.scm
rename to src/pcsample/zones.scm

diff --git a/v7/src/rcs/compile.scm b/src/rcs/compile.scm
similarity index 100%
rename from v7/src/rcs/compile.scm
rename to src/rcs/compile.scm

diff --git a/v7/src/rcs/format.scm b/src/rcs/format.scm
similarity index 100%
rename from v7/src/rcs/format.scm
rename to src/rcs/format.scm

diff --git a/v7/src/rcs/load.scm b/src/rcs/load.scm
similarity index 100%
rename from v7/src/rcs/load.scm
rename to src/rcs/load.scm

diff --git a/v7/src/rcs/logmer.scm b/src/rcs/logmer.scm
similarity index 100%
rename from v7/src/rcs/logmer.scm
rename to src/rcs/logmer.scm

diff --git a/v7/src/rcs/mklogs.scm b/src/rcs/mklogs.scm
similarity index 100%
rename from v7/src/rcs/mklogs.scm
rename to src/rcs/mklogs.scm

diff --git a/v7/src/rcs/nparse.scm b/src/rcs/nparse.scm
similarity index 100%
rename from v7/src/rcs/nparse.scm
rename to src/rcs/nparse.scm

diff --git a/v7/src/rcs/object.scm b/src/rcs/object.scm
similarity index 100%
rename from v7/src/rcs/object.scm
rename to src/rcs/object.scm

diff --git a/v7/src/rcs/rcs.pkg b/src/rcs/rcs.pkg
similarity index 100%
rename from v7/src/rcs/rcs.pkg
rename to src/rcs/rcs.pkg

diff --git a/v7/src/rcs/scheme.scm b/src/rcs/scheme.scm
similarity index 100%
rename from v7/src/rcs/scheme.scm
rename to src/rcs/scheme.scm

diff --git a/v7/src/runtime-check/Clean.sh b/src/runtime-check/Clean.sh
similarity index 100%
rename from v7/src/runtime-check/Clean.sh
rename to src/runtime-check/Clean.sh

diff --git a/v7/src/runtime-check/Setup.sh b/src/runtime-check/Setup.sh
similarity index 100%
rename from v7/src/runtime-check/Setup.sh
rename to src/runtime-check/Setup.sh

diff --git a/v7/src/runtime-check/runtime.cbf b/src/runtime-check/runtime.cbf
similarity index 100%
rename from v7/src/runtime-check/runtime.cbf
rename to src/runtime-check/runtime.cbf

diff --git a/v7/src/runtime/Makefile-fragment b/src/runtime/Makefile-fragment
similarity index 100%
rename from v7/src/runtime/Makefile-fragment
rename to src/runtime/Makefile-fragment

diff --git a/v7/src/runtime/advice.scm b/src/runtime/advice.scm
similarity index 100%
rename from v7/src/runtime/advice.scm
rename to src/runtime/advice.scm

diff --git a/v7/src/runtime/apply.scm b/src/runtime/apply.scm
similarity index 100%
rename from v7/src/runtime/apply.scm
rename to src/runtime/apply.scm

diff --git a/v7/src/runtime/apropos.scm b/src/runtime/apropos.scm
similarity index 100%
rename from v7/src/runtime/apropos.scm
rename to src/runtime/apropos.scm

diff --git a/v7/src/runtime/arith.scm b/src/runtime/arith.scm
similarity index 100%
rename from v7/src/runtime/arith.scm
rename to src/runtime/arith.scm

diff --git a/v7/src/runtime/berkeley-db.scm b/src/runtime/berkeley-db.scm
similarity index 100%
rename from v7/src/runtime/berkeley-db.scm
rename to src/runtime/berkeley-db.scm

diff --git a/v7/src/runtime/bitstr.scm b/src/runtime/bitstr.scm
similarity index 100%
rename from v7/src/runtime/bitstr.scm
rename to src/runtime/bitstr.scm

diff --git a/v7/src/runtime/blowfish.scm b/src/runtime/blowfish.scm
similarity index 100%
rename from v7/src/runtime/blowfish.scm
rename to src/runtime/blowfish.scm

diff --git a/v7/src/runtime/boole.scm b/src/runtime/boole.scm
similarity index 100%
rename from v7/src/runtime/boole.scm
rename to src/runtime/boole.scm

diff --git a/v7/src/runtime/boot.scm b/src/runtime/boot.scm
similarity index 100%
rename from v7/src/runtime/boot.scm
rename to src/runtime/boot.scm

diff --git a/v7/src/runtime/char.scm b/src/runtime/char.scm
similarity index 100%
rename from v7/src/runtime/char.scm
rename to src/runtime/char.scm

diff --git a/v7/src/runtime/chrset.scm b/src/runtime/chrset.scm
similarity index 100%
rename from v7/src/runtime/chrset.scm
rename to src/runtime/chrset.scm

diff --git a/v7/src/runtime/chrsyn.scm b/src/runtime/chrsyn.scm
similarity index 100%
rename from v7/src/runtime/chrsyn.scm
rename to src/runtime/chrsyn.scm

diff --git a/v7/src/runtime/codwlk.scm b/src/runtime/codwlk.scm
similarity index 100%
rename from v7/src/runtime/codwlk.scm
rename to src/runtime/codwlk.scm

diff --git a/v7/src/runtime/conpar.scm b/src/runtime/conpar.scm
similarity index 100%
rename from v7/src/runtime/conpar.scm
rename to src/runtime/conpar.scm

diff --git a/v7/src/runtime/contin.scm b/src/runtime/contin.scm
similarity index 100%
rename from v7/src/runtime/contin.scm
rename to src/runtime/contin.scm

diff --git a/v7/src/runtime/cpoint.scm b/src/runtime/cpoint.scm
similarity index 100%
rename from v7/src/runtime/cpoint.scm
rename to src/runtime/cpoint.scm

diff --git a/v7/src/runtime/cpress.scm b/src/runtime/cpress.scm
similarity index 100%
rename from v7/src/runtime/cpress.scm
rename to src/runtime/cpress.scm

diff --git a/v7/src/runtime/crypto.scm b/src/runtime/crypto.scm
similarity index 100%
rename from v7/src/runtime/crypto.scm
rename to src/runtime/crypto.scm

diff --git a/v7/src/runtime/datime.scm b/src/runtime/datime.scm
similarity index 100%
rename from v7/src/runtime/datime.scm
rename to src/runtime/datime.scm

diff --git a/v7/src/runtime/dbgcmd.scm b/src/runtime/dbgcmd.scm
similarity index 100%
rename from v7/src/runtime/dbgcmd.scm
rename to src/runtime/dbgcmd.scm

diff --git a/v7/src/runtime/dbgutl.scm b/src/runtime/dbgutl.scm
similarity index 100%
rename from v7/src/runtime/dbgutl.scm
rename to src/runtime/dbgutl.scm

diff --git a/v7/src/runtime/debug.scm b/src/runtime/debug.scm
similarity index 100%
rename from v7/src/runtime/debug.scm
rename to src/runtime/debug.scm

diff --git a/v7/src/runtime/defstr.scm b/src/runtime/defstr.scm
similarity index 100%
rename from v7/src/runtime/defstr.scm
rename to src/runtime/defstr.scm

diff --git a/v7/src/runtime/dosdir.scm b/src/runtime/dosdir.scm
similarity index 100%
rename from v7/src/runtime/dosdir.scm
rename to src/runtime/dosdir.scm

diff --git a/v7/src/runtime/dosprm.scm b/src/runtime/dosprm.scm
similarity index 100%
rename from v7/src/runtime/dosprm.scm
rename to src/runtime/dosprm.scm

diff --git a/v7/src/runtime/dosproc.scm b/src/runtime/dosproc.scm
similarity index 100%
rename from v7/src/runtime/dosproc.scm
rename to src/runtime/dosproc.scm

diff --git a/v7/src/runtime/dospth.scm b/src/runtime/dospth.scm
similarity index 100%
rename from v7/src/runtime/dospth.scm
rename to src/runtime/dospth.scm

diff --git a/v7/src/runtime/dragon4.scm b/src/runtime/dragon4.scm
similarity index 100%
rename from v7/src/runtime/dragon4.scm
rename to src/runtime/dragon4.scm

diff --git a/v7/src/runtime/ed-ffi.scm b/src/runtime/ed-ffi.scm
similarity index 100%
rename from v7/src/runtime/ed-ffi.scm
rename to src/runtime/ed-ffi.scm

diff --git a/v7/src/runtime/emacs.scm b/src/runtime/emacs.scm
similarity index 100%
rename from v7/src/runtime/emacs.scm
rename to src/runtime/emacs.scm

diff --git a/v7/src/runtime/equals.scm b/src/runtime/equals.scm
similarity index 100%
rename from v7/src/runtime/equals.scm
rename to src/runtime/equals.scm

diff --git a/v7/src/runtime/error.scm b/src/runtime/error.scm
similarity index 100%
rename from v7/src/runtime/error.scm
rename to src/runtime/error.scm

diff --git a/v7/src/runtime/events.scm b/src/runtime/events.scm
similarity index 100%
rename from v7/src/runtime/events.scm
rename to src/runtime/events.scm

diff --git a/v7/src/runtime/fileio.scm b/src/runtime/fileio.scm
similarity index 100%
rename from v7/src/runtime/fileio.scm
rename to src/runtime/fileio.scm

diff --git a/v7/src/runtime/fixart.scm b/src/runtime/fixart.scm
similarity index 100%
rename from v7/src/runtime/fixart.scm
rename to src/runtime/fixart.scm

diff --git a/v7/src/runtime/format.scm b/src/runtime/format.scm
similarity index 100%
rename from v7/src/runtime/format.scm
rename to src/runtime/format.scm

diff --git a/v7/src/runtime/framex.scm b/src/runtime/framex.scm
similarity index 100%
rename from v7/src/runtime/framex.scm
rename to src/runtime/framex.scm

diff --git a/v7/src/runtime/gc.scm b/src/runtime/gc.scm
similarity index 100%
rename from v7/src/runtime/gc.scm
rename to src/runtime/gc.scm

diff --git a/v7/src/runtime/gcdemn.scm b/src/runtime/gcdemn.scm
similarity index 100%
rename from v7/src/runtime/gcdemn.scm
rename to src/runtime/gcdemn.scm

diff --git a/v7/src/runtime/gcfinal.scm b/src/runtime/gcfinal.scm
similarity index 100%
rename from v7/src/runtime/gcfinal.scm
rename to src/runtime/gcfinal.scm

diff --git a/v7/src/runtime/gcnote.scm b/src/runtime/gcnote.scm
similarity index 100%
rename from v7/src/runtime/gcnote.scm
rename to src/runtime/gcnote.scm

diff --git a/v7/src/runtime/gcstat.scm b/src/runtime/gcstat.scm
similarity index 100%
rename from v7/src/runtime/gcstat.scm
rename to src/runtime/gcstat.scm

diff --git a/v7/src/runtime/gdatab.scm b/src/runtime/gdatab.scm
similarity index 100%
rename from v7/src/runtime/gdatab.scm
rename to src/runtime/gdatab.scm

diff --git a/v7/src/runtime/gdbm.scm b/src/runtime/gdbm.scm
similarity index 100%
rename from v7/src/runtime/gdbm.scm
rename to src/runtime/gdbm.scm

diff --git a/v7/src/runtime/gencache.scm b/src/runtime/gencache.scm
similarity index 100%
rename from v7/src/runtime/gencache.scm
rename to src/runtime/gencache.scm

diff --git a/v7/src/runtime/geneqht.scm b/src/runtime/geneqht.scm
similarity index 100%
rename from v7/src/runtime/geneqht.scm
rename to src/runtime/geneqht.scm

diff --git a/v7/src/runtime/generic.scm b/src/runtime/generic.scm
similarity index 100%
rename from v7/src/runtime/generic.scm
rename to src/runtime/generic.scm

diff --git a/v7/src/runtime/genio.scm b/src/runtime/genio.scm
similarity index 100%
rename from v7/src/runtime/genio.scm
rename to src/runtime/genio.scm

diff --git a/v7/src/runtime/genmult.scm b/src/runtime/genmult.scm
similarity index 100%
rename from v7/src/runtime/genmult.scm
rename to src/runtime/genmult.scm

diff --git a/v7/src/runtime/gensym.scm b/src/runtime/gensym.scm
similarity index 100%
rename from v7/src/runtime/gensym.scm
rename to src/runtime/gensym.scm

diff --git a/v7/src/runtime/gentag.scm b/src/runtime/gentag.scm
similarity index 100%
rename from v7/src/runtime/gentag.scm
rename to src/runtime/gentag.scm

diff --git a/v7/src/runtime/global.scm b/src/runtime/global.scm
similarity index 100%
rename from v7/src/runtime/global.scm
rename to src/runtime/global.scm

diff --git a/v7/src/runtime/graphics.scm b/src/runtime/graphics.scm
similarity index 100%
rename from v7/src/runtime/graphics.scm
rename to src/runtime/graphics.scm

diff --git a/v7/src/runtime/hash.scm b/src/runtime/hash.scm
similarity index 100%
rename from v7/src/runtime/hash.scm
rename to src/runtime/hash.scm

diff --git a/v7/src/runtime/hashtb.scm b/src/runtime/hashtb.scm
similarity index 100%
rename from v7/src/runtime/hashtb.scm
rename to src/runtime/hashtb.scm

diff --git a/v7/src/runtime/histry.scm b/src/runtime/histry.scm
similarity index 100%
rename from v7/src/runtime/histry.scm
rename to src/runtime/histry.scm

diff --git a/v7/src/runtime/html-form-codec.scm b/src/runtime/html-form-codec.scm
similarity index 100%
rename from v7/src/runtime/html-form-codec.scm
rename to src/runtime/html-form-codec.scm

diff --git a/v7/src/runtime/http-client.scm b/src/runtime/http-client.scm
similarity index 100%
rename from v7/src/runtime/http-client.scm
rename to src/runtime/http-client.scm

diff --git a/v7/src/runtime/http-syntax.scm b/src/runtime/http-syntax.scm
similarity index 100%
rename from v7/src/runtime/http-syntax.scm
rename to src/runtime/http-syntax.scm

diff --git a/v7/src/runtime/httpio.scm b/src/runtime/httpio.scm
similarity index 100%
rename from v7/src/runtime/httpio.scm
rename to src/runtime/httpio.scm

diff --git a/v7/src/runtime/infstr.scm b/src/runtime/infstr.scm
similarity index 100%
rename from v7/src/runtime/infstr.scm
rename to src/runtime/infstr.scm

diff --git a/v7/src/runtime/infutl.scm b/src/runtime/infutl.scm
similarity index 100%
rename from v7/src/runtime/infutl.scm
rename to src/runtime/infutl.scm

diff --git a/v7/src/runtime/input.scm b/src/runtime/input.scm
similarity index 100%
rename from v7/src/runtime/input.scm
rename to src/runtime/input.scm

diff --git a/v7/src/runtime/intrpt.scm b/src/runtime/intrpt.scm
similarity index 100%
rename from v7/src/runtime/intrpt.scm
rename to src/runtime/intrpt.scm

diff --git a/v7/src/runtime/io.scm b/src/runtime/io.scm
similarity index 100%
rename from v7/src/runtime/io.scm
rename to src/runtime/io.scm

diff --git a/v7/src/runtime/krypt.scm b/src/runtime/krypt.scm
similarity index 100%
rename from v7/src/runtime/krypt.scm
rename to src/runtime/krypt.scm

diff --git a/v7/src/runtime/kryptdum.scm b/src/runtime/kryptdum.scm
similarity index 100%
rename from v7/src/runtime/kryptdum.scm
rename to src/runtime/kryptdum.scm

diff --git a/v7/src/runtime/lambda.scm b/src/runtime/lambda.scm
similarity index 100%
rename from v7/src/runtime/lambda.scm
rename to src/runtime/lambda.scm

diff --git a/v7/src/runtime/lambdx.scm b/src/runtime/lambdx.scm
similarity index 100%
rename from v7/src/runtime/lambdx.scm
rename to src/runtime/lambdx.scm

diff --git a/v7/src/runtime/list.scm b/src/runtime/list.scm
similarity index 100%
rename from v7/src/runtime/list.scm
rename to src/runtime/list.scm

diff --git a/v7/src/runtime/load.scm b/src/runtime/load.scm
similarity index 100%
rename from v7/src/runtime/load.scm
rename to src/runtime/load.scm

diff --git a/v7/src/runtime/make.scm b/src/runtime/make.scm
similarity index 100%
rename from v7/src/runtime/make.scm
rename to src/runtime/make.scm

diff --git a/v7/src/runtime/mime-codec.scm b/src/runtime/mime-codec.scm
similarity index 100%
rename from v7/src/runtime/mime-codec.scm
rename to src/runtime/mime-codec.scm

diff --git a/v7/src/runtime/mit-syntax.scm b/src/runtime/mit-syntax.scm
similarity index 100%
rename from v7/src/runtime/mit-syntax.scm
rename to src/runtime/mit-syntax.scm

diff --git a/v7/src/runtime/msort.scm b/src/runtime/msort.scm
similarity index 100%
rename from v7/src/runtime/msort.scm
rename to src/runtime/msort.scm

diff --git a/v7/src/runtime/ntdir.scm b/src/runtime/ntdir.scm
similarity index 100%
rename from v7/src/runtime/ntdir.scm
rename to src/runtime/ntdir.scm

diff --git a/v7/src/runtime/ntprm.scm b/src/runtime/ntprm.scm
similarity index 100%
rename from v7/src/runtime/ntprm.scm
rename to src/runtime/ntprm.scm

diff --git a/v7/src/runtime/numint.scm b/src/runtime/numint.scm
similarity index 100%
rename from v7/src/runtime/numint.scm
rename to src/runtime/numint.scm

diff --git a/v7/src/runtime/numpar.scm b/src/runtime/numpar.scm
similarity index 100%
rename from v7/src/runtime/numpar.scm
rename to src/runtime/numpar.scm

diff --git a/v7/src/runtime/option.scm b/src/runtime/option.scm
similarity index 100%
rename from v7/src/runtime/option.scm
rename to src/runtime/option.scm

diff --git a/v7/src/runtime/optiondb.scm b/src/runtime/optiondb.scm
similarity index 100%
rename from v7/src/runtime/optiondb.scm
rename to src/runtime/optiondb.scm

diff --git a/v7/src/runtime/ordvec.scm b/src/runtime/ordvec.scm
similarity index 100%
rename from v7/src/runtime/ordvec.scm
rename to src/runtime/ordvec.scm

diff --git a/v7/src/runtime/os2ctype.scm b/src/runtime/os2ctype.scm
similarity index 100%
rename from v7/src/runtime/os2ctype.scm
rename to src/runtime/os2ctype.scm

diff --git a/v7/src/runtime/os2dir.scm b/src/runtime/os2dir.scm
similarity index 100%
rename from v7/src/runtime/os2dir.scm
rename to src/runtime/os2dir.scm

diff --git a/v7/src/runtime/os2graph.scm b/src/runtime/os2graph.scm
similarity index 100%
rename from v7/src/runtime/os2graph.scm
rename to src/runtime/os2graph.scm

diff --git a/v7/src/runtime/os2prm.scm b/src/runtime/os2prm.scm
similarity index 100%
rename from v7/src/runtime/os2prm.scm
rename to src/runtime/os2prm.scm

diff --git a/v7/src/runtime/os2winp.scm b/src/runtime/os2winp.scm
similarity index 100%
rename from v7/src/runtime/os2winp.scm
rename to src/runtime/os2winp.scm

diff --git a/v7/src/runtime/output.scm b/src/runtime/output.scm
similarity index 100%
rename from v7/src/runtime/output.scm
rename to src/runtime/output.scm

diff --git a/v7/src/runtime/packag.scm b/src/runtime/packag.scm
similarity index 100%
rename from v7/src/runtime/packag.scm
rename to src/runtime/packag.scm

diff --git a/v7/src/runtime/parse.scm b/src/runtime/parse.scm
similarity index 100%
rename from v7/src/runtime/parse.scm
rename to src/runtime/parse.scm

diff --git a/v7/src/runtime/parser-buffer.scm b/src/runtime/parser-buffer.scm
similarity index 100%
rename from v7/src/runtime/parser-buffer.scm
rename to src/runtime/parser-buffer.scm

diff --git a/v7/src/runtime/partab.scm b/src/runtime/partab.scm
similarity index 100%
rename from v7/src/runtime/partab.scm
rename to src/runtime/partab.scm

diff --git a/v7/src/runtime/pathnm.scm b/src/runtime/pathnm.scm
similarity index 100%
rename from v7/src/runtime/pathnm.scm
rename to src/runtime/pathnm.scm

diff --git a/v7/src/runtime/pgsql.scm b/src/runtime/pgsql.scm
similarity index 100%
rename from v7/src/runtime/pgsql.scm
rename to src/runtime/pgsql.scm

diff --git a/v7/src/runtime/poplat.scm b/src/runtime/poplat.scm
similarity index 100%
rename from v7/src/runtime/poplat.scm
rename to src/runtime/poplat.scm

diff --git a/v7/src/runtime/port.scm b/src/runtime/port.scm
similarity index 100%
rename from v7/src/runtime/port.scm
rename to src/runtime/port.scm

diff --git a/v7/src/runtime/pp.scm b/src/runtime/pp.scm
similarity index 100%
rename from v7/src/runtime/pp.scm
rename to src/runtime/pp.scm

diff --git a/v7/src/runtime/prgcop.scm b/src/runtime/prgcop.scm
similarity index 100%
rename from v7/src/runtime/prgcop.scm
rename to src/runtime/prgcop.scm

diff --git a/v7/src/runtime/process.scm b/src/runtime/process.scm
similarity index 100%
rename from v7/src/runtime/process.scm
rename to src/runtime/process.scm

diff --git a/v7/src/runtime/prop1d.scm b/src/runtime/prop1d.scm
similarity index 100%
rename from v7/src/runtime/prop1d.scm
rename to src/runtime/prop1d.scm

diff --git a/v7/src/runtime/prop2d.scm b/src/runtime/prop2d.scm
similarity index 100%
rename from v7/src/runtime/prop2d.scm
rename to src/runtime/prop2d.scm

diff --git a/v7/src/runtime/qsort.scm b/src/runtime/qsort.scm
similarity index 100%
rename from v7/src/runtime/qsort.scm
rename to src/runtime/qsort.scm

diff --git a/v7/src/runtime/queue.scm b/src/runtime/queue.scm
similarity index 100%
rename from v7/src/runtime/queue.scm
rename to src/runtime/queue.scm

diff --git a/v7/src/runtime/random.scm b/src/runtime/random.scm
similarity index 100%
rename from v7/src/runtime/random.scm
rename to src/runtime/random.scm

diff --git a/v7/src/runtime/rbtree.scm b/src/runtime/rbtree.scm
similarity index 100%
rename from v7/src/runtime/rbtree.scm
rename to src/runtime/rbtree.scm

diff --git a/v7/src/runtime/record.scm b/src/runtime/record.scm
similarity index 100%
rename from v7/src/runtime/record.scm
rename to src/runtime/record.scm

diff --git a/v7/src/runtime/recslot.scm b/src/runtime/recslot.scm
similarity index 100%
rename from v7/src/runtime/recslot.scm
rename to src/runtime/recslot.scm

diff --git a/v7/src/runtime/regexp.scm b/src/runtime/regexp.scm
similarity index 100%
rename from v7/src/runtime/regexp.scm
rename to src/runtime/regexp.scm

diff --git a/v7/src/runtime/rep.scm b/src/runtime/rep.scm
similarity index 100%
rename from v7/src/runtime/rep.scm
rename to src/runtime/rep.scm

diff --git a/v7/src/runtime/rexp.scm b/src/runtime/rexp.scm
similarity index 100%
rename from v7/src/runtime/rexp.scm
rename to src/runtime/rexp.scm

diff --git a/v7/src/runtime/rfc2822-headers.scm b/src/runtime/rfc2822-headers.scm
similarity index 100%
rename from v7/src/runtime/rfc2822-headers.scm
rename to src/runtime/rfc2822-headers.scm

diff --git a/v7/src/runtime/rgxcmp.scm b/src/runtime/rgxcmp.scm
similarity index 100%
rename from v7/src/runtime/rgxcmp.scm
rename to src/runtime/rgxcmp.scm

diff --git a/v7/src/runtime/runtime.cbf b/src/runtime/runtime.cbf
similarity index 100%
rename from v7/src/runtime/runtime.cbf
rename to src/runtime/runtime.cbf

diff --git a/v7/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
similarity index 100%
rename from v7/src/runtime/runtime.pkg
rename to src/runtime/runtime.pkg

diff --git a/v7/src/runtime/runtime.sf b/src/runtime/runtime.sf
similarity index 100%
rename from v7/src/runtime/runtime.sf
rename to src/runtime/runtime.sf

diff --git a/v7/src/runtime/savres.scm b/src/runtime/savres.scm
similarity index 100%
rename from v7/src/runtime/savres.scm
rename to src/runtime/savres.scm

diff --git a/v7/src/runtime/scan.scm b/src/runtime/scan.scm
similarity index 100%
rename from v7/src/runtime/scan.scm
rename to src/runtime/scan.scm

diff --git a/v7/src/runtime/scode.scm b/src/runtime/scode.scm
similarity index 100%
rename from v7/src/runtime/scode.scm
rename to src/runtime/scode.scm

diff --git a/v7/src/runtime/scomb.scm b/src/runtime/scomb.scm
similarity index 100%
rename from v7/src/runtime/scomb.scm
rename to src/runtime/scomb.scm

diff --git a/v7/src/runtime/sdata.scm b/src/runtime/sdata.scm
similarity index 100%
rename from v7/src/runtime/sdata.scm
rename to src/runtime/sdata.scm

diff --git a/v7/src/runtime/sfile.scm b/src/runtime/sfile.scm
similarity index 100%
rename from v7/src/runtime/sfile.scm
rename to src/runtime/sfile.scm

diff --git a/v7/src/runtime/site.scm.dos b/src/runtime/site.scm.dos
similarity index 100%
rename from v7/src/runtime/site.scm.dos
rename to src/runtime/site.scm.dos

diff --git a/v7/src/runtime/site.scm.unix b/src/runtime/site.scm.unix
similarity index 100%
rename from v7/src/runtime/site.scm.unix
rename to src/runtime/site.scm.unix

diff --git a/v7/src/runtime/socket.scm b/src/runtime/socket.scm
similarity index 100%
rename from v7/src/runtime/socket.scm
rename to src/runtime/socket.scm

diff --git a/v7/src/runtime/srfi-1.scm b/src/runtime/srfi-1.scm
similarity index 100%
rename from v7/src/runtime/srfi-1.scm
rename to src/runtime/srfi-1.scm

diff --git a/v7/src/runtime/starbase.scm b/src/runtime/starbase.scm
similarity index 100%
rename from v7/src/runtime/starbase.scm
rename to src/runtime/starbase.scm

diff --git a/v7/src/runtime/stream.scm b/src/runtime/stream.scm
similarity index 100%
rename from v7/src/runtime/stream.scm
rename to src/runtime/stream.scm

diff --git a/v7/src/runtime/string.scm b/src/runtime/string.scm
similarity index 100%
rename from v7/src/runtime/string.scm
rename to src/runtime/string.scm

diff --git a/v7/src/runtime/stringio.scm b/src/runtime/stringio.scm
similarity index 100%
rename from v7/src/runtime/stringio.scm
rename to src/runtime/stringio.scm

diff --git a/v7/src/runtime/structure-parser.scm b/src/runtime/structure-parser.scm
similarity index 100%
rename from v7/src/runtime/structure-parser.scm
rename to src/runtime/structure-parser.scm

diff --git a/v7/src/runtime/symbol.scm b/src/runtime/symbol.scm
similarity index 100%
rename from v7/src/runtime/symbol.scm
rename to src/runtime/symbol.scm

diff --git a/v7/src/runtime/syncproc.scm b/src/runtime/syncproc.scm
similarity index 100%
rename from v7/src/runtime/syncproc.scm
rename to src/runtime/syncproc.scm

diff --git a/v7/src/runtime/syntactic-closures.scm b/src/runtime/syntactic-closures.scm
similarity index 100%
rename from v7/src/runtime/syntactic-closures.scm
rename to src/runtime/syntactic-closures.scm

diff --git a/v7/src/runtime/syntax-check.scm b/src/runtime/syntax-check.scm
similarity index 100%
rename from v7/src/runtime/syntax-check.scm
rename to src/runtime/syntax-check.scm

diff --git a/v7/src/runtime/syntax-output.scm b/src/runtime/syntax-output.scm
similarity index 100%
rename from v7/src/runtime/syntax-output.scm
rename to src/runtime/syntax-output.scm

diff --git a/v7/src/runtime/syntax-rules.scm b/src/runtime/syntax-rules.scm
similarity index 100%
rename from v7/src/runtime/syntax-rules.scm
rename to src/runtime/syntax-rules.scm

diff --git a/v7/src/runtime/syntax-transforms.scm b/src/runtime/syntax-transforms.scm
similarity index 100%
rename from v7/src/runtime/syntax-transforms.scm
rename to src/runtime/syntax-transforms.scm

diff --git a/v7/src/runtime/sysclk.scm b/src/runtime/sysclk.scm
similarity index 100%
rename from v7/src/runtime/sysclk.scm
rename to src/runtime/sysclk.scm

diff --git a/v7/src/runtime/sysmac.scm b/src/runtime/sysmac.scm
similarity index 100%
rename from v7/src/runtime/sysmac.scm
rename to src/runtime/sysmac.scm

diff --git a/v7/src/runtime/system.scm b/src/runtime/system.scm
similarity index 100%
rename from v7/src/runtime/system.scm
rename to src/runtime/system.scm

diff --git a/v7/src/runtime/thread.scm b/src/runtime/thread.scm
similarity index 100%
rename from v7/src/runtime/thread.scm
rename to src/runtime/thread.scm

diff --git a/v7/src/runtime/tscript.scm b/src/runtime/tscript.scm
similarity index 100%
rename from v7/src/runtime/tscript.scm
rename to src/runtime/tscript.scm

diff --git a/v7/src/runtime/ttyio.scm b/src/runtime/ttyio.scm
similarity index 100%
rename from v7/src/runtime/ttyio.scm
rename to src/runtime/ttyio.scm

diff --git a/v7/src/runtime/tvector.scm b/src/runtime/tvector.scm
similarity index 100%
rename from v7/src/runtime/tvector.scm
rename to src/runtime/tvector.scm

diff --git a/v7/src/runtime/udata.scm b/src/runtime/udata.scm
similarity index 100%
rename from v7/src/runtime/udata.scm
rename to src/runtime/udata.scm

diff --git a/v7/src/runtime/uenvir.scm b/src/runtime/uenvir.scm
similarity index 100%
rename from v7/src/runtime/uenvir.scm
rename to src/runtime/uenvir.scm

diff --git a/v7/src/runtime/uerror.scm b/src/runtime/uerror.scm
similarity index 100%
rename from v7/src/runtime/uerror.scm
rename to src/runtime/uerror.scm

diff --git a/v7/src/runtime/unicode.scm b/src/runtime/unicode.scm
similarity index 100%
rename from v7/src/runtime/unicode.scm
rename to src/runtime/unicode.scm

diff --git a/v7/src/runtime/unpars.scm b/src/runtime/unpars.scm
similarity index 100%
rename from v7/src/runtime/unpars.scm
rename to src/runtime/unpars.scm

diff --git a/v7/src/runtime/unsyn.scm b/src/runtime/unsyn.scm
similarity index 100%
rename from v7/src/runtime/unsyn.scm
rename to src/runtime/unsyn.scm

diff --git a/v7/src/runtime/unxdir.scm b/src/runtime/unxdir.scm
similarity index 100%
rename from v7/src/runtime/unxdir.scm
rename to src/runtime/unxdir.scm

diff --git a/v7/src/runtime/unxprm.scm b/src/runtime/unxprm.scm
similarity index 100%
rename from v7/src/runtime/unxprm.scm
rename to src/runtime/unxprm.scm

diff --git a/v7/src/runtime/unxpth.scm b/src/runtime/unxpth.scm
similarity index 100%
rename from v7/src/runtime/unxpth.scm
rename to src/runtime/unxpth.scm

diff --git a/v7/src/runtime/uproc.scm b/src/runtime/uproc.scm
similarity index 100%
rename from v7/src/runtime/uproc.scm
rename to src/runtime/uproc.scm

diff --git a/v7/src/runtime/url.scm b/src/runtime/url.scm
similarity index 100%
rename from v7/src/runtime/url.scm
rename to src/runtime/url.scm

diff --git a/v7/src/runtime/urtrap.scm b/src/runtime/urtrap.scm
similarity index 100%
rename from v7/src/runtime/urtrap.scm
rename to src/runtime/urtrap.scm

diff --git a/v7/src/runtime/usrint.scm b/src/runtime/usrint.scm
similarity index 100%
rename from v7/src/runtime/usrint.scm
rename to src/runtime/usrint.scm

diff --git a/v7/src/runtime/utabs.scm b/src/runtime/utabs.scm
similarity index 100%
rename from v7/src/runtime/utabs.scm
rename to src/runtime/utabs.scm

diff --git a/v7/src/runtime/vector.scm b/src/runtime/vector.scm
similarity index 100%
rename from v7/src/runtime/vector.scm
rename to src/runtime/vector.scm

diff --git a/v7/src/runtime/version.scm b/src/runtime/version.scm
similarity index 100%
rename from v7/src/runtime/version.scm
rename to src/runtime/version.scm

diff --git a/v7/src/runtime/where.scm b/src/runtime/where.scm
similarity index 100%
rename from v7/src/runtime/where.scm
rename to src/runtime/where.scm

diff --git a/v7/src/runtime/win32-registry.scm b/src/runtime/win32-registry.scm
similarity index 100%
rename from v7/src/runtime/win32-registry.scm
rename to src/runtime/win32-registry.scm

diff --git a/v7/src/runtime/wind.scm b/src/runtime/wind.scm
similarity index 100%
rename from v7/src/runtime/wind.scm
rename to src/runtime/wind.scm

diff --git a/v7/src/runtime/wrkdir.scm b/src/runtime/wrkdir.scm
similarity index 100%
rename from v7/src/runtime/wrkdir.scm
rename to src/runtime/wrkdir.scm

diff --git a/v7/src/runtime/wttree.scm b/src/runtime/wttree.scm
similarity index 100%
rename from v7/src/runtime/wttree.scm
rename to src/runtime/wttree.scm

diff --git a/v7/src/runtime/x11graph.scm b/src/runtime/x11graph.scm
similarity index 100%
rename from v7/src/runtime/x11graph.scm
rename to src/runtime/x11graph.scm

diff --git a/v7/src/runtime/xeval.scm b/src/runtime/xeval.scm
similarity index 100%
rename from v7/src/runtime/xeval.scm
rename to src/runtime/xeval.scm

diff --git a/v7/src/runtime/ystep.scm b/src/runtime/ystep.scm
similarity index 100%
rename from v7/src/runtime/ystep.scm
rename to src/runtime/ystep.scm

diff --git a/v7/src/sf/Makefile-fragment b/src/sf/Makefile-fragment
similarity index 100%
rename from v7/src/sf/Makefile-fragment
rename to src/sf/Makefile-fragment

diff --git a/v7/src/sf/butils.scm b/src/sf/butils.scm
similarity index 100%
rename from v7/src/sf/butils.scm
rename to src/sf/butils.scm

diff --git a/v7/src/sf/cgen.scm b/src/sf/cgen.scm
similarity index 100%
rename from v7/src/sf/cgen.scm
rename to src/sf/cgen.scm

diff --git a/v7/src/sf/chtype.scm b/src/sf/chtype.scm
similarity index 100%
rename from v7/src/sf/chtype.scm
rename to src/sf/chtype.scm

diff --git a/v7/src/sf/copy.scm b/src/sf/copy.scm
similarity index 100%
rename from v7/src/sf/copy.scm
rename to src/sf/copy.scm

diff --git a/v7/src/sf/emodel.scm b/src/sf/emodel.scm
similarity index 100%
rename from v7/src/sf/emodel.scm
rename to src/sf/emodel.scm

diff --git a/v7/src/sf/free.scm b/src/sf/free.scm
similarity index 100%
rename from v7/src/sf/free.scm
rename to src/sf/free.scm

diff --git a/v7/src/sf/gconst.scm b/src/sf/gconst.scm
similarity index 100%
rename from v7/src/sf/gconst.scm
rename to src/sf/gconst.scm

diff --git a/v7/src/sf/gimprt.scm b/src/sf/gimprt.scm
similarity index 100%
rename from v7/src/sf/gimprt.scm
rename to src/sf/gimprt.scm

diff --git a/v7/src/sf/lsets.scm b/src/sf/lsets.scm
similarity index 100%
rename from v7/src/sf/lsets.scm
rename to src/sf/lsets.scm

diff --git a/v7/src/sf/make.scm b/src/sf/make.scm
similarity index 100%
rename from v7/src/sf/make.scm
rename to src/sf/make.scm

diff --git a/v7/src/sf/object.scm b/src/sf/object.scm
similarity index 100%
rename from v7/src/sf/object.scm
rename to src/sf/object.scm

diff --git a/v7/src/sf/pardec.scm b/src/sf/pardec.scm
similarity index 100%
rename from v7/src/sf/pardec.scm
rename to src/sf/pardec.scm

diff --git a/v7/src/sf/pthmap.scm b/src/sf/pthmap.scm
similarity index 100%
rename from v7/src/sf/pthmap.scm
rename to src/sf/pthmap.scm

diff --git a/v7/src/sf/reduct.scm b/src/sf/reduct.scm
similarity index 100%
rename from v7/src/sf/reduct.scm
rename to src/sf/reduct.scm

diff --git a/v7/src/sf/sf.cbf b/src/sf/sf.cbf
similarity index 100%
rename from v7/src/sf/sf.cbf
rename to src/sf/sf.cbf

diff --git a/v7/src/sf/sf.pkg b/src/sf/sf.pkg
similarity index 100%
rename from v7/src/sf/sf.pkg
rename to src/sf/sf.pkg

diff --git a/v7/src/sf/sf.sf b/src/sf/sf.sf
similarity index 100%
rename from v7/src/sf/sf.sf
rename to src/sf/sf.sf

diff --git a/v7/src/sf/subst.scm b/src/sf/subst.scm
similarity index 100%
rename from v7/src/sf/subst.scm
rename to src/sf/subst.scm

diff --git a/v7/src/sf/table.scm b/src/sf/table.scm
similarity index 100%
rename from v7/src/sf/table.scm
rename to src/sf/table.scm

diff --git a/v7/src/sf/tables.scm b/src/sf/tables.scm
similarity index 100%
rename from v7/src/sf/tables.scm
rename to src/sf/tables.scm

diff --git a/v7/src/sf/toplev.scm b/src/sf/toplev.scm
similarity index 100%
rename from v7/src/sf/toplev.scm
rename to src/sf/toplev.scm

diff --git a/v7/src/sf/usicon.scm b/src/sf/usicon.scm
similarity index 100%
rename from v7/src/sf/usicon.scm
rename to src/sf/usicon.scm

diff --git a/v7/src/sf/usiexp.scm b/src/sf/usiexp.scm
similarity index 100%
rename from v7/src/sf/usiexp.scm
rename to src/sf/usiexp.scm

diff --git a/v7/src/sf/xform.scm b/src/sf/xform.scm
similarity index 100%
rename from v7/src/sf/xform.scm
rename to src/sf/xform.scm

diff --git a/v7/src/sicp/compat.scm b/src/sicp/compat.scm
similarity index 100%
rename from v7/src/sicp/compat.scm
rename to src/sicp/compat.scm

diff --git a/v7/src/sicp/genenv.scm b/src/sicp/genenv.scm
similarity index 100%
rename from v7/src/sicp/genenv.scm
rename to src/sicp/genenv.scm

diff --git a/v7/src/sicp/graphics.scm b/src/sicp/graphics.scm
similarity index 100%
rename from v7/src/sicp/graphics.scm
rename to src/sicp/graphics.scm

diff --git a/v7/src/sicp/sbuild.scm b/src/sicp/sbuild.scm
similarity index 100%
rename from v7/src/sicp/sbuild.scm
rename to src/sicp/sbuild.scm

diff --git a/v7/src/sicp/stream.scm b/src/sicp/stream.scm
similarity index 100%
rename from v7/src/sicp/stream.scm
rename to src/sicp/stream.scm

diff --git a/v7/src/sicp/strmac.scm b/src/sicp/strmac.scm
similarity index 100%
rename from v7/src/sicp/strmac.scm
rename to src/sicp/strmac.scm

diff --git a/v7/src/sicp/studen.scm b/src/sicp/studen.scm
similarity index 100%
rename from v7/src/sicp/studen.scm
rename to src/sicp/studen.scm

diff --git a/v7/src/sos/Makefile-fragment b/src/sos/Makefile-fragment
similarity index 100%
rename from v7/src/sos/Makefile-fragment
rename to src/sos/Makefile-fragment

diff --git a/v7/src/sos/class.scm b/src/sos/class.scm
similarity index 100%
rename from v7/src/sos/class.scm
rename to src/sos/class.scm

diff --git a/v7/src/sos/compile.scm b/src/sos/compile.scm
similarity index 100%
rename from v7/src/sos/compile.scm
rename to src/sos/compile.scm

diff --git a/v7/src/sos/ed-ffi.scm b/src/sos/ed-ffi.scm
similarity index 100%
rename from v7/src/sos/ed-ffi.scm
rename to src/sos/ed-ffi.scm

diff --git a/v7/src/sos/instance.scm b/src/sos/instance.scm
similarity index 100%
rename from v7/src/sos/instance.scm
rename to src/sos/instance.scm

diff --git a/v7/src/sos/load.scm b/src/sos/load.scm
similarity index 100%
rename from v7/src/sos/load.scm
rename to src/sos/load.scm

diff --git a/v7/src/sos/macros.scm b/src/sos/macros.scm
similarity index 100%
rename from v7/src/sos/macros.scm
rename to src/sos/macros.scm

diff --git a/v7/src/sos/method.scm b/src/sos/method.scm
similarity index 100%
rename from v7/src/sos/method.scm
rename to src/sos/method.scm

diff --git a/v7/src/sos/microbench.scm b/src/sos/microbench.scm
similarity index 100%
rename from v7/src/sos/microbench.scm
rename to src/sos/microbench.scm

diff --git a/v7/src/sos/printer.scm b/src/sos/printer.scm
similarity index 100%
rename from v7/src/sos/printer.scm
rename to src/sos/printer.scm

diff --git a/v7/src/sos/slot.scm b/src/sos/slot.scm
similarity index 100%
rename from v7/src/sos/slot.scm
rename to src/sos/slot.scm

diff --git a/v7/src/sos/sos.pkg b/src/sos/sos.pkg
similarity index 100%
rename from v7/src/sos/sos.pkg
rename to src/sos/sos.pkg

diff --git a/v7/src/ssp/Makefile-fragment b/src/ssp/Makefile-fragment
similarity index 100%
rename from v7/src/ssp/Makefile-fragment
rename to src/ssp/Makefile-fragment

diff --git a/v7/src/ssp/compile.scm b/src/ssp/compile.scm
similarity index 100%
rename from v7/src/ssp/compile.scm
rename to src/ssp/compile.scm

diff --git a/v7/src/ssp/expenv.scm b/src/ssp/expenv.scm
similarity index 100%
rename from v7/src/ssp/expenv.scm
rename to src/ssp/expenv.scm

diff --git a/v7/src/ssp/load.scm b/src/ssp/load.scm
similarity index 100%
rename from v7/src/ssp/load.scm
rename to src/ssp/load.scm

diff --git a/v7/src/ssp/mod-lisp.scm b/src/ssp/mod-lisp.scm
similarity index 100%
rename from v7/src/ssp/mod-lisp.scm
rename to src/ssp/mod-lisp.scm

diff --git a/v7/src/ssp/ssp.pkg b/src/ssp/ssp.pkg
similarity index 100%
rename from v7/src/ssp/ssp.pkg
rename to src/ssp/ssp.pkg

diff --git a/v7/src/ssp/xhtml-expander.scm b/src/ssp/xhtml-expander.scm
similarity index 100%
rename from v7/src/ssp/xhtml-expander.scm
rename to src/ssp/xhtml-expander.scm

diff --git a/v7/src/ssp/xmlrpc.scm b/src/ssp/xmlrpc.scm
similarity index 100%
rename from v7/src/ssp/xmlrpc.scm
rename to src/ssp/xmlrpc.scm

diff --git a/v7/src/star-parser/Makefile-fragment b/src/star-parser/Makefile-fragment
similarity index 100%
rename from v7/src/star-parser/Makefile-fragment
rename to src/star-parser/Makefile-fragment

diff --git a/v7/src/star-parser/compile.scm b/src/star-parser/compile.scm
similarity index 100%
rename from v7/src/star-parser/compile.scm
rename to src/star-parser/compile.scm

diff --git a/v7/src/star-parser/ed-ffi.scm b/src/star-parser/ed-ffi.scm
similarity index 100%
rename from v7/src/star-parser/ed-ffi.scm
rename to src/star-parser/ed-ffi.scm

diff --git a/v7/src/star-parser/load.scm b/src/star-parser/load.scm
similarity index 100%
rename from v7/src/star-parser/load.scm
rename to src/star-parser/load.scm

diff --git a/v7/src/star-parser/matcher.scm b/src/star-parser/matcher.scm
similarity index 100%
rename from v7/src/star-parser/matcher.scm
rename to src/star-parser/matcher.scm

diff --git a/v7/src/star-parser/parser.pkg b/src/star-parser/parser.pkg
similarity index 100%
rename from v7/src/star-parser/parser.pkg
rename to src/star-parser/parser.pkg

diff --git a/v7/src/star-parser/parser.scm b/src/star-parser/parser.scm
similarity index 100%
rename from v7/src/star-parser/parser.scm
rename to src/star-parser/parser.scm

diff --git a/v7/src/star-parser/shared.scm b/src/star-parser/shared.scm
similarity index 100%
rename from v7/src/star-parser/shared.scm
rename to src/star-parser/shared.scm

diff --git a/v7/src/star-parser/test-parser.scm b/src/star-parser/test-parser.scm
similarity index 100%
rename from v7/src/star-parser/test-parser.scm
rename to src/star-parser/test-parser.scm

diff --git a/v7/src/swat/Makefile b/src/swat/Makefile
similarity index 100%
rename from v7/src/swat/Makefile
rename to src/swat/Makefile

diff --git a/v7/src/swat/c/MITScheme.c b/src/swat/c/MITScheme.c
similarity index 100%
rename from v7/src/swat/c/MITScheme.c
rename to src/swat/c/MITScheme.c

diff --git a/v7/src/swat/c/Makefile b/src/swat/c/Makefile
similarity index 100%
rename from v7/src/swat/c/Makefile
rename to src/swat/c/Makefile

diff --git a/v7/src/swat/c/scxl.c b/src/swat/c/scxl.c
similarity index 100%
rename from v7/src/swat/c/scxl.c
rename to src/swat/c/scxl.c

diff --git a/v7/src/swat/c/tk-c-mit.c b/src/swat/c/tk-c-mit.c
similarity index 100%
rename from v7/src/swat/c/tk-c-mit.c
rename to src/swat/c/tk-c-mit.c

diff --git a/v7/src/swat/c/tk-c.c b/src/swat/c/tk-c.c
similarity index 100%
rename from v7/src/swat/c/tk-c.c
rename to src/swat/c/tk-c.c

diff --git a/v7/src/swat/c/tk3.2-custom/Makefile b/src/swat/c/tk3.2-custom/Makefile
similarity index 100%
rename from v7/src/swat/c/tk3.2-custom/Makefile
rename to src/swat/c/tk3.2-custom/Makefile

diff --git a/v7/src/swat/c/tk3.2-custom/library/emacs.tcl b/src/swat/c/tk3.2-custom/library/emacs.tcl
similarity index 100%
rename from v7/src/swat/c/tk3.2-custom/library/emacs.tcl
rename to src/swat/c/tk3.2-custom/library/emacs.tcl

diff --git a/v7/src/swat/c/tk3.2-custom/tcl/Makefile b/src/swat/c/tk3.2-custom/tcl/Makefile
similarity index 100%
rename from v7/src/swat/c/tk3.2-custom/tcl/Makefile
rename to src/swat/c/tk3.2-custom/tcl/Makefile

diff --git a/v7/src/swat/c/tk3.2-custom/tcl/tclUnix.h b/src/swat/c/tk3.2-custom/tcl/tclUnix.h
similarity index 100%
rename from v7/src/swat/c/tk3.2-custom/tcl/tclUnix.h
rename to src/swat/c/tk3.2-custom/tcl/tclUnix.h

diff --git a/v7/src/swat/c/tk3.2-custom/tkEvent.c b/src/swat/c/tk3.2-custom/tkEvent.c
similarity index 100%
rename from v7/src/swat/c/tk3.2-custom/tkEvent.c
rename to src/swat/c/tk3.2-custom/tkEvent.c

diff --git a/v7/src/swat/c/tk3.2-custom/tkWindow.c b/src/swat/c/tk3.2-custom/tkWindow.c
similarity index 100%
rename from v7/src/swat/c/tk3.2-custom/tkWindow.c
rename to src/swat/c/tk3.2-custom/tkWindow.c

diff --git a/v7/src/swat/c/uitk-prims.c b/src/swat/c/uitk-prims.c
similarity index 100%
rename from v7/src/swat/c/uitk-prims.c
rename to src/swat/c/uitk-prims.c

diff --git a/v7/src/swat/c/widget-c-mit.c b/src/swat/c/widget-c-mit.c
similarity index 100%
rename from v7/src/swat/c/widget-c-mit.c
rename to src/swat/c/widget-c-mit.c

diff --git a/v7/src/swat/c/widget-c.c b/src/swat/c/widget-c.c
similarity index 100%
rename from v7/src/swat/c/widget-c.c
rename to src/swat/c/widget-c.c

diff --git a/v7/src/swat/scheme/baseobj.scm b/src/swat/scheme/baseobj.scm
similarity index 100%
rename from v7/src/swat/scheme/baseobj.scm
rename to src/swat/scheme/baseobj.scm

diff --git a/v7/src/swat/scheme/canvas.scm b/src/swat/scheme/canvas.scm
similarity index 100%
rename from v7/src/swat/scheme/canvas.scm
rename to src/swat/scheme/canvas.scm

diff --git a/v7/src/swat/scheme/control-floating-errors.scm b/src/swat/scheme/control-floating-errors.scm
similarity index 100%
rename from v7/src/swat/scheme/control-floating-errors.scm
rename to src/swat/scheme/control-floating-errors.scm

diff --git a/v7/src/swat/scheme/demo-plotter.scm b/src/swat/scheme/demo-plotter.scm
similarity index 100%
rename from v7/src/swat/scheme/demo-plotter.scm
rename to src/swat/scheme/demo-plotter.scm

diff --git a/v7/src/swat/scheme/generics.scm b/src/swat/scheme/generics.scm
similarity index 100%
rename from v7/src/swat/scheme/generics.scm
rename to src/swat/scheme/generics.scm

diff --git a/v7/src/swat/scheme/geometry.scm b/src/swat/scheme/geometry.scm
similarity index 100%
rename from v7/src/swat/scheme/geometry.scm
rename to src/swat/scheme/geometry.scm

diff --git a/v7/src/swat/scheme/load.scm b/src/swat/scheme/load.scm
similarity index 100%
rename from v7/src/swat/scheme/load.scm
rename to src/swat/scheme/load.scm

diff --git a/v7/src/swat/scheme/menu.scm b/src/swat/scheme/menu.scm
similarity index 100%
rename from v7/src/swat/scheme/menu.scm
rename to src/swat/scheme/menu.scm

diff --git a/v7/src/swat/scheme/mit-xhooks.scm b/src/swat/scheme/mit-xhooks.scm
similarity index 100%
rename from v7/src/swat/scheme/mit-xhooks.scm
rename to src/swat/scheme/mit-xhooks.scm

diff --git a/v7/src/swat/scheme/mit-xlib.scm b/src/swat/scheme/mit-xlib.scm
similarity index 100%
rename from v7/src/swat/scheme/mit-xlib.scm
rename to src/swat/scheme/mit-xlib.scm

diff --git a/v7/src/swat/scheme/other/btest.scm b/src/swat/scheme/other/btest.scm
similarity index 100%
rename from v7/src/swat/scheme/other/btest.scm
rename to src/swat/scheme/other/btest.scm

diff --git a/v7/src/swat/scheme/other/doodle.scm b/src/swat/scheme/other/doodle.scm
similarity index 100%
rename from v7/src/swat/scheme/other/doodle.scm
rename to src/swat/scheme/other/doodle.scm

diff --git a/v7/src/swat/scheme/other/exports.scm b/src/swat/scheme/other/exports.scm
similarity index 100%
rename from v7/src/swat/scheme/other/exports.scm
rename to src/swat/scheme/other/exports.scm

diff --git a/v7/src/swat/scheme/other/plotter.scm b/src/swat/scheme/other/plotter.scm
similarity index 100%
rename from v7/src/swat/scheme/other/plotter.scm
rename to src/swat/scheme/other/plotter.scm

diff --git a/v7/src/swat/scheme/other/pole-zero.scm b/src/swat/scheme/other/pole-zero.scm
similarity index 100%
rename from v7/src/swat/scheme/other/pole-zero.scm
rename to src/swat/scheme/other/pole-zero.scm

diff --git a/v7/src/swat/scheme/other/rtest.scm b/src/swat/scheme/other/rtest.scm
similarity index 100%
rename from v7/src/swat/scheme/other/rtest.scm
rename to src/swat/scheme/other/rtest.scm

diff --git a/v7/src/swat/scheme/other/test-load.scm b/src/swat/scheme/other/test-load.scm
similarity index 100%
rename from v7/src/swat/scheme/other/test-load.scm
rename to src/swat/scheme/other/test-load.scm

diff --git a/v7/src/swat/scheme/other/test.scm b/src/swat/scheme/other/test.scm
similarity index 100%
rename from v7/src/swat/scheme/other/test.scm
rename to src/swat/scheme/other/test.scm

diff --git a/v7/src/swat/scheme/other/unhash-testing.scm b/src/swat/scheme/other/unhash-testing.scm
similarity index 100%
rename from v7/src/swat/scheme/other/unhash-testing.scm
rename to src/swat/scheme/other/unhash-testing.scm

diff --git a/v7/src/swat/scheme/scc-macros.scm b/src/swat/scheme/scc-macros.scm
similarity index 100%
rename from v7/src/swat/scheme/scc-macros.scm
rename to src/swat/scheme/scc-macros.scm

diff --git a/v7/src/swat/scheme/simple.scm b/src/swat/scheme/simple.scm
similarity index 100%
rename from v7/src/swat/scheme/simple.scm
rename to src/swat/scheme/simple.scm

diff --git a/v7/src/swat/scheme/structures.scm b/src/swat/scheme/structures.scm
similarity index 100%
rename from v7/src/swat/scheme/structures.scm
rename to src/swat/scheme/structures.scm

diff --git a/v7/src/swat/scheme/structures2.scm b/src/swat/scheme/structures2.scm
similarity index 100%
rename from v7/src/swat/scheme/structures2.scm
rename to src/swat/scheme/structures2.scm

diff --git a/v7/src/swat/scheme/swat.cbf b/src/swat/scheme/swat.cbf
similarity index 100%
rename from v7/src/swat/scheme/swat.cbf
rename to src/swat/scheme/swat.cbf

diff --git a/v7/src/swat/scheme/swat.sf b/src/swat/scheme/swat.sf
similarity index 100%
rename from v7/src/swat/scheme/swat.sf
rename to src/swat/scheme/swat.sf

diff --git a/v7/src/swat/scheme/text.scm b/src/swat/scheme/text.scm
similarity index 100%
rename from v7/src/swat/scheme/text.scm
rename to src/swat/scheme/text.scm

diff --git a/v7/src/swat/scheme/tk-mit.scm b/src/swat/scheme/tk-mit.scm
similarity index 100%
rename from v7/src/swat/scheme/tk-mit.scm
rename to src/swat/scheme/tk-mit.scm

diff --git a/v7/src/swat/scheme/uitk-macros.scm b/src/swat/scheme/uitk-macros.scm
similarity index 100%
rename from v7/src/swat/scheme/uitk-macros.scm
rename to src/swat/scheme/uitk-macros.scm

diff --git a/v7/src/swat/scheme/uitk.scm b/src/swat/scheme/uitk.scm
similarity index 100%
rename from v7/src/swat/scheme/uitk.scm
rename to src/swat/scheme/uitk.scm

diff --git a/v7/src/swat/scheme/widget-mit.scm b/src/swat/scheme/widget-mit.scm
similarity index 100%
rename from v7/src/swat/scheme/widget-mit.scm
rename to src/swat/scheme/widget-mit.scm

diff --git a/v7/src/swat/scheme/widget.scm b/src/swat/scheme/widget.scm
similarity index 100%
rename from v7/src/swat/scheme/widget.scm
rename to src/swat/scheme/widget.scm

diff --git a/v7/src/swat/scheme/xlibCONSTANTS.scm b/src/swat/scheme/xlibCONSTANTS.scm
similarity index 100%
rename from v7/src/swat/scheme/xlibCONSTANTS.scm
rename to src/swat/scheme/xlibCONSTANTS.scm

diff --git a/v7/src/wabbit/README b/src/wabbit/README
similarity index 100%
rename from v7/src/wabbit/README
rename to src/wabbit/README

diff --git a/v7/src/wabbit/headhunt.text b/src/wabbit/headhunt.text
similarity index 100%
rename from v7/src/wabbit/headhunt.text
rename to src/wabbit/headhunt.text

diff --git a/v7/src/wabbit/load.scm b/src/wabbit/load.scm
similarity index 100%
rename from v7/src/wabbit/load.scm
rename to src/wabbit/load.scm

diff --git a/v7/src/wabbit/test-wabbit.scm b/src/wabbit/test-wabbit.scm
similarity index 100%
rename from v7/src/wabbit/test-wabbit.scm
rename to src/wabbit/test-wabbit.scm

diff --git a/v7/src/wabbit/wabbit.cbf b/src/wabbit/wabbit.cbf
similarity index 100%
rename from v7/src/wabbit/wabbit.cbf
rename to src/wabbit/wabbit.cbf

diff --git a/v7/src/wabbit/wabbit.pkg b/src/wabbit/wabbit.pkg
similarity index 100%
rename from v7/src/wabbit/wabbit.pkg
rename to src/wabbit/wabbit.pkg

diff --git a/v7/src/wabbit/wabbit.scm b/src/wabbit/wabbit.scm
similarity index 100%
rename from v7/src/wabbit/wabbit.scm
rename to src/wabbit/wabbit.scm

diff --git a/v7/src/wabbit/wabbit.scratch b/src/wabbit/wabbit.scratch
similarity index 100%
rename from v7/src/wabbit/wabbit.scratch
rename to src/wabbit/wabbit.scratch

diff --git a/v7/src/wabbit/wabbit.sf b/src/wabbit/wabbit.sf
similarity index 100%
rename from v7/src/wabbit/wabbit.sf
rename to src/wabbit/wabbit.sf

diff --git a/v7/src/win32/Makefile-fragment b/src/win32/Makefile-fragment
similarity index 100%
rename from v7/src/win32/Makefile-fragment
rename to src/win32/Makefile-fragment

diff --git a/v7/src/win32/clipbrd.scm b/src/win32/clipbrd.scm
similarity index 100%
rename from v7/src/win32/clipbrd.scm
rename to src/win32/clipbrd.scm

diff --git a/v7/src/win32/dib.scm b/src/win32/dib.scm
similarity index 100%
rename from v7/src/win32/dib.scm
rename to src/win32/dib.scm

diff --git a/v7/src/win32/dibutils/dibutils.c b/src/win32/dibutils/dibutils.c
similarity index 100%
rename from v7/src/win32/dibutils/dibutils.c
rename to src/win32/dibutils/dibutils.c

diff --git a/v7/src/win32/dibutils/dibutils.def b/src/win32/dibutils/dibutils.def
similarity index 100%
rename from v7/src/win32/dibutils/dibutils.def
rename to src/win32/dibutils/dibutils.def

diff --git a/v7/src/win32/dibutils/dibutils.h b/src/win32/dibutils/dibutils.h
similarity index 100%
rename from v7/src/win32/dibutils/dibutils.h
rename to src/win32/dibutils/dibutils.h

diff --git a/v7/src/win32/dibutils/dibutils.lbc b/src/win32/dibutils/dibutils.lbc
similarity index 100%
rename from v7/src/win32/dibutils/dibutils.lbc
rename to src/win32/dibutils/dibutils.lbc

diff --git a/v7/src/win32/dibutils/dibutils.lnk b/src/win32/dibutils/dibutils.lnk
similarity index 100%
rename from v7/src/win32/dibutils/dibutils.lnk
rename to src/win32/dibutils/dibutils.lnk

diff --git a/v7/src/win32/dibutils/dibutils.rc b/src/win32/dibutils/dibutils.rc
similarity index 100%
rename from v7/src/win32/dibutils/dibutils.rc
rename to src/win32/dibutils/dibutils.rc

diff --git a/v7/src/win32/dibutils/makefile.msc b/src/win32/dibutils/makefile.msc
similarity index 100%
rename from v7/src/win32/dibutils/makefile.msc
rename to src/win32/dibutils/makefile.msc

diff --git a/v7/src/win32/dibutils/makefile.wcc b/src/win32/dibutils/makefile.wcc
similarity index 100%
rename from v7/src/win32/dibutils/makefile.wcc
rename to src/win32/dibutils/makefile.wcc

diff --git a/v7/src/win32/ffimacro.scm b/src/win32/ffimacro.scm
similarity index 100%
rename from v7/src/win32/ffimacro.scm
rename to src/win32/ffimacro.scm

diff --git a/v7/src/win32/graphics.scm b/src/win32/graphics.scm
similarity index 100%
rename from v7/src/win32/graphics.scm
rename to src/win32/graphics.scm

diff --git a/v7/src/win32/make.scm b/src/win32/make.scm
similarity index 100%
rename from v7/src/win32/make.scm
rename to src/win32/make.scm

diff --git a/v7/src/win32/module.scm b/src/win32/module.scm
similarity index 100%
rename from v7/src/win32/module.scm
rename to src/win32/module.scm

diff --git a/v7/src/win32/protect.scm b/src/win32/protect.scm
similarity index 100%
rename from v7/src/win32/protect.scm
rename to src/win32/protect.scm

diff --git a/v7/src/win32/tests/CLIPBRD.SCM b/src/win32/tests/CLIPBRD.SCM
similarity index 100%
rename from v7/src/win32/tests/CLIPBRD.SCM
rename to src/win32/tests/CLIPBRD.SCM

diff --git a/v7/src/win32/wf_user.scm b/src/win32/wf_user.scm
similarity index 100%
rename from v7/src/win32/wf_user.scm
rename to src/win32/wf_user.scm

diff --git a/v7/src/win32/win32.cbf b/src/win32/win32.cbf
similarity index 100%
rename from v7/src/win32/win32.cbf
rename to src/win32/win32.cbf

diff --git a/v7/src/win32/win32.pkg b/src/win32/win32.pkg
similarity index 100%
rename from v7/src/win32/win32.pkg
rename to src/win32/win32.pkg

diff --git a/v7/src/win32/win32.sf b/src/win32/win32.sf
similarity index 100%
rename from v7/src/win32/win32.sf
rename to src/win32/win32.sf

diff --git a/v7/src/win32/win_ffi.scm b/src/win32/win_ffi.scm
similarity index 100%
rename from v7/src/win32/win_ffi.scm
rename to src/win32/win_ffi.scm

diff --git a/v7/src/win32/wingdi.scm b/src/win32/wingdi.scm
similarity index 100%
rename from v7/src/win32/wingdi.scm
rename to src/win32/wingdi.scm

diff --git a/v7/src/win32/winnt.scm b/src/win32/winnt.scm
similarity index 100%
rename from v7/src/win32/winnt.scm
rename to src/win32/winnt.scm

diff --git a/v7/src/win32/winuser.scm b/src/win32/winuser.scm
similarity index 100%
rename from v7/src/win32/winuser.scm
rename to src/win32/winuser.scm

diff --git a/v7/src/win32/wt_user.scm b/src/win32/wt_user.scm
similarity index 100%
rename from v7/src/win32/wt_user.scm
rename to src/win32/wt_user.scm

diff --git a/v7/src/xdoc/Makefile-fragment b/src/xdoc/Makefile-fragment
similarity index 100%
rename from v7/src/xdoc/Makefile-fragment
rename to src/xdoc/Makefile-fragment

diff --git a/v7/src/xdoc/compile.scm b/src/xdoc/compile.scm
similarity index 100%
rename from v7/src/xdoc/compile.scm
rename to src/xdoc/compile.scm

diff --git a/v7/src/xdoc/db.scm b/src/xdoc/db.scm
similarity index 100%
rename from v7/src/xdoc/db.scm
rename to src/xdoc/db.scm

diff --git a/v7/src/xdoc/load.scm b/src/xdoc/load.scm
similarity index 100%
rename from v7/src/xdoc/load.scm
rename to src/xdoc/load.scm

diff --git a/v7/src/xdoc/validate-xdoc.scm b/src/xdoc/validate-xdoc.scm
similarity index 100%
rename from v7/src/xdoc/validate-xdoc.scm
rename to src/xdoc/validate-xdoc.scm

diff --git a/v7/src/xdoc/xdoc.pkg b/src/xdoc/xdoc.pkg
similarity index 100%
rename from v7/src/xdoc/xdoc.pkg
rename to src/xdoc/xdoc.pkg

diff --git a/v7/src/xdoc/xdoc.scm b/src/xdoc/xdoc.scm
similarity index 100%
rename from v7/src/xdoc/xdoc.scm
rename to src/xdoc/xdoc.scm

diff --git a/v7/src/xml/Makefile-fragment b/src/xml/Makefile-fragment
similarity index 100%
rename from v7/src/xml/Makefile-fragment
rename to src/xml/Makefile-fragment

diff --git a/v7/src/xml/compile.scm b/src/xml/compile.scm
similarity index 100%
rename from v7/src/xml/compile.scm
rename to src/xml/compile.scm

diff --git a/v7/src/xml/ed-ffi.scm b/src/xml/ed-ffi.scm
similarity index 100%
rename from v7/src/xml/ed-ffi.scm
rename to src/xml/ed-ffi.scm

diff --git a/v7/src/xml/load.scm b/src/xml/load.scm
similarity index 100%
rename from v7/src/xml/load.scm
rename to src/xml/load.scm

diff --git a/v7/src/xml/parser-macro.scm b/src/xml/parser-macro.scm
similarity index 100%
rename from v7/src/xml/parser-macro.scm
rename to src/xml/parser-macro.scm

diff --git a/v7/src/xml/rdf-nt.scm b/src/xml/rdf-nt.scm
similarity index 100%
rename from v7/src/xml/rdf-nt.scm
rename to src/xml/rdf-nt.scm

diff --git a/v7/src/xml/rdf-struct.scm b/src/xml/rdf-struct.scm
similarity index 100%
rename from v7/src/xml/rdf-struct.scm
rename to src/xml/rdf-struct.scm

diff --git a/v7/src/xml/test-parser.scm b/src/xml/test-parser.scm
similarity index 100%
rename from v7/src/xml/test-parser.scm
rename to src/xml/test-parser.scm

diff --git a/v7/src/xml/test-turtle.scm b/src/xml/test-turtle.scm
similarity index 100%
rename from v7/src/xml/test-turtle.scm
rename to src/xml/test-turtle.scm

diff --git a/v7/src/xml/turtle.scm b/src/xml/turtle.scm
similarity index 100%
rename from v7/src/xml/turtle.scm
rename to src/xml/turtle.scm

diff --git a/v7/src/xml/xhtml-entities.scm b/src/xml/xhtml-entities.scm
similarity index 100%
rename from v7/src/xml/xhtml-entities.scm
rename to src/xml/xhtml-entities.scm

diff --git a/v7/src/xml/xhtml.scm b/src/xml/xhtml.scm
similarity index 100%
rename from v7/src/xml/xhtml.scm
rename to src/xml/xhtml.scm

diff --git a/v7/src/xml/xml-chars.scm b/src/xml/xml-chars.scm
similarity index 100%
rename from v7/src/xml/xml-chars.scm
rename to src/xml/xml-chars.scm

diff --git a/v7/src/xml/xml-names.scm b/src/xml/xml-names.scm
similarity index 100%
rename from v7/src/xml/xml-names.scm
rename to src/xml/xml-names.scm

diff --git a/v7/src/xml/xml-output.scm b/src/xml/xml-output.scm
similarity index 100%
rename from v7/src/xml/xml-output.scm
rename to src/xml/xml-output.scm

diff --git a/v7/src/xml/xml-parser.scm b/src/xml/xml-parser.scm
similarity index 100%
rename from v7/src/xml/xml-parser.scm
rename to src/xml/xml-parser.scm

diff --git a/v7/src/xml/xml-rpc.scm b/src/xml/xml-rpc.scm
similarity index 100%
rename from v7/src/xml/xml-rpc.scm
rename to src/xml/xml-rpc.scm

diff --git a/v7/src/xml/xml-struct.scm b/src/xml/xml-struct.scm
similarity index 100%
rename from v7/src/xml/xml-struct.scm
rename to src/xml/xml-struct.scm

diff --git a/v7/src/xml/xml.pkg b/src/xml/xml.pkg
similarity index 100%
rename from v7/src/xml/xml.pkg
rename to src/xml/xml.pkg

diff --git a/v7/src/xml/xpath.scm b/src/xml/xpath.scm
similarity index 100%
rename from v7/src/xml/xpath.scm
rename to src/xml/xpath.scm