diff --git a/contrib/file/ChangeLog b/ChangeLog
similarity index 100%
rename from contrib/file/ChangeLog
rename to ChangeLog
diff --git a/contrib/file/FREEBSD-upgrade b/FREEBSD-upgrade
similarity index 87%
rename from contrib/file/FREEBSD-upgrade
rename to FREEBSD-upgrade
index f6657bcfae59..ee8f7a8fdbe0 100644
--- a/contrib/file/FREEBSD-upgrade
+++ b/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: vendor/file/dist/contrib/file/FREEBSD-upgrade 169962 2007-05-24 21:59:38Z obrien $
 
 Christos Zoulas `file'
 	originals can be found at: ftp://ftp.astron.com/pub/file/
diff --git a/contrib/file/Header b/Header
similarity index 100%
rename from contrib/file/Header
rename to Header
diff --git a/contrib/file/LEGAL.NOTICE b/LEGAL.NOTICE
similarity index 100%
rename from contrib/file/LEGAL.NOTICE
rename to LEGAL.NOTICE
diff --git a/contrib/file/Localstuff b/Localstuff
similarity index 100%
rename from contrib/file/Localstuff
rename to Localstuff
diff --git a/contrib/file/MAINT b/MAINT
similarity index 100%
rename from contrib/file/MAINT
rename to MAINT
diff --git a/contrib/file/Magdir/acorn b/Magdir/acorn
similarity index 100%
rename from contrib/file/Magdir/acorn
rename to Magdir/acorn
diff --git a/contrib/file/Magdir/adi b/Magdir/adi
similarity index 100%
rename from contrib/file/Magdir/adi
rename to Magdir/adi
diff --git a/contrib/file/Magdir/adventure b/Magdir/adventure
similarity index 100%
rename from contrib/file/Magdir/adventure
rename to Magdir/adventure
diff --git a/contrib/file/Magdir/allegro b/Magdir/allegro
similarity index 100%
rename from contrib/file/Magdir/allegro
rename to Magdir/allegro
diff --git a/contrib/file/Magdir/alliant b/Magdir/alliant
similarity index 100%
rename from contrib/file/Magdir/alliant
rename to Magdir/alliant
diff --git a/contrib/file/Magdir/alpha b/Magdir/alpha
similarity index 100%
rename from contrib/file/Magdir/alpha
rename to Magdir/alpha
diff --git a/contrib/file/Magdir/amanda b/Magdir/amanda
similarity index 100%
rename from contrib/file/Magdir/amanda
rename to Magdir/amanda
diff --git a/contrib/file/Magdir/amigaos b/Magdir/amigaos
similarity index 100%
rename from contrib/file/Magdir/amigaos
rename to Magdir/amigaos
diff --git a/contrib/file/Magdir/animation b/Magdir/animation
similarity index 100%
rename from contrib/file/Magdir/animation
rename to Magdir/animation
diff --git a/contrib/file/Magdir/apl b/Magdir/apl
similarity index 100%
rename from contrib/file/Magdir/apl
rename to Magdir/apl
diff --git a/contrib/file/Magdir/apple b/Magdir/apple
similarity index 100%
rename from contrib/file/Magdir/apple
rename to Magdir/apple
diff --git a/contrib/file/Magdir/applix b/Magdir/applix
similarity index 100%
rename from contrib/file/Magdir/applix
rename to Magdir/applix
diff --git a/contrib/file/Magdir/archive b/Magdir/archive
similarity index 100%
rename from contrib/file/Magdir/archive
rename to Magdir/archive
diff --git a/contrib/file/Magdir/asterix b/Magdir/asterix
similarity index 100%
rename from contrib/file/Magdir/asterix
rename to Magdir/asterix
diff --git a/contrib/file/Magdir/att3b b/Magdir/att3b
similarity index 100%
rename from contrib/file/Magdir/att3b
rename to Magdir/att3b
diff --git a/contrib/file/Magdir/audio b/Magdir/audio
similarity index 100%
rename from contrib/file/Magdir/audio
rename to Magdir/audio
diff --git a/contrib/file/Magdir/basis b/Magdir/basis
similarity index 100%
rename from contrib/file/Magdir/basis
rename to Magdir/basis
diff --git a/contrib/file/Magdir/bflt b/Magdir/bflt
similarity index 100%
rename from contrib/file/Magdir/bflt
rename to Magdir/bflt
diff --git a/contrib/file/Magdir/blender b/Magdir/blender
similarity index 100%
rename from contrib/file/Magdir/blender
rename to Magdir/blender
diff --git a/contrib/file/Magdir/blit b/Magdir/blit
similarity index 100%
rename from contrib/file/Magdir/blit
rename to Magdir/blit
diff --git a/contrib/file/Magdir/bout b/Magdir/bout
similarity index 100%
rename from contrib/file/Magdir/bout
rename to Magdir/bout
diff --git a/contrib/file/Magdir/bsdi b/Magdir/bsdi
similarity index 100%
rename from contrib/file/Magdir/bsdi
rename to Magdir/bsdi
diff --git a/contrib/file/Magdir/btsnoop b/Magdir/btsnoop
similarity index 100%
rename from contrib/file/Magdir/btsnoop
rename to Magdir/btsnoop
diff --git a/contrib/file/Magdir/c-lang b/Magdir/c-lang
similarity index 100%
rename from contrib/file/Magdir/c-lang
rename to Magdir/c-lang
diff --git a/contrib/file/Magdir/c64 b/Magdir/c64
similarity index 100%
rename from contrib/file/Magdir/c64
rename to Magdir/c64
diff --git a/contrib/file/Magdir/cad b/Magdir/cad
similarity index 100%
rename from contrib/file/Magdir/cad
rename to Magdir/cad
diff --git a/contrib/file/Magdir/cafebabe b/Magdir/cafebabe
similarity index 100%
rename from contrib/file/Magdir/cafebabe
rename to Magdir/cafebabe
diff --git a/contrib/file/Magdir/cddb b/Magdir/cddb
similarity index 100%
rename from contrib/file/Magdir/cddb
rename to Magdir/cddb
diff --git a/contrib/file/Magdir/chord b/Magdir/chord
similarity index 100%
rename from contrib/file/Magdir/chord
rename to Magdir/chord
diff --git a/contrib/file/Magdir/cisco b/Magdir/cisco
similarity index 100%
rename from contrib/file/Magdir/cisco
rename to Magdir/cisco
diff --git a/contrib/file/Magdir/citrus b/Magdir/citrus
similarity index 100%
rename from contrib/file/Magdir/citrus
rename to Magdir/citrus
diff --git a/contrib/file/Magdir/claris b/Magdir/claris
similarity index 100%
rename from contrib/file/Magdir/claris
rename to Magdir/claris
diff --git a/contrib/file/Magdir/clipper b/Magdir/clipper
similarity index 100%
rename from contrib/file/Magdir/clipper
rename to Magdir/clipper
diff --git a/contrib/file/Magdir/commands b/Magdir/commands
similarity index 100%
rename from contrib/file/Magdir/commands
rename to Magdir/commands
diff --git a/contrib/file/Magdir/communications b/Magdir/communications
similarity index 100%
rename from contrib/file/Magdir/communications
rename to Magdir/communications
diff --git a/contrib/file/Magdir/compress b/Magdir/compress
similarity index 100%
rename from contrib/file/Magdir/compress
rename to Magdir/compress
diff --git a/contrib/file/Magdir/console b/Magdir/console
similarity index 100%
rename from contrib/file/Magdir/console
rename to Magdir/console
diff --git a/contrib/file/Magdir/convex b/Magdir/convex
similarity index 100%
rename from contrib/file/Magdir/convex
rename to Magdir/convex
diff --git a/contrib/file/Magdir/cracklib b/Magdir/cracklib
similarity index 100%
rename from contrib/file/Magdir/cracklib
rename to Magdir/cracklib
diff --git a/contrib/file/Magdir/ctags b/Magdir/ctags
similarity index 100%
rename from contrib/file/Magdir/ctags
rename to Magdir/ctags
diff --git a/contrib/file/Magdir/dact b/Magdir/dact
similarity index 100%
rename from contrib/file/Magdir/dact
rename to Magdir/dact
diff --git a/contrib/file/Magdir/database b/Magdir/database
similarity index 100%
rename from contrib/file/Magdir/database
rename to Magdir/database
diff --git a/contrib/file/Magdir/diamond b/Magdir/diamond
similarity index 100%
rename from contrib/file/Magdir/diamond
rename to Magdir/diamond
diff --git a/contrib/file/Magdir/diff b/Magdir/diff
similarity index 100%
rename from contrib/file/Magdir/diff
rename to Magdir/diff
diff --git a/contrib/file/Magdir/digital b/Magdir/digital
similarity index 100%
rename from contrib/file/Magdir/digital
rename to Magdir/digital
diff --git a/contrib/file/Magdir/dolby b/Magdir/dolby
similarity index 100%
rename from contrib/file/Magdir/dolby
rename to Magdir/dolby
diff --git a/contrib/file/Magdir/dump b/Magdir/dump
similarity index 100%
rename from contrib/file/Magdir/dump
rename to Magdir/dump
diff --git a/contrib/file/Magdir/dyadic b/Magdir/dyadic
similarity index 100%
rename from contrib/file/Magdir/dyadic
rename to Magdir/dyadic
diff --git a/contrib/file/Magdir/editors b/Magdir/editors
similarity index 100%
rename from contrib/file/Magdir/editors
rename to Magdir/editors
diff --git a/contrib/file/Magdir/efi b/Magdir/efi
similarity index 100%
rename from contrib/file/Magdir/efi
rename to Magdir/efi
diff --git a/contrib/file/Magdir/elf b/Magdir/elf
similarity index 100%
rename from contrib/file/Magdir/elf
rename to Magdir/elf
diff --git a/contrib/file/Magdir/encore b/Magdir/encore
similarity index 100%
rename from contrib/file/Magdir/encore
rename to Magdir/encore
diff --git a/contrib/file/Magdir/epoc b/Magdir/epoc
similarity index 100%
rename from contrib/file/Magdir/epoc
rename to Magdir/epoc
diff --git a/contrib/file/Magdir/esri b/Magdir/esri
similarity index 100%
rename from contrib/file/Magdir/esri
rename to Magdir/esri
diff --git a/contrib/file/Magdir/fcs b/Magdir/fcs
similarity index 100%
rename from contrib/file/Magdir/fcs
rename to Magdir/fcs
diff --git a/contrib/file/Magdir/filesystems b/Magdir/filesystems
similarity index 100%
rename from contrib/file/Magdir/filesystems
rename to Magdir/filesystems
diff --git a/contrib/file/Magdir/flash b/Magdir/flash
similarity index 100%
rename from contrib/file/Magdir/flash
rename to Magdir/flash
diff --git a/contrib/file/Magdir/fonts b/Magdir/fonts
similarity index 100%
rename from contrib/file/Magdir/fonts
rename to Magdir/fonts
diff --git a/contrib/file/Magdir/fortran b/Magdir/fortran
similarity index 100%
rename from contrib/file/Magdir/fortran
rename to Magdir/fortran
diff --git a/contrib/file/Magdir/frame b/Magdir/frame
similarity index 100%
rename from contrib/file/Magdir/frame
rename to Magdir/frame
diff --git a/contrib/file/Magdir/freebsd b/Magdir/freebsd
similarity index 100%
rename from contrib/file/Magdir/freebsd
rename to Magdir/freebsd
diff --git a/contrib/file/Magdir/fsav b/Magdir/fsav
similarity index 100%
rename from contrib/file/Magdir/fsav
rename to Magdir/fsav
diff --git a/contrib/file/Magdir/games b/Magdir/games
similarity index 100%
rename from contrib/file/Magdir/games
rename to Magdir/games
diff --git a/contrib/file/Magdir/gcc b/Magdir/gcc
similarity index 100%
rename from contrib/file/Magdir/gcc
rename to Magdir/gcc
diff --git a/contrib/file/Magdir/geos b/Magdir/geos
similarity index 100%
rename from contrib/file/Magdir/geos
rename to Magdir/geos
diff --git a/contrib/file/Magdir/gimp b/Magdir/gimp
similarity index 100%
rename from contrib/file/Magdir/gimp
rename to Magdir/gimp
diff --git a/contrib/file/Magdir/gnu b/Magdir/gnu
similarity index 100%
rename from contrib/file/Magdir/gnu
rename to Magdir/gnu
diff --git a/contrib/file/Magdir/grace b/Magdir/grace
similarity index 100%
rename from contrib/file/Magdir/grace
rename to Magdir/grace
diff --git a/contrib/file/Magdir/gringotts b/Magdir/gringotts
similarity index 100%
rename from contrib/file/Magdir/gringotts
rename to Magdir/gringotts
diff --git a/contrib/file/Magdir/hitachi-sh b/Magdir/hitachi-sh
similarity index 100%
rename from contrib/file/Magdir/hitachi-sh
rename to Magdir/hitachi-sh
diff --git a/contrib/file/Magdir/hp b/Magdir/hp
similarity index 100%
rename from contrib/file/Magdir/hp
rename to Magdir/hp
diff --git a/contrib/file/Magdir/human68k b/Magdir/human68k
similarity index 100%
rename from contrib/file/Magdir/human68k
rename to Magdir/human68k
diff --git a/contrib/file/Magdir/ibm370 b/Magdir/ibm370
similarity index 100%
rename from contrib/file/Magdir/ibm370
rename to Magdir/ibm370
diff --git a/contrib/file/Magdir/ibm6000 b/Magdir/ibm6000
similarity index 100%
rename from contrib/file/Magdir/ibm6000
rename to Magdir/ibm6000
diff --git a/contrib/file/Magdir/iff b/Magdir/iff
similarity index 100%
rename from contrib/file/Magdir/iff
rename to Magdir/iff
diff --git a/contrib/file/Magdir/images b/Magdir/images
similarity index 100%
rename from contrib/file/Magdir/images
rename to Magdir/images
diff --git a/contrib/file/Magdir/intel b/Magdir/intel
similarity index 100%
rename from contrib/file/Magdir/intel
rename to Magdir/intel
diff --git a/contrib/file/Magdir/interleaf b/Magdir/interleaf
similarity index 100%
rename from contrib/file/Magdir/interleaf
rename to Magdir/interleaf
diff --git a/contrib/file/Magdir/island b/Magdir/island
similarity index 100%
rename from contrib/file/Magdir/island
rename to Magdir/island
diff --git a/contrib/file/Magdir/ispell b/Magdir/ispell
similarity index 100%
rename from contrib/file/Magdir/ispell
rename to Magdir/ispell
diff --git a/contrib/file/Magdir/java b/Magdir/java
similarity index 100%
rename from contrib/file/Magdir/java
rename to Magdir/java
diff --git a/contrib/file/Magdir/jpeg b/Magdir/jpeg
similarity index 100%
rename from contrib/file/Magdir/jpeg
rename to Magdir/jpeg
diff --git a/contrib/file/Magdir/karma b/Magdir/karma
similarity index 100%
rename from contrib/file/Magdir/karma
rename to Magdir/karma
diff --git a/contrib/file/Magdir/lecter b/Magdir/lecter
similarity index 100%
rename from contrib/file/Magdir/lecter
rename to Magdir/lecter
diff --git a/contrib/file/Magdir/lex b/Magdir/lex
similarity index 100%
rename from contrib/file/Magdir/lex
rename to Magdir/lex
diff --git a/contrib/file/Magdir/lif b/Magdir/lif
similarity index 100%
rename from contrib/file/Magdir/lif
rename to Magdir/lif
diff --git a/contrib/file/Magdir/linux b/Magdir/linux
similarity index 100%
rename from contrib/file/Magdir/linux
rename to Magdir/linux
diff --git a/contrib/file/Magdir/lisp b/Magdir/lisp
similarity index 100%
rename from contrib/file/Magdir/lisp
rename to Magdir/lisp
diff --git a/contrib/file/Magdir/mach b/Magdir/mach
similarity index 100%
rename from contrib/file/Magdir/mach
rename to Magdir/mach
diff --git a/contrib/file/Magdir/macintosh b/Magdir/macintosh
similarity index 100%
rename from contrib/file/Magdir/macintosh
rename to Magdir/macintosh
diff --git a/contrib/file/Magdir/magic b/Magdir/magic
similarity index 100%
rename from contrib/file/Magdir/magic
rename to Magdir/magic
diff --git a/contrib/file/Magdir/mail.news b/Magdir/mail.news
similarity index 100%
rename from contrib/file/Magdir/mail.news
rename to Magdir/mail.news
diff --git a/contrib/file/Magdir/maple b/Magdir/maple
similarity index 100%
rename from contrib/file/Magdir/maple
rename to Magdir/maple
diff --git a/contrib/file/Magdir/mathematica b/Magdir/mathematica
similarity index 100%
rename from contrib/file/Magdir/mathematica
rename to Magdir/mathematica
diff --git a/contrib/file/Magdir/matroska b/Magdir/matroska
similarity index 100%
rename from contrib/file/Magdir/matroska
rename to Magdir/matroska
diff --git a/contrib/file/Magdir/mcrypt b/Magdir/mcrypt
similarity index 100%
rename from contrib/file/Magdir/mcrypt
rename to Magdir/mcrypt
diff --git a/contrib/file/Magdir/mime b/Magdir/mime
similarity index 100%
rename from contrib/file/Magdir/mime
rename to Magdir/mime
diff --git a/contrib/file/Magdir/mips b/Magdir/mips
similarity index 100%
rename from contrib/file/Magdir/mips
rename to Magdir/mips
diff --git a/contrib/file/Magdir/mirage b/Magdir/mirage
similarity index 100%
rename from contrib/file/Magdir/mirage
rename to Magdir/mirage
diff --git a/contrib/file/Magdir/misctools b/Magdir/misctools
similarity index 100%
rename from contrib/file/Magdir/misctools
rename to Magdir/misctools
diff --git a/contrib/file/Magdir/mkid b/Magdir/mkid
similarity index 100%
rename from contrib/file/Magdir/mkid
rename to Magdir/mkid
diff --git a/contrib/file/Magdir/mlssa b/Magdir/mlssa
similarity index 100%
rename from contrib/file/Magdir/mlssa
rename to Magdir/mlssa
diff --git a/contrib/file/Magdir/mmdf b/Magdir/mmdf
similarity index 100%
rename from contrib/file/Magdir/mmdf
rename to Magdir/mmdf
diff --git a/contrib/file/Magdir/modem b/Magdir/modem
similarity index 100%
rename from contrib/file/Magdir/modem
rename to Magdir/modem
diff --git a/contrib/file/Magdir/motorola b/Magdir/motorola
similarity index 100%
rename from contrib/file/Magdir/motorola
rename to Magdir/motorola
diff --git a/contrib/file/Magdir/msdos b/Magdir/msdos
similarity index 100%
rename from contrib/file/Magdir/msdos
rename to Magdir/msdos
diff --git a/contrib/file/Magdir/msvc b/Magdir/msvc
similarity index 100%
rename from contrib/file/Magdir/msvc
rename to Magdir/msvc
diff --git a/contrib/file/Magdir/mup b/Magdir/mup
similarity index 100%
rename from contrib/file/Magdir/mup
rename to Magdir/mup
diff --git a/contrib/file/Magdir/natinst b/Magdir/natinst
similarity index 100%
rename from contrib/file/Magdir/natinst
rename to Magdir/natinst
diff --git a/contrib/file/Magdir/ncr b/Magdir/ncr
similarity index 100%
rename from contrib/file/Magdir/ncr
rename to Magdir/ncr
diff --git a/contrib/file/Magdir/netbsd b/Magdir/netbsd
similarity index 100%
rename from contrib/file/Magdir/netbsd
rename to Magdir/netbsd
diff --git a/contrib/file/Magdir/netscape b/Magdir/netscape
similarity index 100%
rename from contrib/file/Magdir/netscape
rename to Magdir/netscape
diff --git a/contrib/file/Magdir/news b/Magdir/news
similarity index 100%
rename from contrib/file/Magdir/news
rename to Magdir/news
diff --git a/contrib/file/Magdir/nitpicker b/Magdir/nitpicker
similarity index 100%
rename from contrib/file/Magdir/nitpicker
rename to Magdir/nitpicker
diff --git a/contrib/file/Magdir/ocaml b/Magdir/ocaml
similarity index 100%
rename from contrib/file/Magdir/ocaml
rename to Magdir/ocaml
diff --git a/contrib/file/Magdir/octave b/Magdir/octave
similarity index 100%
rename from contrib/file/Magdir/octave
rename to Magdir/octave
diff --git a/contrib/file/Magdir/olf b/Magdir/olf
similarity index 100%
rename from contrib/file/Magdir/olf
rename to Magdir/olf
diff --git a/contrib/file/Magdir/os2 b/Magdir/os2
similarity index 100%
rename from contrib/file/Magdir/os2
rename to Magdir/os2
diff --git a/contrib/file/Magdir/os400 b/Magdir/os400
similarity index 100%
rename from contrib/file/Magdir/os400
rename to Magdir/os400
diff --git a/contrib/file/Magdir/os9 b/Magdir/os9
similarity index 100%
rename from contrib/file/Magdir/os9
rename to Magdir/os9
diff --git a/contrib/file/Magdir/osf1 b/Magdir/osf1
similarity index 100%
rename from contrib/file/Magdir/osf1
rename to Magdir/osf1
diff --git a/contrib/file/Magdir/palm b/Magdir/palm
similarity index 100%
rename from contrib/file/Magdir/palm
rename to Magdir/palm
diff --git a/contrib/file/Magdir/parix b/Magdir/parix
similarity index 100%
rename from contrib/file/Magdir/parix
rename to Magdir/parix
diff --git a/contrib/file/Magdir/pbm b/Magdir/pbm
similarity index 100%
rename from contrib/file/Magdir/pbm
rename to Magdir/pbm
diff --git a/contrib/file/Magdir/pdf b/Magdir/pdf
similarity index 100%
rename from contrib/file/Magdir/pdf
rename to Magdir/pdf
diff --git a/contrib/file/Magdir/pdp b/Magdir/pdp
similarity index 100%
rename from contrib/file/Magdir/pdp
rename to Magdir/pdp
diff --git a/contrib/file/Magdir/perl b/Magdir/perl
similarity index 100%
rename from contrib/file/Magdir/perl
rename to Magdir/perl
diff --git a/contrib/file/Magdir/pgp b/Magdir/pgp
similarity index 100%
rename from contrib/file/Magdir/pgp
rename to Magdir/pgp
diff --git a/contrib/file/Magdir/pkgadd b/Magdir/pkgadd
similarity index 100%
rename from contrib/file/Magdir/pkgadd
rename to Magdir/pkgadd
diff --git a/contrib/file/Magdir/plan9 b/Magdir/plan9
similarity index 100%
rename from contrib/file/Magdir/plan9
rename to Magdir/plan9
diff --git a/contrib/file/Magdir/plus5 b/Magdir/plus5
similarity index 100%
rename from contrib/file/Magdir/plus5
rename to Magdir/plus5
diff --git a/contrib/file/Magdir/printer b/Magdir/printer
similarity index 100%
rename from contrib/file/Magdir/printer
rename to Magdir/printer
diff --git a/contrib/file/Magdir/project b/Magdir/project
similarity index 100%
rename from contrib/file/Magdir/project
rename to Magdir/project
diff --git a/contrib/file/Magdir/psdbms b/Magdir/psdbms
similarity index 100%
rename from contrib/file/Magdir/psdbms
rename to Magdir/psdbms
diff --git a/contrib/file/Magdir/psion b/Magdir/psion
similarity index 100%
rename from contrib/file/Magdir/psion
rename to Magdir/psion
diff --git a/contrib/file/Magdir/pulsar b/Magdir/pulsar
similarity index 100%
rename from contrib/file/Magdir/pulsar
rename to Magdir/pulsar
diff --git a/contrib/file/Magdir/pyramid b/Magdir/pyramid
similarity index 100%
rename from contrib/file/Magdir/pyramid
rename to Magdir/pyramid
diff --git a/contrib/file/Magdir/python b/Magdir/python
similarity index 100%
rename from contrib/file/Magdir/python
rename to Magdir/python
diff --git a/contrib/file/Magdir/revision b/Magdir/revision
similarity index 100%
rename from contrib/file/Magdir/revision
rename to Magdir/revision
diff --git a/contrib/file/Magdir/riff b/Magdir/riff
similarity index 100%
rename from contrib/file/Magdir/riff
rename to Magdir/riff
diff --git a/contrib/file/Magdir/rpm b/Magdir/rpm
similarity index 100%
rename from contrib/file/Magdir/rpm
rename to Magdir/rpm
diff --git a/contrib/file/Magdir/rtf b/Magdir/rtf
similarity index 100%
rename from contrib/file/Magdir/rtf
rename to Magdir/rtf
diff --git a/contrib/file/Magdir/sc b/Magdir/sc
similarity index 100%
rename from contrib/file/Magdir/sc
rename to Magdir/sc
diff --git a/contrib/file/Magdir/sccs b/Magdir/sccs
similarity index 100%
rename from contrib/file/Magdir/sccs
rename to Magdir/sccs
diff --git a/contrib/file/Magdir/scientific b/Magdir/scientific
similarity index 100%
rename from contrib/file/Magdir/scientific
rename to Magdir/scientific
diff --git a/contrib/file/Magdir/sendmail b/Magdir/sendmail
similarity index 100%
rename from contrib/file/Magdir/sendmail
rename to Magdir/sendmail
diff --git a/contrib/file/Magdir/sequent b/Magdir/sequent
similarity index 100%
rename from contrib/file/Magdir/sequent
rename to Magdir/sequent
diff --git a/contrib/file/Magdir/sgi b/Magdir/sgi
similarity index 100%
rename from contrib/file/Magdir/sgi
rename to Magdir/sgi
diff --git a/contrib/file/Magdir/sgml b/Magdir/sgml
similarity index 100%
rename from contrib/file/Magdir/sgml
rename to Magdir/sgml
diff --git a/contrib/file/Magdir/sharc b/Magdir/sharc
similarity index 100%
rename from contrib/file/Magdir/sharc
rename to Magdir/sharc
diff --git a/contrib/file/Magdir/sinclair b/Magdir/sinclair
similarity index 100%
rename from contrib/file/Magdir/sinclair
rename to Magdir/sinclair
diff --git a/contrib/file/Magdir/sketch b/Magdir/sketch
similarity index 100%
rename from contrib/file/Magdir/sketch
rename to Magdir/sketch
diff --git a/contrib/file/Magdir/smalltalk b/Magdir/smalltalk
similarity index 100%
rename from contrib/file/Magdir/smalltalk
rename to Magdir/smalltalk
diff --git a/contrib/file/Magdir/sniffer b/Magdir/sniffer
similarity index 100%
rename from contrib/file/Magdir/sniffer
rename to Magdir/sniffer
diff --git a/contrib/file/Magdir/softquad b/Magdir/softquad
similarity index 100%
rename from contrib/file/Magdir/softquad
rename to Magdir/softquad
diff --git a/contrib/file/Magdir/spec b/Magdir/spec
similarity index 100%
rename from contrib/file/Magdir/spec
rename to Magdir/spec
diff --git a/contrib/file/Magdir/spectrum b/Magdir/spectrum
similarity index 100%
rename from contrib/file/Magdir/spectrum
rename to Magdir/spectrum
diff --git a/contrib/file/Magdir/sql b/Magdir/sql
similarity index 100%
rename from contrib/file/Magdir/sql
rename to Magdir/sql
diff --git a/contrib/file/Magdir/sun b/Magdir/sun
similarity index 100%
rename from contrib/file/Magdir/sun
rename to Magdir/sun
diff --git a/contrib/file/Magdir/sysex b/Magdir/sysex
similarity index 100%
rename from contrib/file/Magdir/sysex
rename to Magdir/sysex
diff --git a/contrib/file/Magdir/teapot b/Magdir/teapot
similarity index 100%
rename from contrib/file/Magdir/teapot
rename to Magdir/teapot
diff --git a/contrib/file/Magdir/terminfo b/Magdir/terminfo
similarity index 100%
rename from contrib/file/Magdir/terminfo
rename to Magdir/terminfo
diff --git a/contrib/file/Magdir/tex b/Magdir/tex
similarity index 100%
rename from contrib/file/Magdir/tex
rename to Magdir/tex
diff --git a/contrib/file/Magdir/tgif b/Magdir/tgif
similarity index 100%
rename from contrib/file/Magdir/tgif
rename to Magdir/tgif
diff --git a/contrib/file/Magdir/ti-8x b/Magdir/ti-8x
similarity index 100%
rename from contrib/file/Magdir/ti-8x
rename to Magdir/ti-8x
diff --git a/contrib/file/Magdir/timezone b/Magdir/timezone
similarity index 100%
rename from contrib/file/Magdir/timezone
rename to Magdir/timezone
diff --git a/contrib/file/Magdir/troff b/Magdir/troff
similarity index 100%
rename from contrib/file/Magdir/troff
rename to Magdir/troff
diff --git a/contrib/file/Magdir/tuxedo b/Magdir/tuxedo
similarity index 100%
rename from contrib/file/Magdir/tuxedo
rename to Magdir/tuxedo
diff --git a/contrib/file/Magdir/typeset b/Magdir/typeset
similarity index 100%
rename from contrib/file/Magdir/typeset
rename to Magdir/typeset
diff --git a/contrib/file/Magdir/unicode b/Magdir/unicode
similarity index 100%
rename from contrib/file/Magdir/unicode
rename to Magdir/unicode
diff --git a/contrib/file/Magdir/unknown b/Magdir/unknown
similarity index 100%
rename from contrib/file/Magdir/unknown
rename to Magdir/unknown
diff --git a/contrib/file/Magdir/uuencode b/Magdir/uuencode
similarity index 100%
rename from contrib/file/Magdir/uuencode
rename to Magdir/uuencode
diff --git a/contrib/file/Magdir/varied.out b/Magdir/varied.out
similarity index 100%
rename from contrib/file/Magdir/varied.out
rename to Magdir/varied.out
diff --git a/contrib/file/Magdir/varied.script b/Magdir/varied.script
similarity index 100%
rename from contrib/file/Magdir/varied.script
rename to Magdir/varied.script
diff --git a/contrib/file/Magdir/vax b/Magdir/vax
similarity index 100%
rename from contrib/file/Magdir/vax
rename to Magdir/vax
diff --git a/contrib/file/Magdir/vicar b/Magdir/vicar
similarity index 100%
rename from contrib/file/Magdir/vicar
rename to Magdir/vicar
diff --git a/contrib/file/Magdir/virtutech b/Magdir/virtutech
similarity index 100%
rename from contrib/file/Magdir/virtutech
rename to Magdir/virtutech
diff --git a/contrib/file/Magdir/visx b/Magdir/visx
similarity index 100%
rename from contrib/file/Magdir/visx
rename to Magdir/visx
diff --git a/contrib/file/Magdir/vms b/Magdir/vms
similarity index 100%
rename from contrib/file/Magdir/vms
rename to Magdir/vms
diff --git a/contrib/file/Magdir/vmware b/Magdir/vmware
similarity index 100%
rename from contrib/file/Magdir/vmware
rename to Magdir/vmware
diff --git a/contrib/file/Magdir/vorbis b/Magdir/vorbis
similarity index 100%
rename from contrib/file/Magdir/vorbis
rename to Magdir/vorbis
diff --git a/contrib/file/Magdir/vxl b/Magdir/vxl
similarity index 100%
rename from contrib/file/Magdir/vxl
rename to Magdir/vxl
diff --git a/contrib/file/Magdir/wordprocessors b/Magdir/wordprocessors
similarity index 100%
rename from contrib/file/Magdir/wordprocessors
rename to Magdir/wordprocessors
diff --git a/contrib/file/Magdir/xdelta b/Magdir/xdelta
similarity index 100%
rename from contrib/file/Magdir/xdelta
rename to Magdir/xdelta
diff --git a/contrib/file/Magdir/xenix b/Magdir/xenix
similarity index 100%
rename from contrib/file/Magdir/xenix
rename to Magdir/xenix
diff --git a/contrib/file/Magdir/xo65 b/Magdir/xo65
similarity index 100%
rename from contrib/file/Magdir/xo65
rename to Magdir/xo65
diff --git a/contrib/file/Magdir/xwindows b/Magdir/xwindows
similarity index 100%
rename from contrib/file/Magdir/xwindows
rename to Magdir/xwindows
diff --git a/contrib/file/Magdir/zilog b/Magdir/zilog
similarity index 100%
rename from contrib/file/Magdir/zilog
rename to Magdir/zilog
diff --git a/contrib/file/Magdir/zyxel b/Magdir/zyxel
similarity index 100%
rename from contrib/file/Magdir/zyxel
rename to Magdir/zyxel
diff --git a/contrib/file/Makefile.am b/Makefile.am
similarity index 100%
rename from contrib/file/Makefile.am
rename to Makefile.am
diff --git a/contrib/file/Makefile.in b/Makefile.in
similarity index 100%
rename from contrib/file/Makefile.in
rename to Makefile.in
diff --git a/contrib/file/Makefile.std b/Makefile.std
similarity index 100%
rename from contrib/file/Makefile.std
rename to Makefile.std
diff --git a/contrib/file/PORTING b/PORTING
similarity index 100%
rename from contrib/file/PORTING
rename to PORTING
diff --git a/contrib/file/README b/README
similarity index 100%
rename from contrib/file/README
rename to README
diff --git a/contrib/file/acinclude.m4 b/acinclude.m4
similarity index 100%
rename from contrib/file/acinclude.m4
rename to acinclude.m4
diff --git a/contrib/file/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from contrib/file/aclocal.m4
rename to aclocal.m4
diff --git a/contrib/file/apprentice.c b/apprentice.c
similarity index 100%
rename from contrib/file/apprentice.c
rename to apprentice.c
diff --git a/contrib/file/apptype.c b/apptype.c
similarity index 100%
rename from contrib/file/apptype.c
rename to apptype.c
diff --git a/contrib/file/ascmagic.c b/ascmagic.c
similarity index 100%
rename from contrib/file/ascmagic.c
rename to ascmagic.c
diff --git a/contrib/file/compress.c b/compress.c
similarity index 100%
rename from contrib/file/compress.c
rename to compress.c
diff --git a/contrib/file/config.h.in b/config.h.in
similarity index 100%
rename from contrib/file/config.h.in
rename to config.h.in
diff --git a/contrib/file/configure b/configure
similarity index 100%
rename from contrib/file/configure
rename to configure
diff --git a/contrib/file/configure.in b/configure.in
similarity index 100%
rename from contrib/file/configure.in
rename to configure.in
diff --git a/contrib/file/.cvsignore b/contrib/file/.cvsignore
deleted file mode 100644
index d89921897ae6..000000000000
--- a/contrib/file/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-autom4te.cache
diff --git a/contrib/file/file.c b/file.c
similarity index 100%
rename from contrib/file/file.c
rename to file.c
diff --git a/contrib/file/file.h b/file.h
similarity index 100%
rename from contrib/file/file.h
rename to file.h
diff --git a/contrib/file/file.man b/file.man
similarity index 100%
rename from contrib/file/file.man
rename to file.man
diff --git a/contrib/file/file_opts.h b/file_opts.h
similarity index 100%
rename from contrib/file/file_opts.h
rename to file_opts.h
diff --git a/contrib/file/fsmagic.c b/fsmagic.c
similarity index 100%
rename from contrib/file/fsmagic.c
rename to fsmagic.c
diff --git a/contrib/file/funcs.c b/funcs.c
similarity index 100%
rename from contrib/file/funcs.c
rename to funcs.c
diff --git a/contrib/file/install-sh b/install-sh
similarity index 100%
rename from contrib/file/install-sh
rename to install-sh
diff --git a/contrib/file/is_tar.c b/is_tar.c
similarity index 100%
rename from contrib/file/is_tar.c
rename to is_tar.c
diff --git a/contrib/file/libmagic.man b/libmagic.man
similarity index 100%
rename from contrib/file/libmagic.man
rename to libmagic.man
diff --git a/contrib/file/magic.c b/magic.c
similarity index 100%
rename from contrib/file/magic.c
rename to magic.c
diff --git a/contrib/file/magic.h b/magic.h
similarity index 100%
rename from contrib/file/magic.h
rename to magic.h
diff --git a/contrib/file/magic.man b/magic.man
similarity index 100%
rename from contrib/file/magic.man
rename to magic.man
diff --git a/contrib/file/magic.mime b/magic.mime
similarity index 100%
rename from contrib/file/magic.mime
rename to magic.mime
diff --git a/contrib/file/magic2mime b/magic2mime
similarity index 100%
rename from contrib/file/magic2mime
rename to magic2mime
diff --git a/contrib/file/mkinstalldirs b/mkinstalldirs
similarity index 100%
rename from contrib/file/mkinstalldirs
rename to mkinstalldirs
diff --git a/contrib/file/names.h b/names.h
similarity index 100%
rename from contrib/file/names.h
rename to names.h
diff --git a/contrib/file/patchlevel.h b/patchlevel.h
similarity index 100%
rename from contrib/file/patchlevel.h
rename to patchlevel.h
diff --git a/contrib/file/print.c b/print.c
similarity index 100%
rename from contrib/file/print.c
rename to print.c
diff --git a/contrib/file/readelf.c b/readelf.c
similarity index 100%
rename from contrib/file/readelf.c
rename to readelf.c
diff --git a/contrib/file/readelf.h b/readelf.h
similarity index 100%
rename from contrib/file/readelf.h
rename to readelf.h
diff --git a/contrib/file/softmagic.c b/softmagic.c
similarity index 100%
rename from contrib/file/softmagic.c
rename to softmagic.c
diff --git a/contrib/file/tar.h b/tar.h
similarity index 100%
rename from contrib/file/tar.h
rename to tar.h
diff --git a/contrib/file/test.c b/test.c
similarity index 100%
rename from contrib/file/test.c
rename to test.c