diff --git a/contrib/nvi/FAQ b/FAQ
similarity index 100%
rename from contrib/nvi/FAQ
rename to FAQ
diff --git a/contrib/nvi/LAYOUT b/LAYOUT
similarity index 100%
rename from contrib/nvi/LAYOUT
rename to LAYOUT
diff --git a/contrib/nvi/LICENSE b/LICENSE
similarity index 100%
rename from contrib/nvi/LICENSE
rename to LICENSE
diff --git a/contrib/nvi/README b/README
similarity index 100%
rename from contrib/nvi/README
rename to README
diff --git a/contrib/nvi/build/ExtUtils/Embed.pm b/build/ExtUtils/Embed.pm
similarity index 100%
rename from contrib/nvi/build/ExtUtils/Embed.pm
rename to build/ExtUtils/Embed.pm
diff --git a/contrib/nvi/build/Makefile.in b/build/Makefile.in
similarity index 100%
rename from contrib/nvi/build/Makefile.in
rename to build/Makefile.in
diff --git a/contrib/nvi/build/README b/build/README
similarity index 100%
rename from contrib/nvi/build/README
rename to build/README
diff --git a/contrib/nvi/build/README.LynxOS b/build/README.LynxOS
similarity index 100%
rename from contrib/nvi/build/README.LynxOS
rename to build/README.LynxOS
diff --git a/contrib/nvi/build/acconfig.h b/build/acconfig.h
similarity index 100%
rename from contrib/nvi/build/acconfig.h
rename to build/acconfig.h
diff --git a/contrib/nvi/build/aclocal.m4 b/build/aclocal.m4
similarity index 100%
rename from contrib/nvi/build/aclocal.m4
rename to build/aclocal.m4
diff --git a/contrib/nvi/build/config.guess b/build/config.guess
similarity index 100%
rename from contrib/nvi/build/config.guess
rename to build/config.guess
diff --git a/contrib/nvi/build/config.h.in b/build/config.h.in
similarity index 100%
rename from contrib/nvi/build/config.h.in
rename to build/config.h.in
diff --git a/contrib/nvi/build/config.sub b/build/config.sub
similarity index 100%
rename from contrib/nvi/build/config.sub
rename to build/config.sub
diff --git a/contrib/nvi/build/configure b/build/configure
similarity index 100%
rename from contrib/nvi/build/configure
rename to build/configure
diff --git a/contrib/nvi/build/configure.in b/build/configure.in
similarity index 100%
rename from contrib/nvi/build/configure.in
rename to build/configure.in
diff --git a/contrib/nvi/build/distrib b/build/distrib
similarity index 100%
rename from contrib/nvi/build/distrib
rename to build/distrib
diff --git a/contrib/nvi/build/install-sh b/build/install-sh
similarity index 100%
rename from contrib/nvi/build/install-sh
rename to build/install-sh
diff --git a/contrib/nvi/build/pathnames.h.in b/build/pathnames.h.in
similarity index 100%
rename from contrib/nvi/build/pathnames.h.in
rename to build/pathnames.h.in
diff --git a/contrib/nvi/build/port.h.in b/build/port.h.in
similarity index 100%
rename from contrib/nvi/build/port.h.in
rename to build/port.h.in
diff --git a/contrib/nvi/build/recover.in b/build/recover.in
similarity index 100%
rename from contrib/nvi/build/recover.in
rename to build/recover.in
diff --git a/contrib/nvi/build/spell.ok b/build/spell.ok
similarity index 100%
rename from contrib/nvi/build/spell.ok
rename to build/spell.ok
diff --git a/contrib/nvi/catalog/Makefile b/catalog/Makefile
similarity index 100%
rename from contrib/nvi/catalog/Makefile
rename to catalog/Makefile
diff --git a/contrib/nvi/catalog/README b/catalog/README
similarity index 100%
rename from contrib/nvi/catalog/README
rename to catalog/README
diff --git a/contrib/nvi/catalog/dump.c b/catalog/dump.c
similarity index 100%
rename from contrib/nvi/catalog/dump.c
rename to catalog/dump.c
diff --git a/contrib/nvi/catalog/dutch b/catalog/dutch
similarity index 100%
rename from contrib/nvi/catalog/dutch
rename to catalog/dutch
diff --git a/contrib/nvi/catalog/dutch.base b/catalog/dutch.base
similarity index 100%
rename from contrib/nvi/catalog/dutch.base
rename to catalog/dutch.base
diff --git a/contrib/nvi/catalog/dutch.check b/catalog/dutch.check
similarity index 100%
rename from contrib/nvi/catalog/dutch.check
rename to catalog/dutch.check
diff --git a/contrib/nvi/catalog/dutch.owner b/catalog/dutch.owner
similarity index 100%
rename from contrib/nvi/catalog/dutch.owner
rename to catalog/dutch.owner
diff --git a/contrib/nvi/catalog/english b/catalog/english
similarity index 100%
rename from contrib/nvi/catalog/english
rename to catalog/english
diff --git a/contrib/nvi/catalog/english.base b/catalog/english.base
similarity index 100%
rename from contrib/nvi/catalog/english.base
rename to catalog/english.base
diff --git a/contrib/nvi/catalog/english.check b/catalog/english.check
similarity index 100%
rename from contrib/nvi/catalog/english.check
rename to catalog/english.check
diff --git a/contrib/nvi/catalog/english.owner b/catalog/english.owner
similarity index 100%
rename from contrib/nvi/catalog/english.owner
rename to catalog/english.owner
diff --git a/contrib/nvi/catalog/french b/catalog/french
similarity index 100%
rename from contrib/nvi/catalog/french
rename to catalog/french
diff --git a/contrib/nvi/catalog/french.base b/catalog/french.base
similarity index 100%
rename from contrib/nvi/catalog/french.base
rename to catalog/french.base
diff --git a/contrib/nvi/catalog/french.check b/catalog/french.check
similarity index 100%
rename from contrib/nvi/catalog/french.check
rename to catalog/french.check
diff --git a/contrib/nvi/catalog/german b/catalog/german
similarity index 100%
rename from contrib/nvi/catalog/german
rename to catalog/german
diff --git a/contrib/nvi/catalog/german.base b/catalog/german.base
similarity index 100%
rename from contrib/nvi/catalog/german.base
rename to catalog/german.base
diff --git a/contrib/nvi/catalog/german.check b/catalog/german.check
similarity index 100%
rename from contrib/nvi/catalog/german.check
rename to catalog/german.check
diff --git a/contrib/nvi/catalog/german.owner b/catalog/german.owner
similarity index 100%
rename from contrib/nvi/catalog/german.owner
rename to catalog/german.owner
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R b/catalog/ru_RU.KOI8-R
similarity index 100%
rename from contrib/nvi/catalog/ru_RU.KOI8-R
rename to catalog/ru_RU.KOI8-R
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R.base b/catalog/ru_RU.KOI8-R.base
similarity index 100%
rename from contrib/nvi/catalog/ru_RU.KOI8-R.base
rename to catalog/ru_RU.KOI8-R.base
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R.check b/catalog/ru_RU.KOI8-R.check
similarity index 100%
rename from contrib/nvi/catalog/ru_RU.KOI8-R.check
rename to catalog/ru_RU.KOI8-R.check
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R.owner b/catalog/ru_RU.KOI8-R.owner
similarity index 100%
rename from contrib/nvi/catalog/ru_RU.KOI8-R.owner
rename to catalog/ru_RU.KOI8-R.owner
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R b/catalog/ru_SU.KOI8-R
similarity index 100%
rename from contrib/nvi/catalog/ru_SU.KOI8-R
rename to catalog/ru_SU.KOI8-R
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R.base b/catalog/ru_SU.KOI8-R.base
similarity index 100%
rename from contrib/nvi/catalog/ru_SU.KOI8-R.base
rename to catalog/ru_SU.KOI8-R.base
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R.check b/catalog/ru_SU.KOI8-R.check
similarity index 100%
rename from contrib/nvi/catalog/ru_SU.KOI8-R.check
rename to catalog/ru_SU.KOI8-R.check
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R.owner b/catalog/ru_SU.KOI8-R.owner
similarity index 100%
rename from contrib/nvi/catalog/ru_SU.KOI8-R.owner
rename to catalog/ru_SU.KOI8-R.owner
diff --git a/contrib/nvi/catalog/spanish b/catalog/spanish
similarity index 100%
rename from contrib/nvi/catalog/spanish
rename to catalog/spanish
diff --git a/contrib/nvi/catalog/spanish.base b/catalog/spanish.base
similarity index 100%
rename from contrib/nvi/catalog/spanish.base
rename to catalog/spanish.base
diff --git a/contrib/nvi/catalog/spanish.check b/catalog/spanish.check
similarity index 100%
rename from contrib/nvi/catalog/spanish.check
rename to catalog/spanish.check
diff --git a/contrib/nvi/catalog/spell.ok b/catalog/spell.ok
similarity index 100%
rename from contrib/nvi/catalog/spell.ok
rename to catalog/spell.ok
diff --git a/contrib/nvi/catalog/swedish b/catalog/swedish
similarity index 100%
rename from contrib/nvi/catalog/swedish
rename to catalog/swedish
diff --git a/contrib/nvi/catalog/swedish.base b/catalog/swedish.base
similarity index 100%
rename from contrib/nvi/catalog/swedish.base
rename to catalog/swedish.base
diff --git a/contrib/nvi/catalog/swedish.check b/catalog/swedish.check
similarity index 100%
rename from contrib/nvi/catalog/swedish.check
rename to catalog/swedish.check
diff --git a/contrib/nvi/catalog/swedish.owner b/catalog/swedish.owner
similarity index 100%
rename from contrib/nvi/catalog/swedish.owner
rename to catalog/swedish.owner
diff --git a/contrib/nvi/cl/README.signal b/cl/README.signal
similarity index 100%
rename from contrib/nvi/cl/README.signal
rename to cl/README.signal
diff --git a/contrib/nvi/cl/cl.h b/cl/cl.h
similarity index 100%
rename from contrib/nvi/cl/cl.h
rename to cl/cl.h
diff --git a/contrib/nvi/cl/cl_bsd.c b/cl/cl_bsd.c
similarity index 100%
rename from contrib/nvi/cl/cl_bsd.c
rename to cl/cl_bsd.c
diff --git a/contrib/nvi/cl/cl_funcs.c b/cl/cl_funcs.c
similarity index 100%
rename from contrib/nvi/cl/cl_funcs.c
rename to cl/cl_funcs.c
diff --git a/contrib/nvi/cl/cl_main.c b/cl/cl_main.c
similarity index 100%
rename from contrib/nvi/cl/cl_main.c
rename to cl/cl_main.c
diff --git a/contrib/nvi/cl/cl_read.c b/cl/cl_read.c
similarity index 100%
rename from contrib/nvi/cl/cl_read.c
rename to cl/cl_read.c
diff --git a/contrib/nvi/cl/cl_screen.c b/cl/cl_screen.c
similarity index 100%
rename from contrib/nvi/cl/cl_screen.c
rename to cl/cl_screen.c
diff --git a/contrib/nvi/cl/cl_term.c b/cl/cl_term.c
similarity index 100%
rename from contrib/nvi/cl/cl_term.c
rename to cl/cl_term.c
diff --git a/contrib/nvi/clib/bsearch.c b/clib/bsearch.c
similarity index 100%
rename from contrib/nvi/clib/bsearch.c
rename to clib/bsearch.c
diff --git a/contrib/nvi/clib/env.c b/clib/env.c
similarity index 100%
rename from contrib/nvi/clib/env.c
rename to clib/env.c
diff --git a/contrib/nvi/clib/gethostname.c b/clib/gethostname.c
similarity index 100%
rename from contrib/nvi/clib/gethostname.c
rename to clib/gethostname.c
diff --git a/contrib/nvi/clib/getopt.c b/clib/getopt.c
similarity index 100%
rename from contrib/nvi/clib/getopt.c
rename to clib/getopt.c
diff --git a/contrib/nvi/clib/memchr.c b/clib/memchr.c
similarity index 100%
rename from contrib/nvi/clib/memchr.c
rename to clib/memchr.c
diff --git a/contrib/nvi/clib/memmove.c b/clib/memmove.c
similarity index 100%
rename from contrib/nvi/clib/memmove.c
rename to clib/memmove.c
diff --git a/contrib/nvi/clib/memset.c b/clib/memset.c
similarity index 100%
rename from contrib/nvi/clib/memset.c
rename to clib/memset.c
diff --git a/contrib/nvi/clib/mkstemp.c b/clib/mkstemp.c
similarity index 100%
rename from contrib/nvi/clib/mkstemp.c
rename to clib/mkstemp.c
diff --git a/contrib/nvi/clib/mmap.c b/clib/mmap.c
similarity index 100%
rename from contrib/nvi/clib/mmap.c
rename to clib/mmap.c
diff --git a/contrib/nvi/clib/snprintf.c b/clib/snprintf.c
similarity index 100%
rename from contrib/nvi/clib/snprintf.c
rename to clib/snprintf.c
diff --git a/contrib/nvi/clib/strdup.c b/clib/strdup.c
similarity index 100%
rename from contrib/nvi/clib/strdup.c
rename to clib/strdup.c
diff --git a/contrib/nvi/clib/strerror.c b/clib/strerror.c
similarity index 100%
rename from contrib/nvi/clib/strerror.c
rename to clib/strerror.c
diff --git a/contrib/nvi/clib/strpbrk.c b/clib/strpbrk.c
similarity index 100%
rename from contrib/nvi/clib/strpbrk.c
rename to clib/strpbrk.c
diff --git a/contrib/nvi/clib/strsep.c b/clib/strsep.c
similarity index 100%
rename from contrib/nvi/clib/strsep.c
rename to clib/strsep.c
diff --git a/contrib/nvi/clib/strtol.c b/clib/strtol.c
similarity index 100%
rename from contrib/nvi/clib/strtol.c
rename to clib/strtol.c
diff --git a/contrib/nvi/clib/strtoul.c b/clib/strtoul.c
similarity index 100%
rename from contrib/nvi/clib/strtoul.c
rename to clib/strtoul.c
diff --git a/contrib/nvi/clib/vsnprintf.c b/clib/vsnprintf.c
similarity index 100%
rename from contrib/nvi/clib/vsnprintf.c
rename to clib/vsnprintf.c
diff --git a/contrib/nvi/common/api.c b/common/api.c
similarity index 100%
rename from contrib/nvi/common/api.c
rename to common/api.c
diff --git a/contrib/nvi/common/args.h b/common/args.h
similarity index 100%
rename from contrib/nvi/common/args.h
rename to common/args.h
diff --git a/contrib/nvi/common/common.h b/common/common.h
similarity index 100%
rename from contrib/nvi/common/common.h
rename to common/common.h
diff --git a/contrib/nvi/common/cut.c b/common/cut.c
similarity index 100%
rename from contrib/nvi/common/cut.c
rename to common/cut.c
diff --git a/contrib/nvi/common/cut.h b/common/cut.h
similarity index 100%
rename from contrib/nvi/common/cut.h
rename to common/cut.h
diff --git a/contrib/nvi/common/delete.c b/common/delete.c
similarity index 100%
rename from contrib/nvi/common/delete.c
rename to common/delete.c
diff --git a/contrib/nvi/common/exf.c b/common/exf.c
similarity index 100%
rename from contrib/nvi/common/exf.c
rename to common/exf.c
diff --git a/contrib/nvi/common/exf.h b/common/exf.h
similarity index 100%
rename from contrib/nvi/common/exf.h
rename to common/exf.h
diff --git a/contrib/nvi/common/gs.h b/common/gs.h
similarity index 100%
rename from contrib/nvi/common/gs.h
rename to common/gs.h
diff --git a/contrib/nvi/common/key.c b/common/key.c
similarity index 100%
rename from contrib/nvi/common/key.c
rename to common/key.c
diff --git a/contrib/nvi/common/key.h b/common/key.h
similarity index 100%
rename from contrib/nvi/common/key.h
rename to common/key.h
diff --git a/contrib/nvi/common/line.c b/common/line.c
similarity index 100%
rename from contrib/nvi/common/line.c
rename to common/line.c
diff --git a/contrib/nvi/common/log.c b/common/log.c
similarity index 100%
rename from contrib/nvi/common/log.c
rename to common/log.c
diff --git a/contrib/nvi/common/log.h b/common/log.h
similarity index 100%
rename from contrib/nvi/common/log.h
rename to common/log.h
diff --git a/contrib/nvi/common/main.c b/common/main.c
similarity index 100%
rename from contrib/nvi/common/main.c
rename to common/main.c
diff --git a/contrib/nvi/common/mark.c b/common/mark.c
similarity index 100%
rename from contrib/nvi/common/mark.c
rename to common/mark.c
diff --git a/contrib/nvi/common/mark.h b/common/mark.h
similarity index 100%
rename from contrib/nvi/common/mark.h
rename to common/mark.h
diff --git a/contrib/nvi/common/mem.h b/common/mem.h
similarity index 100%
rename from contrib/nvi/common/mem.h
rename to common/mem.h
diff --git a/contrib/nvi/common/msg.c b/common/msg.c
similarity index 100%
rename from contrib/nvi/common/msg.c
rename to common/msg.c
diff --git a/contrib/nvi/common/msg.h b/common/msg.h
similarity index 100%
rename from contrib/nvi/common/msg.h
rename to common/msg.h
diff --git a/contrib/nvi/common/options.awk b/common/options.awk
similarity index 100%
rename from contrib/nvi/common/options.awk
rename to common/options.awk
diff --git a/contrib/nvi/common/options.c b/common/options.c
similarity index 100%
rename from contrib/nvi/common/options.c
rename to common/options.c
diff --git a/contrib/nvi/common/options.h b/common/options.h
similarity index 100%
rename from contrib/nvi/common/options.h
rename to common/options.h
diff --git a/contrib/nvi/common/options_f.c b/common/options_f.c
similarity index 100%
rename from contrib/nvi/common/options_f.c
rename to common/options_f.c
diff --git a/contrib/nvi/common/put.c b/common/put.c
similarity index 100%
rename from contrib/nvi/common/put.c
rename to common/put.c
diff --git a/contrib/nvi/common/recover.c b/common/recover.c
similarity index 100%
rename from contrib/nvi/common/recover.c
rename to common/recover.c
diff --git a/contrib/nvi/common/screen.c b/common/screen.c
similarity index 100%
rename from contrib/nvi/common/screen.c
rename to common/screen.c
diff --git a/contrib/nvi/common/screen.h b/common/screen.h
similarity index 100%
rename from contrib/nvi/common/screen.h
rename to common/screen.h
diff --git a/contrib/nvi/common/search.c b/common/search.c
similarity index 100%
rename from contrib/nvi/common/search.c
rename to common/search.c
diff --git a/contrib/nvi/common/seq.c b/common/seq.c
similarity index 100%
rename from contrib/nvi/common/seq.c
rename to common/seq.c
diff --git a/contrib/nvi/common/seq.h b/common/seq.h
similarity index 100%
rename from contrib/nvi/common/seq.h
rename to common/seq.h
diff --git a/contrib/nvi/common/util.c b/common/util.c
similarity index 100%
rename from contrib/nvi/common/util.c
rename to common/util.c
diff --git a/contrib/nvi/common/util.h b/common/util.h
similarity index 100%
rename from contrib/nvi/common/util.h
rename to common/util.h
diff --git a/contrib/nvi/docs/TODO b/docs/TODO
similarity index 100%
rename from contrib/nvi/docs/TODO
rename to docs/TODO
diff --git a/contrib/nvi/docs/USD.doc/edit/Makefile b/docs/USD.doc/edit/Makefile
similarity index 100%
rename from contrib/nvi/docs/USD.doc/edit/Makefile
rename to docs/USD.doc/edit/Makefile
diff --git a/contrib/nvi/docs/USD.doc/edit/edit.vindex b/docs/USD.doc/edit/edit.vindex
similarity index 100%
rename from contrib/nvi/docs/USD.doc/edit/edit.vindex
rename to docs/USD.doc/edit/edit.vindex
diff --git a/contrib/nvi/docs/USD.doc/edit/edittut.ms b/docs/USD.doc/edit/edittut.ms
similarity index 100%
rename from contrib/nvi/docs/USD.doc/edit/edittut.ms
rename to docs/USD.doc/edit/edittut.ms
diff --git a/contrib/nvi/docs/USD.doc/exref/Makefile b/docs/USD.doc/exref/Makefile
similarity index 100%
rename from contrib/nvi/docs/USD.doc/exref/Makefile
rename to docs/USD.doc/exref/Makefile
diff --git a/contrib/nvi/docs/USD.doc/exref/ex.rm b/docs/USD.doc/exref/ex.rm
similarity index 100%
rename from contrib/nvi/docs/USD.doc/exref/ex.rm
rename to docs/USD.doc/exref/ex.rm
diff --git a/contrib/nvi/docs/USD.doc/exref/ex.summary b/docs/USD.doc/exref/ex.summary
similarity index 100%
rename from contrib/nvi/docs/USD.doc/exref/ex.summary
rename to docs/USD.doc/exref/ex.summary
diff --git a/contrib/nvi/docs/USD.doc/vi.man/Makefile b/docs/USD.doc/vi.man/Makefile
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.man/Makefile
rename to docs/USD.doc/vi.man/Makefile
diff --git a/contrib/nvi/docs/USD.doc/vi.man/spell.ok b/docs/USD.doc/vi.man/spell.ok
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.man/spell.ok
rename to docs/USD.doc/vi.man/spell.ok
diff --git a/contrib/nvi/docs/USD.doc/vi.man/vi.1 b/docs/USD.doc/vi.man/vi.1
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.man/vi.1
rename to docs/USD.doc/vi.man/vi.1
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/Makefile b/docs/USD.doc/vi.ref/Makefile
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/Makefile
rename to docs/USD.doc/vi.ref/Makefile
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/ex.cmd.roff b/docs/USD.doc/vi.ref/ex.cmd.roff
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/ex.cmd.roff
rename to docs/USD.doc/vi.ref/ex.cmd.roff
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/index.so b/docs/USD.doc/vi.ref/index.so
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/index.so
rename to docs/USD.doc/vi.ref/index.so
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/merge.awk b/docs/USD.doc/vi.ref/merge.awk
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/merge.awk
rename to docs/USD.doc/vi.ref/merge.awk
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/ref.so b/docs/USD.doc/vi.ref/ref.so
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/ref.so
rename to docs/USD.doc/vi.ref/ref.so
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/set.opt.roff b/docs/USD.doc/vi.ref/set.opt.roff
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/set.opt.roff
rename to docs/USD.doc/vi.ref/set.opt.roff
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/spell.ok b/docs/USD.doc/vi.ref/spell.ok
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/spell.ok
rename to docs/USD.doc/vi.ref/spell.ok
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.cmd.roff b/docs/USD.doc/vi.ref/vi.cmd.roff
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/vi.cmd.roff
rename to docs/USD.doc/vi.ref/vi.cmd.roff
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref b/docs/USD.doc/vi.ref/vi.ref
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vi.ref/vi.ref
rename to docs/USD.doc/vi.ref/vi.ref
diff --git a/contrib/nvi/docs/USD.doc/vitut/Makefile b/docs/USD.doc/vitut/Makefile
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vitut/Makefile
rename to docs/USD.doc/vitut/Makefile
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.apwh.ms b/docs/USD.doc/vitut/vi.apwh.ms
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vitut/vi.apwh.ms
rename to docs/USD.doc/vitut/vi.apwh.ms
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.chars b/docs/USD.doc/vitut/vi.chars
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vitut/vi.chars
rename to docs/USD.doc/vitut/vi.chars
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.in b/docs/USD.doc/vitut/vi.in
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vitut/vi.in
rename to docs/USD.doc/vitut/vi.in
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.summary b/docs/USD.doc/vitut/vi.summary
similarity index 100%
rename from contrib/nvi/docs/USD.doc/vitut/vi.summary
rename to docs/USD.doc/vitut/vi.summary
diff --git a/contrib/nvi/docs/changelog b/docs/changelog
similarity index 100%
rename from contrib/nvi/docs/changelog
rename to docs/changelog
diff --git a/contrib/nvi/docs/ev b/docs/ev
similarity index 100%
rename from contrib/nvi/docs/ev
rename to docs/ev
diff --git a/contrib/nvi/docs/features b/docs/features
similarity index 100%
rename from contrib/nvi/docs/features
rename to docs/features
diff --git a/contrib/nvi/docs/help b/docs/help
similarity index 100%
rename from contrib/nvi/docs/help
rename to docs/help
diff --git a/contrib/nvi/docs/internals/autowrite b/docs/internals/autowrite
similarity index 100%
rename from contrib/nvi/docs/internals/autowrite
rename to docs/internals/autowrite
diff --git a/contrib/nvi/docs/internals/context b/docs/internals/context
similarity index 100%
rename from contrib/nvi/docs/internals/context
rename to docs/internals/context
diff --git a/contrib/nvi/docs/internals/cscope.NOTES b/docs/internals/cscope.NOTES
similarity index 100%
rename from contrib/nvi/docs/internals/cscope.NOTES
rename to docs/internals/cscope.NOTES
diff --git a/contrib/nvi/docs/internals/gdb.script b/docs/internals/gdb.script
similarity index 100%
rename from contrib/nvi/docs/internals/gdb.script
rename to docs/internals/gdb.script
diff --git a/contrib/nvi/docs/internals/input b/docs/internals/input
similarity index 100%
rename from contrib/nvi/docs/internals/input
rename to docs/internals/input
diff --git a/contrib/nvi/docs/internals/openmode b/docs/internals/openmode
similarity index 100%
rename from contrib/nvi/docs/internals/openmode
rename to docs/internals/openmode
diff --git a/contrib/nvi/docs/internals/quoting b/docs/internals/quoting
similarity index 100%
rename from contrib/nvi/docs/internals/quoting
rename to docs/internals/quoting
diff --git a/contrib/nvi/docs/internals/structures b/docs/internals/structures
similarity index 100%
rename from contrib/nvi/docs/internals/structures
rename to docs/internals/structures
diff --git a/contrib/nvi/docs/interp/interp b/docs/interp/interp
similarity index 100%
rename from contrib/nvi/docs/interp/interp
rename to docs/interp/interp
diff --git a/contrib/nvi/docs/interp/spell.ok b/docs/interp/spell.ok
similarity index 100%
rename from contrib/nvi/docs/interp/spell.ok
rename to docs/interp/spell.ok
diff --git a/contrib/nvi/docs/spell.ok b/docs/spell.ok
similarity index 100%
rename from contrib/nvi/docs/spell.ok
rename to docs/spell.ok
diff --git a/contrib/nvi/docs/tutorial/vi.advanced b/docs/tutorial/vi.advanced
similarity index 100%
rename from contrib/nvi/docs/tutorial/vi.advanced
rename to docs/tutorial/vi.advanced
diff --git a/contrib/nvi/docs/tutorial/vi.beginner b/docs/tutorial/vi.beginner
similarity index 100%
rename from contrib/nvi/docs/tutorial/vi.beginner
rename to docs/tutorial/vi.beginner
diff --git a/contrib/nvi/docs/tutorial/vi.tut.csh b/docs/tutorial/vi.tut.csh
similarity index 100%
rename from contrib/nvi/docs/tutorial/vi.tut.csh
rename to docs/tutorial/vi.tut.csh
diff --git a/contrib/nvi/ex/ex.awk b/ex/ex.awk
similarity index 100%
rename from contrib/nvi/ex/ex.awk
rename to ex/ex.awk
diff --git a/contrib/nvi/ex/ex.c b/ex/ex.c
similarity index 100%
rename from contrib/nvi/ex/ex.c
rename to ex/ex.c
diff --git a/contrib/nvi/ex/ex.h b/ex/ex.h
similarity index 100%
rename from contrib/nvi/ex/ex.h
rename to ex/ex.h
diff --git a/contrib/nvi/ex/ex_abbrev.c b/ex/ex_abbrev.c
similarity index 100%
rename from contrib/nvi/ex/ex_abbrev.c
rename to ex/ex_abbrev.c
diff --git a/contrib/nvi/ex/ex_append.c b/ex/ex_append.c
similarity index 100%
rename from contrib/nvi/ex/ex_append.c
rename to ex/ex_append.c
diff --git a/contrib/nvi/ex/ex_args.c b/ex/ex_args.c
similarity index 100%
rename from contrib/nvi/ex/ex_args.c
rename to ex/ex_args.c
diff --git a/contrib/nvi/ex/ex_argv.c b/ex/ex_argv.c
similarity index 100%
rename from contrib/nvi/ex/ex_argv.c
rename to ex/ex_argv.c
diff --git a/contrib/nvi/ex/ex_at.c b/ex/ex_at.c
similarity index 100%
rename from contrib/nvi/ex/ex_at.c
rename to ex/ex_at.c
diff --git a/contrib/nvi/ex/ex_bang.c b/ex/ex_bang.c
similarity index 100%
rename from contrib/nvi/ex/ex_bang.c
rename to ex/ex_bang.c
diff --git a/contrib/nvi/ex/ex_cd.c b/ex/ex_cd.c
similarity index 100%
rename from contrib/nvi/ex/ex_cd.c
rename to ex/ex_cd.c
diff --git a/contrib/nvi/ex/ex_cmd.c b/ex/ex_cmd.c
similarity index 100%
rename from contrib/nvi/ex/ex_cmd.c
rename to ex/ex_cmd.c
diff --git a/contrib/nvi/ex/ex_cscope.c b/ex/ex_cscope.c
similarity index 100%
rename from contrib/nvi/ex/ex_cscope.c
rename to ex/ex_cscope.c
diff --git a/contrib/nvi/ex/ex_delete.c b/ex/ex_delete.c
similarity index 100%
rename from contrib/nvi/ex/ex_delete.c
rename to ex/ex_delete.c
diff --git a/contrib/nvi/ex/ex_display.c b/ex/ex_display.c
similarity index 100%
rename from contrib/nvi/ex/ex_display.c
rename to ex/ex_display.c
diff --git a/contrib/nvi/ex/ex_edit.c b/ex/ex_edit.c
similarity index 100%
rename from contrib/nvi/ex/ex_edit.c
rename to ex/ex_edit.c
diff --git a/contrib/nvi/ex/ex_equal.c b/ex/ex_equal.c
similarity index 100%
rename from contrib/nvi/ex/ex_equal.c
rename to ex/ex_equal.c
diff --git a/contrib/nvi/ex/ex_file.c b/ex/ex_file.c
similarity index 100%
rename from contrib/nvi/ex/ex_file.c
rename to ex/ex_file.c
diff --git a/contrib/nvi/ex/ex_filter.c b/ex/ex_filter.c
similarity index 100%
rename from contrib/nvi/ex/ex_filter.c
rename to ex/ex_filter.c
diff --git a/contrib/nvi/ex/ex_global.c b/ex/ex_global.c
similarity index 100%
rename from contrib/nvi/ex/ex_global.c
rename to ex/ex_global.c
diff --git a/contrib/nvi/ex/ex_init.c b/ex/ex_init.c
similarity index 100%
rename from contrib/nvi/ex/ex_init.c
rename to ex/ex_init.c
diff --git a/contrib/nvi/ex/ex_join.c b/ex/ex_join.c
similarity index 100%
rename from contrib/nvi/ex/ex_join.c
rename to ex/ex_join.c
diff --git a/contrib/nvi/ex/ex_map.c b/ex/ex_map.c
similarity index 100%
rename from contrib/nvi/ex/ex_map.c
rename to ex/ex_map.c
diff --git a/contrib/nvi/ex/ex_mark.c b/ex/ex_mark.c
similarity index 100%
rename from contrib/nvi/ex/ex_mark.c
rename to ex/ex_mark.c
diff --git a/contrib/nvi/ex/ex_mkexrc.c b/ex/ex_mkexrc.c
similarity index 100%
rename from contrib/nvi/ex/ex_mkexrc.c
rename to ex/ex_mkexrc.c
diff --git a/contrib/nvi/ex/ex_move.c b/ex/ex_move.c
similarity index 100%
rename from contrib/nvi/ex/ex_move.c
rename to ex/ex_move.c
diff --git a/contrib/nvi/ex/ex_open.c b/ex/ex_open.c
similarity index 100%
rename from contrib/nvi/ex/ex_open.c
rename to ex/ex_open.c
diff --git a/contrib/nvi/ex/ex_perl.c b/ex/ex_perl.c
similarity index 100%
rename from contrib/nvi/ex/ex_perl.c
rename to ex/ex_perl.c
diff --git a/contrib/nvi/ex/ex_preserve.c b/ex/ex_preserve.c
similarity index 100%
rename from contrib/nvi/ex/ex_preserve.c
rename to ex/ex_preserve.c
diff --git a/contrib/nvi/ex/ex_print.c b/ex/ex_print.c
similarity index 100%
rename from contrib/nvi/ex/ex_print.c
rename to ex/ex_print.c
diff --git a/contrib/nvi/ex/ex_put.c b/ex/ex_put.c
similarity index 100%
rename from contrib/nvi/ex/ex_put.c
rename to ex/ex_put.c
diff --git a/contrib/nvi/ex/ex_quit.c b/ex/ex_quit.c
similarity index 100%
rename from contrib/nvi/ex/ex_quit.c
rename to ex/ex_quit.c
diff --git a/contrib/nvi/ex/ex_read.c b/ex/ex_read.c
similarity index 100%
rename from contrib/nvi/ex/ex_read.c
rename to ex/ex_read.c
diff --git a/contrib/nvi/ex/ex_screen.c b/ex/ex_screen.c
similarity index 100%
rename from contrib/nvi/ex/ex_screen.c
rename to ex/ex_screen.c
diff --git a/contrib/nvi/ex/ex_script.c b/ex/ex_script.c
similarity index 100%
rename from contrib/nvi/ex/ex_script.c
rename to ex/ex_script.c
diff --git a/contrib/nvi/ex/ex_set.c b/ex/ex_set.c
similarity index 100%
rename from contrib/nvi/ex/ex_set.c
rename to ex/ex_set.c
diff --git a/contrib/nvi/ex/ex_shell.c b/ex/ex_shell.c
similarity index 100%
rename from contrib/nvi/ex/ex_shell.c
rename to ex/ex_shell.c
diff --git a/contrib/nvi/ex/ex_shift.c b/ex/ex_shift.c
similarity index 100%
rename from contrib/nvi/ex/ex_shift.c
rename to ex/ex_shift.c
diff --git a/contrib/nvi/ex/ex_source.c b/ex/ex_source.c
similarity index 100%
rename from contrib/nvi/ex/ex_source.c
rename to ex/ex_source.c
diff --git a/contrib/nvi/ex/ex_stop.c b/ex/ex_stop.c
similarity index 100%
rename from contrib/nvi/ex/ex_stop.c
rename to ex/ex_stop.c
diff --git a/contrib/nvi/ex/ex_subst.c b/ex/ex_subst.c
similarity index 100%
rename from contrib/nvi/ex/ex_subst.c
rename to ex/ex_subst.c
diff --git a/contrib/nvi/ex/ex_tag.c b/ex/ex_tag.c
similarity index 100%
rename from contrib/nvi/ex/ex_tag.c
rename to ex/ex_tag.c
diff --git a/contrib/nvi/ex/ex_tcl.c b/ex/ex_tcl.c
similarity index 100%
rename from contrib/nvi/ex/ex_tcl.c
rename to ex/ex_tcl.c
diff --git a/contrib/nvi/ex/ex_txt.c b/ex/ex_txt.c
similarity index 100%
rename from contrib/nvi/ex/ex_txt.c
rename to ex/ex_txt.c
diff --git a/contrib/nvi/ex/ex_undo.c b/ex/ex_undo.c
similarity index 100%
rename from contrib/nvi/ex/ex_undo.c
rename to ex/ex_undo.c
diff --git a/contrib/nvi/ex/ex_usage.c b/ex/ex_usage.c
similarity index 100%
rename from contrib/nvi/ex/ex_usage.c
rename to ex/ex_usage.c
diff --git a/contrib/nvi/ex/ex_util.c b/ex/ex_util.c
similarity index 100%
rename from contrib/nvi/ex/ex_util.c
rename to ex/ex_util.c
diff --git a/contrib/nvi/ex/ex_version.c b/ex/ex_version.c
similarity index 100%
rename from contrib/nvi/ex/ex_version.c
rename to ex/ex_version.c
diff --git a/contrib/nvi/ex/ex_visual.c b/ex/ex_visual.c
similarity index 100%
rename from contrib/nvi/ex/ex_visual.c
rename to ex/ex_visual.c
diff --git a/contrib/nvi/ex/ex_write.c b/ex/ex_write.c
similarity index 100%
rename from contrib/nvi/ex/ex_write.c
rename to ex/ex_write.c
diff --git a/contrib/nvi/ex/ex_yank.c b/ex/ex_yank.c
similarity index 100%
rename from contrib/nvi/ex/ex_yank.c
rename to ex/ex_yank.c
diff --git a/contrib/nvi/ex/ex_z.c b/ex/ex_z.c
similarity index 100%
rename from contrib/nvi/ex/ex_z.c
rename to ex/ex_z.c
diff --git a/contrib/nvi/ex/script.h b/ex/script.h
similarity index 100%
rename from contrib/nvi/ex/script.h
rename to ex/script.h
diff --git a/contrib/nvi/ex/tag.h b/ex/tag.h
similarity index 100%
rename from contrib/nvi/ex/tag.h
rename to ex/tag.h
diff --git a/contrib/nvi/ex/version.h b/ex/version.h
similarity index 100%
rename from contrib/nvi/ex/version.h
rename to ex/version.h
diff --git a/contrib/nvi/include/bitstring.h b/include/bitstring.h
similarity index 100%
rename from contrib/nvi/include/bitstring.h
rename to include/bitstring.h
diff --git a/contrib/nvi/include/cl_extern.h b/include/cl_extern.h
similarity index 100%
rename from contrib/nvi/include/cl_extern.h
rename to include/cl_extern.h
diff --git a/contrib/nvi/include/com_extern.h b/include/com_extern.h
similarity index 100%
rename from contrib/nvi/include/com_extern.h
rename to include/com_extern.h
diff --git a/contrib/nvi/include/ex_def.h b/include/ex_def.h
similarity index 100%
rename from contrib/nvi/include/ex_def.h
rename to include/ex_def.h
diff --git a/contrib/nvi/include/ex_extern.h b/include/ex_extern.h
similarity index 100%
rename from contrib/nvi/include/ex_extern.h
rename to include/ex_extern.h
diff --git a/contrib/nvi/include/ip_extern.h b/include/ip_extern.h
similarity index 100%
rename from contrib/nvi/include/ip_extern.h
rename to include/ip_extern.h
diff --git a/contrib/nvi/include/options_def.h b/include/options_def.h
similarity index 100%
rename from contrib/nvi/include/options_def.h
rename to include/options_def.h
diff --git a/contrib/nvi/include/perl_extern.h b/include/perl_extern.h
similarity index 100%
rename from contrib/nvi/include/perl_extern.h
rename to include/perl_extern.h
diff --git a/contrib/nvi/include/sys/queue.h b/include/sys/queue.h
similarity index 100%
rename from contrib/nvi/include/sys/queue.h
rename to include/sys/queue.h
diff --git a/contrib/nvi/include/tcl_extern.h b/include/tcl_extern.h
similarity index 100%
rename from contrib/nvi/include/tcl_extern.h
rename to include/tcl_extern.h
diff --git a/contrib/nvi/include/tk_extern.h b/include/tk_extern.h
similarity index 100%
rename from contrib/nvi/include/tk_extern.h
rename to include/tk_extern.h
diff --git a/contrib/nvi/include/vi_extern.h b/include/vi_extern.h
similarity index 100%
rename from contrib/nvi/include/vi_extern.h
rename to include/vi_extern.h
diff --git a/contrib/nvi/ip/IP_INSTRUCTIONS b/ip/IP_INSTRUCTIONS
similarity index 100%
rename from contrib/nvi/ip/IP_INSTRUCTIONS
rename to ip/IP_INSTRUCTIONS
diff --git a/contrib/nvi/ip/ip.h b/ip/ip.h
similarity index 100%
rename from contrib/nvi/ip/ip.h
rename to ip/ip.h
diff --git a/contrib/nvi/ip/ip_funcs.c b/ip/ip_funcs.c
similarity index 100%
rename from contrib/nvi/ip/ip_funcs.c
rename to ip/ip_funcs.c
diff --git a/contrib/nvi/ip/ip_main.c b/ip/ip_main.c
similarity index 100%
rename from contrib/nvi/ip/ip_main.c
rename to ip/ip_main.c
diff --git a/contrib/nvi/ip/ip_read.c b/ip/ip_read.c
similarity index 100%
rename from contrib/nvi/ip/ip_read.c
rename to ip/ip_read.c
diff --git a/contrib/nvi/ip/ip_screen.c b/ip/ip_screen.c
similarity index 100%
rename from contrib/nvi/ip/ip_screen.c
rename to ip/ip_screen.c
diff --git a/contrib/nvi/ip/ip_term.c b/ip/ip_term.c
similarity index 100%
rename from contrib/nvi/ip/ip_term.c
rename to ip/ip_term.c
diff --git a/contrib/nvi/ip_cl/Makefile b/ip_cl/Makefile
similarity index 100%
rename from contrib/nvi/ip_cl/Makefile
rename to ip_cl/Makefile
diff --git a/contrib/nvi/ip_cl/ip_cl.c b/ip_cl/ip_cl.c
similarity index 100%
rename from contrib/nvi/ip_cl/ip_cl.c
rename to ip_cl/ip_cl.c
diff --git a/contrib/nvi/perl_api/VI.pod b/perl_api/VI.pod
similarity index 100%
rename from contrib/nvi/perl_api/VI.pod
rename to perl_api/VI.pod
diff --git a/contrib/nvi/perl_api/nviperl.pod b/perl_api/nviperl.pod
similarity index 100%
rename from contrib/nvi/perl_api/nviperl.pod
rename to perl_api/nviperl.pod
diff --git a/contrib/nvi/perl_api/perl.xs b/perl_api/perl.xs
similarity index 100%
rename from contrib/nvi/perl_api/perl.xs
rename to perl_api/perl.xs
diff --git a/contrib/nvi/perl_api/perlsfio.c b/perl_api/perlsfio.c
similarity index 100%
rename from contrib/nvi/perl_api/perlsfio.c
rename to perl_api/perlsfio.c
diff --git a/contrib/nvi/perl_api/typemap b/perl_api/typemap
similarity index 100%
rename from contrib/nvi/perl_api/typemap
rename to perl_api/typemap
diff --git a/contrib/nvi/perl_scripts/forall.pl b/perl_scripts/forall.pl
similarity index 100%
rename from contrib/nvi/perl_scripts/forall.pl
rename to perl_scripts/forall.pl
diff --git a/contrib/nvi/perl_scripts/make.pl b/perl_scripts/make.pl
similarity index 100%
rename from contrib/nvi/perl_scripts/make.pl
rename to perl_scripts/make.pl
diff --git a/contrib/nvi/perl_scripts/tk.pl b/perl_scripts/tk.pl
similarity index 100%
rename from contrib/nvi/perl_scripts/tk.pl
rename to perl_scripts/tk.pl
diff --git a/contrib/nvi/perl_scripts/wc.pl b/perl_scripts/wc.pl
similarity index 100%
rename from contrib/nvi/perl_scripts/wc.pl
rename to perl_scripts/wc.pl
diff --git a/contrib/nvi/tcl_api/tcl.c b/tcl_api/tcl.c
similarity index 100%
rename from contrib/nvi/tcl_api/tcl.c
rename to tcl_api/tcl.c
diff --git a/contrib/nvi/tcl_scripts/errors.tcl b/tcl_scripts/errors.tcl
similarity index 100%
rename from contrib/nvi/tcl_scripts/errors.tcl
rename to tcl_scripts/errors.tcl
diff --git a/contrib/nvi/tcl_scripts/gnats.tcl b/tcl_scripts/gnats.tcl
similarity index 100%
rename from contrib/nvi/tcl_scripts/gnats.tcl
rename to tcl_scripts/gnats.tcl
diff --git a/contrib/nvi/tcl_scripts/mailprocs.tcl b/tcl_scripts/mailprocs.tcl
similarity index 100%
rename from contrib/nvi/tcl_scripts/mailprocs.tcl
rename to tcl_scripts/mailprocs.tcl
diff --git a/contrib/nvi/tcl_scripts/wc.tcl b/tcl_scripts/wc.tcl
similarity index 100%
rename from contrib/nvi/tcl_scripts/wc.tcl
rename to tcl_scripts/wc.tcl
diff --git a/contrib/nvi/tk/init.tcl b/tk/init.tcl
similarity index 100%
rename from contrib/nvi/tk/init.tcl
rename to tk/init.tcl
diff --git a/contrib/nvi/tk/tk_funcs.c b/tk/tk_funcs.c
similarity index 100%
rename from contrib/nvi/tk/tk_funcs.c
rename to tk/tk_funcs.c
diff --git a/contrib/nvi/tk/tk_main.c b/tk/tk_main.c
similarity index 100%
rename from contrib/nvi/tk/tk_main.c
rename to tk/tk_main.c
diff --git a/contrib/nvi/tk/tk_read.c b/tk/tk_read.c
similarity index 100%
rename from contrib/nvi/tk/tk_read.c
rename to tk/tk_read.c
diff --git a/contrib/nvi/tk/tk_screen.c b/tk/tk_screen.c
similarity index 100%
rename from contrib/nvi/tk/tk_screen.c
rename to tk/tk_screen.c
diff --git a/contrib/nvi/tk/tk_term.c b/tk/tk_term.c
similarity index 100%
rename from contrib/nvi/tk/tk_term.c
rename to tk/tk_term.c
diff --git a/contrib/nvi/tk/tk_util.c b/tk/tk_util.c
similarity index 100%
rename from contrib/nvi/tk/tk_util.c
rename to tk/tk_util.c
diff --git a/contrib/nvi/tk/tki.h b/tk/tki.h
similarity index 100%
rename from contrib/nvi/tk/tki.h
rename to tk/tki.h
diff --git a/contrib/nvi/vi/getc.c b/vi/getc.c
similarity index 100%
rename from contrib/nvi/vi/getc.c
rename to vi/getc.c
diff --git a/contrib/nvi/vi/v_at.c b/vi/v_at.c
similarity index 100%
rename from contrib/nvi/vi/v_at.c
rename to vi/v_at.c
diff --git a/contrib/nvi/vi/v_ch.c b/vi/v_ch.c
similarity index 100%
rename from contrib/nvi/vi/v_ch.c
rename to vi/v_ch.c
diff --git a/contrib/nvi/vi/v_cmd.c b/vi/v_cmd.c
similarity index 100%
rename from contrib/nvi/vi/v_cmd.c
rename to vi/v_cmd.c
diff --git a/contrib/nvi/vi/v_delete.c b/vi/v_delete.c
similarity index 100%
rename from contrib/nvi/vi/v_delete.c
rename to vi/v_delete.c
diff --git a/contrib/nvi/vi/v_ex.c b/vi/v_ex.c
similarity index 100%
rename from contrib/nvi/vi/v_ex.c
rename to vi/v_ex.c
diff --git a/contrib/nvi/vi/v_increment.c b/vi/v_increment.c
similarity index 100%
rename from contrib/nvi/vi/v_increment.c
rename to vi/v_increment.c
diff --git a/contrib/nvi/vi/v_init.c b/vi/v_init.c
similarity index 100%
rename from contrib/nvi/vi/v_init.c
rename to vi/v_init.c
diff --git a/contrib/nvi/vi/v_itxt.c b/vi/v_itxt.c
similarity index 100%
rename from contrib/nvi/vi/v_itxt.c
rename to vi/v_itxt.c
diff --git a/contrib/nvi/vi/v_left.c b/vi/v_left.c
similarity index 100%
rename from contrib/nvi/vi/v_left.c
rename to vi/v_left.c
diff --git a/contrib/nvi/vi/v_mark.c b/vi/v_mark.c
similarity index 100%
rename from contrib/nvi/vi/v_mark.c
rename to vi/v_mark.c
diff --git a/contrib/nvi/vi/v_match.c b/vi/v_match.c
similarity index 100%
rename from contrib/nvi/vi/v_match.c
rename to vi/v_match.c
diff --git a/contrib/nvi/vi/v_paragraph.c b/vi/v_paragraph.c
similarity index 100%
rename from contrib/nvi/vi/v_paragraph.c
rename to vi/v_paragraph.c
diff --git a/contrib/nvi/vi/v_put.c b/vi/v_put.c
similarity index 100%
rename from contrib/nvi/vi/v_put.c
rename to vi/v_put.c
diff --git a/contrib/nvi/vi/v_redraw.c b/vi/v_redraw.c
similarity index 100%
rename from contrib/nvi/vi/v_redraw.c
rename to vi/v_redraw.c
diff --git a/contrib/nvi/vi/v_replace.c b/vi/v_replace.c
similarity index 100%
rename from contrib/nvi/vi/v_replace.c
rename to vi/v_replace.c
diff --git a/contrib/nvi/vi/v_right.c b/vi/v_right.c
similarity index 100%
rename from contrib/nvi/vi/v_right.c
rename to vi/v_right.c
diff --git a/contrib/nvi/vi/v_screen.c b/vi/v_screen.c
similarity index 100%
rename from contrib/nvi/vi/v_screen.c
rename to vi/v_screen.c
diff --git a/contrib/nvi/vi/v_scroll.c b/vi/v_scroll.c
similarity index 100%
rename from contrib/nvi/vi/v_scroll.c
rename to vi/v_scroll.c
diff --git a/contrib/nvi/vi/v_search.c b/vi/v_search.c
similarity index 100%
rename from contrib/nvi/vi/v_search.c
rename to vi/v_search.c
diff --git a/contrib/nvi/vi/v_section.c b/vi/v_section.c
similarity index 100%
rename from contrib/nvi/vi/v_section.c
rename to vi/v_section.c
diff --git a/contrib/nvi/vi/v_sentence.c b/vi/v_sentence.c
similarity index 100%
rename from contrib/nvi/vi/v_sentence.c
rename to vi/v_sentence.c
diff --git a/contrib/nvi/vi/v_status.c b/vi/v_status.c
similarity index 100%
rename from contrib/nvi/vi/v_status.c
rename to vi/v_status.c
diff --git a/contrib/nvi/vi/v_txt.c b/vi/v_txt.c
similarity index 100%
rename from contrib/nvi/vi/v_txt.c
rename to vi/v_txt.c
diff --git a/contrib/nvi/vi/v_ulcase.c b/vi/v_ulcase.c
similarity index 100%
rename from contrib/nvi/vi/v_ulcase.c
rename to vi/v_ulcase.c
diff --git a/contrib/nvi/vi/v_undo.c b/vi/v_undo.c
similarity index 100%
rename from contrib/nvi/vi/v_undo.c
rename to vi/v_undo.c
diff --git a/contrib/nvi/vi/v_util.c b/vi/v_util.c
similarity index 100%
rename from contrib/nvi/vi/v_util.c
rename to vi/v_util.c
diff --git a/contrib/nvi/vi/v_word.c b/vi/v_word.c
similarity index 100%
rename from contrib/nvi/vi/v_word.c
rename to vi/v_word.c
diff --git a/contrib/nvi/vi/v_xchar.c b/vi/v_xchar.c
similarity index 100%
rename from contrib/nvi/vi/v_xchar.c
rename to vi/v_xchar.c
diff --git a/contrib/nvi/vi/v_yank.c b/vi/v_yank.c
similarity index 100%
rename from contrib/nvi/vi/v_yank.c
rename to vi/v_yank.c
diff --git a/contrib/nvi/vi/v_z.c b/vi/v_z.c
similarity index 100%
rename from contrib/nvi/vi/v_z.c
rename to vi/v_z.c
diff --git a/contrib/nvi/vi/v_zexit.c b/vi/v_zexit.c
similarity index 100%
rename from contrib/nvi/vi/v_zexit.c
rename to vi/v_zexit.c
diff --git a/contrib/nvi/vi/vi.c b/vi/vi.c
similarity index 100%
rename from contrib/nvi/vi/vi.c
rename to vi/vi.c
diff --git a/contrib/nvi/vi/vi.h b/vi/vi.h
similarity index 100%
rename from contrib/nvi/vi/vi.h
rename to vi/vi.h
diff --git a/contrib/nvi/vi/vs_line.c b/vi/vs_line.c
similarity index 100%
rename from contrib/nvi/vi/vs_line.c
rename to vi/vs_line.c
diff --git a/contrib/nvi/vi/vs_msg.c b/vi/vs_msg.c
similarity index 100%
rename from contrib/nvi/vi/vs_msg.c
rename to vi/vs_msg.c
diff --git a/contrib/nvi/vi/vs_refresh.c b/vi/vs_refresh.c
similarity index 100%
rename from contrib/nvi/vi/vs_refresh.c
rename to vi/vs_refresh.c
diff --git a/contrib/nvi/vi/vs_relative.c b/vi/vs_relative.c
similarity index 100%
rename from contrib/nvi/vi/vs_relative.c
rename to vi/vs_relative.c
diff --git a/contrib/nvi/vi/vs_smap.c b/vi/vs_smap.c
similarity index 100%
rename from contrib/nvi/vi/vs_smap.c
rename to vi/vs_smap.c
diff --git a/contrib/nvi/vi/vs_split.c b/vi/vs_split.c
similarity index 100%
rename from contrib/nvi/vi/vs_split.c
rename to vi/vs_split.c