Move tcpdump-3.9/ to tcpdump/. No need for a versioned dir.

diff --git a/contrib/tcpdump-3.9/CHANGES b/contrib/tcpdump/CHANGES
similarity index 100%
rename from contrib/tcpdump-3.9/CHANGES
rename to contrib/tcpdump/CHANGES

diff --git a/contrib/tcpdump-3.9/LICENSE b/contrib/tcpdump/LICENSE
similarity index 100%
rename from contrib/tcpdump-3.9/LICENSE
rename to contrib/tcpdump/LICENSE

diff --git a/contrib/tcpdump-3.9/README b/contrib/tcpdump/README
similarity index 100%
rename from contrib/tcpdump-3.9/README
rename to contrib/tcpdump/README

diff --git a/contrib/tcpdump-3.9/VERSION b/contrib/tcpdump/VERSION
similarity index 100%
rename from contrib/tcpdump-3.9/VERSION
rename to contrib/tcpdump/VERSION

diff --git a/contrib/tcpdump-3.9/addrtoname.c b/contrib/tcpdump/addrtoname.c
similarity index 100%
rename from contrib/tcpdump-3.9/addrtoname.c
rename to contrib/tcpdump/addrtoname.c

diff --git a/contrib/tcpdump-3.9/addrtoname.h b/contrib/tcpdump/addrtoname.h
similarity index 100%
rename from contrib/tcpdump-3.9/addrtoname.h
rename to contrib/tcpdump/addrtoname.h

diff --git a/contrib/tcpdump-3.9/af.c b/contrib/tcpdump/af.c
similarity index 100%
rename from contrib/tcpdump-3.9/af.c
rename to contrib/tcpdump/af.c

diff --git a/contrib/tcpdump-3.9/af.h b/contrib/tcpdump/af.h
similarity index 100%
rename from contrib/tcpdump-3.9/af.h
rename to contrib/tcpdump/af.h

diff --git a/contrib/tcpdump-3.9/ah.h b/contrib/tcpdump/ah.h
similarity index 100%
rename from contrib/tcpdump-3.9/ah.h
rename to contrib/tcpdump/ah.h

diff --git a/contrib/tcpdump-3.9/aodv.h b/contrib/tcpdump/aodv.h
similarity index 100%
rename from contrib/tcpdump-3.9/aodv.h
rename to contrib/tcpdump/aodv.h

diff --git a/contrib/tcpdump-3.9/appletalk.h b/contrib/tcpdump/appletalk.h
similarity index 100%
rename from contrib/tcpdump-3.9/appletalk.h
rename to contrib/tcpdump/appletalk.h

diff --git a/contrib/tcpdump-3.9/arcnet.h b/contrib/tcpdump/arcnet.h
similarity index 100%
rename from contrib/tcpdump-3.9/arcnet.h
rename to contrib/tcpdump/arcnet.h

diff --git a/contrib/tcpdump-3.9/atm.h b/contrib/tcpdump/atm.h
similarity index 100%
rename from contrib/tcpdump-3.9/atm.h
rename to contrib/tcpdump/atm.h

diff --git a/contrib/tcpdump-3.9/atmuni31.h b/contrib/tcpdump/atmuni31.h
similarity index 100%
rename from contrib/tcpdump-3.9/atmuni31.h
rename to contrib/tcpdump/atmuni31.h

diff --git a/contrib/tcpdump-3.9/bgp.h b/contrib/tcpdump/bgp.h
similarity index 100%
rename from contrib/tcpdump-3.9/bgp.h
rename to contrib/tcpdump/bgp.h

diff --git a/contrib/tcpdump-3.9/bootp.h b/contrib/tcpdump/bootp.h
similarity index 100%
rename from contrib/tcpdump-3.9/bootp.h
rename to contrib/tcpdump/bootp.h

diff --git a/contrib/tcpdump-3.9/bpf_dump.c b/contrib/tcpdump/bpf_dump.c
similarity index 100%
rename from contrib/tcpdump-3.9/bpf_dump.c
rename to contrib/tcpdump/bpf_dump.c

diff --git a/contrib/tcpdump-3.9/chdlc.h b/contrib/tcpdump/chdlc.h
similarity index 100%
rename from contrib/tcpdump-3.9/chdlc.h
rename to contrib/tcpdump/chdlc.h

diff --git a/contrib/tcpdump-3.9/cpack.c b/contrib/tcpdump/cpack.c
similarity index 100%
rename from contrib/tcpdump-3.9/cpack.c
rename to contrib/tcpdump/cpack.c

diff --git a/contrib/tcpdump-3.9/cpack.h b/contrib/tcpdump/cpack.h
similarity index 100%
rename from contrib/tcpdump-3.9/cpack.h
rename to contrib/tcpdump/cpack.h

diff --git a/contrib/tcpdump-3.9/dccp.h b/contrib/tcpdump/dccp.h
similarity index 100%
rename from contrib/tcpdump-3.9/dccp.h
rename to contrib/tcpdump/dccp.h

diff --git a/contrib/tcpdump-3.9/decnet.h b/contrib/tcpdump/decnet.h
similarity index 100%
rename from contrib/tcpdump-3.9/decnet.h
rename to contrib/tcpdump/decnet.h

diff --git a/contrib/tcpdump-3.9/decode_prefix.h b/contrib/tcpdump/decode_prefix.h
similarity index 100%
rename from contrib/tcpdump-3.9/decode_prefix.h
rename to contrib/tcpdump/decode_prefix.h

diff --git a/contrib/tcpdump-3.9/enc.h b/contrib/tcpdump/enc.h
similarity index 100%
rename from contrib/tcpdump-3.9/enc.h
rename to contrib/tcpdump/enc.h

diff --git a/contrib/tcpdump-3.9/esp.h b/contrib/tcpdump/esp.h
similarity index 100%
rename from contrib/tcpdump-3.9/esp.h
rename to contrib/tcpdump/esp.h

diff --git a/contrib/tcpdump-3.9/ether.h b/contrib/tcpdump/ether.h
similarity index 100%
rename from contrib/tcpdump-3.9/ether.h
rename to contrib/tcpdump/ether.h

diff --git a/contrib/tcpdump-3.9/ethertype.h b/contrib/tcpdump/ethertype.h
similarity index 100%
rename from contrib/tcpdump-3.9/ethertype.h
rename to contrib/tcpdump/ethertype.h

diff --git a/contrib/tcpdump-3.9/extract.h b/contrib/tcpdump/extract.h
similarity index 100%
rename from contrib/tcpdump-3.9/extract.h
rename to contrib/tcpdump/extract.h

diff --git a/contrib/tcpdump-3.9/fddi.h b/contrib/tcpdump/fddi.h
similarity index 100%
rename from contrib/tcpdump-3.9/fddi.h
rename to contrib/tcpdump/fddi.h

diff --git a/contrib/tcpdump-3.9/gmpls.c b/contrib/tcpdump/gmpls.c
similarity index 100%
rename from contrib/tcpdump-3.9/gmpls.c
rename to contrib/tcpdump/gmpls.c

diff --git a/contrib/tcpdump-3.9/gmpls.h b/contrib/tcpdump/gmpls.h
similarity index 100%
rename from contrib/tcpdump-3.9/gmpls.h
rename to contrib/tcpdump/gmpls.h

diff --git a/contrib/tcpdump-3.9/gmt2local.c b/contrib/tcpdump/gmt2local.c
similarity index 100%
rename from contrib/tcpdump-3.9/gmt2local.c
rename to contrib/tcpdump/gmt2local.c

diff --git a/contrib/tcpdump-3.9/gmt2local.h b/contrib/tcpdump/gmt2local.h
similarity index 100%
rename from contrib/tcpdump-3.9/gmt2local.h
rename to contrib/tcpdump/gmt2local.h

diff --git a/contrib/tcpdump-3.9/icmp6.h b/contrib/tcpdump/icmp6.h
similarity index 100%
rename from contrib/tcpdump-3.9/icmp6.h
rename to contrib/tcpdump/icmp6.h

diff --git a/contrib/tcpdump-3.9/ieee802_11.h b/contrib/tcpdump/ieee802_11.h
similarity index 100%
rename from contrib/tcpdump-3.9/ieee802_11.h
rename to contrib/tcpdump/ieee802_11.h

diff --git a/contrib/tcpdump-3.9/ieee802_11_radio.h b/contrib/tcpdump/ieee802_11_radio.h
similarity index 100%
rename from contrib/tcpdump-3.9/ieee802_11_radio.h
rename to contrib/tcpdump/ieee802_11_radio.h

diff --git a/contrib/tcpdump-3.9/igrp.h b/contrib/tcpdump/igrp.h
similarity index 100%
rename from contrib/tcpdump-3.9/igrp.h
rename to contrib/tcpdump/igrp.h

diff --git a/contrib/tcpdump-3.9/interface.h b/contrib/tcpdump/interface.h
similarity index 100%
rename from contrib/tcpdump-3.9/interface.h
rename to contrib/tcpdump/interface.h

diff --git a/contrib/tcpdump-3.9/ip.h b/contrib/tcpdump/ip.h
similarity index 100%
rename from contrib/tcpdump-3.9/ip.h
rename to contrib/tcpdump/ip.h

diff --git a/contrib/tcpdump-3.9/ip6.h b/contrib/tcpdump/ip6.h
similarity index 100%
rename from contrib/tcpdump-3.9/ip6.h
rename to contrib/tcpdump/ip6.h

diff --git a/contrib/tcpdump-3.9/ipfc.h b/contrib/tcpdump/ipfc.h
similarity index 100%
rename from contrib/tcpdump-3.9/ipfc.h
rename to contrib/tcpdump/ipfc.h

diff --git a/contrib/tcpdump-3.9/ipproto.c b/contrib/tcpdump/ipproto.c
similarity index 100%
rename from contrib/tcpdump-3.9/ipproto.c
rename to contrib/tcpdump/ipproto.c

diff --git a/contrib/tcpdump-3.9/ipproto.h b/contrib/tcpdump/ipproto.h
similarity index 100%
rename from contrib/tcpdump-3.9/ipproto.h
rename to contrib/tcpdump/ipproto.h

diff --git a/contrib/tcpdump-3.9/ipsec_doi.h b/contrib/tcpdump/ipsec_doi.h
similarity index 100%
rename from contrib/tcpdump-3.9/ipsec_doi.h
rename to contrib/tcpdump/ipsec_doi.h

diff --git a/contrib/tcpdump-3.9/ipx.h b/contrib/tcpdump/ipx.h
similarity index 100%
rename from contrib/tcpdump-3.9/ipx.h
rename to contrib/tcpdump/ipx.h

diff --git a/contrib/tcpdump-3.9/isakmp.h b/contrib/tcpdump/isakmp.h
similarity index 100%
rename from contrib/tcpdump-3.9/isakmp.h
rename to contrib/tcpdump/isakmp.h

diff --git a/contrib/tcpdump-3.9/l2tp.h b/contrib/tcpdump/l2tp.h
similarity index 100%
rename from contrib/tcpdump-3.9/l2tp.h
rename to contrib/tcpdump/l2tp.h

diff --git a/contrib/tcpdump-3.9/l2vpn.c b/contrib/tcpdump/l2vpn.c
similarity index 100%
rename from contrib/tcpdump-3.9/l2vpn.c
rename to contrib/tcpdump/l2vpn.c

diff --git a/contrib/tcpdump-3.9/l2vpn.h b/contrib/tcpdump/l2vpn.h
similarity index 100%
rename from contrib/tcpdump-3.9/l2vpn.h
rename to contrib/tcpdump/l2vpn.h

diff --git a/contrib/tcpdump-3.9/lane.h b/contrib/tcpdump/lane.h
similarity index 100%
rename from contrib/tcpdump-3.9/lane.h
rename to contrib/tcpdump/lane.h

diff --git a/contrib/tcpdump-3.9/llc.h b/contrib/tcpdump/llc.h
similarity index 100%
rename from contrib/tcpdump-3.9/llc.h
rename to contrib/tcpdump/llc.h

diff --git a/contrib/tcpdump-3.9/machdep.c b/contrib/tcpdump/machdep.c
similarity index 100%
rename from contrib/tcpdump-3.9/machdep.c
rename to contrib/tcpdump/machdep.c

diff --git a/contrib/tcpdump-3.9/machdep.h b/contrib/tcpdump/machdep.h
similarity index 100%
rename from contrib/tcpdump-3.9/machdep.h
rename to contrib/tcpdump/machdep.h

diff --git a/contrib/tcpdump-3.9/makemib b/contrib/tcpdump/makemib
similarity index 100%
rename from contrib/tcpdump-3.9/makemib
rename to contrib/tcpdump/makemib

diff --git a/contrib/tcpdump-3.9/mib.h b/contrib/tcpdump/mib.h
similarity index 100%
rename from contrib/tcpdump-3.9/mib.h
rename to contrib/tcpdump/mib.h

diff --git a/contrib/tcpdump-3.9/mpls.h b/contrib/tcpdump/mpls.h
similarity index 100%
rename from contrib/tcpdump-3.9/mpls.h
rename to contrib/tcpdump/mpls.h

diff --git a/contrib/tcpdump-3.9/nameser.h b/contrib/tcpdump/nameser.h
similarity index 100%
rename from contrib/tcpdump-3.9/nameser.h
rename to contrib/tcpdump/nameser.h

diff --git a/contrib/tcpdump-3.9/netbios.h b/contrib/tcpdump/netbios.h
similarity index 100%
rename from contrib/tcpdump-3.9/netbios.h
rename to contrib/tcpdump/netbios.h

diff --git a/contrib/tcpdump-3.9/netdissect.h b/contrib/tcpdump/netdissect.h
similarity index 100%
rename from contrib/tcpdump-3.9/netdissect.h
rename to contrib/tcpdump/netdissect.h

diff --git a/contrib/tcpdump-3.9/nfs.h b/contrib/tcpdump/nfs.h
similarity index 100%
rename from contrib/tcpdump-3.9/nfs.h
rename to contrib/tcpdump/nfs.h

diff --git a/contrib/tcpdump-3.9/nfsfh.h b/contrib/tcpdump/nfsfh.h
similarity index 100%
rename from contrib/tcpdump-3.9/nfsfh.h
rename to contrib/tcpdump/nfsfh.h

diff --git a/contrib/tcpdump-3.9/nlpid.c b/contrib/tcpdump/nlpid.c
similarity index 100%
rename from contrib/tcpdump-3.9/nlpid.c
rename to contrib/tcpdump/nlpid.c

diff --git a/contrib/tcpdump-3.9/nlpid.h b/contrib/tcpdump/nlpid.h
similarity index 100%
rename from contrib/tcpdump-3.9/nlpid.h
rename to contrib/tcpdump/nlpid.h

diff --git a/contrib/tcpdump-3.9/ntp.h b/contrib/tcpdump/ntp.h
similarity index 100%
rename from contrib/tcpdump-3.9/ntp.h
rename to contrib/tcpdump/ntp.h

diff --git a/contrib/tcpdump-3.9/oakley.h b/contrib/tcpdump/oakley.h
similarity index 100%
rename from contrib/tcpdump-3.9/oakley.h
rename to contrib/tcpdump/oakley.h

diff --git a/contrib/tcpdump-3.9/ospf.h b/contrib/tcpdump/ospf.h
similarity index 100%
rename from contrib/tcpdump-3.9/ospf.h
rename to contrib/tcpdump/ospf.h

diff --git a/contrib/tcpdump-3.9/ospf6.h b/contrib/tcpdump/ospf6.h
similarity index 100%
rename from contrib/tcpdump-3.9/ospf6.h
rename to contrib/tcpdump/ospf6.h

diff --git a/contrib/tcpdump-3.9/oui.c b/contrib/tcpdump/oui.c
similarity index 100%
rename from contrib/tcpdump-3.9/oui.c
rename to contrib/tcpdump/oui.c

diff --git a/contrib/tcpdump-3.9/oui.h b/contrib/tcpdump/oui.h
similarity index 100%
rename from contrib/tcpdump-3.9/oui.h
rename to contrib/tcpdump/oui.h

diff --git a/contrib/tcpdump-3.9/parsenfsfh.c b/contrib/tcpdump/parsenfsfh.c
similarity index 100%
rename from contrib/tcpdump-3.9/parsenfsfh.c
rename to contrib/tcpdump/parsenfsfh.c

diff --git a/contrib/tcpdump-3.9/pcap-missing.h b/contrib/tcpdump/pcap-missing.h
similarity index 100%
rename from contrib/tcpdump-3.9/pcap-missing.h
rename to contrib/tcpdump/pcap-missing.h

diff --git a/contrib/tcpdump-3.9/pcap_dump_ftell.c b/contrib/tcpdump/pcap_dump_ftell.c
similarity index 100%
rename from contrib/tcpdump-3.9/pcap_dump_ftell.c
rename to contrib/tcpdump/pcap_dump_ftell.c

diff --git a/contrib/tcpdump-3.9/pf.h b/contrib/tcpdump/pf.h
similarity index 100%
rename from contrib/tcpdump-3.9/pf.h
rename to contrib/tcpdump/pf.h

diff --git a/contrib/tcpdump-3.9/pmap_prot.h b/contrib/tcpdump/pmap_prot.h
similarity index 100%
rename from contrib/tcpdump-3.9/pmap_prot.h
rename to contrib/tcpdump/pmap_prot.h

diff --git a/contrib/tcpdump-3.9/ppp.h b/contrib/tcpdump/ppp.h
similarity index 100%
rename from contrib/tcpdump-3.9/ppp.h
rename to contrib/tcpdump/ppp.h

diff --git a/contrib/tcpdump-3.9/print-802_11.c b/contrib/tcpdump/print-802_11.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-802_11.c
rename to contrib/tcpdump/print-802_11.c

diff --git a/contrib/tcpdump-3.9/print-ah.c b/contrib/tcpdump/print-ah.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ah.c
rename to contrib/tcpdump/print-ah.c

diff --git a/contrib/tcpdump-3.9/print-aodv.c b/contrib/tcpdump/print-aodv.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-aodv.c
rename to contrib/tcpdump/print-aodv.c

diff --git a/contrib/tcpdump-3.9/print-ap1394.c b/contrib/tcpdump/print-ap1394.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ap1394.c
rename to contrib/tcpdump/print-ap1394.c

diff --git a/contrib/tcpdump-3.9/print-arcnet.c b/contrib/tcpdump/print-arcnet.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-arcnet.c
rename to contrib/tcpdump/print-arcnet.c

diff --git a/contrib/tcpdump-3.9/print-arp.c b/contrib/tcpdump/print-arp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-arp.c
rename to contrib/tcpdump/print-arp.c

diff --git a/contrib/tcpdump-3.9/print-ascii.c b/contrib/tcpdump/print-ascii.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ascii.c
rename to contrib/tcpdump/print-ascii.c

diff --git a/contrib/tcpdump-3.9/print-atalk.c b/contrib/tcpdump/print-atalk.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-atalk.c
rename to contrib/tcpdump/print-atalk.c

diff --git a/contrib/tcpdump-3.9/print-atm.c b/contrib/tcpdump/print-atm.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-atm.c
rename to contrib/tcpdump/print-atm.c

diff --git a/contrib/tcpdump-3.9/print-beep.c b/contrib/tcpdump/print-beep.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-beep.c
rename to contrib/tcpdump/print-beep.c

diff --git a/contrib/tcpdump-3.9/print-bfd.c b/contrib/tcpdump/print-bfd.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-bfd.c
rename to contrib/tcpdump/print-bfd.c

diff --git a/contrib/tcpdump-3.9/print-bgp.c b/contrib/tcpdump/print-bgp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-bgp.c
rename to contrib/tcpdump/print-bgp.c

diff --git a/contrib/tcpdump-3.9/print-bootp.c b/contrib/tcpdump/print-bootp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-bootp.c
rename to contrib/tcpdump/print-bootp.c

diff --git a/contrib/tcpdump-3.9/print-cdp.c b/contrib/tcpdump/print-cdp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-cdp.c
rename to contrib/tcpdump/print-cdp.c

diff --git a/contrib/tcpdump-3.9/print-chdlc.c b/contrib/tcpdump/print-chdlc.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-chdlc.c
rename to contrib/tcpdump/print-chdlc.c

diff --git a/contrib/tcpdump-3.9/print-cip.c b/contrib/tcpdump/print-cip.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-cip.c
rename to contrib/tcpdump/print-cip.c

diff --git a/contrib/tcpdump-3.9/print-cnfp.c b/contrib/tcpdump/print-cnfp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-cnfp.c
rename to contrib/tcpdump/print-cnfp.c

diff --git a/contrib/tcpdump-3.9/print-dccp.c b/contrib/tcpdump/print-dccp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-dccp.c
rename to contrib/tcpdump/print-dccp.c

diff --git a/contrib/tcpdump-3.9/print-decnet.c b/contrib/tcpdump/print-decnet.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-decnet.c
rename to contrib/tcpdump/print-decnet.c

diff --git a/contrib/tcpdump-3.9/print-dhcp6.c b/contrib/tcpdump/print-dhcp6.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-dhcp6.c
rename to contrib/tcpdump/print-dhcp6.c

diff --git a/contrib/tcpdump-3.9/print-domain.c b/contrib/tcpdump/print-domain.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-domain.c
rename to contrib/tcpdump/print-domain.c

diff --git a/contrib/tcpdump-3.9/print-dvmrp.c b/contrib/tcpdump/print-dvmrp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-dvmrp.c
rename to contrib/tcpdump/print-dvmrp.c

diff --git a/contrib/tcpdump-3.9/print-eap.c b/contrib/tcpdump/print-eap.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-eap.c
rename to contrib/tcpdump/print-eap.c

diff --git a/contrib/tcpdump-3.9/print-egp.c b/contrib/tcpdump/print-egp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-egp.c
rename to contrib/tcpdump/print-egp.c

diff --git a/contrib/tcpdump-3.9/print-eigrp.c b/contrib/tcpdump/print-eigrp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-eigrp.c
rename to contrib/tcpdump/print-eigrp.c

diff --git a/contrib/tcpdump-3.9/print-enc.c b/contrib/tcpdump/print-enc.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-enc.c
rename to contrib/tcpdump/print-enc.c

diff --git a/contrib/tcpdump-3.9/print-esp.c b/contrib/tcpdump/print-esp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-esp.c
rename to contrib/tcpdump/print-esp.c

diff --git a/contrib/tcpdump-3.9/print-ether.c b/contrib/tcpdump/print-ether.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ether.c
rename to contrib/tcpdump/print-ether.c

diff --git a/contrib/tcpdump-3.9/print-fddi.c b/contrib/tcpdump/print-fddi.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-fddi.c
rename to contrib/tcpdump/print-fddi.c

diff --git a/contrib/tcpdump-3.9/print-fr.c b/contrib/tcpdump/print-fr.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-fr.c
rename to contrib/tcpdump/print-fr.c

diff --git a/contrib/tcpdump-3.9/print-frag6.c b/contrib/tcpdump/print-frag6.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-frag6.c
rename to contrib/tcpdump/print-frag6.c

diff --git a/contrib/tcpdump-3.9/print-gre.c b/contrib/tcpdump/print-gre.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-gre.c
rename to contrib/tcpdump/print-gre.c

diff --git a/contrib/tcpdump-3.9/print-hsrp.c b/contrib/tcpdump/print-hsrp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-hsrp.c
rename to contrib/tcpdump/print-hsrp.c

diff --git a/contrib/tcpdump-3.9/print-icmp.c b/contrib/tcpdump/print-icmp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-icmp.c
rename to contrib/tcpdump/print-icmp.c

diff --git a/contrib/tcpdump-3.9/print-icmp6.c b/contrib/tcpdump/print-icmp6.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-icmp6.c
rename to contrib/tcpdump/print-icmp6.c

diff --git a/contrib/tcpdump-3.9/print-igmp.c b/contrib/tcpdump/print-igmp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-igmp.c
rename to contrib/tcpdump/print-igmp.c

diff --git a/contrib/tcpdump-3.9/print-igrp.c b/contrib/tcpdump/print-igrp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-igrp.c
rename to contrib/tcpdump/print-igrp.c

diff --git a/contrib/tcpdump-3.9/print-ip.c b/contrib/tcpdump/print-ip.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ip.c
rename to contrib/tcpdump/print-ip.c

diff --git a/contrib/tcpdump-3.9/print-ip6.c b/contrib/tcpdump/print-ip6.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ip6.c
rename to contrib/tcpdump/print-ip6.c

diff --git a/contrib/tcpdump-3.9/print-ip6opts.c b/contrib/tcpdump/print-ip6opts.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ip6opts.c
rename to contrib/tcpdump/print-ip6opts.c

diff --git a/contrib/tcpdump-3.9/print-ipcomp.c b/contrib/tcpdump/print-ipcomp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ipcomp.c
rename to contrib/tcpdump/print-ipcomp.c

diff --git a/contrib/tcpdump-3.9/print-ipfc.c b/contrib/tcpdump/print-ipfc.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ipfc.c
rename to contrib/tcpdump/print-ipfc.c

diff --git a/contrib/tcpdump-3.9/print-ipx.c b/contrib/tcpdump/print-ipx.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ipx.c
rename to contrib/tcpdump/print-ipx.c

diff --git a/contrib/tcpdump-3.9/print-isakmp.c b/contrib/tcpdump/print-isakmp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-isakmp.c
rename to contrib/tcpdump/print-isakmp.c

diff --git a/contrib/tcpdump-3.9/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-isoclns.c
rename to contrib/tcpdump/print-isoclns.c

diff --git a/contrib/tcpdump-3.9/print-juniper.c b/contrib/tcpdump/print-juniper.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-juniper.c
rename to contrib/tcpdump/print-juniper.c

diff --git a/contrib/tcpdump-3.9/print-krb.c b/contrib/tcpdump/print-krb.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-krb.c
rename to contrib/tcpdump/print-krb.c

diff --git a/contrib/tcpdump-3.9/print-l2tp.c b/contrib/tcpdump/print-l2tp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-l2tp.c
rename to contrib/tcpdump/print-l2tp.c

diff --git a/contrib/tcpdump-3.9/print-lane.c b/contrib/tcpdump/print-lane.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-lane.c
rename to contrib/tcpdump/print-lane.c

diff --git a/contrib/tcpdump-3.9/print-ldp.c b/contrib/tcpdump/print-ldp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ldp.c
rename to contrib/tcpdump/print-ldp.c

diff --git a/contrib/tcpdump-3.9/print-llc.c b/contrib/tcpdump/print-llc.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-llc.c
rename to contrib/tcpdump/print-llc.c

diff --git a/contrib/tcpdump-3.9/print-lmp.c b/contrib/tcpdump/print-lmp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-lmp.c
rename to contrib/tcpdump/print-lmp.c

diff --git a/contrib/tcpdump-3.9/print-lspping.c b/contrib/tcpdump/print-lspping.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-lspping.c
rename to contrib/tcpdump/print-lspping.c

diff --git a/contrib/tcpdump-3.9/print-lwres.c b/contrib/tcpdump/print-lwres.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-lwres.c
rename to contrib/tcpdump/print-lwres.c

diff --git a/contrib/tcpdump-3.9/print-mobile.c b/contrib/tcpdump/print-mobile.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-mobile.c
rename to contrib/tcpdump/print-mobile.c

diff --git a/contrib/tcpdump-3.9/print-mobility.c b/contrib/tcpdump/print-mobility.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-mobility.c
rename to contrib/tcpdump/print-mobility.c

diff --git a/contrib/tcpdump-3.9/print-mpls.c b/contrib/tcpdump/print-mpls.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-mpls.c
rename to contrib/tcpdump/print-mpls.c

diff --git a/contrib/tcpdump-3.9/print-msdp.c b/contrib/tcpdump/print-msdp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-msdp.c
rename to contrib/tcpdump/print-msdp.c

diff --git a/contrib/tcpdump-3.9/print-netbios.c b/contrib/tcpdump/print-netbios.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-netbios.c
rename to contrib/tcpdump/print-netbios.c

diff --git a/contrib/tcpdump-3.9/print-nfs.c b/contrib/tcpdump/print-nfs.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-nfs.c
rename to contrib/tcpdump/print-nfs.c

diff --git a/contrib/tcpdump-3.9/print-ntp.c b/contrib/tcpdump/print-ntp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ntp.c
rename to contrib/tcpdump/print-ntp.c

diff --git a/contrib/tcpdump-3.9/print-null.c b/contrib/tcpdump/print-null.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-null.c
rename to contrib/tcpdump/print-null.c

diff --git a/contrib/tcpdump-3.9/print-olsr.c b/contrib/tcpdump/print-olsr.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-olsr.c
rename to contrib/tcpdump/print-olsr.c

diff --git a/contrib/tcpdump-3.9/print-ospf.c b/contrib/tcpdump/print-ospf.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ospf.c
rename to contrib/tcpdump/print-ospf.c

diff --git a/contrib/tcpdump-3.9/print-ospf6.c b/contrib/tcpdump/print-ospf6.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ospf6.c
rename to contrib/tcpdump/print-ospf6.c

diff --git a/contrib/tcpdump-3.9/print-pflog.c b/contrib/tcpdump/print-pflog.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-pflog.c
rename to contrib/tcpdump/print-pflog.c

diff --git a/contrib/tcpdump-3.9/print-pgm.c b/contrib/tcpdump/print-pgm.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-pgm.c
rename to contrib/tcpdump/print-pgm.c

diff --git a/contrib/tcpdump-3.9/print-pim.c b/contrib/tcpdump/print-pim.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-pim.c
rename to contrib/tcpdump/print-pim.c

diff --git a/contrib/tcpdump-3.9/print-ppp.c b/contrib/tcpdump/print-ppp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ppp.c
rename to contrib/tcpdump/print-ppp.c

diff --git a/contrib/tcpdump-3.9/print-pppoe.c b/contrib/tcpdump/print-pppoe.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-pppoe.c
rename to contrib/tcpdump/print-pppoe.c

diff --git a/contrib/tcpdump-3.9/print-pptp.c b/contrib/tcpdump/print-pptp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-pptp.c
rename to contrib/tcpdump/print-pptp.c

diff --git a/contrib/tcpdump-3.9/print-radius.c b/contrib/tcpdump/print-radius.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-radius.c
rename to contrib/tcpdump/print-radius.c

diff --git a/contrib/tcpdump-3.9/print-raw.c b/contrib/tcpdump/print-raw.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-raw.c
rename to contrib/tcpdump/print-raw.c

diff --git a/contrib/tcpdump-3.9/print-rip.c b/contrib/tcpdump/print-rip.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-rip.c
rename to contrib/tcpdump/print-rip.c

diff --git a/contrib/tcpdump-3.9/print-ripng.c b/contrib/tcpdump/print-ripng.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-ripng.c
rename to contrib/tcpdump/print-ripng.c

diff --git a/contrib/tcpdump-3.9/print-rsvp.c b/contrib/tcpdump/print-rsvp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-rsvp.c
rename to contrib/tcpdump/print-rsvp.c

diff --git a/contrib/tcpdump-3.9/print-rt6.c b/contrib/tcpdump/print-rt6.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-rt6.c
rename to contrib/tcpdump/print-rt6.c

diff --git a/contrib/tcpdump-3.9/print-rx.c b/contrib/tcpdump/print-rx.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-rx.c
rename to contrib/tcpdump/print-rx.c

diff --git a/contrib/tcpdump-3.9/print-sctp.c b/contrib/tcpdump/print-sctp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-sctp.c
rename to contrib/tcpdump/print-sctp.c

diff --git a/contrib/tcpdump-3.9/print-sip.c b/contrib/tcpdump/print-sip.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-sip.c
rename to contrib/tcpdump/print-sip.c

diff --git a/contrib/tcpdump-3.9/print-sl.c b/contrib/tcpdump/print-sl.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-sl.c
rename to contrib/tcpdump/print-sl.c

diff --git a/contrib/tcpdump-3.9/print-sll.c b/contrib/tcpdump/print-sll.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-sll.c
rename to contrib/tcpdump/print-sll.c

diff --git a/contrib/tcpdump-3.9/print-slow.c b/contrib/tcpdump/print-slow.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-slow.c
rename to contrib/tcpdump/print-slow.c

diff --git a/contrib/tcpdump-3.9/print-smb.c b/contrib/tcpdump/print-smb.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-smb.c
rename to contrib/tcpdump/print-smb.c

diff --git a/contrib/tcpdump-3.9/print-snmp.c b/contrib/tcpdump/print-snmp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-snmp.c
rename to contrib/tcpdump/print-snmp.c

diff --git a/contrib/tcpdump-3.9/print-stp.c b/contrib/tcpdump/print-stp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-stp.c
rename to contrib/tcpdump/print-stp.c

diff --git a/contrib/tcpdump-3.9/print-sunatm.c b/contrib/tcpdump/print-sunatm.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-sunatm.c
rename to contrib/tcpdump/print-sunatm.c

diff --git a/contrib/tcpdump-3.9/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-sunrpc.c
rename to contrib/tcpdump/print-sunrpc.c

diff --git a/contrib/tcpdump-3.9/print-symantec.c b/contrib/tcpdump/print-symantec.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-symantec.c
rename to contrib/tcpdump/print-symantec.c

diff --git a/contrib/tcpdump-3.9/print-syslog.c b/contrib/tcpdump/print-syslog.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-syslog.c
rename to contrib/tcpdump/print-syslog.c

diff --git a/contrib/tcpdump-3.9/print-tcp.c b/contrib/tcpdump/print-tcp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-tcp.c
rename to contrib/tcpdump/print-tcp.c

diff --git a/contrib/tcpdump-3.9/print-telnet.c b/contrib/tcpdump/print-telnet.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-telnet.c
rename to contrib/tcpdump/print-telnet.c

diff --git a/contrib/tcpdump-3.9/print-tftp.c b/contrib/tcpdump/print-tftp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-tftp.c
rename to contrib/tcpdump/print-tftp.c

diff --git a/contrib/tcpdump-3.9/print-timed.c b/contrib/tcpdump/print-timed.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-timed.c
rename to contrib/tcpdump/print-timed.c

diff --git a/contrib/tcpdump-3.9/print-token.c b/contrib/tcpdump/print-token.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-token.c
rename to contrib/tcpdump/print-token.c

diff --git a/contrib/tcpdump-3.9/print-udp.c b/contrib/tcpdump/print-udp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-udp.c
rename to contrib/tcpdump/print-udp.c

diff --git a/contrib/tcpdump-3.9/print-vjc.c b/contrib/tcpdump/print-vjc.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-vjc.c
rename to contrib/tcpdump/print-vjc.c

diff --git a/contrib/tcpdump-3.9/print-vrrp.c b/contrib/tcpdump/print-vrrp.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-vrrp.c
rename to contrib/tcpdump/print-vrrp.c

diff --git a/contrib/tcpdump-3.9/print-wb.c b/contrib/tcpdump/print-wb.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-wb.c
rename to contrib/tcpdump/print-wb.c

diff --git a/contrib/tcpdump-3.9/print-zephyr.c b/contrib/tcpdump/print-zephyr.c
similarity index 100%
rename from contrib/tcpdump-3.9/print-zephyr.c
rename to contrib/tcpdump/print-zephyr.c

diff --git a/contrib/tcpdump-3.9/route6d.h b/contrib/tcpdump/route6d.h
similarity index 100%
rename from contrib/tcpdump-3.9/route6d.h
rename to contrib/tcpdump/route6d.h

diff --git a/contrib/tcpdump-3.9/rpc_auth.h b/contrib/tcpdump/rpc_auth.h
similarity index 100%
rename from contrib/tcpdump-3.9/rpc_auth.h
rename to contrib/tcpdump/rpc_auth.h

diff --git a/contrib/tcpdump-3.9/rpc_msg.h b/contrib/tcpdump/rpc_msg.h
similarity index 100%
rename from contrib/tcpdump-3.9/rpc_msg.h
rename to contrib/tcpdump/rpc_msg.h

diff --git a/contrib/tcpdump-3.9/rx.h b/contrib/tcpdump/rx.h
similarity index 100%
rename from contrib/tcpdump-3.9/rx.h
rename to contrib/tcpdump/rx.h

diff --git a/contrib/tcpdump-3.9/sctpConstants.h b/contrib/tcpdump/sctpConstants.h
similarity index 100%
rename from contrib/tcpdump-3.9/sctpConstants.h
rename to contrib/tcpdump/sctpConstants.h

diff --git a/contrib/tcpdump-3.9/sctpHeader.h b/contrib/tcpdump/sctpHeader.h
similarity index 100%
rename from contrib/tcpdump-3.9/sctpHeader.h
rename to contrib/tcpdump/sctpHeader.h

diff --git a/contrib/tcpdump-3.9/setsignal.c b/contrib/tcpdump/setsignal.c
similarity index 100%
rename from contrib/tcpdump-3.9/setsignal.c
rename to contrib/tcpdump/setsignal.c

diff --git a/contrib/tcpdump-3.9/setsignal.h b/contrib/tcpdump/setsignal.h
similarity index 100%
rename from contrib/tcpdump-3.9/setsignal.h
rename to contrib/tcpdump/setsignal.h

diff --git a/contrib/tcpdump-3.9/slcompress.h b/contrib/tcpdump/slcompress.h
similarity index 100%
rename from contrib/tcpdump-3.9/slcompress.h
rename to contrib/tcpdump/slcompress.h

diff --git a/contrib/tcpdump-3.9/slip.h b/contrib/tcpdump/slip.h
similarity index 100%
rename from contrib/tcpdump-3.9/slip.h
rename to contrib/tcpdump/slip.h

diff --git a/contrib/tcpdump-3.9/sll.h b/contrib/tcpdump/sll.h
similarity index 100%
rename from contrib/tcpdump-3.9/sll.h
rename to contrib/tcpdump/sll.h

diff --git a/contrib/tcpdump-3.9/smb.h b/contrib/tcpdump/smb.h
similarity index 100%
rename from contrib/tcpdump-3.9/smb.h
rename to contrib/tcpdump/smb.h

diff --git a/contrib/tcpdump-3.9/smbutil.c b/contrib/tcpdump/smbutil.c
similarity index 100%
rename from contrib/tcpdump-3.9/smbutil.c
rename to contrib/tcpdump/smbutil.c

diff --git a/contrib/tcpdump-3.9/strcasecmp.c b/contrib/tcpdump/strcasecmp.c
similarity index 100%
rename from contrib/tcpdump-3.9/strcasecmp.c
rename to contrib/tcpdump/strcasecmp.c

diff --git a/contrib/tcpdump-3.9/tcp.h b/contrib/tcpdump/tcp.h
similarity index 100%
rename from contrib/tcpdump-3.9/tcp.h
rename to contrib/tcpdump/tcp.h

diff --git a/contrib/tcpdump-3.9/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h
similarity index 100%
rename from contrib/tcpdump-3.9/tcpdump-stdinc.h
rename to contrib/tcpdump/tcpdump-stdinc.h

diff --git a/contrib/tcpdump-3.9/tcpdump.1 b/contrib/tcpdump/tcpdump.1
similarity index 100%
rename from contrib/tcpdump-3.9/tcpdump.1
rename to contrib/tcpdump/tcpdump.1

diff --git a/contrib/tcpdump-3.9/tcpdump.c b/contrib/tcpdump/tcpdump.c
similarity index 100%
rename from contrib/tcpdump-3.9/tcpdump.c
rename to contrib/tcpdump/tcpdump.c

diff --git a/contrib/tcpdump-3.9/telnet.h b/contrib/tcpdump/telnet.h
similarity index 100%
rename from contrib/tcpdump-3.9/telnet.h
rename to contrib/tcpdump/telnet.h

diff --git a/contrib/tcpdump-3.9/tftp.h b/contrib/tcpdump/tftp.h
similarity index 100%
rename from contrib/tcpdump-3.9/tftp.h
rename to contrib/tcpdump/tftp.h

diff --git a/contrib/tcpdump-3.9/timed.h b/contrib/tcpdump/timed.h
similarity index 100%
rename from contrib/tcpdump-3.9/timed.h
rename to contrib/tcpdump/timed.h

diff --git a/contrib/tcpdump-3.9/token.h b/contrib/tcpdump/token.h
similarity index 100%
rename from contrib/tcpdump-3.9/token.h
rename to contrib/tcpdump/token.h

diff --git a/contrib/tcpdump-3.9/udp.h b/contrib/tcpdump/udp.h
similarity index 100%
rename from contrib/tcpdump-3.9/udp.h
rename to contrib/tcpdump/udp.h

diff --git a/contrib/tcpdump-3.9/util.c b/contrib/tcpdump/util.c
similarity index 100%
rename from contrib/tcpdump-3.9/util.c
rename to contrib/tcpdump/util.c

diff --git a/contrib/tcpdump-3.9/vfprintf.c b/contrib/tcpdump/vfprintf.c
similarity index 100%
rename from contrib/tcpdump-3.9/vfprintf.c
rename to contrib/tcpdump/vfprintf.c