diff --git a/contrib/less/COPYING b/COPYING
similarity index 100%
rename from contrib/less/COPYING
rename to COPYING
diff --git a/contrib/less/INSTALL b/INSTALL
similarity index 100%
rename from contrib/less/INSTALL
rename to INSTALL
diff --git a/contrib/less/LICENSE b/LICENSE
similarity index 100%
rename from contrib/less/LICENSE
rename to LICENSE
diff --git a/contrib/less/Makefile.aut b/Makefile.aut
similarity index 100%
rename from contrib/less/Makefile.aut
rename to Makefile.aut
diff --git a/contrib/less/Makefile.dsb b/Makefile.dsb
similarity index 100%
rename from contrib/less/Makefile.dsb
rename to Makefile.dsb
diff --git a/contrib/less/Makefile.dsg b/Makefile.dsg
similarity index 100%
rename from contrib/less/Makefile.dsg
rename to Makefile.dsg
diff --git a/contrib/less/Makefile.dsu b/Makefile.dsu
similarity index 100%
rename from contrib/less/Makefile.dsu
rename to Makefile.dsu
diff --git a/contrib/less/Makefile.in b/Makefile.in
similarity index 100%
rename from contrib/less/Makefile.in
rename to Makefile.in
diff --git a/contrib/less/Makefile.o2e b/Makefile.o2e
similarity index 100%
rename from contrib/less/Makefile.o2e
rename to Makefile.o2e
diff --git a/contrib/less/Makefile.o9c b/Makefile.o9c
similarity index 100%
rename from contrib/less/Makefile.o9c
rename to Makefile.o9c
diff --git a/contrib/less/Makefile.o9u b/Makefile.o9u
similarity index 100%
rename from contrib/less/Makefile.o9u
rename to Makefile.o9u
diff --git a/contrib/less/Makefile.wnb b/Makefile.wnb
similarity index 100%
rename from contrib/less/Makefile.wnb
rename to Makefile.wnb
diff --git a/contrib/less/Makefile.wnm b/Makefile.wnm
similarity index 100%
rename from contrib/less/Makefile.wnm
rename to Makefile.wnm
diff --git a/contrib/less/NEWS b/NEWS
similarity index 100%
rename from contrib/less/NEWS
rename to NEWS
diff --git a/contrib/less/README b/README
similarity index 100%
rename from contrib/less/README
rename to README
diff --git a/contrib/less/brac.c b/brac.c
similarity index 100%
rename from contrib/less/brac.c
rename to brac.c
diff --git a/contrib/less/ch.c b/ch.c
similarity index 100%
rename from contrib/less/ch.c
rename to ch.c
diff --git a/contrib/less/charset.c b/charset.c
similarity index 100%
rename from contrib/less/charset.c
rename to charset.c
diff --git a/contrib/less/charset.h b/charset.h
similarity index 100%
rename from contrib/less/charset.h
rename to charset.h
diff --git a/contrib/less/cmd.h b/cmd.h
similarity index 100%
rename from contrib/less/cmd.h
rename to cmd.h
diff --git a/contrib/less/cmdbuf.c b/cmdbuf.c
similarity index 100%
rename from contrib/less/cmdbuf.c
rename to cmdbuf.c
diff --git a/contrib/less/command.c b/command.c
similarity index 100%
rename from contrib/less/command.c
rename to command.c
diff --git a/contrib/less/configure b/configure
similarity index 100%
rename from contrib/less/configure
rename to configure
diff --git a/contrib/less/configure.ac b/configure.ac
similarity index 100%
rename from contrib/less/configure.ac
rename to configure.ac
diff --git a/contrib/less/decode.c b/decode.c
similarity index 100%
rename from contrib/less/decode.c
rename to decode.c
diff --git a/contrib/less/defines.ds b/defines.ds
similarity index 100%
rename from contrib/less/defines.ds
rename to defines.ds
diff --git a/contrib/less/defines.h.in b/defines.h.in
similarity index 100%
rename from contrib/less/defines.h.in
rename to defines.h.in
diff --git a/contrib/less/defines.o2 b/defines.o2
similarity index 100%
rename from contrib/less/defines.o2
rename to defines.o2
diff --git a/contrib/less/defines.o9 b/defines.o9
similarity index 100%
rename from contrib/less/defines.o9
rename to defines.o9
diff --git a/contrib/less/defines.wn b/defines.wn
similarity index 100%
rename from contrib/less/defines.wn
rename to defines.wn
diff --git a/contrib/less/edit.c b/edit.c
similarity index 100%
rename from contrib/less/edit.c
rename to edit.c
diff --git a/contrib/less/filename.c b/filename.c
similarity index 100%
rename from contrib/less/filename.c
rename to filename.c
diff --git a/contrib/less/forwback.c b/forwback.c
similarity index 100%
rename from contrib/less/forwback.c
rename to forwback.c
diff --git a/contrib/less/funcs.h b/funcs.h
similarity index 100%
rename from contrib/less/funcs.h
rename to funcs.h
diff --git a/contrib/less/help.c b/help.c
similarity index 100%
rename from contrib/less/help.c
rename to help.c
diff --git a/contrib/less/ifile.c b/ifile.c
similarity index 100%
rename from contrib/less/ifile.c
rename to ifile.c
diff --git a/contrib/less/input.c b/input.c
similarity index 100%
rename from contrib/less/input.c
rename to input.c
diff --git a/contrib/less/install.sh b/install.sh
similarity index 100%
rename from contrib/less/install.sh
rename to install.sh
diff --git a/contrib/less/jump.c b/jump.c
similarity index 100%
rename from contrib/less/jump.c
rename to jump.c
diff --git a/contrib/less/less.h b/less.h
similarity index 100%
rename from contrib/less/less.h
rename to less.h
diff --git a/contrib/less/less.hlp b/less.hlp
similarity index 100%
rename from contrib/less/less.hlp
rename to less.hlp
diff --git a/contrib/less/less.man b/less.man
similarity index 100%
rename from contrib/less/less.man
rename to less.man
diff --git a/contrib/less/less.nro b/less.nro
similarity index 100%
rename from contrib/less/less.nro
rename to less.nro
diff --git a/contrib/less/lessecho.c b/lessecho.c
similarity index 100%
rename from contrib/less/lessecho.c
rename to lessecho.c
diff --git a/contrib/less/lessecho.man b/lessecho.man
similarity index 100%
rename from contrib/less/lessecho.man
rename to lessecho.man
diff --git a/contrib/less/lessecho.nro b/lessecho.nro
similarity index 100%
rename from contrib/less/lessecho.nro
rename to lessecho.nro
diff --git a/contrib/less/lesskey.c b/lesskey.c
similarity index 100%
rename from contrib/less/lesskey.c
rename to lesskey.c
diff --git a/contrib/less/lesskey.h b/lesskey.h
similarity index 100%
rename from contrib/less/lesskey.h
rename to lesskey.h
diff --git a/contrib/less/lesskey.man b/lesskey.man
similarity index 100%
rename from contrib/less/lesskey.man
rename to lesskey.man
diff --git a/contrib/less/lesskey.nro b/lesskey.nro
similarity index 100%
rename from contrib/less/lesskey.nro
rename to lesskey.nro
diff --git a/contrib/less/lglob.h b/lglob.h
similarity index 100%
rename from contrib/less/lglob.h
rename to lglob.h
diff --git a/contrib/less/line.c b/line.c
similarity index 100%
rename from contrib/less/line.c
rename to line.c
diff --git a/contrib/less/linenum.c b/linenum.c
similarity index 100%
rename from contrib/less/linenum.c
rename to linenum.c
diff --git a/contrib/less/lsystem.c b/lsystem.c
similarity index 100%
rename from contrib/less/lsystem.c
rename to lsystem.c
diff --git a/contrib/less/main.c b/main.c
similarity index 100%
rename from contrib/less/main.c
rename to main.c
diff --git a/contrib/less/mark.c b/mark.c
similarity index 100%
rename from contrib/less/mark.c
rename to mark.c
diff --git a/contrib/less/mkfuncs.awk b/mkfuncs.awk
similarity index 100%
rename from contrib/less/mkfuncs.awk
rename to mkfuncs.awk
diff --git a/contrib/less/mkhelp.c b/mkhelp.c
similarity index 100%
rename from contrib/less/mkhelp.c
rename to mkhelp.c
diff --git a/contrib/less/mkinstalldirs b/mkinstalldirs
similarity index 100%
rename from contrib/less/mkinstalldirs
rename to mkinstalldirs
diff --git a/contrib/less/optfunc.c b/optfunc.c
similarity index 100%
rename from contrib/less/optfunc.c
rename to optfunc.c
diff --git a/contrib/less/option.c b/option.c
similarity index 100%
rename from contrib/less/option.c
rename to option.c
diff --git a/contrib/less/option.h b/option.h
similarity index 100%
rename from contrib/less/option.h
rename to option.h
diff --git a/contrib/less/opttbl.c b/opttbl.c
similarity index 100%
rename from contrib/less/opttbl.c
rename to opttbl.c
diff --git a/contrib/less/os.c b/os.c
similarity index 100%
rename from contrib/less/os.c
rename to os.c
diff --git a/contrib/less/output.c b/output.c
similarity index 100%
rename from contrib/less/output.c
rename to output.c
diff --git a/contrib/less/pckeys.h b/pckeys.h
similarity index 100%
rename from contrib/less/pckeys.h
rename to pckeys.h
diff --git a/contrib/less/position.c b/position.c
similarity index 100%
rename from contrib/less/position.c
rename to position.c
diff --git a/contrib/less/position.h b/position.h
similarity index 100%
rename from contrib/less/position.h
rename to position.h
diff --git a/contrib/less/prompt.c b/prompt.c
similarity index 100%
rename from contrib/less/prompt.c
rename to prompt.c
diff --git a/contrib/less/regexp.c b/regexp.c
similarity index 100%
rename from contrib/less/regexp.c
rename to regexp.c
diff --git a/contrib/less/regexp.h b/regexp.h
similarity index 100%
rename from contrib/less/regexp.h
rename to regexp.h
diff --git a/contrib/less/screen.c b/screen.c
similarity index 100%
rename from contrib/less/screen.c
rename to screen.c
diff --git a/contrib/less/scrsize.c b/scrsize.c
similarity index 100%
rename from contrib/less/scrsize.c
rename to scrsize.c
diff --git a/contrib/less/search.c b/search.c
similarity index 100%
rename from contrib/less/search.c
rename to search.c
diff --git a/contrib/less/signal.c b/signal.c
similarity index 100%
rename from contrib/less/signal.c
rename to signal.c
diff --git a/contrib/less/tags.c b/tags.c
similarity index 100%
rename from contrib/less/tags.c
rename to tags.c
diff --git a/contrib/less/ttyin.c b/ttyin.c
similarity index 100%
rename from contrib/less/ttyin.c
rename to ttyin.c
diff --git a/contrib/less/version.c b/version.c
similarity index 100%
rename from contrib/less/version.c
rename to version.c