diff --git a/contrib/libpcap/CHANGES b/CHANGES
similarity index 100%
rename from contrib/libpcap/CHANGES
rename to CHANGES
diff --git a/contrib/libpcap/CREDITS b/CREDITS
similarity index 100%
rename from contrib/libpcap/CREDITS
rename to CREDITS
diff --git a/contrib/libpcap/FILES b/FILES
similarity index 100%
rename from contrib/libpcap/FILES
rename to FILES
diff --git a/contrib/libpcap/INSTALL b/INSTALL
similarity index 100%
rename from contrib/libpcap/INSTALL
rename to INSTALL
diff --git a/contrib/libpcap/INSTALL.txt b/INSTALL.txt
similarity index 100%
rename from contrib/libpcap/INSTALL.txt
rename to INSTALL.txt
diff --git a/contrib/libpcap/LICENSE b/LICENSE
similarity index 100%
rename from contrib/libpcap/LICENSE
rename to LICENSE
diff --git a/contrib/libpcap/Makefile.in b/Makefile.in
similarity index 100%
rename from contrib/libpcap/Makefile.in
rename to Makefile.in
diff --git a/contrib/libpcap/README b/README
similarity index 100%
rename from contrib/libpcap/README
rename to README
diff --git a/contrib/libpcap/README.Win32 b/README.Win32
similarity index 100%
rename from contrib/libpcap/README.Win32
rename to README.Win32
diff --git a/contrib/libpcap/README.aix b/README.aix
similarity index 100%
rename from contrib/libpcap/README.aix
rename to README.aix
diff --git a/contrib/libpcap/README.dag b/README.dag
similarity index 100%
rename from contrib/libpcap/README.dag
rename to README.dag
diff --git a/contrib/libpcap/README.hpux b/README.hpux
similarity index 100%
rename from contrib/libpcap/README.hpux
rename to README.hpux
diff --git a/contrib/libpcap/README.linux b/README.linux
similarity index 100%
rename from contrib/libpcap/README.linux
rename to README.linux
diff --git a/contrib/libpcap/README.macosx b/README.macosx
similarity index 100%
rename from contrib/libpcap/README.macosx
rename to README.macosx
diff --git a/contrib/libpcap/README.septel b/README.septel
similarity index 100%
rename from contrib/libpcap/README.septel
rename to README.septel
diff --git a/contrib/libpcap/README.tru64 b/README.tru64
similarity index 100%
rename from contrib/libpcap/README.tru64
rename to README.tru64
diff --git a/contrib/libpcap/TODO b/TODO
similarity index 100%
rename from contrib/libpcap/TODO
rename to TODO
diff --git a/contrib/libpcap/VERSION b/VERSION
similarity index 100%
rename from contrib/libpcap/VERSION
rename to VERSION
diff --git a/contrib/libpcap/acconfig.h b/acconfig.h
similarity index 100%
rename from contrib/libpcap/acconfig.h
rename to acconfig.h
diff --git a/contrib/libpcap/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from contrib/libpcap/aclocal.m4
rename to aclocal.m4
diff --git a/contrib/libpcap/acsite.m4 b/acsite.m4
similarity index 100%
rename from contrib/libpcap/acsite.m4
rename to acsite.m4
diff --git a/contrib/libpcap/arcnet.h b/arcnet.h
similarity index 100%
rename from contrib/libpcap/arcnet.h
rename to arcnet.h
diff --git a/contrib/libpcap/atmuni31.h b/atmuni31.h
similarity index 100%
rename from contrib/libpcap/atmuni31.h
rename to atmuni31.h
diff --git a/contrib/libpcap/bpf/net/bpf.h b/bpf/net/bpf.h
similarity index 100%
rename from contrib/libpcap/bpf/net/bpf.h
rename to bpf/net/bpf.h
diff --git a/contrib/libpcap/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c
similarity index 100%
rename from contrib/libpcap/bpf/net/bpf_filter.c
rename to bpf/net/bpf_filter.c
diff --git a/contrib/libpcap/bpf_dump.c b/bpf_dump.c
similarity index 100%
rename from contrib/libpcap/bpf_dump.c
rename to bpf_dump.c
diff --git a/contrib/libpcap/bpf_image.c b/bpf_image.c
similarity index 100%
rename from contrib/libpcap/bpf_image.c
rename to bpf_image.c
diff --git a/contrib/libpcap/config.guess b/config.guess
similarity index 100%
rename from contrib/libpcap/config.guess
rename to config.guess
diff --git a/contrib/libpcap/config.h.in b/config.h.in
similarity index 100%
rename from contrib/libpcap/config.h.in
rename to config.h.in
diff --git a/contrib/libpcap/config.sub b/config.sub
similarity index 100%
rename from contrib/libpcap/config.sub
rename to config.sub
diff --git a/contrib/libpcap/configure b/configure
similarity index 100%
rename from contrib/libpcap/configure
rename to configure
diff --git a/contrib/libpcap/configure.in b/configure.in
similarity index 100%
rename from contrib/libpcap/configure.in
rename to configure.in
diff --git a/contrib/libpcap/.cvsignore b/contrib/libpcap/.cvsignore
deleted file mode 100644
index 138c28814a08..000000000000
--- a/contrib/libpcap/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-config.log
-config.cache
-config.status
-config.h
-.devel
-stamp-h
-stamp-h.in
-Makefile
-scanner.c
-grammar.c
-tokdefs.h
-version.c
-version.h
diff --git a/contrib/libpcap/doc/pcap.html b/doc/pcap.html
similarity index 100%
rename from contrib/libpcap/doc/pcap.html
rename to doc/pcap.html
diff --git a/contrib/libpcap/doc/pcap.txt b/doc/pcap.txt
similarity index 100%
rename from contrib/libpcap/doc/pcap.txt
rename to doc/pcap.txt
diff --git a/contrib/libpcap/doc/pcap.xml b/doc/pcap.xml
similarity index 100%
rename from contrib/libpcap/doc/pcap.xml
rename to doc/pcap.xml
diff --git a/contrib/libpcap/etherent.c b/etherent.c
similarity index 100%
rename from contrib/libpcap/etherent.c
rename to etherent.c
diff --git a/contrib/libpcap/ethertype.h b/ethertype.h
similarity index 100%
rename from contrib/libpcap/ethertype.h
rename to ethertype.h
diff --git a/contrib/libpcap/fad-getad.c b/fad-getad.c
similarity index 100%
rename from contrib/libpcap/fad-getad.c
rename to fad-getad.c
diff --git a/contrib/libpcap/fad-gifc.c b/fad-gifc.c
similarity index 100%
rename from contrib/libpcap/fad-gifc.c
rename to fad-gifc.c
diff --git a/contrib/libpcap/fad-glifc.c b/fad-glifc.c
similarity index 100%
rename from contrib/libpcap/fad-glifc.c
rename to fad-glifc.c
diff --git a/contrib/libpcap/fad-null.c b/fad-null.c
similarity index 100%
rename from contrib/libpcap/fad-null.c
rename to fad-null.c
diff --git a/contrib/libpcap/fad-win32.c b/fad-win32.c
similarity index 100%
rename from contrib/libpcap/fad-win32.c
rename to fad-win32.c
diff --git a/contrib/libpcap/gencode.c b/gencode.c
similarity index 100%
rename from contrib/libpcap/gencode.c
rename to gencode.c
diff --git a/contrib/libpcap/gencode.h b/gencode.h
similarity index 100%
rename from contrib/libpcap/gencode.h
rename to gencode.h
diff --git a/contrib/libpcap/grammar.y b/grammar.y
similarity index 100%
rename from contrib/libpcap/grammar.y
rename to grammar.y
diff --git a/contrib/libpcap/inet.c b/inet.c
similarity index 100%
rename from contrib/libpcap/inet.c
rename to inet.c
diff --git a/contrib/libpcap/install-sh b/install-sh
similarity index 100%
rename from contrib/libpcap/install-sh
rename to install-sh
diff --git a/contrib/libpcap/lbl/gnuc.h b/lbl/gnuc.h
similarity index 100%
rename from contrib/libpcap/lbl/gnuc.h
rename to lbl/gnuc.h
diff --git a/contrib/libpcap/lbl/os-aix4.h b/lbl/os-aix4.h
similarity index 100%
rename from contrib/libpcap/lbl/os-aix4.h
rename to lbl/os-aix4.h
diff --git a/contrib/libpcap/lbl/os-hpux11.h b/lbl/os-hpux11.h
similarity index 100%
rename from contrib/libpcap/lbl/os-hpux11.h
rename to lbl/os-hpux11.h
diff --git a/contrib/libpcap/lbl/os-osf4.h b/lbl/os-osf4.h
similarity index 100%
rename from contrib/libpcap/lbl/os-osf4.h
rename to lbl/os-osf4.h
diff --git a/contrib/libpcap/lbl/os-osf5.h b/lbl/os-osf5.h
similarity index 100%
rename from contrib/libpcap/lbl/os-osf5.h
rename to lbl/os-osf5.h
diff --git a/contrib/libpcap/lbl/os-solaris2.h b/lbl/os-solaris2.h
similarity index 100%
rename from contrib/libpcap/lbl/os-solaris2.h
rename to lbl/os-solaris2.h
diff --git a/contrib/libpcap/lbl/os-sunos4.h b/lbl/os-sunos4.h
similarity index 100%
rename from contrib/libpcap/lbl/os-sunos4.h
rename to lbl/os-sunos4.h
diff --git a/contrib/libpcap/lbl/os-ultrix4.h b/lbl/os-ultrix4.h
similarity index 100%
rename from contrib/libpcap/lbl/os-ultrix4.h
rename to lbl/os-ultrix4.h
diff --git a/contrib/libpcap/llc.h b/llc.h
similarity index 100%
rename from contrib/libpcap/llc.h
rename to llc.h
diff --git a/contrib/libpcap/mkdep b/mkdep
similarity index 100%
rename from contrib/libpcap/mkdep
rename to mkdep
diff --git a/contrib/libpcap/nametoaddr.c b/nametoaddr.c
similarity index 100%
rename from contrib/libpcap/nametoaddr.c
rename to nametoaddr.c
diff --git a/contrib/libpcap/nlpid.h b/nlpid.h
similarity index 100%
rename from contrib/libpcap/nlpid.h
rename to nlpid.h
diff --git a/contrib/libpcap/optimize.c b/optimize.c
similarity index 100%
rename from contrib/libpcap/optimize.c
rename to optimize.c
diff --git a/contrib/libpcap/packaging/pcap.spec b/packaging/pcap.spec
similarity index 100%
rename from contrib/libpcap/packaging/pcap.spec
rename to packaging/pcap.spec
diff --git a/contrib/libpcap/packaging/pcap.spec.in b/packaging/pcap.spec.in
similarity index 100%
rename from contrib/libpcap/packaging/pcap.spec.in
rename to packaging/pcap.spec.in
diff --git a/contrib/libpcap/pcap-bpf.c b/pcap-bpf.c
similarity index 100%
rename from contrib/libpcap/pcap-bpf.c
rename to pcap-bpf.c
diff --git a/contrib/libpcap/pcap-bpf.h b/pcap-bpf.h
similarity index 100%
rename from contrib/libpcap/pcap-bpf.h
rename to pcap-bpf.h
diff --git a/contrib/libpcap/pcap-dag.c b/pcap-dag.c
similarity index 100%
rename from contrib/libpcap/pcap-dag.c
rename to pcap-dag.c
diff --git a/contrib/libpcap/pcap-dag.h b/pcap-dag.h
similarity index 100%
rename from contrib/libpcap/pcap-dag.h
rename to pcap-dag.h
diff --git a/contrib/libpcap/pcap-dlpi.c b/pcap-dlpi.c
similarity index 100%
rename from contrib/libpcap/pcap-dlpi.c
rename to pcap-dlpi.c
diff --git a/contrib/libpcap/pcap-dos.c b/pcap-dos.c
similarity index 100%
rename from contrib/libpcap/pcap-dos.c
rename to pcap-dos.c
diff --git a/contrib/libpcap/pcap-dos.h b/pcap-dos.h
similarity index 100%
rename from contrib/libpcap/pcap-dos.h
rename to pcap-dos.h
diff --git a/contrib/libpcap/pcap-enet.c b/pcap-enet.c
similarity index 100%
rename from contrib/libpcap/pcap-enet.c
rename to pcap-enet.c
diff --git a/contrib/libpcap/pcap-int.h b/pcap-int.h
similarity index 100%
rename from contrib/libpcap/pcap-int.h
rename to pcap-int.h
diff --git a/contrib/libpcap/pcap-linux.c b/pcap-linux.c
similarity index 100%
rename from contrib/libpcap/pcap-linux.c
rename to pcap-linux.c
diff --git a/contrib/libpcap/pcap-namedb.h b/pcap-namedb.h
similarity index 100%
rename from contrib/libpcap/pcap-namedb.h
rename to pcap-namedb.h
diff --git a/contrib/libpcap/pcap-nit.c b/pcap-nit.c
similarity index 100%
rename from contrib/libpcap/pcap-nit.c
rename to pcap-nit.c
diff --git a/contrib/libpcap/pcap-nit.h b/pcap-nit.h
similarity index 100%
rename from contrib/libpcap/pcap-nit.h
rename to pcap-nit.h
diff --git a/contrib/libpcap/pcap-null.c b/pcap-null.c
similarity index 100%
rename from contrib/libpcap/pcap-null.c
rename to pcap-null.c
diff --git a/contrib/libpcap/pcap-pf.c b/pcap-pf.c
similarity index 100%
rename from contrib/libpcap/pcap-pf.c
rename to pcap-pf.c
diff --git a/contrib/libpcap/pcap-pf.h b/pcap-pf.h
similarity index 100%
rename from contrib/libpcap/pcap-pf.h
rename to pcap-pf.h
diff --git a/contrib/libpcap/pcap-septel.c b/pcap-septel.c
similarity index 100%
rename from contrib/libpcap/pcap-septel.c
rename to pcap-septel.c
diff --git a/contrib/libpcap/pcap-septel.h b/pcap-septel.h
similarity index 100%
rename from contrib/libpcap/pcap-septel.h
rename to pcap-septel.h
diff --git a/contrib/libpcap/pcap-snit.c b/pcap-snit.c
similarity index 100%
rename from contrib/libpcap/pcap-snit.c
rename to pcap-snit.c
diff --git a/contrib/libpcap/pcap-snoop.c b/pcap-snoop.c
similarity index 100%
rename from contrib/libpcap/pcap-snoop.c
rename to pcap-snoop.c
diff --git a/contrib/libpcap/pcap-stdinc.h b/pcap-stdinc.h
similarity index 100%
rename from contrib/libpcap/pcap-stdinc.h
rename to pcap-stdinc.h
diff --git a/contrib/libpcap/pcap-win32.c b/pcap-win32.c
similarity index 100%
rename from contrib/libpcap/pcap-win32.c
rename to pcap-win32.c
diff --git a/contrib/libpcap/pcap.3 b/pcap.3
similarity index 100%
rename from contrib/libpcap/pcap.3
rename to pcap.3
diff --git a/contrib/libpcap/pcap.c b/pcap.c
similarity index 100%
rename from contrib/libpcap/pcap.c
rename to pcap.c
diff --git a/contrib/libpcap/pcap.h b/pcap.h
similarity index 100%
rename from contrib/libpcap/pcap.h
rename to pcap.h
diff --git a/contrib/libpcap/pcap1.h b/pcap1.h
similarity index 100%
rename from contrib/libpcap/pcap1.h
rename to pcap1.h
diff --git a/contrib/libpcap/pf.h b/pf.h
similarity index 100%
rename from contrib/libpcap/pf.h
rename to pf.h
diff --git a/contrib/libpcap/ppp.h b/ppp.h
similarity index 100%
rename from contrib/libpcap/ppp.h
rename to ppp.h
diff --git a/contrib/libpcap/rawss7.h b/rawss7.h
similarity index 100%
rename from contrib/libpcap/rawss7.h
rename to rawss7.h
diff --git a/contrib/libpcap/savefile.c b/savefile.c
similarity index 100%
rename from contrib/libpcap/savefile.c
rename to savefile.c
diff --git a/contrib/libpcap/scanner.l b/scanner.l
similarity index 100%
rename from contrib/libpcap/scanner.l
rename to scanner.l
diff --git a/contrib/libpcap/sll.h b/sll.h
similarity index 100%
rename from contrib/libpcap/sll.h
rename to sll.h
diff --git a/contrib/libpcap/snprintf.c b/snprintf.c
similarity index 100%
rename from contrib/libpcap/snprintf.c
rename to snprintf.c
diff --git a/contrib/libpcap/sunatmpos.h b/sunatmpos.h
similarity index 100%
rename from contrib/libpcap/sunatmpos.h
rename to sunatmpos.h