diff --git a/contrib/groff/BUG-REPORT b/BUG-REPORT
similarity index 100%
rename from contrib/groff/BUG-REPORT
rename to BUG-REPORT
diff --git a/contrib/groff/COPYING b/COPYING
similarity index 100%
rename from contrib/groff/COPYING
rename to COPYING
diff --git a/contrib/groff/ChangeLog b/ChangeLog
similarity index 100%
rename from contrib/groff/ChangeLog
rename to ChangeLog
diff --git a/contrib/groff/ChangeLog.115 b/ChangeLog.115
similarity index 100%
rename from contrib/groff/ChangeLog.115
rename to ChangeLog.115
diff --git a/contrib/groff/ChangeLog.116 b/ChangeLog.116
similarity index 100%
rename from contrib/groff/ChangeLog.116
rename to ChangeLog.116
diff --git a/contrib/groff/ChangeLog.117 b/ChangeLog.117
similarity index 100%
rename from contrib/groff/ChangeLog.117
rename to ChangeLog.117
diff --git a/contrib/groff/ChangeLog.118 b/ChangeLog.118
similarity index 100%
rename from contrib/groff/ChangeLog.118
rename to ChangeLog.118
diff --git a/contrib/groff/FDL b/FDL
similarity index 100%
rename from contrib/groff/FDL
rename to FDL
diff --git a/contrib/groff/INSTALL b/INSTALL
similarity index 100%
rename from contrib/groff/INSTALL
rename to INSTALL
diff --git a/contrib/groff/INSTALL.gen b/INSTALL.gen
similarity index 100%
rename from contrib/groff/INSTALL.gen
rename to INSTALL.gen
diff --git a/contrib/groff/LICENSE b/LICENSE
similarity index 100%
rename from contrib/groff/LICENSE
rename to LICENSE
diff --git a/contrib/groff/MANIFEST b/MANIFEST
similarity index 100%
rename from contrib/groff/MANIFEST
rename to MANIFEST
diff --git a/contrib/groff/MORE.STUFF b/MORE.STUFF
similarity index 100%
rename from contrib/groff/MORE.STUFF
rename to MORE.STUFF
diff --git a/contrib/groff/Makefile b/Makefile
similarity index 100%
rename from contrib/groff/Makefile
rename to Makefile
diff --git a/contrib/groff/Makefile.ccpg b/Makefile.ccpg
similarity index 100%
rename from contrib/groff/Makefile.ccpg
rename to Makefile.ccpg
diff --git a/contrib/groff/Makefile.comm b/Makefile.comm
similarity index 100%
rename from contrib/groff/Makefile.comm
rename to Makefile.comm
diff --git a/contrib/groff/Makefile.cpg b/Makefile.cpg
similarity index 100%
rename from contrib/groff/Makefile.cpg
rename to Makefile.cpg
diff --git a/contrib/groff/Makefile.dev b/Makefile.dev
similarity index 100%
rename from contrib/groff/Makefile.dev
rename to Makefile.dev
diff --git a/contrib/groff/Makefile.in b/Makefile.in
similarity index 100%
rename from contrib/groff/Makefile.in
rename to Makefile.in
diff --git a/contrib/groff/Makefile.init b/Makefile.init
similarity index 100%
rename from contrib/groff/Makefile.init
rename to Makefile.init
diff --git a/contrib/groff/Makefile.lib b/Makefile.lib
similarity index 100%
rename from contrib/groff/Makefile.lib
rename to Makefile.lib
diff --git a/contrib/groff/Makefile.man b/Makefile.man
similarity index 100%
rename from contrib/groff/Makefile.man
rename to Makefile.man
diff --git a/contrib/groff/Makefile.sub b/Makefile.sub
similarity index 100%
rename from contrib/groff/Makefile.sub
rename to Makefile.sub
diff --git a/contrib/groff/NEWS b/NEWS
similarity index 100%
rename from contrib/groff/NEWS
rename to NEWS
diff --git a/contrib/groff/PROBLEMS b/PROBLEMS
similarity index 100%
rename from contrib/groff/PROBLEMS
rename to PROBLEMS
diff --git a/contrib/groff/PROJECTS b/PROJECTS
similarity index 100%
rename from contrib/groff/PROJECTS
rename to PROJECTS
diff --git a/contrib/groff/README b/README
similarity index 100%
rename from contrib/groff/README
rename to README
diff --git a/contrib/groff/README.MinGW b/README.MinGW
similarity index 100%
rename from contrib/groff/README.MinGW
rename to README.MinGW
diff --git a/contrib/groff/REVISION b/REVISION
similarity index 100%
rename from contrib/groff/REVISION
rename to REVISION
diff --git a/contrib/groff/TODO b/TODO
similarity index 100%
rename from contrib/groff/TODO
rename to TODO
diff --git a/contrib/groff/VERSION b/VERSION
similarity index 100%
rename from contrib/groff/VERSION
rename to VERSION
diff --git a/contrib/groff/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from contrib/groff/aclocal.m4
rename to aclocal.m4
diff --git a/contrib/groff/configure b/configure
similarity index 100%
rename from contrib/groff/configure
rename to configure
diff --git a/contrib/groff/configure.ac b/configure.ac
similarity index 100%
rename from contrib/groff/configure.ac
rename to configure.ac
diff --git a/contrib/groff/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/eqn2graph/Makefile.sub
rename to contrib/eqn2graph/Makefile.sub
diff --git a/contrib/groff/contrib/eqn2graph/eqn2graph.man b/contrib/eqn2graph/eqn2graph.man
similarity index 100%
rename from contrib/groff/contrib/eqn2graph/eqn2graph.man
rename to contrib/eqn2graph/eqn2graph.man
diff --git a/contrib/groff/contrib/eqn2graph/eqn2graph.sh b/contrib/eqn2graph/eqn2graph.sh
similarity index 100%
rename from contrib/groff/contrib/eqn2graph/eqn2graph.sh
rename to contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/groff/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/ChangeLog
rename to contrib/gdiffmk/ChangeLog
diff --git a/contrib/groff/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/Makefile.sub
rename to contrib/gdiffmk/Makefile.sub
diff --git a/contrib/groff/contrib/gdiffmk/README b/contrib/gdiffmk/README
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/README
rename to contrib/gdiffmk/README
diff --git a/contrib/groff/contrib/gdiffmk/gdiffmk.man b/contrib/gdiffmk/gdiffmk.man
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/gdiffmk.man
rename to contrib/gdiffmk/gdiffmk.man
diff --git a/contrib/groff/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/gdiffmk.sh
rename to contrib/gdiffmk/gdiffmk.sh
diff --git a/contrib/groff/contrib/gdiffmk/tests/file1 b/contrib/gdiffmk/tests/file1
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/file1
rename to contrib/gdiffmk/tests/file1
diff --git a/contrib/groff/contrib/gdiffmk/tests/file2 b/contrib/gdiffmk/tests/file2
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/file2
rename to contrib/gdiffmk/tests/file2
diff --git a/contrib/groff/contrib/gdiffmk/tests/runtests.in b/contrib/gdiffmk/tests/runtests.in
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/runtests.in
rename to contrib/gdiffmk/tests/runtests.in
diff --git a/contrib/groff/contrib/gdiffmk/tests/test_baseline b/contrib/gdiffmk/tests/test_baseline
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/test_baseline
rename to contrib/gdiffmk/tests/test_baseline
diff --git a/contrib/groff/contrib/gdiffmk/tests/test_baseline10 b/contrib/gdiffmk/tests/test_baseline10
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/test_baseline10
rename to contrib/gdiffmk/tests/test_baseline10
diff --git a/contrib/groff/contrib/gdiffmk/tests/test_baseline6 b/contrib/gdiffmk/tests/test_baseline6
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/test_baseline6
rename to contrib/gdiffmk/tests/test_baseline6
diff --git a/contrib/groff/contrib/gdiffmk/tests/test_baseline7 b/contrib/gdiffmk/tests/test_baseline7
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/test_baseline7
rename to contrib/gdiffmk/tests/test_baseline7
diff --git a/contrib/groff/contrib/gdiffmk/tests/test_baseline8 b/contrib/gdiffmk/tests/test_baseline8
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/test_baseline8
rename to contrib/gdiffmk/tests/test_baseline8
diff --git a/contrib/groff/contrib/gdiffmk/tests/test_baseline9 b/contrib/gdiffmk/tests/test_baseline9
similarity index 100%
rename from contrib/groff/contrib/gdiffmk/tests/test_baseline9
rename to contrib/gdiffmk/tests/test_baseline9
diff --git a/contrib/groff/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/grap2graph/Makefile.sub
rename to contrib/grap2graph/Makefile.sub
diff --git a/contrib/groff/contrib/grap2graph/grap2graph.man b/contrib/grap2graph/grap2graph.man
similarity index 100%
rename from contrib/groff/contrib/grap2graph/grap2graph.man
rename to contrib/grap2graph/grap2graph.man
diff --git a/contrib/groff/contrib/grap2graph/grap2graph.sh b/contrib/grap2graph/grap2graph.sh
similarity index 100%
rename from contrib/groff/contrib/grap2graph/grap2graph.sh
rename to contrib/grap2graph/grap2graph.sh
diff --git a/contrib/groff/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
similarity index 100%
rename from contrib/groff/contrib/groffer/ChangeLog
rename to contrib/groffer/ChangeLog
diff --git a/contrib/groff/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/groffer/Makefile.sub
rename to contrib/groffer/Makefile.sub
diff --git a/contrib/groff/contrib/groffer/README b/contrib/groffer/README
similarity index 100%
rename from contrib/groff/contrib/groffer/README
rename to contrib/groffer/README
diff --git a/contrib/groff/contrib/groffer/README_SH b/contrib/groffer/README_SH
similarity index 100%
rename from contrib/groff/contrib/groffer/README_SH
rename to contrib/groffer/README_SH
diff --git a/contrib/groff/contrib/groffer/TODO b/contrib/groffer/TODO
similarity index 100%
rename from contrib/groff/contrib/groffer/TODO
rename to contrib/groffer/TODO
diff --git a/contrib/groff/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
similarity index 100%
rename from contrib/groff/contrib/groffer/groffer.man
rename to contrib/groffer/groffer.man
diff --git a/contrib/groff/contrib/groffer/groffer.sh b/contrib/groffer/groffer.sh
similarity index 100%
rename from contrib/groff/contrib/groffer/groffer.sh
rename to contrib/groffer/groffer.sh
diff --git a/contrib/groff/contrib/groffer/groffer2.sh b/contrib/groffer/groffer2.sh
similarity index 100%
rename from contrib/groff/contrib/groffer/groffer2.sh
rename to contrib/groffer/groffer2.sh
diff --git a/contrib/groff/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
similarity index 100%
rename from contrib/groff/contrib/mm/ChangeLog
rename to contrib/mm/ChangeLog
diff --git a/contrib/groff/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
similarity index 100%
rename from contrib/groff/contrib/mm/Makefile.sim
rename to contrib/mm/Makefile.sim
diff --git a/contrib/groff/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/mm/Makefile.sub
rename to contrib/mm/Makefile.sub
diff --git a/contrib/groff/contrib/mm/NOTES b/contrib/mm/NOTES
similarity index 100%
rename from contrib/groff/contrib/mm/NOTES
rename to contrib/mm/NOTES
diff --git a/contrib/groff/contrib/mm/README b/contrib/mm/README
similarity index 100%
rename from contrib/groff/contrib/mm/README
rename to contrib/mm/README
diff --git a/contrib/groff/contrib/mm/examples/APP b/contrib/mm/examples/APP
similarity index 100%
rename from contrib/groff/contrib/mm/examples/APP
rename to contrib/mm/examples/APP
diff --git a/contrib/groff/contrib/mm/examples/B1B2 b/contrib/mm/examples/B1B2
similarity index 100%
rename from contrib/groff/contrib/mm/examples/B1B2
rename to contrib/mm/examples/B1B2
diff --git a/contrib/groff/contrib/mm/examples/COVER b/contrib/mm/examples/COVER
similarity index 100%
rename from contrib/groff/contrib/mm/examples/COVER
rename to contrib/mm/examples/COVER
diff --git a/contrib/groff/contrib/mm/examples/IND b/contrib/mm/examples/IND
similarity index 100%
rename from contrib/groff/contrib/mm/examples/IND
rename to contrib/mm/examples/IND
diff --git a/contrib/groff/contrib/mm/examples/LT b/contrib/mm/examples/LT
similarity index 100%
rename from contrib/groff/contrib/mm/examples/LT
rename to contrib/mm/examples/LT
diff --git a/contrib/groff/contrib/mm/examples/LT.se b/contrib/mm/examples/LT.se
similarity index 100%
rename from contrib/groff/contrib/mm/examples/LT.se
rename to contrib/mm/examples/LT.se
diff --git a/contrib/groff/contrib/mm/examples/ML b/contrib/mm/examples/ML
similarity index 100%
rename from contrib/groff/contrib/mm/examples/ML
rename to contrib/mm/examples/ML
diff --git a/contrib/groff/contrib/mm/examples/MOVE b/contrib/mm/examples/MOVE
similarity index 100%
rename from contrib/groff/contrib/mm/examples/MOVE
rename to contrib/mm/examples/MOVE
diff --git a/contrib/groff/contrib/mm/examples/MUL b/contrib/mm/examples/MUL
similarity index 100%
rename from contrib/groff/contrib/mm/examples/MUL
rename to contrib/mm/examples/MUL
diff --git a/contrib/groff/contrib/mm/examples/NCOL b/contrib/mm/examples/NCOL
similarity index 100%
rename from contrib/groff/contrib/mm/examples/NCOL
rename to contrib/mm/examples/NCOL
diff --git a/contrib/groff/contrib/mm/examples/ND b/contrib/mm/examples/ND
similarity index 100%
rename from contrib/groff/contrib/mm/examples/ND
rename to contrib/mm/examples/ND
diff --git a/contrib/groff/contrib/mm/examples/README b/contrib/mm/examples/README
similarity index 100%
rename from contrib/groff/contrib/mm/examples/README
rename to contrib/mm/examples/README
diff --git a/contrib/groff/contrib/mm/examples/References b/contrib/mm/examples/References
similarity index 100%
rename from contrib/groff/contrib/mm/examples/References
rename to contrib/mm/examples/References
diff --git a/contrib/groff/contrib/mm/examples/SETR b/contrib/mm/examples/SETR
similarity index 100%
rename from contrib/groff/contrib/mm/examples/SETR
rename to contrib/mm/examples/SETR
diff --git a/contrib/groff/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
similarity index 100%
rename from contrib/groff/contrib/mm/groff_mm.man
rename to contrib/mm/groff_mm.man
diff --git a/contrib/groff/contrib/mm/groff_mmse.man b/contrib/mm/groff_mmse.man
similarity index 100%
rename from contrib/groff/contrib/mm/groff_mmse.man
rename to contrib/mm/groff_mmse.man
diff --git a/contrib/groff/contrib/mm/m.tmac b/contrib/mm/m.tmac
similarity index 100%
rename from contrib/groff/contrib/mm/m.tmac
rename to contrib/mm/m.tmac
diff --git a/contrib/groff/contrib/mm/mm.tmac b/contrib/mm/mm.tmac
similarity index 100%
rename from contrib/groff/contrib/mm/mm.tmac
rename to contrib/mm/mm.tmac
diff --git a/contrib/groff/contrib/mm/mm/0.MT b/contrib/mm/mm/0.MT
similarity index 100%
rename from contrib/groff/contrib/mm/mm/0.MT
rename to contrib/mm/mm/0.MT
diff --git a/contrib/groff/contrib/mm/mm/4.MT b/contrib/mm/mm/4.MT
similarity index 100%
rename from contrib/groff/contrib/mm/mm/4.MT
rename to contrib/mm/mm/4.MT
diff --git a/contrib/groff/contrib/mm/mm/5.MT b/contrib/mm/mm/5.MT
similarity index 100%
rename from contrib/groff/contrib/mm/mm/5.MT
rename to contrib/mm/mm/5.MT
diff --git a/contrib/groff/contrib/mm/mm/ms.cov b/contrib/mm/mm/ms.cov
similarity index 100%
rename from contrib/groff/contrib/mm/mm/ms.cov
rename to contrib/mm/mm/ms.cov
diff --git a/contrib/groff/contrib/mm/mm/se_ms.cov b/contrib/mm/mm/se_ms.cov
similarity index 100%
rename from contrib/groff/contrib/mm/mm/se_ms.cov
rename to contrib/mm/mm/se_ms.cov
diff --git a/contrib/groff/contrib/mm/mmroff.man b/contrib/mm/mmroff.man
similarity index 100%
rename from contrib/groff/contrib/mm/mmroff.man
rename to contrib/mm/mmroff.man
diff --git a/contrib/groff/contrib/mm/mmroff.pl b/contrib/mm/mmroff.pl
similarity index 100%
rename from contrib/groff/contrib/mm/mmroff.pl
rename to contrib/mm/mmroff.pl
diff --git a/contrib/groff/contrib/mm/mmse.tmac b/contrib/mm/mmse.tmac
similarity index 100%
rename from contrib/groff/contrib/mm/mmse.tmac
rename to contrib/mm/mmse.tmac
diff --git a/contrib/groff/contrib/mm/mse.tmac b/contrib/mm/mse.tmac
similarity index 100%
rename from contrib/groff/contrib/mm/mse.tmac
rename to contrib/mm/mse.tmac
diff --git a/contrib/groff/contrib/mom/BUGS b/contrib/mom/BUGS
similarity index 100%
rename from contrib/groff/contrib/mom/BUGS
rename to contrib/mom/BUGS
diff --git a/contrib/groff/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
similarity index 100%
rename from contrib/groff/contrib/mom/ChangeLog
rename to contrib/mom/ChangeLog
diff --git a/contrib/groff/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/mom/Makefile.sub
rename to contrib/mom/Makefile.sub
diff --git a/contrib/groff/contrib/mom/NEWS b/contrib/mom/NEWS
similarity index 100%
rename from contrib/groff/contrib/mom/NEWS
rename to contrib/mom/NEWS
diff --git a/contrib/groff/contrib/mom/TODO b/contrib/mom/TODO
similarity index 100%
rename from contrib/groff/contrib/mom/TODO
rename to contrib/mom/TODO
diff --git a/contrib/groff/contrib/mom/copyright b/contrib/mom/copyright
similarity index 100%
rename from contrib/groff/contrib/mom/copyright
rename to contrib/mom/copyright
diff --git a/contrib/groff/contrib/mom/examples/README.txt b/contrib/mom/examples/README.txt
similarity index 100%
rename from contrib/groff/contrib/mom/examples/README.txt
rename to contrib/mom/examples/README.txt
diff --git a/contrib/groff/contrib/mom/examples/elvis_syntax b/contrib/mom/examples/elvis_syntax
similarity index 100%
rename from contrib/groff/contrib/mom/examples/elvis_syntax
rename to contrib/mom/examples/elvis_syntax
diff --git a/contrib/groff/contrib/mom/examples/elvis_syntax.new b/contrib/mom/examples/elvis_syntax.new
similarity index 100%
rename from contrib/groff/contrib/mom/examples/elvis_syntax.new
rename to contrib/mom/examples/elvis_syntax.new
diff --git a/contrib/groff/contrib/mom/examples/letter.mom b/contrib/mom/examples/letter.mom
similarity index 100%
rename from contrib/groff/contrib/mom/examples/letter.mom
rename to contrib/mom/examples/letter.mom
diff --git a/contrib/groff/contrib/mom/examples/penguin.ps b/contrib/mom/examples/penguin.ps
similarity index 100%
rename from contrib/groff/contrib/mom/examples/penguin.ps
rename to contrib/mom/examples/penguin.ps
diff --git a/contrib/groff/contrib/mom/examples/sample_docs.mom b/contrib/mom/examples/sample_docs.mom
similarity index 100%
rename from contrib/groff/contrib/mom/examples/sample_docs.mom
rename to contrib/mom/examples/sample_docs.mom
diff --git a/contrib/groff/contrib/mom/examples/typesetting.mom b/contrib/mom/examples/typesetting.mom
similarity index 100%
rename from contrib/groff/contrib/mom/examples/typesetting.mom
rename to contrib/mom/examples/typesetting.mom
diff --git a/contrib/groff/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.man
similarity index 100%
rename from contrib/groff/contrib/mom/groff_mom.man
rename to contrib/mom/groff_mom.man
diff --git a/contrib/groff/contrib/mom/mom.tmac b/contrib/mom/mom.tmac
similarity index 100%
rename from contrib/groff/contrib/mom/mom.tmac
rename to contrib/mom/mom.tmac
diff --git a/contrib/groff/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/appendices.html
rename to contrib/mom/momdoc/appendices.html
diff --git a/contrib/groff/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/color.html
rename to contrib/mom/momdoc/color.html
diff --git a/contrib/groff/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/cover.html
rename to contrib/mom/momdoc/cover.html
diff --git a/contrib/groff/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/definitions.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/definitions.html
rename to contrib/mom/momdoc/definitions.html
diff --git a/contrib/groff/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/docelement.html
rename to contrib/mom/momdoc/docelement.html
diff --git a/contrib/groff/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/docprocessing.html
rename to contrib/mom/momdoc/docprocessing.html
diff --git a/contrib/groff/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/goodies.html
rename to contrib/mom/momdoc/goodies.html
diff --git a/contrib/groff/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/headfootpage.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/headfootpage.html
rename to contrib/mom/momdoc/headfootpage.html
diff --git a/contrib/groff/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/inlines.html
rename to contrib/mom/momdoc/inlines.html
diff --git a/contrib/groff/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/intro.html
rename to contrib/mom/momdoc/intro.html
diff --git a/contrib/groff/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/letters.html
rename to contrib/mom/momdoc/letters.html
diff --git a/contrib/groff/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macrolist.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/macrolist.html
rename to contrib/mom/momdoc/macrolist.html
diff --git a/contrib/groff/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rectoverso.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/rectoverso.html
rename to contrib/mom/momdoc/rectoverso.html
diff --git a/contrib/groff/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/refer.html
rename to contrib/mom/momdoc/refer.html
diff --git a/contrib/groff/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/reserved.html
rename to contrib/mom/momdoc/reserved.html
diff --git a/contrib/groff/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/toc.html
rename to contrib/mom/momdoc/toc.html
diff --git a/contrib/groff/contrib/mom/momdoc/typemacdoc.html b/contrib/mom/momdoc/typemacdoc.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/typemacdoc.html
rename to contrib/mom/momdoc/typemacdoc.html
diff --git a/contrib/groff/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/typesetting.html
rename to contrib/mom/momdoc/typesetting.html
diff --git a/contrib/groff/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html
similarity index 100%
rename from contrib/groff/contrib/mom/momdoc/using.html
rename to contrib/mom/momdoc/using.html
diff --git a/contrib/groff/contrib/mom/om.tmac b/contrib/mom/om.tmac
similarity index 100%
rename from contrib/groff/contrib/mom/om.tmac
rename to contrib/mom/om.tmac
diff --git a/contrib/groff/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
similarity index 100%
rename from contrib/groff/contrib/pdfmark/ChangeLog
rename to contrib/pdfmark/ChangeLog
diff --git a/contrib/groff/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/pdfmark/Makefile.sub
rename to contrib/pdfmark/Makefile.sub
diff --git a/contrib/groff/contrib/pdfmark/PROBLEMS b/contrib/pdfmark/PROBLEMS
similarity index 100%
rename from contrib/groff/contrib/pdfmark/PROBLEMS
rename to contrib/pdfmark/PROBLEMS
diff --git a/contrib/groff/contrib/pdfmark/README b/contrib/pdfmark/README
similarity index 100%
rename from contrib/groff/contrib/pdfmark/README
rename to contrib/pdfmark/README
diff --git a/contrib/groff/contrib/pdfmark/TODO b/contrib/pdfmark/TODO
similarity index 100%
rename from contrib/groff/contrib/pdfmark/TODO
rename to contrib/pdfmark/TODO
diff --git a/contrib/groff/contrib/pdfmark/cover.ms b/contrib/pdfmark/cover.ms
similarity index 100%
rename from contrib/groff/contrib/pdfmark/cover.ms
rename to contrib/pdfmark/cover.ms
diff --git a/contrib/groff/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms
similarity index 100%
rename from contrib/groff/contrib/pdfmark/pdfmark.ms
rename to contrib/pdfmark/pdfmark.ms
diff --git a/contrib/groff/contrib/pdfmark/pdfmark.tmac b/contrib/pdfmark/pdfmark.tmac
similarity index 100%
rename from contrib/groff/contrib/pdfmark/pdfmark.tmac
rename to contrib/pdfmark/pdfmark.tmac
diff --git a/contrib/groff/contrib/pdfmark/pdfroff.man b/contrib/pdfmark/pdfroff.man
similarity index 100%
rename from contrib/groff/contrib/pdfmark/pdfroff.man
rename to contrib/pdfmark/pdfroff.man
diff --git a/contrib/groff/contrib/pdfmark/pdfroff.sh b/contrib/pdfmark/pdfroff.sh
similarity index 100%
rename from contrib/groff/contrib/pdfmark/pdfroff.sh
rename to contrib/pdfmark/pdfroff.sh
diff --git a/contrib/groff/contrib/pdfmark/spdf.tmac b/contrib/pdfmark/spdf.tmac
similarity index 100%
rename from contrib/groff/contrib/pdfmark/spdf.tmac
rename to contrib/pdfmark/spdf.tmac
diff --git a/contrib/groff/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
similarity index 100%
rename from contrib/groff/contrib/pic2graph/Makefile.sub
rename to contrib/pic2graph/Makefile.sub
diff --git a/contrib/groff/contrib/pic2graph/pic2graph.man b/contrib/pic2graph/pic2graph.man
similarity index 100%
rename from contrib/groff/contrib/pic2graph/pic2graph.man
rename to contrib/pic2graph/pic2graph.man
diff --git a/contrib/groff/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph.sh
similarity index 100%
rename from contrib/groff/contrib/pic2graph/pic2graph.sh
rename to contrib/pic2graph/pic2graph.sh
diff --git a/contrib/groff/doc/Makefile.in b/doc/Makefile.in
similarity index 100%
rename from contrib/groff/doc/Makefile.in
rename to doc/Makefile.in
diff --git a/contrib/groff/doc/Makefile.sub b/doc/Makefile.sub
similarity index 100%
rename from contrib/groff/doc/Makefile.sub
rename to doc/Makefile.sub
diff --git a/contrib/groff/doc/fdl.texi b/doc/fdl.texi
similarity index 100%
rename from contrib/groff/doc/fdl.texi
rename to doc/fdl.texi
diff --git a/contrib/groff/doc/fixinfo.sh b/doc/fixinfo.sh
similarity index 100%
rename from contrib/groff/doc/fixinfo.sh
rename to doc/fixinfo.sh
diff --git a/contrib/groff/doc/gnu.eps b/doc/gnu.eps
similarity index 100%
rename from contrib/groff/doc/gnu.eps
rename to doc/gnu.eps
diff --git a/contrib/groff/doc/gnu.png b/doc/gnu.png
similarity index 100%
rename from contrib/groff/doc/gnu.png
rename to doc/gnu.png
diff --git a/contrib/groff/doc/gnu.xpm b/doc/gnu.xpm
similarity index 100%
rename from contrib/groff/doc/gnu.xpm
rename to doc/gnu.xpm
diff --git a/contrib/groff/doc/grnexmpl.g b/doc/grnexmpl.g
similarity index 100%
rename from contrib/groff/doc/grnexmpl.g
rename to doc/grnexmpl.g
diff --git a/contrib/groff/doc/grnexmpl.me b/doc/grnexmpl.me
similarity index 100%
rename from contrib/groff/doc/grnexmpl.me
rename to doc/grnexmpl.me
diff --git a/contrib/groff/doc/groff b/doc/groff
similarity index 100%
rename from contrib/groff/doc/groff
rename to doc/groff
diff --git a/contrib/groff/doc/groff-1 b/doc/groff-1
similarity index 100%
rename from contrib/groff/doc/groff-1
rename to doc/groff-1
diff --git a/contrib/groff/doc/groff-2 b/doc/groff-2
similarity index 100%
rename from contrib/groff/doc/groff-2
rename to doc/groff-2
diff --git a/contrib/groff/doc/groff-3 b/doc/groff-3
similarity index 100%
rename from contrib/groff/doc/groff-3
rename to doc/groff-3
diff --git a/contrib/groff/doc/groff.css b/doc/groff.css
similarity index 100%
rename from contrib/groff/doc/groff.css
rename to doc/groff.css
diff --git a/contrib/groff/doc/groff.texinfo b/doc/groff.texinfo
similarity index 100%
rename from contrib/groff/doc/groff.texinfo
rename to doc/groff.texinfo
diff --git a/contrib/groff/doc/meintro.me b/doc/meintro.me
similarity index 100%
rename from contrib/groff/doc/meintro.me
rename to doc/meintro.me
diff --git a/contrib/groff/doc/meref.me b/doc/meref.me
similarity index 100%
rename from contrib/groff/doc/meref.me
rename to doc/meref.me
diff --git a/contrib/groff/doc/pic.ms b/doc/pic.ms
similarity index 100%
rename from contrib/groff/doc/pic.ms
rename to doc/pic.ms
diff --git a/contrib/groff/doc/texinfo.tex b/doc/texinfo.tex
similarity index 100%
rename from contrib/groff/doc/texinfo.tex
rename to doc/texinfo.tex
diff --git a/contrib/groff/doc/webpage.ms b/doc/webpage.ms
similarity index 100%
rename from contrib/groff/doc/webpage.ms
rename to doc/webpage.ms
diff --git a/contrib/groff/font/devX100-12/CB b/font/devX100-12/CB
similarity index 100%
rename from contrib/groff/font/devX100-12/CB
rename to font/devX100-12/CB
diff --git a/contrib/groff/font/devX100-12/CBI b/font/devX100-12/CBI
similarity index 100%
rename from contrib/groff/font/devX100-12/CBI
rename to font/devX100-12/CBI
diff --git a/contrib/groff/font/devX100-12/CI b/font/devX100-12/CI
similarity index 100%
rename from contrib/groff/font/devX100-12/CI
rename to font/devX100-12/CI
diff --git a/contrib/groff/font/devX100-12/CR b/font/devX100-12/CR
similarity index 100%
rename from contrib/groff/font/devX100-12/CR
rename to font/devX100-12/CR
diff --git a/contrib/groff/font/devX100-12/DESC b/font/devX100-12/DESC
similarity index 100%
rename from contrib/groff/font/devX100-12/DESC
rename to font/devX100-12/DESC
diff --git a/contrib/groff/font/devX100-12/HB b/font/devX100-12/HB
similarity index 100%
rename from contrib/groff/font/devX100-12/HB
rename to font/devX100-12/HB
diff --git a/contrib/groff/font/devX100-12/HBI b/font/devX100-12/HBI
similarity index 100%
rename from contrib/groff/font/devX100-12/HBI
rename to font/devX100-12/HBI
diff --git a/contrib/groff/font/devX100-12/HI b/font/devX100-12/HI
similarity index 100%
rename from contrib/groff/font/devX100-12/HI
rename to font/devX100-12/HI
diff --git a/contrib/groff/font/devX100-12/HR b/font/devX100-12/HR
similarity index 100%
rename from contrib/groff/font/devX100-12/HR
rename to font/devX100-12/HR
diff --git a/contrib/groff/font/devX100-12/Makefile.sub b/font/devX100-12/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devX100-12/Makefile.sub
rename to font/devX100-12/Makefile.sub
diff --git a/contrib/groff/font/devX100-12/NB b/font/devX100-12/NB
similarity index 100%
rename from contrib/groff/font/devX100-12/NB
rename to font/devX100-12/NB
diff --git a/contrib/groff/font/devX100-12/NBI b/font/devX100-12/NBI
similarity index 100%
rename from contrib/groff/font/devX100-12/NBI
rename to font/devX100-12/NBI
diff --git a/contrib/groff/font/devX100-12/NI b/font/devX100-12/NI
similarity index 100%
rename from contrib/groff/font/devX100-12/NI
rename to font/devX100-12/NI
diff --git a/contrib/groff/font/devX100-12/NR b/font/devX100-12/NR
similarity index 100%
rename from contrib/groff/font/devX100-12/NR
rename to font/devX100-12/NR
diff --git a/contrib/groff/font/devX100-12/S b/font/devX100-12/S
similarity index 100%
rename from contrib/groff/font/devX100-12/S
rename to font/devX100-12/S
diff --git a/contrib/groff/font/devX100-12/TB b/font/devX100-12/TB
similarity index 100%
rename from contrib/groff/font/devX100-12/TB
rename to font/devX100-12/TB
diff --git a/contrib/groff/font/devX100-12/TBI b/font/devX100-12/TBI
similarity index 100%
rename from contrib/groff/font/devX100-12/TBI
rename to font/devX100-12/TBI
diff --git a/contrib/groff/font/devX100-12/TI b/font/devX100-12/TI
similarity index 100%
rename from contrib/groff/font/devX100-12/TI
rename to font/devX100-12/TI
diff --git a/contrib/groff/font/devX100-12/TR b/font/devX100-12/TR
similarity index 100%
rename from contrib/groff/font/devX100-12/TR
rename to font/devX100-12/TR
diff --git a/contrib/groff/font/devX100/CB b/font/devX100/CB
similarity index 100%
rename from contrib/groff/font/devX100/CB
rename to font/devX100/CB
diff --git a/contrib/groff/font/devX100/CBI b/font/devX100/CBI
similarity index 100%
rename from contrib/groff/font/devX100/CBI
rename to font/devX100/CBI
diff --git a/contrib/groff/font/devX100/CI b/font/devX100/CI
similarity index 100%
rename from contrib/groff/font/devX100/CI
rename to font/devX100/CI
diff --git a/contrib/groff/font/devX100/CR b/font/devX100/CR
similarity index 100%
rename from contrib/groff/font/devX100/CR
rename to font/devX100/CR
diff --git a/contrib/groff/font/devX100/DESC b/font/devX100/DESC
similarity index 100%
rename from contrib/groff/font/devX100/DESC
rename to font/devX100/DESC
diff --git a/contrib/groff/font/devX100/HB b/font/devX100/HB
similarity index 100%
rename from contrib/groff/font/devX100/HB
rename to font/devX100/HB
diff --git a/contrib/groff/font/devX100/HBI b/font/devX100/HBI
similarity index 100%
rename from contrib/groff/font/devX100/HBI
rename to font/devX100/HBI
diff --git a/contrib/groff/font/devX100/HI b/font/devX100/HI
similarity index 100%
rename from contrib/groff/font/devX100/HI
rename to font/devX100/HI
diff --git a/contrib/groff/font/devX100/HR b/font/devX100/HR
similarity index 100%
rename from contrib/groff/font/devX100/HR
rename to font/devX100/HR
diff --git a/contrib/groff/font/devX100/Makefile.sub b/font/devX100/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devX100/Makefile.sub
rename to font/devX100/Makefile.sub
diff --git a/contrib/groff/font/devX100/NB b/font/devX100/NB
similarity index 100%
rename from contrib/groff/font/devX100/NB
rename to font/devX100/NB
diff --git a/contrib/groff/font/devX100/NBI b/font/devX100/NBI
similarity index 100%
rename from contrib/groff/font/devX100/NBI
rename to font/devX100/NBI
diff --git a/contrib/groff/font/devX100/NI b/font/devX100/NI
similarity index 100%
rename from contrib/groff/font/devX100/NI
rename to font/devX100/NI
diff --git a/contrib/groff/font/devX100/NR b/font/devX100/NR
similarity index 100%
rename from contrib/groff/font/devX100/NR
rename to font/devX100/NR
diff --git a/contrib/groff/font/devX100/S b/font/devX100/S
similarity index 100%
rename from contrib/groff/font/devX100/S
rename to font/devX100/S
diff --git a/contrib/groff/font/devX100/TB b/font/devX100/TB
similarity index 100%
rename from contrib/groff/font/devX100/TB
rename to font/devX100/TB
diff --git a/contrib/groff/font/devX100/TBI b/font/devX100/TBI
similarity index 100%
rename from contrib/groff/font/devX100/TBI
rename to font/devX100/TBI
diff --git a/contrib/groff/font/devX100/TI b/font/devX100/TI
similarity index 100%
rename from contrib/groff/font/devX100/TI
rename to font/devX100/TI
diff --git a/contrib/groff/font/devX100/TR b/font/devX100/TR
similarity index 100%
rename from contrib/groff/font/devX100/TR
rename to font/devX100/TR
diff --git a/contrib/groff/font/devX75-12/CB b/font/devX75-12/CB
similarity index 100%
rename from contrib/groff/font/devX75-12/CB
rename to font/devX75-12/CB
diff --git a/contrib/groff/font/devX75-12/CBI b/font/devX75-12/CBI
similarity index 100%
rename from contrib/groff/font/devX75-12/CBI
rename to font/devX75-12/CBI
diff --git a/contrib/groff/font/devX75-12/CI b/font/devX75-12/CI
similarity index 100%
rename from contrib/groff/font/devX75-12/CI
rename to font/devX75-12/CI
diff --git a/contrib/groff/font/devX75-12/CR b/font/devX75-12/CR
similarity index 100%
rename from contrib/groff/font/devX75-12/CR
rename to font/devX75-12/CR
diff --git a/contrib/groff/font/devX75-12/DESC b/font/devX75-12/DESC
similarity index 100%
rename from contrib/groff/font/devX75-12/DESC
rename to font/devX75-12/DESC
diff --git a/contrib/groff/font/devX75-12/HB b/font/devX75-12/HB
similarity index 100%
rename from contrib/groff/font/devX75-12/HB
rename to font/devX75-12/HB
diff --git a/contrib/groff/font/devX75-12/HBI b/font/devX75-12/HBI
similarity index 100%
rename from contrib/groff/font/devX75-12/HBI
rename to font/devX75-12/HBI
diff --git a/contrib/groff/font/devX75-12/HI b/font/devX75-12/HI
similarity index 100%
rename from contrib/groff/font/devX75-12/HI
rename to font/devX75-12/HI
diff --git a/contrib/groff/font/devX75-12/HR b/font/devX75-12/HR
similarity index 100%
rename from contrib/groff/font/devX75-12/HR
rename to font/devX75-12/HR
diff --git a/contrib/groff/font/devX75-12/Makefile.sub b/font/devX75-12/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devX75-12/Makefile.sub
rename to font/devX75-12/Makefile.sub
diff --git a/contrib/groff/font/devX75-12/NB b/font/devX75-12/NB
similarity index 100%
rename from contrib/groff/font/devX75-12/NB
rename to font/devX75-12/NB
diff --git a/contrib/groff/font/devX75-12/NBI b/font/devX75-12/NBI
similarity index 100%
rename from contrib/groff/font/devX75-12/NBI
rename to font/devX75-12/NBI
diff --git a/contrib/groff/font/devX75-12/NI b/font/devX75-12/NI
similarity index 100%
rename from contrib/groff/font/devX75-12/NI
rename to font/devX75-12/NI
diff --git a/contrib/groff/font/devX75-12/NR b/font/devX75-12/NR
similarity index 100%
rename from contrib/groff/font/devX75-12/NR
rename to font/devX75-12/NR
diff --git a/contrib/groff/font/devX75-12/S b/font/devX75-12/S
similarity index 100%
rename from contrib/groff/font/devX75-12/S
rename to font/devX75-12/S
diff --git a/contrib/groff/font/devX75-12/TB b/font/devX75-12/TB
similarity index 100%
rename from contrib/groff/font/devX75-12/TB
rename to font/devX75-12/TB
diff --git a/contrib/groff/font/devX75-12/TBI b/font/devX75-12/TBI
similarity index 100%
rename from contrib/groff/font/devX75-12/TBI
rename to font/devX75-12/TBI
diff --git a/contrib/groff/font/devX75-12/TI b/font/devX75-12/TI
similarity index 100%
rename from contrib/groff/font/devX75-12/TI
rename to font/devX75-12/TI
diff --git a/contrib/groff/font/devX75-12/TR b/font/devX75-12/TR
similarity index 100%
rename from contrib/groff/font/devX75-12/TR
rename to font/devX75-12/TR
diff --git a/contrib/groff/font/devX75/CB b/font/devX75/CB
similarity index 100%
rename from contrib/groff/font/devX75/CB
rename to font/devX75/CB
diff --git a/contrib/groff/font/devX75/CBI b/font/devX75/CBI
similarity index 100%
rename from contrib/groff/font/devX75/CBI
rename to font/devX75/CBI
diff --git a/contrib/groff/font/devX75/CI b/font/devX75/CI
similarity index 100%
rename from contrib/groff/font/devX75/CI
rename to font/devX75/CI
diff --git a/contrib/groff/font/devX75/CR b/font/devX75/CR
similarity index 100%
rename from contrib/groff/font/devX75/CR
rename to font/devX75/CR
diff --git a/contrib/groff/font/devX75/DESC b/font/devX75/DESC
similarity index 100%
rename from contrib/groff/font/devX75/DESC
rename to font/devX75/DESC
diff --git a/contrib/groff/font/devX75/HB b/font/devX75/HB
similarity index 100%
rename from contrib/groff/font/devX75/HB
rename to font/devX75/HB
diff --git a/contrib/groff/font/devX75/HBI b/font/devX75/HBI
similarity index 100%
rename from contrib/groff/font/devX75/HBI
rename to font/devX75/HBI
diff --git a/contrib/groff/font/devX75/HI b/font/devX75/HI
similarity index 100%
rename from contrib/groff/font/devX75/HI
rename to font/devX75/HI
diff --git a/contrib/groff/font/devX75/HR b/font/devX75/HR
similarity index 100%
rename from contrib/groff/font/devX75/HR
rename to font/devX75/HR
diff --git a/contrib/groff/font/devX75/Makefile.sub b/font/devX75/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devX75/Makefile.sub
rename to font/devX75/Makefile.sub
diff --git a/contrib/groff/font/devX75/NB b/font/devX75/NB
similarity index 100%
rename from contrib/groff/font/devX75/NB
rename to font/devX75/NB
diff --git a/contrib/groff/font/devX75/NBI b/font/devX75/NBI
similarity index 100%
rename from contrib/groff/font/devX75/NBI
rename to font/devX75/NBI
diff --git a/contrib/groff/font/devX75/NI b/font/devX75/NI
similarity index 100%
rename from contrib/groff/font/devX75/NI
rename to font/devX75/NI
diff --git a/contrib/groff/font/devX75/NR b/font/devX75/NR
similarity index 100%
rename from contrib/groff/font/devX75/NR
rename to font/devX75/NR
diff --git a/contrib/groff/font/devX75/S b/font/devX75/S
similarity index 100%
rename from contrib/groff/font/devX75/S
rename to font/devX75/S
diff --git a/contrib/groff/font/devX75/TB b/font/devX75/TB
similarity index 100%
rename from contrib/groff/font/devX75/TB
rename to font/devX75/TB
diff --git a/contrib/groff/font/devX75/TBI b/font/devX75/TBI
similarity index 100%
rename from contrib/groff/font/devX75/TBI
rename to font/devX75/TBI
diff --git a/contrib/groff/font/devX75/TI b/font/devX75/TI
similarity index 100%
rename from contrib/groff/font/devX75/TI
rename to font/devX75/TI
diff --git a/contrib/groff/font/devX75/TR b/font/devX75/TR
similarity index 100%
rename from contrib/groff/font/devX75/TR
rename to font/devX75/TR
diff --git a/contrib/groff/font/devascii/DESC.proto b/font/devascii/DESC.proto
similarity index 100%
rename from contrib/groff/font/devascii/DESC.proto
rename to font/devascii/DESC.proto
diff --git a/contrib/groff/font/devascii/Makefile.sub b/font/devascii/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devascii/Makefile.sub
rename to font/devascii/Makefile.sub
diff --git a/contrib/groff/font/devascii/R.proto b/font/devascii/R.proto
similarity index 100%
rename from contrib/groff/font/devascii/R.proto
rename to font/devascii/R.proto
diff --git a/contrib/groff/font/devcp1047/DESC.proto b/font/devcp1047/DESC.proto
similarity index 100%
rename from contrib/groff/font/devcp1047/DESC.proto
rename to font/devcp1047/DESC.proto
diff --git a/contrib/groff/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devcp1047/Makefile.sub
rename to font/devcp1047/Makefile.sub
diff --git a/contrib/groff/font/devcp1047/R.proto b/font/devcp1047/R.proto
similarity index 100%
rename from contrib/groff/font/devcp1047/R.proto
rename to font/devcp1047/R.proto
diff --git a/contrib/groff/font/devdvi/CW b/font/devdvi/CW
similarity index 100%
rename from contrib/groff/font/devdvi/CW
rename to font/devdvi/CW
diff --git a/contrib/groff/font/devdvi/CWEC b/font/devdvi/CWEC
similarity index 100%
rename from contrib/groff/font/devdvi/CWEC
rename to font/devdvi/CWEC
diff --git a/contrib/groff/font/devdvi/CWI b/font/devdvi/CWI
similarity index 100%
rename from contrib/groff/font/devdvi/CWI
rename to font/devdvi/CWI
diff --git a/contrib/groff/font/devdvi/CWIEC b/font/devdvi/CWIEC
similarity index 100%
rename from contrib/groff/font/devdvi/CWIEC
rename to font/devdvi/CWIEC
diff --git a/contrib/groff/font/devdvi/CWITC b/font/devdvi/CWITC
similarity index 100%
rename from contrib/groff/font/devdvi/CWITC
rename to font/devdvi/CWITC
diff --git a/contrib/groff/font/devdvi/CWTC b/font/devdvi/CWTC
similarity index 100%
rename from contrib/groff/font/devdvi/CWTC
rename to font/devdvi/CWTC
diff --git a/contrib/groff/font/devdvi/DESC.in b/font/devdvi/DESC.in
similarity index 100%
rename from contrib/groff/font/devdvi/DESC.in
rename to font/devdvi/DESC.in
diff --git a/contrib/groff/font/devdvi/EX b/font/devdvi/EX
similarity index 100%
rename from contrib/groff/font/devdvi/EX
rename to font/devdvi/EX
diff --git a/contrib/groff/font/devdvi/HB b/font/devdvi/HB
similarity index 100%
rename from contrib/groff/font/devdvi/HB
rename to font/devdvi/HB
diff --git a/contrib/groff/font/devdvi/HBEC b/font/devdvi/HBEC
similarity index 100%
rename from contrib/groff/font/devdvi/HBEC
rename to font/devdvi/HBEC
diff --git a/contrib/groff/font/devdvi/HBI b/font/devdvi/HBI
similarity index 100%
rename from contrib/groff/font/devdvi/HBI
rename to font/devdvi/HBI
diff --git a/contrib/groff/font/devdvi/HBIEC b/font/devdvi/HBIEC
similarity index 100%
rename from contrib/groff/font/devdvi/HBIEC
rename to font/devdvi/HBIEC
diff --git a/contrib/groff/font/devdvi/HBITC b/font/devdvi/HBITC
similarity index 100%
rename from contrib/groff/font/devdvi/HBITC
rename to font/devdvi/HBITC
diff --git a/contrib/groff/font/devdvi/HBTC b/font/devdvi/HBTC
similarity index 100%
rename from contrib/groff/font/devdvi/HBTC
rename to font/devdvi/HBTC
diff --git a/contrib/groff/font/devdvi/HI b/font/devdvi/HI
similarity index 100%
rename from contrib/groff/font/devdvi/HI
rename to font/devdvi/HI
diff --git a/contrib/groff/font/devdvi/HIEC b/font/devdvi/HIEC
similarity index 100%
rename from contrib/groff/font/devdvi/HIEC
rename to font/devdvi/HIEC
diff --git a/contrib/groff/font/devdvi/HITC b/font/devdvi/HITC
similarity index 100%
rename from contrib/groff/font/devdvi/HITC
rename to font/devdvi/HITC
diff --git a/contrib/groff/font/devdvi/HR b/font/devdvi/HR
similarity index 100%
rename from contrib/groff/font/devdvi/HR
rename to font/devdvi/HR
diff --git a/contrib/groff/font/devdvi/HREC b/font/devdvi/HREC
similarity index 100%
rename from contrib/groff/font/devdvi/HREC
rename to font/devdvi/HREC
diff --git a/contrib/groff/font/devdvi/HRTC b/font/devdvi/HRTC
similarity index 100%
rename from contrib/groff/font/devdvi/HRTC
rename to font/devdvi/HRTC
diff --git a/contrib/groff/font/devdvi/MI b/font/devdvi/MI
similarity index 100%
rename from contrib/groff/font/devdvi/MI
rename to font/devdvi/MI
diff --git a/contrib/groff/font/devdvi/Makefile.sub b/font/devdvi/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devdvi/Makefile.sub
rename to font/devdvi/Makefile.sub
diff --git a/contrib/groff/font/devdvi/S b/font/devdvi/S
similarity index 100%
rename from contrib/groff/font/devdvi/S
rename to font/devdvi/S
diff --git a/contrib/groff/font/devdvi/SA b/font/devdvi/SA
similarity index 100%
rename from contrib/groff/font/devdvi/SA
rename to font/devdvi/SA
diff --git a/contrib/groff/font/devdvi/SB b/font/devdvi/SB
similarity index 100%
rename from contrib/groff/font/devdvi/SB
rename to font/devdvi/SB
diff --git a/contrib/groff/font/devdvi/SC b/font/devdvi/SC
similarity index 100%
rename from contrib/groff/font/devdvi/SC
rename to font/devdvi/SC
diff --git a/contrib/groff/font/devdvi/TB b/font/devdvi/TB
similarity index 100%
rename from contrib/groff/font/devdvi/TB
rename to font/devdvi/TB
diff --git a/contrib/groff/font/devdvi/TBEC b/font/devdvi/TBEC
similarity index 100%
rename from contrib/groff/font/devdvi/TBEC
rename to font/devdvi/TBEC
diff --git a/contrib/groff/font/devdvi/TBI b/font/devdvi/TBI
similarity index 100%
rename from contrib/groff/font/devdvi/TBI
rename to font/devdvi/TBI
diff --git a/contrib/groff/font/devdvi/TBIEC b/font/devdvi/TBIEC
similarity index 100%
rename from contrib/groff/font/devdvi/TBIEC
rename to font/devdvi/TBIEC
diff --git a/contrib/groff/font/devdvi/TBITC b/font/devdvi/TBITC
similarity index 100%
rename from contrib/groff/font/devdvi/TBITC
rename to font/devdvi/TBITC
diff --git a/contrib/groff/font/devdvi/TBTC b/font/devdvi/TBTC
similarity index 100%
rename from contrib/groff/font/devdvi/TBTC
rename to font/devdvi/TBTC
diff --git a/contrib/groff/font/devdvi/TI b/font/devdvi/TI
similarity index 100%
rename from contrib/groff/font/devdvi/TI
rename to font/devdvi/TI
diff --git a/contrib/groff/font/devdvi/TIEC b/font/devdvi/TIEC
similarity index 100%
rename from contrib/groff/font/devdvi/TIEC
rename to font/devdvi/TIEC
diff --git a/contrib/groff/font/devdvi/TITC b/font/devdvi/TITC
similarity index 100%
rename from contrib/groff/font/devdvi/TITC
rename to font/devdvi/TITC
diff --git a/contrib/groff/font/devdvi/TR b/font/devdvi/TR
similarity index 100%
rename from contrib/groff/font/devdvi/TR
rename to font/devdvi/TR
diff --git a/contrib/groff/font/devdvi/TREC b/font/devdvi/TREC
similarity index 100%
rename from contrib/groff/font/devdvi/TREC
rename to font/devdvi/TREC
diff --git a/contrib/groff/font/devdvi/TRTC b/font/devdvi/TRTC
similarity index 100%
rename from contrib/groff/font/devdvi/TRTC
rename to font/devdvi/TRTC
diff --git a/contrib/groff/font/devdvi/generate/CompileFonts b/font/devdvi/generate/CompileFonts
similarity index 100%
rename from contrib/groff/font/devdvi/generate/CompileFonts
rename to font/devdvi/generate/CompileFonts
diff --git a/contrib/groff/font/devdvi/generate/Makefile b/font/devdvi/generate/Makefile
similarity index 100%
rename from contrib/groff/font/devdvi/generate/Makefile
rename to font/devdvi/generate/Makefile
diff --git a/contrib/groff/font/devdvi/generate/ec.map b/font/devdvi/generate/ec.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/ec.map
rename to font/devdvi/generate/ec.map
diff --git a/contrib/groff/font/devdvi/generate/msam.map b/font/devdvi/generate/msam.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/msam.map
rename to font/devdvi/generate/msam.map
diff --git a/contrib/groff/font/devdvi/generate/msbm.map b/font/devdvi/generate/msbm.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/msbm.map
rename to font/devdvi/generate/msbm.map
diff --git a/contrib/groff/font/devdvi/generate/tc.map b/font/devdvi/generate/tc.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/tc.map
rename to font/devdvi/generate/tc.map
diff --git a/contrib/groff/font/devdvi/generate/texb.map b/font/devdvi/generate/texb.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/texb.map
rename to font/devdvi/generate/texb.map
diff --git a/contrib/groff/font/devdvi/generate/texex.map b/font/devdvi/generate/texex.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/texex.map
rename to font/devdvi/generate/texex.map
diff --git a/contrib/groff/font/devdvi/generate/texi.map b/font/devdvi/generate/texi.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/texi.map
rename to font/devdvi/generate/texi.map
diff --git a/contrib/groff/font/devdvi/generate/texmi.map b/font/devdvi/generate/texmi.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/texmi.map
rename to font/devdvi/generate/texmi.map
diff --git a/contrib/groff/font/devdvi/generate/texr.map b/font/devdvi/generate/texr.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/texr.map
rename to font/devdvi/generate/texr.map
diff --git a/contrib/groff/font/devdvi/generate/texsy.map b/font/devdvi/generate/texsy.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/texsy.map
rename to font/devdvi/generate/texsy.map
diff --git a/contrib/groff/font/devdvi/generate/textex.map b/font/devdvi/generate/textex.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/textex.map
rename to font/devdvi/generate/textex.map
diff --git a/contrib/groff/font/devdvi/generate/textt.map b/font/devdvi/generate/textt.map
similarity index 100%
rename from contrib/groff/font/devdvi/generate/textt.map
rename to font/devdvi/generate/textt.map
diff --git a/contrib/groff/font/devhtml/DESC.proto b/font/devhtml/DESC.proto
similarity index 100%
rename from contrib/groff/font/devhtml/DESC.proto
rename to font/devhtml/DESC.proto
diff --git a/contrib/groff/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devhtml/Makefile.sub
rename to font/devhtml/Makefile.sub
diff --git a/contrib/groff/font/devhtml/R.proto b/font/devhtml/R.proto
similarity index 100%
rename from contrib/groff/font/devhtml/R.proto
rename to font/devhtml/R.proto
diff --git a/contrib/groff/font/devlatin1/DESC.proto b/font/devlatin1/DESC.proto
similarity index 100%
rename from contrib/groff/font/devlatin1/DESC.proto
rename to font/devlatin1/DESC.proto
diff --git a/contrib/groff/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devlatin1/Makefile.sub
rename to font/devlatin1/Makefile.sub
diff --git a/contrib/groff/font/devlatin1/R.proto b/font/devlatin1/R.proto
similarity index 100%
rename from contrib/groff/font/devlatin1/R.proto
rename to font/devlatin1/R.proto
diff --git a/contrib/groff/font/devlbp/CB b/font/devlbp/CB
similarity index 100%
rename from contrib/groff/font/devlbp/CB
rename to font/devlbp/CB
diff --git a/contrib/groff/font/devlbp/CI b/font/devlbp/CI
similarity index 100%
rename from contrib/groff/font/devlbp/CI
rename to font/devlbp/CI
diff --git a/contrib/groff/font/devlbp/CR b/font/devlbp/CR
similarity index 100%
rename from contrib/groff/font/devlbp/CR
rename to font/devlbp/CR
diff --git a/contrib/groff/font/devlbp/DESC.in b/font/devlbp/DESC.in
similarity index 100%
rename from contrib/groff/font/devlbp/DESC.in
rename to font/devlbp/DESC.in
diff --git a/contrib/groff/font/devlbp/EB b/font/devlbp/EB
similarity index 100%
rename from contrib/groff/font/devlbp/EB
rename to font/devlbp/EB
diff --git a/contrib/groff/font/devlbp/EI b/font/devlbp/EI
similarity index 100%
rename from contrib/groff/font/devlbp/EI
rename to font/devlbp/EI
diff --git a/contrib/groff/font/devlbp/ER b/font/devlbp/ER
similarity index 100%
rename from contrib/groff/font/devlbp/ER
rename to font/devlbp/ER
diff --git a/contrib/groff/font/devlbp/HB b/font/devlbp/HB
similarity index 100%
rename from contrib/groff/font/devlbp/HB
rename to font/devlbp/HB
diff --git a/contrib/groff/font/devlbp/HBI b/font/devlbp/HBI
similarity index 100%
rename from contrib/groff/font/devlbp/HBI
rename to font/devlbp/HBI
diff --git a/contrib/groff/font/devlbp/HI b/font/devlbp/HI
similarity index 100%
rename from contrib/groff/font/devlbp/HI
rename to font/devlbp/HI
diff --git a/contrib/groff/font/devlbp/HNB b/font/devlbp/HNB
similarity index 100%
rename from contrib/groff/font/devlbp/HNB
rename to font/devlbp/HNB
diff --git a/contrib/groff/font/devlbp/HNBI b/font/devlbp/HNBI
similarity index 100%
rename from contrib/groff/font/devlbp/HNBI
rename to font/devlbp/HNBI
diff --git a/contrib/groff/font/devlbp/HNI b/font/devlbp/HNI
similarity index 100%
rename from contrib/groff/font/devlbp/HNI
rename to font/devlbp/HNI
diff --git a/contrib/groff/font/devlbp/HNR b/font/devlbp/HNR
similarity index 100%
rename from contrib/groff/font/devlbp/HNR
rename to font/devlbp/HNR
diff --git a/contrib/groff/font/devlbp/HR b/font/devlbp/HR
similarity index 100%
rename from contrib/groff/font/devlbp/HR
rename to font/devlbp/HR
diff --git a/contrib/groff/font/devlbp/Makefile.sub b/font/devlbp/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devlbp/Makefile.sub
rename to font/devlbp/Makefile.sub
diff --git a/contrib/groff/font/devlbp/TB b/font/devlbp/TB
similarity index 100%
rename from contrib/groff/font/devlbp/TB
rename to font/devlbp/TB
diff --git a/contrib/groff/font/devlbp/TBI b/font/devlbp/TBI
similarity index 100%
rename from contrib/groff/font/devlbp/TBI
rename to font/devlbp/TBI
diff --git a/contrib/groff/font/devlbp/TI b/font/devlbp/TI
similarity index 100%
rename from contrib/groff/font/devlbp/TI
rename to font/devlbp/TI
diff --git a/contrib/groff/font/devlbp/TR b/font/devlbp/TR
similarity index 100%
rename from contrib/groff/font/devlbp/TR
rename to font/devlbp/TR
diff --git a/contrib/groff/font/devlj4/AB b/font/devlj4/AB
similarity index 100%
rename from contrib/groff/font/devlj4/AB
rename to font/devlj4/AB
diff --git a/contrib/groff/font/devlj4/ABI b/font/devlj4/ABI
similarity index 100%
rename from contrib/groff/font/devlj4/ABI
rename to font/devlj4/ABI
diff --git a/contrib/groff/font/devlj4/AI b/font/devlj4/AI
similarity index 100%
rename from contrib/groff/font/devlj4/AI
rename to font/devlj4/AI
diff --git a/contrib/groff/font/devlj4/ALBB b/font/devlj4/ALBB
similarity index 100%
rename from contrib/groff/font/devlj4/ALBB
rename to font/devlj4/ALBB
diff --git a/contrib/groff/font/devlj4/ALBR b/font/devlj4/ALBR
similarity index 100%
rename from contrib/groff/font/devlj4/ALBR
rename to font/devlj4/ALBR
diff --git a/contrib/groff/font/devlj4/AOB b/font/devlj4/AOB
similarity index 100%
rename from contrib/groff/font/devlj4/AOB
rename to font/devlj4/AOB
diff --git a/contrib/groff/font/devlj4/AOI b/font/devlj4/AOI
similarity index 100%
rename from contrib/groff/font/devlj4/AOI
rename to font/devlj4/AOI
diff --git a/contrib/groff/font/devlj4/AOR b/font/devlj4/AOR
similarity index 100%
rename from contrib/groff/font/devlj4/AOR
rename to font/devlj4/AOR
diff --git a/contrib/groff/font/devlj4/AR b/font/devlj4/AR
similarity index 100%
rename from contrib/groff/font/devlj4/AR
rename to font/devlj4/AR
diff --git a/contrib/groff/font/devlj4/CB b/font/devlj4/CB
similarity index 100%
rename from contrib/groff/font/devlj4/CB
rename to font/devlj4/CB
diff --git a/contrib/groff/font/devlj4/CBI b/font/devlj4/CBI
similarity index 100%
rename from contrib/groff/font/devlj4/CBI
rename to font/devlj4/CBI
diff --git a/contrib/groff/font/devlj4/CI b/font/devlj4/CI
similarity index 100%
rename from contrib/groff/font/devlj4/CI
rename to font/devlj4/CI
diff --git a/contrib/groff/font/devlj4/CLARENDON b/font/devlj4/CLARENDON
similarity index 100%
rename from contrib/groff/font/devlj4/CLARENDON
rename to font/devlj4/CLARENDON
diff --git a/contrib/groff/font/devlj4/CORONET b/font/devlj4/CORONET
similarity index 100%
rename from contrib/groff/font/devlj4/CORONET
rename to font/devlj4/CORONET
diff --git a/contrib/groff/font/devlj4/CR b/font/devlj4/CR
similarity index 100%
rename from contrib/groff/font/devlj4/CR
rename to font/devlj4/CR
diff --git a/contrib/groff/font/devlj4/DESC.in b/font/devlj4/DESC.in
similarity index 100%
rename from contrib/groff/font/devlj4/DESC.in
rename to font/devlj4/DESC.in
diff --git a/contrib/groff/font/devlj4/GB b/font/devlj4/GB
similarity index 100%
rename from contrib/groff/font/devlj4/GB
rename to font/devlj4/GB
diff --git a/contrib/groff/font/devlj4/GBI b/font/devlj4/GBI
similarity index 100%
rename from contrib/groff/font/devlj4/GBI
rename to font/devlj4/GBI
diff --git a/contrib/groff/font/devlj4/GI b/font/devlj4/GI
similarity index 100%
rename from contrib/groff/font/devlj4/GI
rename to font/devlj4/GI
diff --git a/contrib/groff/font/devlj4/GR b/font/devlj4/GR
similarity index 100%
rename from contrib/groff/font/devlj4/GR
rename to font/devlj4/GR
diff --git a/contrib/groff/font/devlj4/LGB b/font/devlj4/LGB
similarity index 100%
rename from contrib/groff/font/devlj4/LGB
rename to font/devlj4/LGB
diff --git a/contrib/groff/font/devlj4/LGI b/font/devlj4/LGI
similarity index 100%
rename from contrib/groff/font/devlj4/LGI
rename to font/devlj4/LGI
diff --git a/contrib/groff/font/devlj4/LGR b/font/devlj4/LGR
similarity index 100%
rename from contrib/groff/font/devlj4/LGR
rename to font/devlj4/LGR
diff --git a/contrib/groff/font/devlj4/MARIGOLD b/font/devlj4/MARIGOLD
similarity index 100%
rename from contrib/groff/font/devlj4/MARIGOLD
rename to font/devlj4/MARIGOLD
diff --git a/contrib/groff/font/devlj4/Makefile.sub b/font/devlj4/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devlj4/Makefile.sub
rename to font/devlj4/Makefile.sub
diff --git a/contrib/groff/font/devlj4/OB b/font/devlj4/OB
similarity index 100%
rename from contrib/groff/font/devlj4/OB
rename to font/devlj4/OB
diff --git a/contrib/groff/font/devlj4/OBI b/font/devlj4/OBI
similarity index 100%
rename from contrib/groff/font/devlj4/OBI
rename to font/devlj4/OBI
diff --git a/contrib/groff/font/devlj4/OI b/font/devlj4/OI
similarity index 100%
rename from contrib/groff/font/devlj4/OI
rename to font/devlj4/OI
diff --git a/contrib/groff/font/devlj4/OR b/font/devlj4/OR
similarity index 100%
rename from contrib/groff/font/devlj4/OR
rename to font/devlj4/OR
diff --git a/contrib/groff/font/devlj4/S b/font/devlj4/S
similarity index 100%
rename from contrib/groff/font/devlj4/S
rename to font/devlj4/S
diff --git a/contrib/groff/font/devlj4/SYMBOL b/font/devlj4/SYMBOL
similarity index 100%
rename from contrib/groff/font/devlj4/SYMBOL
rename to font/devlj4/SYMBOL
diff --git a/contrib/groff/font/devlj4/TB b/font/devlj4/TB
similarity index 100%
rename from contrib/groff/font/devlj4/TB
rename to font/devlj4/TB
diff --git a/contrib/groff/font/devlj4/TBI b/font/devlj4/TBI
similarity index 100%
rename from contrib/groff/font/devlj4/TBI
rename to font/devlj4/TBI
diff --git a/contrib/groff/font/devlj4/TI b/font/devlj4/TI
similarity index 100%
rename from contrib/groff/font/devlj4/TI
rename to font/devlj4/TI
diff --git a/contrib/groff/font/devlj4/TNRB b/font/devlj4/TNRB
similarity index 100%
rename from contrib/groff/font/devlj4/TNRB
rename to font/devlj4/TNRB
diff --git a/contrib/groff/font/devlj4/TNRBI b/font/devlj4/TNRBI
similarity index 100%
rename from contrib/groff/font/devlj4/TNRBI
rename to font/devlj4/TNRBI
diff --git a/contrib/groff/font/devlj4/TNRI b/font/devlj4/TNRI
similarity index 100%
rename from contrib/groff/font/devlj4/TNRI
rename to font/devlj4/TNRI
diff --git a/contrib/groff/font/devlj4/TNRR b/font/devlj4/TNRR
similarity index 100%
rename from contrib/groff/font/devlj4/TNRR
rename to font/devlj4/TNRR
diff --git a/contrib/groff/font/devlj4/TR b/font/devlj4/TR
similarity index 100%
rename from contrib/groff/font/devlj4/TR
rename to font/devlj4/TR
diff --git a/contrib/groff/font/devlj4/UB b/font/devlj4/UB
similarity index 100%
rename from contrib/groff/font/devlj4/UB
rename to font/devlj4/UB
diff --git a/contrib/groff/font/devlj4/UBI b/font/devlj4/UBI
similarity index 100%
rename from contrib/groff/font/devlj4/UBI
rename to font/devlj4/UBI
diff --git a/contrib/groff/font/devlj4/UCB b/font/devlj4/UCB
similarity index 100%
rename from contrib/groff/font/devlj4/UCB
rename to font/devlj4/UCB
diff --git a/contrib/groff/font/devlj4/UCBI b/font/devlj4/UCBI
similarity index 100%
rename from contrib/groff/font/devlj4/UCBI
rename to font/devlj4/UCBI
diff --git a/contrib/groff/font/devlj4/UCI b/font/devlj4/UCI
similarity index 100%
rename from contrib/groff/font/devlj4/UCI
rename to font/devlj4/UCI
diff --git a/contrib/groff/font/devlj4/UCR b/font/devlj4/UCR
similarity index 100%
rename from contrib/groff/font/devlj4/UCR
rename to font/devlj4/UCR
diff --git a/contrib/groff/font/devlj4/UI b/font/devlj4/UI
similarity index 100%
rename from contrib/groff/font/devlj4/UI
rename to font/devlj4/UI
diff --git a/contrib/groff/font/devlj4/UR b/font/devlj4/UR
similarity index 100%
rename from contrib/groff/font/devlj4/UR
rename to font/devlj4/UR
diff --git a/contrib/groff/font/devlj4/WINGDINGS b/font/devlj4/WINGDINGS
similarity index 100%
rename from contrib/groff/font/devlj4/WINGDINGS
rename to font/devlj4/WINGDINGS
diff --git a/contrib/groff/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile
similarity index 100%
rename from contrib/groff/font/devlj4/generate/Makefile
rename to font/devlj4/generate/Makefile
diff --git a/contrib/groff/font/devlj4/generate/special.awk b/font/devlj4/generate/special.awk
similarity index 100%
rename from contrib/groff/font/devlj4/generate/special.awk
rename to font/devlj4/generate/special.awk
diff --git a/contrib/groff/font/devlj4/generate/special.map b/font/devlj4/generate/special.map
similarity index 100%
rename from contrib/groff/font/devlj4/generate/special.map
rename to font/devlj4/generate/special.map
diff --git a/contrib/groff/font/devlj4/generate/symbol.map b/font/devlj4/generate/symbol.map
similarity index 100%
rename from contrib/groff/font/devlj4/generate/symbol.map
rename to font/devlj4/generate/symbol.map
diff --git a/contrib/groff/font/devlj4/generate/text.map b/font/devlj4/generate/text.map
similarity index 100%
rename from contrib/groff/font/devlj4/generate/text.map
rename to font/devlj4/generate/text.map
diff --git a/contrib/groff/font/devlj4/generate/wingdings.map b/font/devlj4/generate/wingdings.map
similarity index 100%
rename from contrib/groff/font/devlj4/generate/wingdings.map
rename to font/devlj4/generate/wingdings.map
diff --git a/contrib/groff/font/devps/AB b/font/devps/AB
similarity index 100%
rename from contrib/groff/font/devps/AB
rename to font/devps/AB
diff --git a/contrib/groff/font/devps/ABI b/font/devps/ABI
similarity index 100%
rename from contrib/groff/font/devps/ABI
rename to font/devps/ABI
diff --git a/contrib/groff/font/devps/AI b/font/devps/AI
similarity index 100%
rename from contrib/groff/font/devps/AI
rename to font/devps/AI
diff --git a/contrib/groff/font/devps/AR b/font/devps/AR
similarity index 100%
rename from contrib/groff/font/devps/AR
rename to font/devps/AR
diff --git a/contrib/groff/font/devps/BMB b/font/devps/BMB
similarity index 100%
rename from contrib/groff/font/devps/BMB
rename to font/devps/BMB
diff --git a/contrib/groff/font/devps/BMBI b/font/devps/BMBI
similarity index 100%
rename from contrib/groff/font/devps/BMBI
rename to font/devps/BMBI
diff --git a/contrib/groff/font/devps/BMI b/font/devps/BMI
similarity index 100%
rename from contrib/groff/font/devps/BMI
rename to font/devps/BMI
diff --git a/contrib/groff/font/devps/BMR b/font/devps/BMR
similarity index 100%
rename from contrib/groff/font/devps/BMR
rename to font/devps/BMR
diff --git a/contrib/groff/font/devps/CB b/font/devps/CB
similarity index 100%
rename from contrib/groff/font/devps/CB
rename to font/devps/CB
diff --git a/contrib/groff/font/devps/CBI b/font/devps/CBI
similarity index 100%
rename from contrib/groff/font/devps/CBI
rename to font/devps/CBI
diff --git a/contrib/groff/font/devps/CI b/font/devps/CI
similarity index 100%
rename from contrib/groff/font/devps/CI
rename to font/devps/CI
diff --git a/contrib/groff/font/devps/CR b/font/devps/CR
similarity index 100%
rename from contrib/groff/font/devps/CR
rename to font/devps/CR
diff --git a/contrib/groff/font/devps/DESC.in b/font/devps/DESC.in
similarity index 100%
rename from contrib/groff/font/devps/DESC.in
rename to font/devps/DESC.in
diff --git a/contrib/groff/font/devps/EURO b/font/devps/EURO
similarity index 100%
rename from contrib/groff/font/devps/EURO
rename to font/devps/EURO
diff --git a/contrib/groff/font/devps/HB b/font/devps/HB
similarity index 100%
rename from contrib/groff/font/devps/HB
rename to font/devps/HB
diff --git a/contrib/groff/font/devps/HBI b/font/devps/HBI
similarity index 100%
rename from contrib/groff/font/devps/HBI
rename to font/devps/HBI
diff --git a/contrib/groff/font/devps/HI b/font/devps/HI
similarity index 100%
rename from contrib/groff/font/devps/HI
rename to font/devps/HI
diff --git a/contrib/groff/font/devps/HNB b/font/devps/HNB
similarity index 100%
rename from contrib/groff/font/devps/HNB
rename to font/devps/HNB
diff --git a/contrib/groff/font/devps/HNBI b/font/devps/HNBI
similarity index 100%
rename from contrib/groff/font/devps/HNBI
rename to font/devps/HNBI
diff --git a/contrib/groff/font/devps/HNI b/font/devps/HNI
similarity index 100%
rename from contrib/groff/font/devps/HNI
rename to font/devps/HNI
diff --git a/contrib/groff/font/devps/HNR b/font/devps/HNR
similarity index 100%
rename from contrib/groff/font/devps/HNR
rename to font/devps/HNR
diff --git a/contrib/groff/font/devps/HR b/font/devps/HR
similarity index 100%
rename from contrib/groff/font/devps/HR
rename to font/devps/HR
diff --git a/contrib/groff/font/devps/Makefile.sub b/font/devps/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devps/Makefile.sub
rename to font/devps/Makefile.sub
diff --git a/contrib/groff/font/devps/NB b/font/devps/NB
similarity index 100%
rename from contrib/groff/font/devps/NB
rename to font/devps/NB
diff --git a/contrib/groff/font/devps/NBI b/font/devps/NBI
similarity index 100%
rename from contrib/groff/font/devps/NBI
rename to font/devps/NBI
diff --git a/contrib/groff/font/devps/NI b/font/devps/NI
similarity index 100%
rename from contrib/groff/font/devps/NI
rename to font/devps/NI
diff --git a/contrib/groff/font/devps/NR b/font/devps/NR
similarity index 100%
rename from contrib/groff/font/devps/NR
rename to font/devps/NR
diff --git a/contrib/groff/font/devps/PB b/font/devps/PB
similarity index 100%
rename from contrib/groff/font/devps/PB
rename to font/devps/PB
diff --git a/contrib/groff/font/devps/PBI b/font/devps/PBI
similarity index 100%
rename from contrib/groff/font/devps/PBI
rename to font/devps/PBI
diff --git a/contrib/groff/font/devps/PI b/font/devps/PI
similarity index 100%
rename from contrib/groff/font/devps/PI
rename to font/devps/PI
diff --git a/contrib/groff/font/devps/PR b/font/devps/PR
similarity index 100%
rename from contrib/groff/font/devps/PR
rename to font/devps/PR
diff --git a/contrib/groff/font/devps/S b/font/devps/S
similarity index 100%
rename from contrib/groff/font/devps/S
rename to font/devps/S
diff --git a/contrib/groff/font/devps/SS b/font/devps/SS
similarity index 100%
rename from contrib/groff/font/devps/SS
rename to font/devps/SS
diff --git a/contrib/groff/font/devps/TB b/font/devps/TB
similarity index 100%
rename from contrib/groff/font/devps/TB
rename to font/devps/TB
diff --git a/contrib/groff/font/devps/TBI b/font/devps/TBI
similarity index 100%
rename from contrib/groff/font/devps/TBI
rename to font/devps/TBI
diff --git a/contrib/groff/font/devps/TI b/font/devps/TI
similarity index 100%
rename from contrib/groff/font/devps/TI
rename to font/devps/TI
diff --git a/contrib/groff/font/devps/TR b/font/devps/TR
similarity index 100%
rename from contrib/groff/font/devps/TR
rename to font/devps/TR
diff --git a/contrib/groff/font/devps/ZCMI b/font/devps/ZCMI
similarity index 100%
rename from contrib/groff/font/devps/ZCMI
rename to font/devps/ZCMI
diff --git a/contrib/groff/font/devps/ZD b/font/devps/ZD
similarity index 100%
rename from contrib/groff/font/devps/ZD
rename to font/devps/ZD
diff --git a/contrib/groff/font/devps/ZDR b/font/devps/ZDR
similarity index 100%
rename from contrib/groff/font/devps/ZDR
rename to font/devps/ZDR
diff --git a/contrib/groff/font/devps/download b/font/devps/download
similarity index 100%
rename from contrib/groff/font/devps/download
rename to font/devps/download
diff --git a/contrib/groff/font/devps/freeeuro.afm b/font/devps/freeeuro.afm
similarity index 100%
rename from contrib/groff/font/devps/freeeuro.afm
rename to font/devps/freeeuro.afm
diff --git a/contrib/groff/font/devps/freeeuro.pfa b/font/devps/freeeuro.pfa
similarity index 100%
rename from contrib/groff/font/devps/freeeuro.pfa
rename to font/devps/freeeuro.pfa
diff --git a/contrib/groff/font/devps/generate/Makefile b/font/devps/generate/Makefile
similarity index 100%
rename from contrib/groff/font/devps/generate/Makefile
rename to font/devps/generate/Makefile
diff --git a/contrib/groff/font/devps/generate/afmname b/font/devps/generate/afmname
similarity index 100%
rename from contrib/groff/font/devps/generate/afmname
rename to font/devps/generate/afmname
diff --git a/contrib/groff/font/devps/generate/dingbats.map b/font/devps/generate/dingbats.map
similarity index 100%
rename from contrib/groff/font/devps/generate/dingbats.map
rename to font/devps/generate/dingbats.map
diff --git a/contrib/groff/font/devps/generate/dingbats.rmap b/font/devps/generate/dingbats.rmap
similarity index 100%
rename from contrib/groff/font/devps/generate/dingbats.rmap
rename to font/devps/generate/dingbats.rmap
diff --git a/contrib/groff/font/devps/generate/freeeuro.sfd b/font/devps/generate/freeeuro.sfd
similarity index 100%
rename from contrib/groff/font/devps/generate/freeeuro.sfd
rename to font/devps/generate/freeeuro.sfd
diff --git a/contrib/groff/font/devps/generate/lgreekmap b/font/devps/generate/lgreekmap
similarity index 100%
rename from contrib/groff/font/devps/generate/lgreekmap
rename to font/devps/generate/lgreekmap
diff --git a/contrib/groff/font/devps/generate/sfdtopfa.pe b/font/devps/generate/sfdtopfa.pe
similarity index 100%
rename from contrib/groff/font/devps/generate/sfdtopfa.pe
rename to font/devps/generate/sfdtopfa.pe
diff --git a/contrib/groff/font/devps/generate/symbol.sed b/font/devps/generate/symbol.sed
similarity index 100%
rename from contrib/groff/font/devps/generate/symbol.sed
rename to font/devps/generate/symbol.sed
diff --git a/contrib/groff/font/devps/generate/symbolchars b/font/devps/generate/symbolchars
similarity index 100%
rename from contrib/groff/font/devps/generate/symbolchars
rename to font/devps/generate/symbolchars
diff --git a/contrib/groff/font/devps/generate/symbolsl.afm b/font/devps/generate/symbolsl.afm
similarity index 100%
rename from contrib/groff/font/devps/generate/symbolsl.afm
rename to font/devps/generate/symbolsl.afm
diff --git a/contrib/groff/font/devps/generate/textmap b/font/devps/generate/textmap
similarity index 100%
rename from contrib/groff/font/devps/generate/textmap
rename to font/devps/generate/textmap
diff --git a/contrib/groff/font/devps/prologue.ps b/font/devps/prologue.ps
similarity index 100%
rename from contrib/groff/font/devps/prologue.ps
rename to font/devps/prologue.ps
diff --git a/contrib/groff/font/devps/psstrip.sed b/font/devps/psstrip.sed
similarity index 100%
rename from contrib/groff/font/devps/psstrip.sed
rename to font/devps/psstrip.sed
diff --git a/contrib/groff/font/devps/symbol.afm b/font/devps/symbol.afm
similarity index 100%
rename from contrib/groff/font/devps/symbol.afm
rename to font/devps/symbol.afm
diff --git a/contrib/groff/font/devps/symbolmap b/font/devps/symbolmap
similarity index 100%
rename from contrib/groff/font/devps/symbolmap
rename to font/devps/symbolmap
diff --git a/contrib/groff/font/devps/symbolsl.ps b/font/devps/symbolsl.ps
similarity index 100%
rename from contrib/groff/font/devps/symbolsl.ps
rename to font/devps/symbolsl.ps
diff --git a/contrib/groff/font/devps/text.enc b/font/devps/text.enc
similarity index 100%
rename from contrib/groff/font/devps/text.enc
rename to font/devps/text.enc
diff --git a/contrib/groff/font/devps/zapfdr.afm b/font/devps/zapfdr.afm
similarity index 100%
rename from contrib/groff/font/devps/zapfdr.afm
rename to font/devps/zapfdr.afm
diff --git a/contrib/groff/font/devps/zapfdr.ps b/font/devps/zapfdr.ps
similarity index 100%
rename from contrib/groff/font/devps/zapfdr.ps
rename to font/devps/zapfdr.ps
diff --git a/contrib/groff/font/devutf8/DESC.proto b/font/devutf8/DESC.proto
similarity index 100%
rename from contrib/groff/font/devutf8/DESC.proto
rename to font/devutf8/DESC.proto
diff --git a/contrib/groff/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub
similarity index 100%
rename from contrib/groff/font/devutf8/Makefile.sub
rename to font/devutf8/Makefile.sub
diff --git a/contrib/groff/font/devutf8/NOTES b/font/devutf8/NOTES
similarity index 100%
rename from contrib/groff/font/devutf8/NOTES
rename to font/devutf8/NOTES
diff --git a/contrib/groff/font/devutf8/R.proto b/font/devutf8/R.proto
similarity index 100%
rename from contrib/groff/font/devutf8/R.proto
rename to font/devutf8/R.proto
diff --git a/contrib/groff/gendef.sh b/gendef.sh
similarity index 100%
rename from contrib/groff/gendef.sh
rename to gendef.sh
diff --git a/contrib/groff/install-sh b/install-sh
similarity index 100%
rename from contrib/groff/install-sh
rename to install-sh
diff --git a/contrib/groff/man/Makefile.sub b/man/Makefile.sub
similarity index 100%
rename from contrib/groff/man/Makefile.sub
rename to man/Makefile.sub
diff --git a/contrib/groff/man/ditroff.man b/man/ditroff.man
similarity index 100%
rename from contrib/groff/man/ditroff.man
rename to man/ditroff.man
diff --git a/contrib/groff/man/groff.man b/man/groff.man
similarity index 100%
rename from contrib/groff/man/groff.man
rename to man/groff.man
diff --git a/contrib/groff/man/groff_char.man b/man/groff_char.man
similarity index 100%
rename from contrib/groff/man/groff_char.man
rename to man/groff_char.man
diff --git a/contrib/groff/man/groff_diff.man b/man/groff_diff.man
similarity index 100%
rename from contrib/groff/man/groff_diff.man
rename to man/groff_diff.man
diff --git a/contrib/groff/man/groff_font.man b/man/groff_font.man
similarity index 100%
rename from contrib/groff/man/groff_font.man
rename to man/groff_font.man
diff --git a/contrib/groff/man/groff_out.man b/man/groff_out.man
similarity index 100%
rename from contrib/groff/man/groff_out.man
rename to man/groff_out.man
diff --git a/contrib/groff/man/groff_tmac.man b/man/groff_tmac.man
similarity index 100%
rename from contrib/groff/man/groff_tmac.man
rename to man/groff_tmac.man
diff --git a/contrib/groff/man/roff.man b/man/roff.man
similarity index 100%
rename from contrib/groff/man/roff.man
rename to man/roff.man
diff --git a/contrib/groff/mdate.sh b/mdate.sh
similarity index 100%
rename from contrib/groff/mdate.sh
rename to mdate.sh
diff --git a/contrib/groff/mkinstalldirs b/mkinstalldirs
similarity index 100%
rename from contrib/groff/mkinstalldirs
rename to mkinstalldirs
diff --git a/contrib/groff/src/devices/grodvi/Makefile.sub b/src/devices/grodvi/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/grodvi/Makefile.sub
rename to src/devices/grodvi/Makefile.sub
diff --git a/contrib/groff/src/devices/grodvi/dvi.cpp b/src/devices/grodvi/dvi.cpp
similarity index 100%
rename from contrib/groff/src/devices/grodvi/dvi.cpp
rename to src/devices/grodvi/dvi.cpp
diff --git a/contrib/groff/src/devices/grodvi/grodvi.man b/src/devices/grodvi/grodvi.man
similarity index 100%
rename from contrib/groff/src/devices/grodvi/grodvi.man
rename to src/devices/grodvi/grodvi.man
diff --git a/contrib/groff/src/devices/grohtml/Makefile.sub b/src/devices/grohtml/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/grohtml/Makefile.sub
rename to src/devices/grohtml/Makefile.sub
diff --git a/contrib/groff/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.man
similarity index 100%
rename from contrib/groff/src/devices/grohtml/grohtml.man
rename to src/devices/grohtml/grohtml.man
diff --git a/contrib/groff/src/devices/grohtml/html-table.cpp b/src/devices/grohtml/html-table.cpp
similarity index 100%
rename from contrib/groff/src/devices/grohtml/html-table.cpp
rename to src/devices/grohtml/html-table.cpp
diff --git a/contrib/groff/src/devices/grohtml/html-table.h b/src/devices/grohtml/html-table.h
similarity index 100%
rename from contrib/groff/src/devices/grohtml/html-table.h
rename to src/devices/grohtml/html-table.h
diff --git a/contrib/groff/src/devices/grohtml/html-text.cpp b/src/devices/grohtml/html-text.cpp
similarity index 100%
rename from contrib/groff/src/devices/grohtml/html-text.cpp
rename to src/devices/grohtml/html-text.cpp
diff --git a/contrib/groff/src/devices/grohtml/html-text.h b/src/devices/grohtml/html-text.h
similarity index 100%
rename from contrib/groff/src/devices/grohtml/html-text.h
rename to src/devices/grohtml/html-text.h
diff --git a/contrib/groff/src/devices/grohtml/html.h b/src/devices/grohtml/html.h
similarity index 100%
rename from contrib/groff/src/devices/grohtml/html.h
rename to src/devices/grohtml/html.h
diff --git a/contrib/groff/src/devices/grohtml/output.cpp b/src/devices/grohtml/output.cpp
similarity index 100%
rename from contrib/groff/src/devices/grohtml/output.cpp
rename to src/devices/grohtml/output.cpp
diff --git a/contrib/groff/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp
similarity index 100%
rename from contrib/groff/src/devices/grohtml/post-html.cpp
rename to src/devices/grohtml/post-html.cpp
diff --git a/contrib/groff/src/devices/grolbp/Makefile.sub b/src/devices/grolbp/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/grolbp/Makefile.sub
rename to src/devices/grolbp/Makefile.sub
diff --git a/contrib/groff/src/devices/grolbp/charset.h b/src/devices/grolbp/charset.h
similarity index 100%
rename from contrib/groff/src/devices/grolbp/charset.h
rename to src/devices/grolbp/charset.h
diff --git a/contrib/groff/src/devices/grolbp/grolbp.man b/src/devices/grolbp/grolbp.man
similarity index 100%
rename from contrib/groff/src/devices/grolbp/grolbp.man
rename to src/devices/grolbp/grolbp.man
diff --git a/contrib/groff/src/devices/grolbp/lbp.cpp b/src/devices/grolbp/lbp.cpp
similarity index 100%
rename from contrib/groff/src/devices/grolbp/lbp.cpp
rename to src/devices/grolbp/lbp.cpp
diff --git a/contrib/groff/src/devices/grolbp/lbp.h b/src/devices/grolbp/lbp.h
similarity index 100%
rename from contrib/groff/src/devices/grolbp/lbp.h
rename to src/devices/grolbp/lbp.h
diff --git a/contrib/groff/src/devices/grolj4/Makefile.sub b/src/devices/grolj4/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/grolj4/Makefile.sub
rename to src/devices/grolj4/Makefile.sub
diff --git a/contrib/groff/src/devices/grolj4/grolj4.man b/src/devices/grolj4/grolj4.man
similarity index 100%
rename from contrib/groff/src/devices/grolj4/grolj4.man
rename to src/devices/grolj4/grolj4.man
diff --git a/contrib/groff/src/devices/grolj4/lj4.cpp b/src/devices/grolj4/lj4.cpp
similarity index 100%
rename from contrib/groff/src/devices/grolj4/lj4.cpp
rename to src/devices/grolj4/lj4.cpp
diff --git a/contrib/groff/src/devices/grolj4/lj4_font.man b/src/devices/grolj4/lj4_font.man
similarity index 100%
rename from contrib/groff/src/devices/grolj4/lj4_font.man
rename to src/devices/grolj4/lj4_font.man
diff --git a/contrib/groff/src/devices/grops/Makefile.sub b/src/devices/grops/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/grops/Makefile.sub
rename to src/devices/grops/Makefile.sub
diff --git a/contrib/groff/src/devices/grops/TODO b/src/devices/grops/TODO
similarity index 100%
rename from contrib/groff/src/devices/grops/TODO
rename to src/devices/grops/TODO
diff --git a/contrib/groff/src/devices/grops/grops.man b/src/devices/grops/grops.man
similarity index 100%
rename from contrib/groff/src/devices/grops/grops.man
rename to src/devices/grops/grops.man
diff --git a/contrib/groff/src/devices/grops/ps.cpp b/src/devices/grops/ps.cpp
similarity index 100%
rename from contrib/groff/src/devices/grops/ps.cpp
rename to src/devices/grops/ps.cpp
diff --git a/contrib/groff/src/devices/grops/ps.h b/src/devices/grops/ps.h
similarity index 100%
rename from contrib/groff/src/devices/grops/ps.h
rename to src/devices/grops/ps.h
diff --git a/contrib/groff/src/devices/grops/psfig.diff b/src/devices/grops/psfig.diff
similarity index 100%
rename from contrib/groff/src/devices/grops/psfig.diff
rename to src/devices/grops/psfig.diff
diff --git a/contrib/groff/src/devices/grops/psrm.cpp b/src/devices/grops/psrm.cpp
similarity index 100%
rename from contrib/groff/src/devices/grops/psrm.cpp
rename to src/devices/grops/psrm.cpp
diff --git a/contrib/groff/src/devices/grotty/Makefile.sub b/src/devices/grotty/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/grotty/Makefile.sub
rename to src/devices/grotty/Makefile.sub
diff --git a/contrib/groff/src/devices/grotty/TODO b/src/devices/grotty/TODO
similarity index 100%
rename from contrib/groff/src/devices/grotty/TODO
rename to src/devices/grotty/TODO
diff --git a/contrib/groff/src/devices/grotty/grotty.man b/src/devices/grotty/grotty.man
similarity index 100%
rename from contrib/groff/src/devices/grotty/grotty.man
rename to src/devices/grotty/grotty.man
diff --git a/contrib/groff/src/devices/grotty/tty.cpp b/src/devices/grotty/tty.cpp
similarity index 100%
rename from contrib/groff/src/devices/grotty/tty.cpp
rename to src/devices/grotty/tty.cpp
diff --git a/contrib/groff/src/devices/xditview/ChangeLog b/src/devices/xditview/ChangeLog
similarity index 100%
rename from contrib/groff/src/devices/xditview/ChangeLog
rename to src/devices/xditview/ChangeLog
diff --git a/contrib/groff/src/devices/xditview/DESC.in b/src/devices/xditview/DESC.in
similarity index 100%
rename from contrib/groff/src/devices/xditview/DESC.in
rename to src/devices/xditview/DESC.in
diff --git a/contrib/groff/src/devices/xditview/Dvi.c b/src/devices/xditview/Dvi.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/Dvi.c
rename to src/devices/xditview/Dvi.c
diff --git a/contrib/groff/src/devices/xditview/Dvi.h b/src/devices/xditview/Dvi.h
similarity index 100%
rename from contrib/groff/src/devices/xditview/Dvi.h
rename to src/devices/xditview/Dvi.h
diff --git a/contrib/groff/src/devices/xditview/DviP.h b/src/devices/xditview/DviP.h
similarity index 100%
rename from contrib/groff/src/devices/xditview/DviP.h
rename to src/devices/xditview/DviP.h
diff --git a/contrib/groff/src/devices/xditview/FontMap b/src/devices/xditview/FontMap
similarity index 100%
rename from contrib/groff/src/devices/xditview/FontMap
rename to src/devices/xditview/FontMap
diff --git a/contrib/groff/src/devices/xditview/GXditview.ad b/src/devices/xditview/GXditview.ad
similarity index 100%
rename from contrib/groff/src/devices/xditview/GXditview.ad
rename to src/devices/xditview/GXditview.ad
diff --git a/contrib/groff/src/devices/xditview/Makefile.sub b/src/devices/xditview/Makefile.sub
similarity index 100%
rename from contrib/groff/src/devices/xditview/Makefile.sub
rename to src/devices/xditview/Makefile.sub
diff --git a/contrib/groff/src/devices/xditview/Menu.h b/src/devices/xditview/Menu.h
similarity index 100%
rename from contrib/groff/src/devices/xditview/Menu.h
rename to src/devices/xditview/Menu.h
diff --git a/contrib/groff/src/devices/xditview/README b/src/devices/xditview/README
similarity index 100%
rename from contrib/groff/src/devices/xditview/README
rename to src/devices/xditview/README
diff --git a/contrib/groff/src/devices/xditview/TODO b/src/devices/xditview/TODO
similarity index 100%
rename from contrib/groff/src/devices/xditview/TODO
rename to src/devices/xditview/TODO
diff --git a/contrib/groff/src/devices/xditview/ad2c b/src/devices/xditview/ad2c
similarity index 100%
rename from contrib/groff/src/devices/xditview/ad2c
rename to src/devices/xditview/ad2c
diff --git a/contrib/groff/src/devices/xditview/device.c b/src/devices/xditview/device.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/device.c
rename to src/devices/xditview/device.c
diff --git a/contrib/groff/src/devices/xditview/device.h b/src/devices/xditview/device.h
similarity index 100%
rename from contrib/groff/src/devices/xditview/device.h
rename to src/devices/xditview/device.h
diff --git a/contrib/groff/src/devices/xditview/draw.c b/src/devices/xditview/draw.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/draw.c
rename to src/devices/xditview/draw.c
diff --git a/contrib/groff/src/devices/xditview/font.c b/src/devices/xditview/font.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/font.c
rename to src/devices/xditview/font.c
diff --git a/contrib/groff/src/devices/xditview/gray1.bm b/src/devices/xditview/gray1.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray1.bm
rename to src/devices/xditview/gray1.bm
diff --git a/contrib/groff/src/devices/xditview/gray2.bm b/src/devices/xditview/gray2.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray2.bm
rename to src/devices/xditview/gray2.bm
diff --git a/contrib/groff/src/devices/xditview/gray3.bm b/src/devices/xditview/gray3.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray3.bm
rename to src/devices/xditview/gray3.bm
diff --git a/contrib/groff/src/devices/xditview/gray4.bm b/src/devices/xditview/gray4.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray4.bm
rename to src/devices/xditview/gray4.bm
diff --git a/contrib/groff/src/devices/xditview/gray5.bm b/src/devices/xditview/gray5.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray5.bm
rename to src/devices/xditview/gray5.bm
diff --git a/contrib/groff/src/devices/xditview/gray6.bm b/src/devices/xditview/gray6.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray6.bm
rename to src/devices/xditview/gray6.bm
diff --git a/contrib/groff/src/devices/xditview/gray7.bm b/src/devices/xditview/gray7.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray7.bm
rename to src/devices/xditview/gray7.bm
diff --git a/contrib/groff/src/devices/xditview/gray8.bm b/src/devices/xditview/gray8.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/gray8.bm
rename to src/devices/xditview/gray8.bm
diff --git a/contrib/groff/src/devices/xditview/gxditview.man b/src/devices/xditview/gxditview.man
similarity index 100%
rename from contrib/groff/src/devices/xditview/gxditview.man
rename to src/devices/xditview/gxditview.man
diff --git a/contrib/groff/src/devices/xditview/lex.c b/src/devices/xditview/lex.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/lex.c
rename to src/devices/xditview/lex.c
diff --git a/contrib/groff/src/devices/xditview/page.c b/src/devices/xditview/page.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/page.c
rename to src/devices/xditview/page.c
diff --git a/contrib/groff/src/devices/xditview/parse.c b/src/devices/xditview/parse.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/parse.c
rename to src/devices/xditview/parse.c
diff --git a/contrib/groff/src/devices/xditview/xdit.bm b/src/devices/xditview/xdit.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/xdit.bm
rename to src/devices/xditview/xdit.bm
diff --git a/contrib/groff/src/devices/xditview/xdit_mask.bm b/src/devices/xditview/xdit_mask.bm
similarity index 100%
rename from contrib/groff/src/devices/xditview/xdit_mask.bm
rename to src/devices/xditview/xdit_mask.bm
diff --git a/contrib/groff/src/devices/xditview/xditview.c b/src/devices/xditview/xditview.c
similarity index 100%
rename from contrib/groff/src/devices/xditview/xditview.c
rename to src/devices/xditview/xditview.c
diff --git a/contrib/groff/src/include/DviChar.h b/src/include/DviChar.h
similarity index 100%
rename from contrib/groff/src/include/DviChar.h
rename to src/include/DviChar.h
diff --git a/contrib/groff/src/include/Makefile.sub b/src/include/Makefile.sub
similarity index 100%
rename from contrib/groff/src/include/Makefile.sub
rename to src/include/Makefile.sub
diff --git a/contrib/groff/src/include/XFontName.h b/src/include/XFontName.h
similarity index 100%
rename from contrib/groff/src/include/XFontName.h
rename to src/include/XFontName.h
diff --git a/contrib/groff/src/include/assert.h b/src/include/assert.h
similarity index 100%
rename from contrib/groff/src/include/assert.h
rename to src/include/assert.h
diff --git a/contrib/groff/src/include/cmap.h b/src/include/cmap.h
similarity index 100%
rename from contrib/groff/src/include/cmap.h
rename to src/include/cmap.h
diff --git a/contrib/groff/src/include/color.h b/src/include/color.h
similarity index 100%
rename from contrib/groff/src/include/color.h
rename to src/include/color.h
diff --git a/contrib/groff/src/include/config.hin b/src/include/config.hin
similarity index 100%
rename from contrib/groff/src/include/config.hin
rename to src/include/config.hin
diff --git a/contrib/groff/src/include/cset.h b/src/include/cset.h
similarity index 100%
rename from contrib/groff/src/include/cset.h
rename to src/include/cset.h
diff --git a/contrib/groff/src/include/device.h b/src/include/device.h
similarity index 100%
rename from contrib/groff/src/include/device.h
rename to src/include/device.h
diff --git a/contrib/groff/src/include/driver.h b/src/include/driver.h
similarity index 100%
rename from contrib/groff/src/include/driver.h
rename to src/include/driver.h
diff --git a/contrib/groff/src/include/errarg.h b/src/include/errarg.h
similarity index 100%
rename from contrib/groff/src/include/errarg.h
rename to src/include/errarg.h
diff --git a/contrib/groff/src/include/error.h b/src/include/error.h
similarity index 100%
rename from contrib/groff/src/include/error.h
rename to src/include/error.h
diff --git a/contrib/groff/src/include/font.h b/src/include/font.h
similarity index 100%
rename from contrib/groff/src/include/font.h
rename to src/include/font.h
diff --git a/contrib/groff/src/include/geometry.h b/src/include/geometry.h
similarity index 100%
rename from contrib/groff/src/include/geometry.h
rename to src/include/geometry.h
diff --git a/contrib/groff/src/include/getopt.h b/src/include/getopt.h
similarity index 100%
rename from contrib/groff/src/include/getopt.h
rename to src/include/getopt.h
diff --git a/contrib/groff/src/include/getopt_int.h b/src/include/getopt_int.h
similarity index 100%
rename from contrib/groff/src/include/getopt_int.h
rename to src/include/getopt_int.h
diff --git a/contrib/groff/src/include/gettext.h b/src/include/gettext.h
similarity index 100%
rename from contrib/groff/src/include/gettext.h
rename to src/include/gettext.h
diff --git a/contrib/groff/src/include/html-strings.h b/src/include/html-strings.h
similarity index 100%
rename from contrib/groff/src/include/html-strings.h
rename to src/include/html-strings.h
diff --git a/contrib/groff/src/include/htmlhint.h b/src/include/htmlhint.h
similarity index 100%
rename from contrib/groff/src/include/htmlhint.h
rename to src/include/htmlhint.h
diff --git a/contrib/groff/src/include/index.h b/src/include/index.h
similarity index 100%
rename from contrib/groff/src/include/index.h
rename to src/include/index.h
diff --git a/contrib/groff/src/include/lib.h b/src/include/lib.h
similarity index 100%
rename from contrib/groff/src/include/lib.h
rename to src/include/lib.h
diff --git a/contrib/groff/src/include/macropath.h b/src/include/macropath.h
similarity index 100%
rename from contrib/groff/src/include/macropath.h
rename to src/include/macropath.h
diff --git a/contrib/groff/src/include/nonposix.h b/src/include/nonposix.h
similarity index 100%
rename from contrib/groff/src/include/nonposix.h
rename to src/include/nonposix.h
diff --git a/contrib/groff/src/include/paper.h b/src/include/paper.h
similarity index 100%
rename from contrib/groff/src/include/paper.h
rename to src/include/paper.h
diff --git a/contrib/groff/src/include/posix.h b/src/include/posix.h
similarity index 100%
rename from contrib/groff/src/include/posix.h
rename to src/include/posix.h
diff --git a/contrib/groff/src/include/printer.h b/src/include/printer.h
similarity index 100%
rename from contrib/groff/src/include/printer.h
rename to src/include/printer.h
diff --git a/contrib/groff/src/include/ptable.h b/src/include/ptable.h
similarity index 100%
rename from contrib/groff/src/include/ptable.h
rename to src/include/ptable.h
diff --git a/contrib/groff/src/include/refid.h b/src/include/refid.h
similarity index 100%
rename from contrib/groff/src/include/refid.h
rename to src/include/refid.h
diff --git a/contrib/groff/src/include/relocate.h b/src/include/relocate.h
similarity index 100%
rename from contrib/groff/src/include/relocate.h
rename to src/include/relocate.h
diff --git a/contrib/groff/src/include/search.h b/src/include/search.h
similarity index 100%
rename from contrib/groff/src/include/search.h
rename to src/include/search.h
diff --git a/contrib/groff/src/include/searchpath.h b/src/include/searchpath.h
similarity index 100%
rename from contrib/groff/src/include/searchpath.h
rename to src/include/searchpath.h
diff --git a/contrib/groff/src/include/stringclass.h b/src/include/stringclass.h
similarity index 100%
rename from contrib/groff/src/include/stringclass.h
rename to src/include/stringclass.h
diff --git a/contrib/groff/src/include/symbol.h b/src/include/symbol.h
similarity index 100%
rename from contrib/groff/src/include/symbol.h
rename to src/include/symbol.h
diff --git a/contrib/groff/src/include/unicode.h b/src/include/unicode.h
similarity index 100%
rename from contrib/groff/src/include/unicode.h
rename to src/include/unicode.h
diff --git a/contrib/groff/src/libs/libbib/Makefile.sub b/src/libs/libbib/Makefile.sub
similarity index 100%
rename from contrib/groff/src/libs/libbib/Makefile.sub
rename to src/libs/libbib/Makefile.sub
diff --git a/contrib/groff/src/libs/libbib/common.cpp b/src/libs/libbib/common.cpp
similarity index 100%
rename from contrib/groff/src/libs/libbib/common.cpp
rename to src/libs/libbib/common.cpp
diff --git a/contrib/groff/src/libs/libbib/index.cpp b/src/libs/libbib/index.cpp
similarity index 100%
rename from contrib/groff/src/libs/libbib/index.cpp
rename to src/libs/libbib/index.cpp
diff --git a/contrib/groff/src/libs/libbib/linear.cpp b/src/libs/libbib/linear.cpp
similarity index 100%
rename from contrib/groff/src/libs/libbib/linear.cpp
rename to src/libs/libbib/linear.cpp
diff --git a/contrib/groff/src/libs/libbib/map.c b/src/libs/libbib/map.c
similarity index 100%
rename from contrib/groff/src/libs/libbib/map.c
rename to src/libs/libbib/map.c
diff --git a/contrib/groff/src/libs/libbib/search.cpp b/src/libs/libbib/search.cpp
similarity index 100%
rename from contrib/groff/src/libs/libbib/search.cpp
rename to src/libs/libbib/search.cpp
diff --git a/contrib/groff/src/libs/libdriver/Makefile.sub b/src/libs/libdriver/Makefile.sub
similarity index 100%
rename from contrib/groff/src/libs/libdriver/Makefile.sub
rename to src/libs/libdriver/Makefile.sub
diff --git a/contrib/groff/src/libs/libdriver/input.cpp b/src/libs/libdriver/input.cpp
similarity index 100%
rename from contrib/groff/src/libs/libdriver/input.cpp
rename to src/libs/libdriver/input.cpp
diff --git a/contrib/groff/src/libs/libdriver/printer.cpp b/src/libs/libdriver/printer.cpp
similarity index 100%
rename from contrib/groff/src/libs/libdriver/printer.cpp
rename to src/libs/libdriver/printer.cpp
diff --git a/contrib/groff/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
similarity index 100%
rename from contrib/groff/src/libs/libgroff/Makefile.sub
rename to src/libs/libgroff/Makefile.sub
diff --git a/contrib/groff/src/libs/libgroff/assert.cpp b/src/libs/libgroff/assert.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/assert.cpp
rename to src/libs/libgroff/assert.cpp
diff --git a/contrib/groff/src/libs/libgroff/change_lf.cpp b/src/libs/libgroff/change_lf.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/change_lf.cpp
rename to src/libs/libgroff/change_lf.cpp
diff --git a/contrib/groff/src/libs/libgroff/cmap.cpp b/src/libs/libgroff/cmap.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/cmap.cpp
rename to src/libs/libgroff/cmap.cpp
diff --git a/contrib/groff/src/libs/libgroff/color.cpp b/src/libs/libgroff/color.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/color.cpp
rename to src/libs/libgroff/color.cpp
diff --git a/contrib/groff/src/libs/libgroff/cset.cpp b/src/libs/libgroff/cset.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/cset.cpp
rename to src/libs/libgroff/cset.cpp
diff --git a/contrib/groff/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/device.cpp
rename to src/libs/libgroff/device.cpp
diff --git a/contrib/groff/src/libs/libgroff/errarg.cpp b/src/libs/libgroff/errarg.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/errarg.cpp
rename to src/libs/libgroff/errarg.cpp
diff --git a/contrib/groff/src/libs/libgroff/error.cpp b/src/libs/libgroff/error.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/error.cpp
rename to src/libs/libgroff/error.cpp
diff --git a/contrib/groff/src/libs/libgroff/fatal.cpp b/src/libs/libgroff/fatal.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/fatal.cpp
rename to src/libs/libgroff/fatal.cpp
diff --git a/contrib/groff/src/libs/libgroff/filename.cpp b/src/libs/libgroff/filename.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/filename.cpp
rename to src/libs/libgroff/filename.cpp
diff --git a/contrib/groff/src/libs/libgroff/fmod.c b/src/libs/libgroff/fmod.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/fmod.c
rename to src/libs/libgroff/fmod.c
diff --git a/contrib/groff/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/font.cpp
rename to src/libs/libgroff/font.cpp
diff --git a/contrib/groff/src/libs/libgroff/fontfile.cpp b/src/libs/libgroff/fontfile.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/fontfile.cpp
rename to src/libs/libgroff/fontfile.cpp
diff --git a/contrib/groff/src/libs/libgroff/geometry.cpp b/src/libs/libgroff/geometry.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/geometry.cpp
rename to src/libs/libgroff/geometry.cpp
diff --git a/contrib/groff/src/libs/libgroff/getcwd.c b/src/libs/libgroff/getcwd.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/getcwd.c
rename to src/libs/libgroff/getcwd.c
diff --git a/contrib/groff/src/libs/libgroff/getopt.c b/src/libs/libgroff/getopt.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/getopt.c
rename to src/libs/libgroff/getopt.c
diff --git a/contrib/groff/src/libs/libgroff/getopt1.c b/src/libs/libgroff/getopt1.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/getopt1.c
rename to src/libs/libgroff/getopt1.c
diff --git a/contrib/groff/src/libs/libgroff/glyphuni.cpp b/src/libs/libgroff/glyphuni.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/glyphuni.cpp
rename to src/libs/libgroff/glyphuni.cpp
diff --git a/contrib/groff/src/libs/libgroff/htmlhint.cpp b/src/libs/libgroff/htmlhint.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/htmlhint.cpp
rename to src/libs/libgroff/htmlhint.cpp
diff --git a/contrib/groff/src/libs/libgroff/hypot.cpp b/src/libs/libgroff/hypot.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/hypot.cpp
rename to src/libs/libgroff/hypot.cpp
diff --git a/contrib/groff/src/libs/libgroff/iftoa.c b/src/libs/libgroff/iftoa.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/iftoa.c
rename to src/libs/libgroff/iftoa.c
diff --git a/contrib/groff/src/libs/libgroff/invalid.cpp b/src/libs/libgroff/invalid.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/invalid.cpp
rename to src/libs/libgroff/invalid.cpp
diff --git a/contrib/groff/src/libs/libgroff/itoa.c b/src/libs/libgroff/itoa.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/itoa.c
rename to src/libs/libgroff/itoa.c
diff --git a/contrib/groff/src/libs/libgroff/lf.cpp b/src/libs/libgroff/lf.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/lf.cpp
rename to src/libs/libgroff/lf.cpp
diff --git a/contrib/groff/src/libs/libgroff/lineno.cpp b/src/libs/libgroff/lineno.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/lineno.cpp
rename to src/libs/libgroff/lineno.cpp
diff --git a/contrib/groff/src/libs/libgroff/macropath.cpp b/src/libs/libgroff/macropath.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/macropath.cpp
rename to src/libs/libgroff/macropath.cpp
diff --git a/contrib/groff/src/libs/libgroff/matherr.c b/src/libs/libgroff/matherr.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/matherr.c
rename to src/libs/libgroff/matherr.c
diff --git a/contrib/groff/src/libs/libgroff/maxfilename.cpp b/src/libs/libgroff/maxfilename.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/maxfilename.cpp
rename to src/libs/libgroff/maxfilename.cpp
diff --git a/contrib/groff/src/libs/libgroff/maxpathname.cpp b/src/libs/libgroff/maxpathname.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/maxpathname.cpp
rename to src/libs/libgroff/maxpathname.cpp
diff --git a/contrib/groff/src/libs/libgroff/mksdir.cpp b/src/libs/libgroff/mksdir.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/mksdir.cpp
rename to src/libs/libgroff/mksdir.cpp
diff --git a/contrib/groff/src/libs/libgroff/mkstemp.cpp b/src/libs/libgroff/mkstemp.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/mkstemp.cpp
rename to src/libs/libgroff/mkstemp.cpp
diff --git a/contrib/groff/src/libs/libgroff/nametoindex.cpp b/src/libs/libgroff/nametoindex.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/nametoindex.cpp
rename to src/libs/libgroff/nametoindex.cpp
diff --git a/contrib/groff/src/libs/libgroff/new.cpp b/src/libs/libgroff/new.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/new.cpp
rename to src/libs/libgroff/new.cpp
diff --git a/contrib/groff/src/libs/libgroff/paper.cpp b/src/libs/libgroff/paper.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/paper.cpp
rename to src/libs/libgroff/paper.cpp
diff --git a/contrib/groff/src/libs/libgroff/prime.cpp b/src/libs/libgroff/prime.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/prime.cpp
rename to src/libs/libgroff/prime.cpp
diff --git a/contrib/groff/src/libs/libgroff/progname.c b/src/libs/libgroff/progname.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/progname.c
rename to src/libs/libgroff/progname.c
diff --git a/contrib/groff/src/libs/libgroff/ptable.cpp b/src/libs/libgroff/ptable.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/ptable.cpp
rename to src/libs/libgroff/ptable.cpp
diff --git a/contrib/groff/src/libs/libgroff/putenv.c b/src/libs/libgroff/putenv.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/putenv.c
rename to src/libs/libgroff/putenv.c
diff --git a/contrib/groff/src/libs/libgroff/quotearg.c b/src/libs/libgroff/quotearg.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/quotearg.c
rename to src/libs/libgroff/quotearg.c
diff --git a/contrib/groff/src/libs/libgroff/relocate.cpp b/src/libs/libgroff/relocate.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/relocate.cpp
rename to src/libs/libgroff/relocate.cpp
diff --git a/contrib/groff/src/libs/libgroff/searchpath.cpp b/src/libs/libgroff/searchpath.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/searchpath.cpp
rename to src/libs/libgroff/searchpath.cpp
diff --git a/contrib/groff/src/libs/libgroff/spawnvp.c b/src/libs/libgroff/spawnvp.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/spawnvp.c
rename to src/libs/libgroff/spawnvp.c
diff --git a/contrib/groff/src/libs/libgroff/strcasecmp.c b/src/libs/libgroff/strcasecmp.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/strcasecmp.c
rename to src/libs/libgroff/strcasecmp.c
diff --git a/contrib/groff/src/libs/libgroff/strerror.c b/src/libs/libgroff/strerror.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/strerror.c
rename to src/libs/libgroff/strerror.c
diff --git a/contrib/groff/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/string.cpp
rename to src/libs/libgroff/string.cpp
diff --git a/contrib/groff/src/libs/libgroff/strncasecmp.c b/src/libs/libgroff/strncasecmp.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/strncasecmp.c
rename to src/libs/libgroff/strncasecmp.c
diff --git a/contrib/groff/src/libs/libgroff/strsave.cpp b/src/libs/libgroff/strsave.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/strsave.cpp
rename to src/libs/libgroff/strsave.cpp
diff --git a/contrib/groff/src/libs/libgroff/strtol.c b/src/libs/libgroff/strtol.c
similarity index 100%
rename from contrib/groff/src/libs/libgroff/strtol.c
rename to src/libs/libgroff/strtol.c
diff --git a/contrib/groff/src/libs/libgroff/symbol.cpp b/src/libs/libgroff/symbol.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/symbol.cpp
rename to src/libs/libgroff/symbol.cpp
diff --git a/contrib/groff/src/libs/libgroff/tmpfile.cpp b/src/libs/libgroff/tmpfile.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/tmpfile.cpp
rename to src/libs/libgroff/tmpfile.cpp
diff --git a/contrib/groff/src/libs/libgroff/tmpname.cpp b/src/libs/libgroff/tmpname.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/tmpname.cpp
rename to src/libs/libgroff/tmpname.cpp
diff --git a/contrib/groff/src/libs/libgroff/unicode.cpp b/src/libs/libgroff/unicode.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/unicode.cpp
rename to src/libs/libgroff/unicode.cpp
diff --git a/contrib/groff/src/libs/libgroff/uniglyph.cpp b/src/libs/libgroff/uniglyph.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/uniglyph.cpp
rename to src/libs/libgroff/uniglyph.cpp
diff --git a/contrib/groff/src/libs/libgroff/uniuni.cpp b/src/libs/libgroff/uniuni.cpp
similarity index 100%
rename from contrib/groff/src/libs/libgroff/uniuni.cpp
rename to src/libs/libgroff/uniuni.cpp
diff --git a/contrib/groff/src/libs/libxutil/DviChar.c b/src/libs/libxutil/DviChar.c
similarity index 100%
rename from contrib/groff/src/libs/libxutil/DviChar.c
rename to src/libs/libxutil/DviChar.c
diff --git a/contrib/groff/src/libs/libxutil/Makefile.sub b/src/libs/libxutil/Makefile.sub
similarity index 100%
rename from contrib/groff/src/libs/libxutil/Makefile.sub
rename to src/libs/libxutil/Makefile.sub
diff --git a/contrib/groff/src/libs/libxutil/XFontName.c b/src/libs/libxutil/XFontName.c
similarity index 100%
rename from contrib/groff/src/libs/libxutil/XFontName.c
rename to src/libs/libxutil/XFontName.c
diff --git a/contrib/groff/src/libs/libxutil/xmalloc.c b/src/libs/libxutil/xmalloc.c
similarity index 100%
rename from contrib/groff/src/libs/libxutil/xmalloc.c
rename to src/libs/libxutil/xmalloc.c
diff --git a/contrib/groff/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/eqn/Makefile.sub
rename to src/preproc/eqn/Makefile.sub
diff --git a/contrib/groff/src/preproc/eqn/TODO b/src/preproc/eqn/TODO
similarity index 100%
rename from contrib/groff/src/preproc/eqn/TODO
rename to src/preproc/eqn/TODO
diff --git a/contrib/groff/src/preproc/eqn/box.cpp b/src/preproc/eqn/box.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/box.cpp
rename to src/preproc/eqn/box.cpp
diff --git a/contrib/groff/src/preproc/eqn/box.h b/src/preproc/eqn/box.h
similarity index 100%
rename from contrib/groff/src/preproc/eqn/box.h
rename to src/preproc/eqn/box.h
diff --git a/contrib/groff/src/preproc/eqn/delim.cpp b/src/preproc/eqn/delim.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/delim.cpp
rename to src/preproc/eqn/delim.cpp
diff --git a/contrib/groff/src/preproc/eqn/eqn.cpp b/src/preproc/eqn/eqn.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/eqn.cpp
rename to src/preproc/eqn/eqn.cpp
diff --git a/contrib/groff/src/preproc/eqn/eqn.h b/src/preproc/eqn/eqn.h
similarity index 100%
rename from contrib/groff/src/preproc/eqn/eqn.h
rename to src/preproc/eqn/eqn.h
diff --git a/contrib/groff/src/preproc/eqn/eqn.man b/src/preproc/eqn/eqn.man
similarity index 100%
rename from contrib/groff/src/preproc/eqn/eqn.man
rename to src/preproc/eqn/eqn.man
diff --git a/contrib/groff/src/preproc/eqn/eqn.y b/src/preproc/eqn/eqn.y
similarity index 100%
rename from contrib/groff/src/preproc/eqn/eqn.y
rename to src/preproc/eqn/eqn.y
diff --git a/contrib/groff/src/preproc/eqn/eqn_tab.h b/src/preproc/eqn/eqn_tab.h
similarity index 100%
rename from contrib/groff/src/preproc/eqn/eqn_tab.h
rename to src/preproc/eqn/eqn_tab.h
diff --git a/contrib/groff/src/preproc/eqn/lex.cpp b/src/preproc/eqn/lex.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/lex.cpp
rename to src/preproc/eqn/lex.cpp
diff --git a/contrib/groff/src/preproc/eqn/limit.cpp b/src/preproc/eqn/limit.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/limit.cpp
rename to src/preproc/eqn/limit.cpp
diff --git a/contrib/groff/src/preproc/eqn/list.cpp b/src/preproc/eqn/list.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/list.cpp
rename to src/preproc/eqn/list.cpp
diff --git a/contrib/groff/src/preproc/eqn/main.cpp b/src/preproc/eqn/main.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/main.cpp
rename to src/preproc/eqn/main.cpp
diff --git a/contrib/groff/src/preproc/eqn/mark.cpp b/src/preproc/eqn/mark.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/mark.cpp
rename to src/preproc/eqn/mark.cpp
diff --git a/contrib/groff/src/preproc/eqn/neqn.man b/src/preproc/eqn/neqn.man
similarity index 100%
rename from contrib/groff/src/preproc/eqn/neqn.man
rename to src/preproc/eqn/neqn.man
diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/src/preproc/eqn/neqn.sh
similarity index 100%
rename from contrib/groff/src/preproc/eqn/neqn.sh
rename to src/preproc/eqn/neqn.sh
diff --git a/contrib/groff/src/preproc/eqn/other.cpp b/src/preproc/eqn/other.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/other.cpp
rename to src/preproc/eqn/other.cpp
diff --git a/contrib/groff/src/preproc/eqn/over.cpp b/src/preproc/eqn/over.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/over.cpp
rename to src/preproc/eqn/over.cpp
diff --git a/contrib/groff/src/preproc/eqn/pbox.h b/src/preproc/eqn/pbox.h
similarity index 100%
rename from contrib/groff/src/preproc/eqn/pbox.h
rename to src/preproc/eqn/pbox.h
diff --git a/contrib/groff/src/preproc/eqn/pile.cpp b/src/preproc/eqn/pile.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/pile.cpp
rename to src/preproc/eqn/pile.cpp
diff --git a/contrib/groff/src/preproc/eqn/script.cpp b/src/preproc/eqn/script.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/script.cpp
rename to src/preproc/eqn/script.cpp
diff --git a/contrib/groff/src/preproc/eqn/special.cpp b/src/preproc/eqn/special.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/special.cpp
rename to src/preproc/eqn/special.cpp
diff --git a/contrib/groff/src/preproc/eqn/sqrt.cpp b/src/preproc/eqn/sqrt.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/sqrt.cpp
rename to src/preproc/eqn/sqrt.cpp
diff --git a/contrib/groff/src/preproc/eqn/text.cpp b/src/preproc/eqn/text.cpp
similarity index 100%
rename from contrib/groff/src/preproc/eqn/text.cpp
rename to src/preproc/eqn/text.cpp
diff --git a/contrib/groff/src/preproc/grn/Makefile.sub b/src/preproc/grn/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/grn/Makefile.sub
rename to src/preproc/grn/Makefile.sub
diff --git a/contrib/groff/src/preproc/grn/README b/src/preproc/grn/README
similarity index 100%
rename from contrib/groff/src/preproc/grn/README
rename to src/preproc/grn/README
diff --git a/contrib/groff/src/preproc/grn/gprint.h b/src/preproc/grn/gprint.h
similarity index 100%
rename from contrib/groff/src/preproc/grn/gprint.h
rename to src/preproc/grn/gprint.h
diff --git a/contrib/groff/src/preproc/grn/grn.man b/src/preproc/grn/grn.man
similarity index 100%
rename from contrib/groff/src/preproc/grn/grn.man
rename to src/preproc/grn/grn.man
diff --git a/contrib/groff/src/preproc/grn/hdb.cpp b/src/preproc/grn/hdb.cpp
similarity index 100%
rename from contrib/groff/src/preproc/grn/hdb.cpp
rename to src/preproc/grn/hdb.cpp
diff --git a/contrib/groff/src/preproc/grn/hgraph.cpp b/src/preproc/grn/hgraph.cpp
similarity index 100%
rename from contrib/groff/src/preproc/grn/hgraph.cpp
rename to src/preproc/grn/hgraph.cpp
diff --git a/contrib/groff/src/preproc/grn/hpoint.cpp b/src/preproc/grn/hpoint.cpp
similarity index 100%
rename from contrib/groff/src/preproc/grn/hpoint.cpp
rename to src/preproc/grn/hpoint.cpp
diff --git a/contrib/groff/src/preproc/grn/main.cpp b/src/preproc/grn/main.cpp
similarity index 100%
rename from contrib/groff/src/preproc/grn/main.cpp
rename to src/preproc/grn/main.cpp
diff --git a/contrib/groff/src/preproc/html/Makefile.sub b/src/preproc/html/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/html/Makefile.sub
rename to src/preproc/html/Makefile.sub
diff --git a/contrib/groff/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
similarity index 100%
rename from contrib/groff/src/preproc/html/pre-html.cpp
rename to src/preproc/html/pre-html.cpp
diff --git a/contrib/groff/src/preproc/html/pre-html.h b/src/preproc/html/pre-html.h
similarity index 100%
rename from contrib/groff/src/preproc/html/pre-html.h
rename to src/preproc/html/pre-html.h
diff --git a/contrib/groff/src/preproc/html/pushback.cpp b/src/preproc/html/pushback.cpp
similarity index 100%
rename from contrib/groff/src/preproc/html/pushback.cpp
rename to src/preproc/html/pushback.cpp
diff --git a/contrib/groff/src/preproc/html/pushback.h b/src/preproc/html/pushback.h
similarity index 100%
rename from contrib/groff/src/preproc/html/pushback.h
rename to src/preproc/html/pushback.h
diff --git a/contrib/groff/src/preproc/pic/Makefile.sub b/src/preproc/pic/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/pic/Makefile.sub
rename to src/preproc/pic/Makefile.sub
diff --git a/contrib/groff/src/preproc/pic/TODO b/src/preproc/pic/TODO
similarity index 100%
rename from contrib/groff/src/preproc/pic/TODO
rename to src/preproc/pic/TODO
diff --git a/contrib/groff/src/preproc/pic/common.cpp b/src/preproc/pic/common.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/common.cpp
rename to src/preproc/pic/common.cpp
diff --git a/contrib/groff/src/preproc/pic/common.h b/src/preproc/pic/common.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/common.h
rename to src/preproc/pic/common.h
diff --git a/contrib/groff/src/preproc/pic/lex.cpp b/src/preproc/pic/lex.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/lex.cpp
rename to src/preproc/pic/lex.cpp
diff --git a/contrib/groff/src/preproc/pic/main.cpp b/src/preproc/pic/main.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/main.cpp
rename to src/preproc/pic/main.cpp
diff --git a/contrib/groff/src/preproc/pic/object.cpp b/src/preproc/pic/object.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/object.cpp
rename to src/preproc/pic/object.cpp
diff --git a/contrib/groff/src/preproc/pic/object.h b/src/preproc/pic/object.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/object.h
rename to src/preproc/pic/object.h
diff --git a/contrib/groff/src/preproc/pic/output.h b/src/preproc/pic/output.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/output.h
rename to src/preproc/pic/output.h
diff --git a/contrib/groff/src/preproc/pic/pic.cpp b/src/preproc/pic/pic.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/pic.cpp
rename to src/preproc/pic/pic.cpp
diff --git a/contrib/groff/src/preproc/pic/pic.h b/src/preproc/pic/pic.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/pic.h
rename to src/preproc/pic/pic.h
diff --git a/contrib/groff/src/preproc/pic/pic.man b/src/preproc/pic/pic.man
similarity index 100%
rename from contrib/groff/src/preproc/pic/pic.man
rename to src/preproc/pic/pic.man
diff --git a/contrib/groff/src/preproc/pic/pic.y b/src/preproc/pic/pic.y
similarity index 100%
rename from contrib/groff/src/preproc/pic/pic.y
rename to src/preproc/pic/pic.y
diff --git a/contrib/groff/src/preproc/pic/pic_tab.h b/src/preproc/pic/pic_tab.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/pic_tab.h
rename to src/preproc/pic/pic_tab.h
diff --git a/contrib/groff/src/preproc/pic/position.h b/src/preproc/pic/position.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/position.h
rename to src/preproc/pic/position.h
diff --git a/contrib/groff/src/preproc/pic/tex.cpp b/src/preproc/pic/tex.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/tex.cpp
rename to src/preproc/pic/tex.cpp
diff --git a/contrib/groff/src/preproc/pic/text.h b/src/preproc/pic/text.h
similarity index 100%
rename from contrib/groff/src/preproc/pic/text.h
rename to src/preproc/pic/text.h
diff --git a/contrib/groff/src/preproc/pic/troff.cpp b/src/preproc/pic/troff.cpp
similarity index 100%
rename from contrib/groff/src/preproc/pic/troff.cpp
rename to src/preproc/pic/troff.cpp
diff --git a/contrib/groff/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/refer/Makefile.sub
rename to src/preproc/refer/Makefile.sub
diff --git a/contrib/groff/src/preproc/refer/TODO b/src/preproc/refer/TODO
similarity index 100%
rename from contrib/groff/src/preproc/refer/TODO
rename to src/preproc/refer/TODO
diff --git a/contrib/groff/src/preproc/refer/command.cpp b/src/preproc/refer/command.cpp
similarity index 100%
rename from contrib/groff/src/preproc/refer/command.cpp
rename to src/preproc/refer/command.cpp
diff --git a/contrib/groff/src/preproc/refer/command.h b/src/preproc/refer/command.h
similarity index 100%
rename from contrib/groff/src/preproc/refer/command.h
rename to src/preproc/refer/command.h
diff --git a/contrib/groff/src/preproc/refer/label.cpp b/src/preproc/refer/label.cpp
similarity index 100%
rename from contrib/groff/src/preproc/refer/label.cpp
rename to src/preproc/refer/label.cpp
diff --git a/contrib/groff/src/preproc/refer/label.y b/src/preproc/refer/label.y
similarity index 100%
rename from contrib/groff/src/preproc/refer/label.y
rename to src/preproc/refer/label.y
diff --git a/contrib/groff/src/preproc/refer/ref.cpp b/src/preproc/refer/ref.cpp
similarity index 100%
rename from contrib/groff/src/preproc/refer/ref.cpp
rename to src/preproc/refer/ref.cpp
diff --git a/contrib/groff/src/preproc/refer/ref.h b/src/preproc/refer/ref.h
similarity index 100%
rename from contrib/groff/src/preproc/refer/ref.h
rename to src/preproc/refer/ref.h
diff --git a/contrib/groff/src/preproc/refer/refer.cpp b/src/preproc/refer/refer.cpp
similarity index 100%
rename from contrib/groff/src/preproc/refer/refer.cpp
rename to src/preproc/refer/refer.cpp
diff --git a/contrib/groff/src/preproc/refer/refer.h b/src/preproc/refer/refer.h
similarity index 100%
rename from contrib/groff/src/preproc/refer/refer.h
rename to src/preproc/refer/refer.h
diff --git a/contrib/groff/src/preproc/refer/refer.man b/src/preproc/refer/refer.man
similarity index 100%
rename from contrib/groff/src/preproc/refer/refer.man
rename to src/preproc/refer/refer.man
diff --git a/contrib/groff/src/preproc/refer/token.cpp b/src/preproc/refer/token.cpp
similarity index 100%
rename from contrib/groff/src/preproc/refer/token.cpp
rename to src/preproc/refer/token.cpp
diff --git a/contrib/groff/src/preproc/refer/token.h b/src/preproc/refer/token.h
similarity index 100%
rename from contrib/groff/src/preproc/refer/token.h
rename to src/preproc/refer/token.h
diff --git a/contrib/groff/src/preproc/soelim/Makefile.sub b/src/preproc/soelim/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/soelim/Makefile.sub
rename to src/preproc/soelim/Makefile.sub
diff --git a/contrib/groff/src/preproc/soelim/TODO b/src/preproc/soelim/TODO
similarity index 100%
rename from contrib/groff/src/preproc/soelim/TODO
rename to src/preproc/soelim/TODO
diff --git a/contrib/groff/src/preproc/soelim/soelim.cpp b/src/preproc/soelim/soelim.cpp
similarity index 100%
rename from contrib/groff/src/preproc/soelim/soelim.cpp
rename to src/preproc/soelim/soelim.cpp
diff --git a/contrib/groff/src/preproc/soelim/soelim.man b/src/preproc/soelim/soelim.man
similarity index 100%
rename from contrib/groff/src/preproc/soelim/soelim.man
rename to src/preproc/soelim/soelim.man
diff --git a/contrib/groff/src/preproc/tbl/Makefile.sub b/src/preproc/tbl/Makefile.sub
similarity index 100%
rename from contrib/groff/src/preproc/tbl/Makefile.sub
rename to src/preproc/tbl/Makefile.sub
diff --git a/contrib/groff/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
similarity index 100%
rename from contrib/groff/src/preproc/tbl/main.cpp
rename to src/preproc/tbl/main.cpp
diff --git a/contrib/groff/src/preproc/tbl/table.cpp b/src/preproc/tbl/table.cpp
similarity index 100%
rename from contrib/groff/src/preproc/tbl/table.cpp
rename to src/preproc/tbl/table.cpp
diff --git a/contrib/groff/src/preproc/tbl/table.h b/src/preproc/tbl/table.h
similarity index 100%
rename from contrib/groff/src/preproc/tbl/table.h
rename to src/preproc/tbl/table.h
diff --git a/contrib/groff/src/preproc/tbl/tbl.man b/src/preproc/tbl/tbl.man
similarity index 100%
rename from contrib/groff/src/preproc/tbl/tbl.man
rename to src/preproc/tbl/tbl.man
diff --git a/contrib/groff/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
similarity index 100%
rename from contrib/groff/src/roff/groff/Makefile.sub
rename to src/roff/groff/Makefile.sub
diff --git a/contrib/groff/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
similarity index 100%
rename from contrib/groff/src/roff/groff/groff.cpp
rename to src/roff/groff/groff.cpp
diff --git a/contrib/groff/src/roff/groff/groff.man b/src/roff/groff/groff.man
similarity index 100%
rename from contrib/groff/src/roff/groff/groff.man
rename to src/roff/groff/groff.man
diff --git a/contrib/groff/src/roff/groff/pipeline.c b/src/roff/groff/pipeline.c
similarity index 100%
rename from contrib/groff/src/roff/groff/pipeline.c
rename to src/roff/groff/pipeline.c
diff --git a/contrib/groff/src/roff/groff/pipeline.h b/src/roff/groff/pipeline.h
similarity index 100%
rename from contrib/groff/src/roff/groff/pipeline.h
rename to src/roff/groff/pipeline.h
diff --git a/contrib/groff/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
similarity index 100%
rename from contrib/groff/src/roff/grog/Makefile.sub
rename to src/roff/grog/Makefile.sub
diff --git a/contrib/groff/src/roff/grog/grog.man b/src/roff/grog/grog.man
similarity index 100%
rename from contrib/groff/src/roff/grog/grog.man
rename to src/roff/grog/grog.man
diff --git a/contrib/groff/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
similarity index 100%
rename from contrib/groff/src/roff/grog/grog.pl
rename to src/roff/grog/grog.pl
diff --git a/contrib/groff/src/roff/grog/grog.sh b/src/roff/grog/grog.sh
similarity index 100%
rename from contrib/groff/src/roff/grog/grog.sh
rename to src/roff/grog/grog.sh
diff --git a/contrib/groff/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
similarity index 100%
rename from contrib/groff/src/roff/nroff/Makefile.sub
rename to src/roff/nroff/Makefile.sub
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man
similarity index 100%
rename from contrib/groff/src/roff/nroff/nroff.man
rename to src/roff/nroff/nroff.man
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
similarity index 100%
rename from contrib/groff/src/roff/nroff/nroff.sh
rename to src/roff/nroff/nroff.sh
diff --git a/contrib/groff/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
similarity index 100%
rename from contrib/groff/src/roff/troff/Makefile.sub
rename to src/roff/troff/Makefile.sub
diff --git a/contrib/groff/src/roff/troff/TODO b/src/roff/troff/TODO
similarity index 100%
rename from contrib/groff/src/roff/troff/TODO
rename to src/roff/troff/TODO
diff --git a/contrib/groff/src/roff/troff/charinfo.h b/src/roff/troff/charinfo.h
similarity index 100%
rename from contrib/groff/src/roff/troff/charinfo.h
rename to src/roff/troff/charinfo.h
diff --git a/contrib/groff/src/roff/troff/column.cpp b/src/roff/troff/column.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/column.cpp
rename to src/roff/troff/column.cpp
diff --git a/contrib/groff/src/roff/troff/dictionary.cpp b/src/roff/troff/dictionary.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/dictionary.cpp
rename to src/roff/troff/dictionary.cpp
diff --git a/contrib/groff/src/roff/troff/dictionary.h b/src/roff/troff/dictionary.h
similarity index 100%
rename from contrib/groff/src/roff/troff/dictionary.h
rename to src/roff/troff/dictionary.h
diff --git a/contrib/groff/src/roff/troff/div.cpp b/src/roff/troff/div.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/div.cpp
rename to src/roff/troff/div.cpp
diff --git a/contrib/groff/src/roff/troff/div.h b/src/roff/troff/div.h
similarity index 100%
rename from contrib/groff/src/roff/troff/div.h
rename to src/roff/troff/div.h
diff --git a/contrib/groff/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/env.cpp
rename to src/roff/troff/env.cpp
diff --git a/contrib/groff/src/roff/troff/env.h b/src/roff/troff/env.h
similarity index 100%
rename from contrib/groff/src/roff/troff/env.h
rename to src/roff/troff/env.h
diff --git a/contrib/groff/src/roff/troff/hvunits.h b/src/roff/troff/hvunits.h
similarity index 100%
rename from contrib/groff/src/roff/troff/hvunits.h
rename to src/roff/troff/hvunits.h
diff --git a/contrib/groff/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/input.cpp
rename to src/roff/troff/input.cpp
diff --git a/contrib/groff/src/roff/troff/input.h b/src/roff/troff/input.h
similarity index 100%
rename from contrib/groff/src/roff/troff/input.h
rename to src/roff/troff/input.h
diff --git a/contrib/groff/src/roff/troff/mtsm.cpp b/src/roff/troff/mtsm.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/mtsm.cpp
rename to src/roff/troff/mtsm.cpp
diff --git a/contrib/groff/src/roff/troff/mtsm.h b/src/roff/troff/mtsm.h
similarity index 100%
rename from contrib/groff/src/roff/troff/mtsm.h
rename to src/roff/troff/mtsm.h
diff --git a/contrib/groff/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/node.cpp
rename to src/roff/troff/node.cpp
diff --git a/contrib/groff/src/roff/troff/node.h b/src/roff/troff/node.h
similarity index 100%
rename from contrib/groff/src/roff/troff/node.h
rename to src/roff/troff/node.h
diff --git a/contrib/groff/src/roff/troff/number.cpp b/src/roff/troff/number.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/number.cpp
rename to src/roff/troff/number.cpp
diff --git a/contrib/groff/src/roff/troff/reg.cpp b/src/roff/troff/reg.cpp
similarity index 100%
rename from contrib/groff/src/roff/troff/reg.cpp
rename to src/roff/troff/reg.cpp
diff --git a/contrib/groff/src/roff/troff/reg.h b/src/roff/troff/reg.h
similarity index 100%
rename from contrib/groff/src/roff/troff/reg.h
rename to src/roff/troff/reg.h
diff --git a/contrib/groff/src/roff/troff/request.h b/src/roff/troff/request.h
similarity index 100%
rename from contrib/groff/src/roff/troff/request.h
rename to src/roff/troff/request.h
diff --git a/contrib/groff/src/roff/troff/token.h b/src/roff/troff/token.h
similarity index 100%
rename from contrib/groff/src/roff/troff/token.h
rename to src/roff/troff/token.h
diff --git a/contrib/groff/src/roff/troff/troff.h b/src/roff/troff/troff.h
similarity index 100%
rename from contrib/groff/src/roff/troff/troff.h
rename to src/roff/troff/troff.h
diff --git a/contrib/groff/src/roff/troff/troff.man b/src/roff/troff/troff.man
similarity index 100%
rename from contrib/groff/src/roff/troff/troff.man
rename to src/roff/troff/troff.man
diff --git a/contrib/groff/src/utils/addftinfo/Makefile.sub b/src/utils/addftinfo/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/addftinfo/Makefile.sub
rename to src/utils/addftinfo/Makefile.sub
diff --git a/contrib/groff/src/utils/addftinfo/addftinfo.cpp b/src/utils/addftinfo/addftinfo.cpp
similarity index 100%
rename from contrib/groff/src/utils/addftinfo/addftinfo.cpp
rename to src/utils/addftinfo/addftinfo.cpp
diff --git a/contrib/groff/src/utils/addftinfo/addftinfo.man b/src/utils/addftinfo/addftinfo.man
similarity index 100%
rename from contrib/groff/src/utils/addftinfo/addftinfo.man
rename to src/utils/addftinfo/addftinfo.man
diff --git a/contrib/groff/src/utils/addftinfo/guess.cpp b/src/utils/addftinfo/guess.cpp
similarity index 100%
rename from contrib/groff/src/utils/addftinfo/guess.cpp
rename to src/utils/addftinfo/guess.cpp
diff --git a/contrib/groff/src/utils/addftinfo/guess.h b/src/utils/addftinfo/guess.h
similarity index 100%
rename from contrib/groff/src/utils/addftinfo/guess.h
rename to src/utils/addftinfo/guess.h
diff --git a/contrib/groff/src/utils/afmtodit/Makefile.sub b/src/utils/afmtodit/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/afmtodit/Makefile.sub
rename to src/utils/afmtodit/Makefile.sub
diff --git a/contrib/groff/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.man
similarity index 100%
rename from contrib/groff/src/utils/afmtodit/afmtodit.man
rename to src/utils/afmtodit/afmtodit.man
diff --git a/contrib/groff/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
similarity index 100%
rename from contrib/groff/src/utils/afmtodit/afmtodit.pl
rename to src/utils/afmtodit/afmtodit.pl
diff --git a/contrib/groff/src/utils/hpftodit/Makefile.sub b/src/utils/hpftodit/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/hpftodit/Makefile.sub
rename to src/utils/hpftodit/Makefile.sub
diff --git a/contrib/groff/src/utils/hpftodit/hpftodit.cpp b/src/utils/hpftodit/hpftodit.cpp
similarity index 100%
rename from contrib/groff/src/utils/hpftodit/hpftodit.cpp
rename to src/utils/hpftodit/hpftodit.cpp
diff --git a/contrib/groff/src/utils/hpftodit/hpftodit.man b/src/utils/hpftodit/hpftodit.man
similarity index 100%
rename from contrib/groff/src/utils/hpftodit/hpftodit.man
rename to src/utils/hpftodit/hpftodit.man
diff --git a/contrib/groff/src/utils/hpftodit/hpuni.cpp b/src/utils/hpftodit/hpuni.cpp
similarity index 100%
rename from contrib/groff/src/utils/hpftodit/hpuni.cpp
rename to src/utils/hpftodit/hpuni.cpp
diff --git a/contrib/groff/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/indxbib/Makefile.sub
rename to src/utils/indxbib/Makefile.sub
diff --git a/contrib/groff/src/utils/indxbib/eign b/src/utils/indxbib/eign
similarity index 100%
rename from contrib/groff/src/utils/indxbib/eign
rename to src/utils/indxbib/eign
diff --git a/contrib/groff/src/utils/indxbib/indxbib.cpp b/src/utils/indxbib/indxbib.cpp
similarity index 100%
rename from contrib/groff/src/utils/indxbib/indxbib.cpp
rename to src/utils/indxbib/indxbib.cpp
diff --git a/contrib/groff/src/utils/indxbib/indxbib.man b/src/utils/indxbib/indxbib.man
similarity index 100%
rename from contrib/groff/src/utils/indxbib/indxbib.man
rename to src/utils/indxbib/indxbib.man
diff --git a/contrib/groff/src/utils/indxbib/signal.c b/src/utils/indxbib/signal.c
similarity index 100%
rename from contrib/groff/src/utils/indxbib/signal.c
rename to src/utils/indxbib/signal.c
diff --git a/contrib/groff/src/utils/lkbib/Makefile.sub b/src/utils/lkbib/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/lkbib/Makefile.sub
rename to src/utils/lkbib/Makefile.sub
diff --git a/contrib/groff/src/utils/lkbib/lkbib.cpp b/src/utils/lkbib/lkbib.cpp
similarity index 100%
rename from contrib/groff/src/utils/lkbib/lkbib.cpp
rename to src/utils/lkbib/lkbib.cpp
diff --git a/contrib/groff/src/utils/lkbib/lkbib.man b/src/utils/lkbib/lkbib.man
similarity index 100%
rename from contrib/groff/src/utils/lkbib/lkbib.man
rename to src/utils/lkbib/lkbib.man
diff --git a/contrib/groff/src/utils/lookbib/Makefile.sub b/src/utils/lookbib/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/lookbib/Makefile.sub
rename to src/utils/lookbib/Makefile.sub
diff --git a/contrib/groff/src/utils/lookbib/lookbib.cpp b/src/utils/lookbib/lookbib.cpp
similarity index 100%
rename from contrib/groff/src/utils/lookbib/lookbib.cpp
rename to src/utils/lookbib/lookbib.cpp
diff --git a/contrib/groff/src/utils/lookbib/lookbib.man b/src/utils/lookbib/lookbib.man
similarity index 100%
rename from contrib/groff/src/utils/lookbib/lookbib.man
rename to src/utils/lookbib/lookbib.man
diff --git a/contrib/groff/src/utils/pfbtops/Makefile.sub b/src/utils/pfbtops/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/pfbtops/Makefile.sub
rename to src/utils/pfbtops/Makefile.sub
diff --git a/contrib/groff/src/utils/pfbtops/pfbtops.c b/src/utils/pfbtops/pfbtops.c
similarity index 100%
rename from contrib/groff/src/utils/pfbtops/pfbtops.c
rename to src/utils/pfbtops/pfbtops.c
diff --git a/contrib/groff/src/utils/pfbtops/pfbtops.man b/src/utils/pfbtops/pfbtops.man
similarity index 100%
rename from contrib/groff/src/utils/pfbtops/pfbtops.man
rename to src/utils/pfbtops/pfbtops.man
diff --git a/contrib/groff/src/utils/tfmtodit/Makefile.sub b/src/utils/tfmtodit/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/tfmtodit/Makefile.sub
rename to src/utils/tfmtodit/Makefile.sub
diff --git a/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp b/src/utils/tfmtodit/tfmtodit.cpp
similarity index 100%
rename from contrib/groff/src/utils/tfmtodit/tfmtodit.cpp
rename to src/utils/tfmtodit/tfmtodit.cpp
diff --git a/contrib/groff/src/utils/tfmtodit/tfmtodit.man b/src/utils/tfmtodit/tfmtodit.man
similarity index 100%
rename from contrib/groff/src/utils/tfmtodit/tfmtodit.man
rename to src/utils/tfmtodit/tfmtodit.man
diff --git a/contrib/groff/src/utils/xtotroff/Makefile.in b/src/utils/xtotroff/Makefile.in
similarity index 100%
rename from contrib/groff/src/utils/xtotroff/Makefile.in
rename to src/utils/xtotroff/Makefile.in
diff --git a/contrib/groff/src/utils/xtotroff/Makefile.sub b/src/utils/xtotroff/Makefile.sub
similarity index 100%
rename from contrib/groff/src/utils/xtotroff/Makefile.sub
rename to src/utils/xtotroff/Makefile.sub
diff --git a/contrib/groff/src/utils/xtotroff/xtotroff.c b/src/utils/xtotroff/xtotroff.c
similarity index 100%
rename from contrib/groff/src/utils/xtotroff/xtotroff.c
rename to src/utils/xtotroff/xtotroff.c
diff --git a/contrib/groff/src/utils/xtotroff/xtotroff.man b/src/utils/xtotroff/xtotroff.man
similarity index 100%
rename from contrib/groff/src/utils/xtotroff/xtotroff.man
rename to src/utils/xtotroff/xtotroff.man
diff --git a/contrib/groff/stamp-h.in b/stamp-h.in
similarity index 100%
rename from contrib/groff/stamp-h.in
rename to stamp-h.in
diff --git a/contrib/groff/test-groff.in b/test-groff.in
similarity index 100%
rename from contrib/groff/test-groff.in
rename to test-groff.in
diff --git a/contrib/groff/tmac/Makefile.sub b/tmac/Makefile.sub
similarity index 100%
rename from contrib/groff/tmac/Makefile.sub
rename to tmac/Makefile.sub
diff --git a/contrib/groff/tmac/README b/tmac/README
similarity index 100%
rename from contrib/groff/tmac/README
rename to tmac/README
diff --git a/contrib/groff/tmac/TODO b/tmac/TODO
similarity index 100%
rename from contrib/groff/tmac/TODO
rename to tmac/TODO
diff --git a/contrib/groff/tmac/X.tmac b/tmac/X.tmac
similarity index 100%
rename from contrib/groff/tmac/X.tmac
rename to tmac/X.tmac
diff --git a/contrib/groff/tmac/Xps.tmac b/tmac/Xps.tmac
similarity index 100%
rename from contrib/groff/tmac/Xps.tmac
rename to tmac/Xps.tmac
diff --git a/contrib/groff/tmac/a4.tmac b/tmac/a4.tmac
similarity index 100%
rename from contrib/groff/tmac/a4.tmac
rename to tmac/a4.tmac
diff --git a/contrib/groff/tmac/an-old.tmac b/tmac/an-old.tmac
similarity index 100%
rename from contrib/groff/tmac/an-old.tmac
rename to tmac/an-old.tmac
diff --git a/contrib/groff/tmac/an.tmac b/tmac/an.tmac
similarity index 100%
rename from contrib/groff/tmac/an.tmac
rename to tmac/an.tmac
diff --git a/contrib/groff/tmac/andoc.tmac b/tmac/andoc.tmac
similarity index 100%
rename from contrib/groff/tmac/andoc.tmac
rename to tmac/andoc.tmac
diff --git a/contrib/groff/tmac/composite.tmac b/tmac/composite.tmac
similarity index 100%
rename from contrib/groff/tmac/composite.tmac
rename to tmac/composite.tmac
diff --git a/contrib/groff/tmac/cp1047.tmac b/tmac/cp1047.tmac
similarity index 100%
rename from contrib/groff/tmac/cp1047.tmac
rename to tmac/cp1047.tmac
diff --git a/contrib/groff/tmac/devtag.tmac b/tmac/devtag.tmac
similarity index 100%
rename from contrib/groff/tmac/devtag.tmac
rename to tmac/devtag.tmac
diff --git a/contrib/groff/tmac/doc-common b/tmac/doc-common
similarity index 100%
rename from contrib/groff/tmac/doc-common
rename to tmac/doc-common
diff --git a/contrib/groff/tmac/doc-ditroff b/tmac/doc-ditroff
similarity index 100%
rename from contrib/groff/tmac/doc-ditroff
rename to tmac/doc-ditroff
diff --git a/contrib/groff/tmac/doc-nroff b/tmac/doc-nroff
similarity index 100%
rename from contrib/groff/tmac/doc-nroff
rename to tmac/doc-nroff
diff --git a/contrib/groff/tmac/doc-old.tmac b/tmac/doc-old.tmac
similarity index 100%
rename from contrib/groff/tmac/doc-old.tmac
rename to tmac/doc-old.tmac
diff --git a/contrib/groff/tmac/doc-syms b/tmac/doc-syms
similarity index 100%
rename from contrib/groff/tmac/doc-syms
rename to tmac/doc-syms
diff --git a/contrib/groff/tmac/doc.tmac b/tmac/doc.tmac
similarity index 100%
rename from contrib/groff/tmac/doc.tmac
rename to tmac/doc.tmac
diff --git a/contrib/groff/tmac/dvi.tmac b/tmac/dvi.tmac
similarity index 100%
rename from contrib/groff/tmac/dvi.tmac
rename to tmac/dvi.tmac
diff --git a/contrib/groff/tmac/e.tmac b/tmac/e.tmac
similarity index 100%
rename from contrib/groff/tmac/e.tmac
rename to tmac/e.tmac
diff --git a/contrib/groff/tmac/ec.tmac b/tmac/ec.tmac
similarity index 100%
rename from contrib/groff/tmac/ec.tmac
rename to tmac/ec.tmac
diff --git a/contrib/groff/tmac/eqnrc b/tmac/eqnrc
similarity index 100%
rename from contrib/groff/tmac/eqnrc
rename to tmac/eqnrc
diff --git a/contrib/groff/tmac/europs.tmac b/tmac/europs.tmac
similarity index 100%
rename from contrib/groff/tmac/europs.tmac
rename to tmac/europs.tmac
diff --git a/contrib/groff/tmac/fixmacros.sed b/tmac/fixmacros.sed
similarity index 100%
rename from contrib/groff/tmac/fixmacros.sed
rename to tmac/fixmacros.sed
diff --git a/contrib/groff/tmac/groff_man.man b/tmac/groff_man.man
similarity index 100%
rename from contrib/groff/tmac/groff_man.man
rename to tmac/groff_man.man
diff --git a/contrib/groff/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
similarity index 100%
rename from contrib/groff/tmac/groff_mdoc.man
rename to tmac/groff_mdoc.man
diff --git a/contrib/groff/tmac/groff_me.man b/tmac/groff_me.man
similarity index 100%
rename from contrib/groff/tmac/groff_me.man
rename to tmac/groff_me.man
diff --git a/contrib/groff/tmac/groff_ms.man b/tmac/groff_ms.man
similarity index 100%
rename from contrib/groff/tmac/groff_ms.man
rename to tmac/groff_ms.man
diff --git a/contrib/groff/tmac/groff_trace.man b/tmac/groff_trace.man
similarity index 100%
rename from contrib/groff/tmac/groff_trace.man
rename to tmac/groff_trace.man
diff --git a/contrib/groff/tmac/groff_www.man b/tmac/groff_www.man
similarity index 100%
rename from contrib/groff/tmac/groff_www.man
rename to tmac/groff_www.man
diff --git a/contrib/groff/tmac/html-end.tmac b/tmac/html-end.tmac
similarity index 100%
rename from contrib/groff/tmac/html-end.tmac
rename to tmac/html-end.tmac
diff --git a/contrib/groff/tmac/html.tmac b/tmac/html.tmac
similarity index 100%
rename from contrib/groff/tmac/html.tmac
rename to tmac/html.tmac
diff --git a/contrib/groff/tmac/hyphen.us b/tmac/hyphen.us
similarity index 100%
rename from contrib/groff/tmac/hyphen.us
rename to tmac/hyphen.us
diff --git a/contrib/groff/tmac/hyphenex.pl b/tmac/hyphenex.pl
similarity index 100%
rename from contrib/groff/tmac/hyphenex.pl
rename to tmac/hyphenex.pl
diff --git a/contrib/groff/tmac/hyphenex.us b/tmac/hyphenex.us
similarity index 100%
rename from contrib/groff/tmac/hyphenex.us
rename to tmac/hyphenex.us
diff --git a/contrib/groff/tmac/latin1.tmac b/tmac/latin1.tmac
similarity index 100%
rename from contrib/groff/tmac/latin1.tmac
rename to tmac/latin1.tmac
diff --git a/contrib/groff/tmac/latin2.tmac b/tmac/latin2.tmac
similarity index 100%
rename from contrib/groff/tmac/latin2.tmac
rename to tmac/latin2.tmac
diff --git a/contrib/groff/tmac/latin5.tmac b/tmac/latin5.tmac
similarity index 100%
rename from contrib/groff/tmac/latin5.tmac
rename to tmac/latin5.tmac
diff --git a/contrib/groff/tmac/latin9.tmac b/tmac/latin9.tmac
similarity index 100%
rename from contrib/groff/tmac/latin9.tmac
rename to tmac/latin9.tmac
diff --git a/contrib/groff/tmac/lbp.tmac b/tmac/lbp.tmac
similarity index 100%
rename from contrib/groff/tmac/lbp.tmac
rename to tmac/lbp.tmac
diff --git a/contrib/groff/tmac/lj4.tmac b/tmac/lj4.tmac
similarity index 100%
rename from contrib/groff/tmac/lj4.tmac
rename to tmac/lj4.tmac
diff --git a/contrib/groff/tmac/man.local b/tmac/man.local
similarity index 100%
rename from contrib/groff/tmac/man.local
rename to tmac/man.local
diff --git a/contrib/groff/tmac/man.tmac b/tmac/man.tmac
similarity index 100%
rename from contrib/groff/tmac/man.tmac
rename to tmac/man.tmac
diff --git a/contrib/groff/tmac/man.ultrix b/tmac/man.ultrix
similarity index 100%
rename from contrib/groff/tmac/man.ultrix
rename to tmac/man.ultrix
diff --git a/contrib/groff/tmac/mandoc.tmac b/tmac/mandoc.tmac
similarity index 100%
rename from contrib/groff/tmac/mandoc.tmac
rename to tmac/mandoc.tmac
diff --git a/contrib/groff/tmac/mdoc.local b/tmac/mdoc.local
similarity index 100%
rename from contrib/groff/tmac/mdoc.local
rename to tmac/mdoc.local
diff --git a/contrib/groff/tmac/mdoc.tmac b/tmac/mdoc.tmac
similarity index 100%
rename from contrib/groff/tmac/mdoc.tmac
rename to tmac/mdoc.tmac
diff --git a/contrib/groff/tmac/me.tmac b/tmac/me.tmac
similarity index 100%
rename from contrib/groff/tmac/me.tmac
rename to tmac/me.tmac
diff --git a/contrib/groff/tmac/ms.tmac b/tmac/ms.tmac
similarity index 100%
rename from contrib/groff/tmac/ms.tmac
rename to tmac/ms.tmac
diff --git a/contrib/groff/tmac/papersize.tmac b/tmac/papersize.tmac
similarity index 100%
rename from contrib/groff/tmac/papersize.tmac
rename to tmac/papersize.tmac
diff --git a/contrib/groff/tmac/pic.tmac b/tmac/pic.tmac
similarity index 100%
rename from contrib/groff/tmac/pic.tmac
rename to tmac/pic.tmac
diff --git a/contrib/groff/tmac/ps.tmac b/tmac/ps.tmac
similarity index 100%
rename from contrib/groff/tmac/ps.tmac
rename to tmac/ps.tmac
diff --git a/contrib/groff/tmac/psatk.tmac b/tmac/psatk.tmac
similarity index 100%
rename from contrib/groff/tmac/psatk.tmac
rename to tmac/psatk.tmac
diff --git a/contrib/groff/tmac/psfig.tmac b/tmac/psfig.tmac
similarity index 100%
rename from contrib/groff/tmac/psfig.tmac
rename to tmac/psfig.tmac
diff --git a/contrib/groff/tmac/psold.tmac b/tmac/psold.tmac
similarity index 100%
rename from contrib/groff/tmac/psold.tmac
rename to tmac/psold.tmac
diff --git a/contrib/groff/tmac/pspic.tmac b/tmac/pspic.tmac
similarity index 100%
rename from contrib/groff/tmac/pspic.tmac
rename to tmac/pspic.tmac
diff --git a/contrib/groff/tmac/s.tmac b/tmac/s.tmac
similarity index 100%
rename from contrib/groff/tmac/s.tmac
rename to tmac/s.tmac
diff --git a/contrib/groff/tmac/safer.tmac b/tmac/safer.tmac
similarity index 100%
rename from contrib/groff/tmac/safer.tmac
rename to tmac/safer.tmac
diff --git a/contrib/groff/tmac/strip.sed b/tmac/strip.sed
similarity index 100%
rename from contrib/groff/tmac/strip.sed
rename to tmac/strip.sed
diff --git a/contrib/groff/tmac/trace.tmac b/tmac/trace.tmac
similarity index 100%
rename from contrib/groff/tmac/trace.tmac
rename to tmac/trace.tmac
diff --git a/contrib/groff/tmac/troffrc b/tmac/troffrc
similarity index 100%
rename from contrib/groff/tmac/troffrc
rename to tmac/troffrc
diff --git a/contrib/groff/tmac/troffrc-end b/tmac/troffrc-end
similarity index 100%
rename from contrib/groff/tmac/troffrc-end
rename to tmac/troffrc-end
diff --git a/contrib/groff/tmac/tty-char.tmac b/tmac/tty-char.tmac
similarity index 100%
rename from contrib/groff/tmac/tty-char.tmac
rename to tmac/tty-char.tmac
diff --git a/contrib/groff/tmac/tty.tmac b/tmac/tty.tmac
similarity index 100%
rename from contrib/groff/tmac/tty.tmac
rename to tmac/tty.tmac
diff --git a/contrib/groff/tmac/unicode.tmac b/tmac/unicode.tmac
similarity index 100%
rename from contrib/groff/tmac/unicode.tmac
rename to tmac/unicode.tmac
diff --git a/contrib/groff/tmac/www.tmac b/tmac/www.tmac
similarity index 100%
rename from contrib/groff/tmac/www.tmac
rename to tmac/www.tmac