diff --git a/contrib/ipfilter/.cvsignore b/.cvsignore
similarity index 100%
rename from contrib/ipfilter/.cvsignore
rename to .cvsignore
diff --git a/contrib/ipfilter/BNF b/BNF
similarity index 100%
rename from contrib/ipfilter/BNF
rename to BNF
diff --git a/contrib/ipfilter/BSD/.cvsignore b/BSD/.cvsignore
similarity index 100%
rename from contrib/ipfilter/BSD/.cvsignore
rename to BSD/.cvsignore
diff --git a/contrib/ipfilter/BSD/Makefile b/BSD/Makefile
similarity index 100%
rename from contrib/ipfilter/BSD/Makefile
rename to BSD/Makefile
diff --git a/contrib/ipfilter/BSD/Makefile.ipsend b/BSD/Makefile.ipsend
similarity index 100%
rename from contrib/ipfilter/BSD/Makefile.ipsend
rename to BSD/Makefile.ipsend
diff --git a/contrib/ipfilter/BSD/ipfadm-rcd b/BSD/ipfadm-rcd
similarity index 100%
rename from contrib/ipfilter/BSD/ipfadm-rcd
rename to BSD/ipfadm-rcd
diff --git a/contrib/ipfilter/BSD/kupgrade b/BSD/kupgrade
similarity index 100%
rename from contrib/ipfilter/BSD/kupgrade
rename to BSD/kupgrade
diff --git a/contrib/ipfilter/BSD/make-devices b/BSD/make-devices
similarity index 100%
rename from contrib/ipfilter/BSD/make-devices
rename to BSD/make-devices
diff --git a/contrib/ipfilter/BugReport b/BugReport
similarity index 100%
rename from contrib/ipfilter/BugReport
rename to BugReport
diff --git a/contrib/ipfilter/COMPILE.2.5 b/COMPILE.2.5
similarity index 100%
rename from contrib/ipfilter/COMPILE.2.5
rename to COMPILE.2.5
diff --git a/contrib/ipfilter/COMPILE.Solaris2 b/COMPILE.Solaris2
similarity index 100%
rename from contrib/ipfilter/COMPILE.Solaris2
rename to COMPILE.Solaris2
diff --git a/contrib/ipfilter/FAQ.FreeBSD b/FAQ.FreeBSD
similarity index 100%
rename from contrib/ipfilter/FAQ.FreeBSD
rename to FAQ.FreeBSD
diff --git a/contrib/ipfilter/FWTK/FWTK.sed b/FWTK/FWTK.sed
similarity index 100%
rename from contrib/ipfilter/FWTK/FWTK.sed
rename to FWTK/FWTK.sed
diff --git a/contrib/ipfilter/FWTK/Index b/FWTK/Index
similarity index 100%
rename from contrib/ipfilter/FWTK/Index
rename to FWTK/Index
diff --git a/contrib/ipfilter/FWTK/README b/FWTK/README
similarity index 100%
rename from contrib/ipfilter/FWTK/README
rename to FWTK/README
diff --git a/contrib/ipfilter/FWTK/README.ipfilter b/FWTK/README.ipfilter
similarity index 100%
rename from contrib/ipfilter/FWTK/README.ipfilter
rename to FWTK/README.ipfilter
diff --git a/contrib/ipfilter/FWTK/ftp-gw.diff b/FWTK/ftp-gw.diff
similarity index 100%
rename from contrib/ipfilter/FWTK/ftp-gw.diff
rename to FWTK/ftp-gw.diff
diff --git a/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt b/FWTK/fwtk-2.1-transparency.txt
similarity index 100%
rename from contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt
rename to FWTK/fwtk-2.1-transparency.txt
diff --git a/contrib/ipfilter/FWTK/fwtk_transparent.diff b/FWTK/fwtk_transparent.diff
similarity index 100%
rename from contrib/ipfilter/FWTK/fwtk_transparent.diff
rename to FWTK/fwtk_transparent.diff
diff --git a/contrib/ipfilter/FWTK/fwtkp b/FWTK/fwtkp
similarity index 100%
rename from contrib/ipfilter/FWTK/fwtkp
rename to FWTK/fwtkp
diff --git a/contrib/ipfilter/FWTK/tproxy.diff b/FWTK/tproxy.diff
similarity index 100%
rename from contrib/ipfilter/FWTK/tproxy.diff
rename to FWTK/tproxy.diff
diff --git a/contrib/ipfilter/FreeBSD-2.2/files.diffs b/FreeBSD-2.2/files.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/files.diffs
rename to FreeBSD-2.2/files.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs b/FreeBSD-2.2/files.newconf.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs
rename to FreeBSD-2.2/files.newconf.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs b/FreeBSD-2.2/in_proto.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs
rename to FreeBSD-2.2/in_proto.c.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs b/FreeBSD-2.2/ip_input.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs
rename to FreeBSD-2.2/ip_input.c.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs b/FreeBSD-2.2/ip_output.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs
rename to FreeBSD-2.2/ip_output.c.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/kinstall b/FreeBSD-2.2/kinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/kinstall
rename to FreeBSD-2.2/kinstall
diff --git a/contrib/ipfilter/FreeBSD-2.2/minstall b/FreeBSD-2.2/minstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/minstall
rename to FreeBSD-2.2/minstall
diff --git a/contrib/ipfilter/FreeBSD-2.2/unkinstall b/FreeBSD-2.2/unkinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/unkinstall
rename to FreeBSD-2.2/unkinstall
diff --git a/contrib/ipfilter/FreeBSD-2.2/unminstall b/FreeBSD-2.2/unminstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-2.2/unminstall
rename to FreeBSD-2.2/unminstall
diff --git a/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 b/FreeBSD-3/INST.FreeBSD-3
similarity index 100%
rename from contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3
rename to FreeBSD-3/INST.FreeBSD-3
diff --git a/contrib/ipfilter/FreeBSD-3/kinstall b/FreeBSD-3/kinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-3/kinstall
rename to FreeBSD-3/kinstall
diff --git a/contrib/ipfilter/FreeBSD-3/unkinstall b/FreeBSD-3/unkinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-3/unkinstall
rename to FreeBSD-3/unkinstall
diff --git a/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4 b/FreeBSD-4.0/INST.FreeBSD-4
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4
rename to FreeBSD-4.0/INST.FreeBSD-4
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch b/FreeBSD-4.0/ipv6-patch
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/ipv6-patch
rename to FreeBSD-4.0/ipv6-patch
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 b/FreeBSD-4.0/ipv6-patch-4.0
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
rename to FreeBSD-4.0/ipv6-patch-4.0
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 b/FreeBSD-4.0/ipv6-patch-4.1
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
rename to FreeBSD-4.0/ipv6-patch-4.1
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 b/FreeBSD-4.0/ipv6-patch-4.2
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
rename to FreeBSD-4.0/ipv6-patch-4.2
diff --git a/contrib/ipfilter/FreeBSD-4.0/kinstall b/FreeBSD-4.0/kinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/kinstall
rename to FreeBSD-4.0/kinstall
diff --git a/contrib/ipfilter/FreeBSD-4.0/unkinstall b/FreeBSD-4.0/unkinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD-4.0/unkinstall
rename to FreeBSD-4.0/unkinstall
diff --git a/contrib/ipfilter/FreeBSD/conf.c.diffs b/FreeBSD/conf.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/conf.c.diffs
rename to FreeBSD/conf.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/files.diffs b/FreeBSD/files.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/files.diffs
rename to FreeBSD/files.diffs
diff --git a/contrib/ipfilter/FreeBSD/files.newconf.diffs b/FreeBSD/files.newconf.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/files.newconf.diffs
rename to FreeBSD/files.newconf.diffs
diff --git a/contrib/ipfilter/FreeBSD/files.oldconf.diffs b/FreeBSD/files.oldconf.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/files.oldconf.diffs
rename to FreeBSD/files.oldconf.diffs
diff --git a/contrib/ipfilter/FreeBSD/filez.diffs b/FreeBSD/filez.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/filez.diffs
rename to FreeBSD/filez.diffs
diff --git a/contrib/ipfilter/FreeBSD/in_proto.c.diffs b/FreeBSD/in_proto.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/in_proto.c.diffs
rename to FreeBSD/in_proto.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/ip_input.c.diffs b/FreeBSD/ip_input.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/ip_input.c.diffs
rename to FreeBSD/ip_input.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/ip_output.c.diffs b/FreeBSD/ip_output.c.diffs
similarity index 100%
rename from contrib/ipfilter/FreeBSD/ip_output.c.diffs
rename to FreeBSD/ip_output.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/kinstall b/FreeBSD/kinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD/kinstall
rename to FreeBSD/kinstall
diff --git a/contrib/ipfilter/FreeBSD/minstall b/FreeBSD/minstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD/minstall
rename to FreeBSD/minstall
diff --git a/contrib/ipfilter/FreeBSD/unkinstall b/FreeBSD/unkinstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD/unkinstall
rename to FreeBSD/unkinstall
diff --git a/contrib/ipfilter/FreeBSD/unminstall b/FreeBSD/unminstall
similarity index 100%
rename from contrib/ipfilter/FreeBSD/unminstall
rename to FreeBSD/unminstall
diff --git a/contrib/ipfilter/HISTORY b/HISTORY
similarity index 100%
rename from contrib/ipfilter/HISTORY
rename to HISTORY
diff --git a/contrib/ipfilter/IMPORTANT b/IMPORTANT
similarity index 100%
rename from contrib/ipfilter/IMPORTANT
rename to IMPORTANT
diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/INST.FreeBSD-2.2
similarity index 100%
rename from contrib/ipfilter/INST.FreeBSD-2.2
rename to INST.FreeBSD-2.2
diff --git a/contrib/ipfilter/INSTALL.BSDOS b/INSTALL.BSDOS
similarity index 100%
rename from contrib/ipfilter/INSTALL.BSDOS
rename to INSTALL.BSDOS
diff --git a/contrib/ipfilter/INSTALL.BSDOS3 b/INSTALL.BSDOS3
similarity index 100%
rename from contrib/ipfilter/INSTALL.BSDOS3
rename to INSTALL.BSDOS3
diff --git a/contrib/ipfilter/INSTALL.FreeBSD b/INSTALL.FreeBSD
similarity index 100%
rename from contrib/ipfilter/INSTALL.FreeBSD
rename to INSTALL.FreeBSD
diff --git a/contrib/ipfilter/INSTALL.IRIX b/INSTALL.IRIX
similarity index 100%
rename from contrib/ipfilter/INSTALL.IRIX
rename to INSTALL.IRIX
diff --git a/contrib/ipfilter/INSTALL.Linux b/INSTALL.Linux
similarity index 100%
rename from contrib/ipfilter/INSTALL.Linux
rename to INSTALL.Linux
diff --git a/contrib/ipfilter/INSTALL.NetBSD b/INSTALL.NetBSD
similarity index 100%
rename from contrib/ipfilter/INSTALL.NetBSD
rename to INSTALL.NetBSD
diff --git a/contrib/ipfilter/INSTALL.Sol2 b/INSTALL.Sol2
similarity index 100%
rename from contrib/ipfilter/INSTALL.Sol2
rename to INSTALL.Sol2
diff --git a/contrib/ipfilter/INSTALL.SunOS b/INSTALL.SunOS
similarity index 100%
rename from contrib/ipfilter/INSTALL.SunOS
rename to INSTALL.SunOS
diff --git a/contrib/ipfilter/INSTALL.xBSD b/INSTALL.xBSD
similarity index 100%
rename from contrib/ipfilter/INSTALL.xBSD
rename to INSTALL.xBSD
diff --git a/contrib/ipfilter/IPF.KANJI b/IPF.KANJI
similarity index 100%
rename from contrib/ipfilter/IPF.KANJI
rename to IPF.KANJI
diff --git a/contrib/ipfilter/IPFILTER.LICENCE b/IPFILTER.LICENCE
similarity index 100%
rename from contrib/ipfilter/IPFILTER.LICENCE
rename to IPFILTER.LICENCE
diff --git a/contrib/ipfilter/LICENCE b/LICENCE
similarity index 100%
rename from contrib/ipfilter/LICENCE
rename to LICENCE
diff --git a/contrib/ipfilter/Makefile b/Makefile
similarity index 100%
rename from contrib/ipfilter/Makefile
rename to Makefile
diff --git a/contrib/ipfilter/NAT.FreeBSD b/NAT.FreeBSD
similarity index 100%
rename from contrib/ipfilter/NAT.FreeBSD
rename to NAT.FreeBSD
diff --git a/contrib/ipfilter/QNX_OCL.txt b/QNX_OCL.txt
similarity index 100%
rename from contrib/ipfilter/QNX_OCL.txt
rename to QNX_OCL.txt
diff --git a/contrib/ipfilter/README b/README
similarity index 100%
rename from contrib/ipfilter/README
rename to README
diff --git a/contrib/ipfilter/STYLE.TXT b/STYLE.TXT
similarity index 100%
rename from contrib/ipfilter/STYLE.TXT
rename to STYLE.TXT
diff --git a/contrib/ipfilter/UPGRADE_NOTICE b/UPGRADE_NOTICE
similarity index 100%
rename from contrib/ipfilter/UPGRADE_NOTICE
rename to UPGRADE_NOTICE
diff --git a/contrib/ipfilter/WhatsNew40.txt b/WhatsNew40.txt
similarity index 100%
rename from contrib/ipfilter/WhatsNew40.txt
rename to WhatsNew40.txt
diff --git a/contrib/ipfilter/Y2K b/Y2K
similarity index 100%
rename from contrib/ipfilter/Y2K
rename to Y2K
diff --git a/contrib/ipfilter/bpf-ipf.h b/bpf-ipf.h
similarity index 100%
rename from contrib/ipfilter/bpf-ipf.h
rename to bpf-ipf.h
diff --git a/contrib/ipfilter/bpf.h b/bpf.h
similarity index 100%
rename from contrib/ipfilter/bpf.h
rename to bpf.h
diff --git a/contrib/ipfilter/bpf_filter.c b/bpf_filter.c
similarity index 100%
rename from contrib/ipfilter/bpf_filter.c
rename to bpf_filter.c
diff --git a/contrib/ipfilter/bsdinstall b/bsdinstall
similarity index 100%
rename from contrib/ipfilter/bsdinstall
rename to bsdinstall
diff --git a/contrib/ipfilter/buildlinux b/buildlinux
similarity index 100%
rename from contrib/ipfilter/buildlinux
rename to buildlinux
diff --git a/contrib/ipfilter/buildsunos b/buildsunos
similarity index 100%
rename from contrib/ipfilter/buildsunos
rename to buildsunos
diff --git a/contrib/ipfilter/common.c b/common.c
similarity index 100%
rename from contrib/ipfilter/common.c
rename to common.c
diff --git a/contrib/ipfilter/etc/etc.sed b/etc/etc.sed
similarity index 100%
rename from contrib/ipfilter/etc/etc.sed
rename to etc/etc.sed
diff --git a/contrib/ipfilter/etc/protocols b/etc/protocols
similarity index 100%
rename from contrib/ipfilter/etc/protocols
rename to etc/protocols
diff --git a/contrib/ipfilter/etc/services b/etc/services
similarity index 100%
rename from contrib/ipfilter/etc/services
rename to etc/services
diff --git a/contrib/ipfilter/facpri.c b/facpri.c
similarity index 100%
rename from contrib/ipfilter/facpri.c
rename to facpri.c
diff --git a/contrib/ipfilter/facpri.h b/facpri.h
similarity index 100%
rename from contrib/ipfilter/facpri.h
rename to facpri.h
diff --git a/contrib/ipfilter/fil.c b/fil.c
similarity index 100%
rename from contrib/ipfilter/fil.c
rename to fil.c
diff --git a/contrib/ipfilter/fils.c b/fils.c
similarity index 100%
rename from contrib/ipfilter/fils.c
rename to fils.c
diff --git a/contrib/ipfilter/inet_addr.c b/inet_addr.c
similarity index 100%
rename from contrib/ipfilter/inet_addr.c
rename to inet_addr.c
diff --git a/contrib/ipfilter/ip_auth.c b/ip_auth.c
similarity index 100%
rename from contrib/ipfilter/ip_auth.c
rename to ip_auth.c
diff --git a/contrib/ipfilter/ip_auth.h b/ip_auth.h
similarity index 100%
rename from contrib/ipfilter/ip_auth.h
rename to ip_auth.h
diff --git a/contrib/ipfilter/ip_compat.h b/ip_compat.h
similarity index 100%
rename from contrib/ipfilter/ip_compat.h
rename to ip_compat.h
diff --git a/contrib/ipfilter/ip_fil.c b/ip_fil.c
similarity index 100%
rename from contrib/ipfilter/ip_fil.c
rename to ip_fil.c
diff --git a/contrib/ipfilter/ip_fil.h b/ip_fil.h
similarity index 100%
rename from contrib/ipfilter/ip_fil.h
rename to ip_fil.h
diff --git a/contrib/ipfilter/ip_fil_freebsd.c b/ip_fil_freebsd.c
similarity index 100%
rename from contrib/ipfilter/ip_fil_freebsd.c
rename to ip_fil_freebsd.c
diff --git a/contrib/ipfilter/ip_frag.c b/ip_frag.c
similarity index 100%
rename from contrib/ipfilter/ip_frag.c
rename to ip_frag.c
diff --git a/contrib/ipfilter/ip_frag.h b/ip_frag.h
similarity index 100%
rename from contrib/ipfilter/ip_frag.h
rename to ip_frag.h
diff --git a/contrib/ipfilter/ip_ftp_pxy.c b/ip_ftp_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_ftp_pxy.c
rename to ip_ftp_pxy.c
diff --git a/contrib/ipfilter/ip_h323_pxy.c b/ip_h323_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_h323_pxy.c
rename to ip_h323_pxy.c
diff --git a/contrib/ipfilter/ip_htable.c b/ip_htable.c
similarity index 100%
rename from contrib/ipfilter/ip_htable.c
rename to ip_htable.c
diff --git a/contrib/ipfilter/ip_htable.h b/ip_htable.h
similarity index 100%
rename from contrib/ipfilter/ip_htable.h
rename to ip_htable.h
diff --git a/contrib/ipfilter/ip_ipsec_pxy.c b/ip_ipsec_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_ipsec_pxy.c
rename to ip_ipsec_pxy.c
diff --git a/contrib/ipfilter/ip_irc_pxy.c b/ip_irc_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_irc_pxy.c
rename to ip_irc_pxy.c
diff --git a/contrib/ipfilter/ip_lfil.c b/ip_lfil.c
similarity index 100%
rename from contrib/ipfilter/ip_lfil.c
rename to ip_lfil.c
diff --git a/contrib/ipfilter/ip_log.c b/ip_log.c
similarity index 100%
rename from contrib/ipfilter/ip_log.c
rename to ip_log.c
diff --git a/contrib/ipfilter/ip_lookup.c b/ip_lookup.c
similarity index 100%
rename from contrib/ipfilter/ip_lookup.c
rename to ip_lookup.c
diff --git a/contrib/ipfilter/ip_lookup.h b/ip_lookup.h
similarity index 100%
rename from contrib/ipfilter/ip_lookup.h
rename to ip_lookup.h
diff --git a/contrib/ipfilter/ip_msnrpc_pxy.c b/ip_msnrpc_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_msnrpc_pxy.c
rename to ip_msnrpc_pxy.c
diff --git a/contrib/ipfilter/ip_nat.c b/ip_nat.c
similarity index 100%
rename from contrib/ipfilter/ip_nat.c
rename to ip_nat.c
diff --git a/contrib/ipfilter/ip_nat.h b/ip_nat.h
similarity index 100%
rename from contrib/ipfilter/ip_nat.h
rename to ip_nat.h
diff --git a/contrib/ipfilter/ip_netbios_pxy.c b/ip_netbios_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_netbios_pxy.c
rename to ip_netbios_pxy.c
diff --git a/contrib/ipfilter/ip_pool.c b/ip_pool.c
similarity index 100%
rename from contrib/ipfilter/ip_pool.c
rename to ip_pool.c
diff --git a/contrib/ipfilter/ip_pool.h b/ip_pool.h
similarity index 100%
rename from contrib/ipfilter/ip_pool.h
rename to ip_pool.h
diff --git a/contrib/ipfilter/ip_pptp_pxy.c b/ip_pptp_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_pptp_pxy.c
rename to ip_pptp_pxy.c
diff --git a/contrib/ipfilter/ip_proxy.c b/ip_proxy.c
similarity index 100%
rename from contrib/ipfilter/ip_proxy.c
rename to ip_proxy.c
diff --git a/contrib/ipfilter/ip_proxy.h b/ip_proxy.h
similarity index 100%
rename from contrib/ipfilter/ip_proxy.h
rename to ip_proxy.h
diff --git a/contrib/ipfilter/ip_raudio_pxy.c b/ip_raudio_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_raudio_pxy.c
rename to ip_raudio_pxy.c
diff --git a/contrib/ipfilter/ip_rcmd_pxy.c b/ip_rcmd_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_rcmd_pxy.c
rename to ip_rcmd_pxy.c
diff --git a/contrib/ipfilter/ip_rpcb_pxy.c b/ip_rpcb_pxy.c
similarity index 100%
rename from contrib/ipfilter/ip_rpcb_pxy.c
rename to ip_rpcb_pxy.c
diff --git a/contrib/ipfilter/ip_scan.c b/ip_scan.c
similarity index 100%
rename from contrib/ipfilter/ip_scan.c
rename to ip_scan.c
diff --git a/contrib/ipfilter/ip_scan.h b/ip_scan.h
similarity index 100%
rename from contrib/ipfilter/ip_scan.h
rename to ip_scan.h
diff --git a/contrib/ipfilter/ip_sfil.c b/ip_sfil.c
similarity index 100%
rename from contrib/ipfilter/ip_sfil.c
rename to ip_sfil.c
diff --git a/contrib/ipfilter/ip_state.c b/ip_state.c
similarity index 100%
rename from contrib/ipfilter/ip_state.c
rename to ip_state.c
diff --git a/contrib/ipfilter/ip_state.h b/ip_state.h
similarity index 100%
rename from contrib/ipfilter/ip_state.h
rename to ip_state.h
diff --git a/contrib/ipfilter/ip_sync.c b/ip_sync.c
similarity index 100%
rename from contrib/ipfilter/ip_sync.c
rename to ip_sync.c
diff --git a/contrib/ipfilter/ip_sync.h b/ip_sync.h
similarity index 100%
rename from contrib/ipfilter/ip_sync.h
rename to ip_sync.h
diff --git a/contrib/ipfilter/ipf.c b/ipf.c
similarity index 100%
rename from contrib/ipfilter/ipf.c
rename to ipf.c
diff --git a/contrib/ipfilter/ipf.h b/ipf.h
similarity index 100%
rename from contrib/ipfilter/ipf.h
rename to ipf.h
diff --git a/contrib/ipfilter/ipfs.c b/ipfs.c
similarity index 100%
rename from contrib/ipfilter/ipfs.c
rename to ipfs.c
diff --git a/contrib/ipfilter/ipft_ef.c b/ipft_ef.c
similarity index 100%
rename from contrib/ipfilter/ipft_ef.c
rename to ipft_ef.c
diff --git a/contrib/ipfilter/ipft_hx.c b/ipft_hx.c
similarity index 100%
rename from contrib/ipfilter/ipft_hx.c
rename to ipft_hx.c
diff --git a/contrib/ipfilter/ipft_pc.c b/ipft_pc.c
similarity index 100%
rename from contrib/ipfilter/ipft_pc.c
rename to ipft_pc.c
diff --git a/contrib/ipfilter/ipft_sn.c b/ipft_sn.c
similarity index 100%
rename from contrib/ipfilter/ipft_sn.c
rename to ipft_sn.c
diff --git a/contrib/ipfilter/ipft_td.c b/ipft_td.c
similarity index 100%
rename from contrib/ipfilter/ipft_td.c
rename to ipft_td.c
diff --git a/contrib/ipfilter/ipft_tx.c b/ipft_tx.c
similarity index 100%
rename from contrib/ipfilter/ipft_tx.c
rename to ipft_tx.c
diff --git a/contrib/ipfilter/ipl.h b/ipl.h
similarity index 100%
rename from contrib/ipfilter/ipl.h
rename to ipl.h
diff --git a/contrib/ipfilter/ipl_ldev.c b/ipl_ldev.c
similarity index 100%
rename from contrib/ipfilter/ipl_ldev.c
rename to ipl_ldev.c
diff --git a/contrib/ipfilter/iplang/.cvsignore b/iplang/.cvsignore
similarity index 100%
rename from contrib/ipfilter/iplang/.cvsignore
rename to iplang/.cvsignore
diff --git a/contrib/ipfilter/iplang/BNF b/iplang/BNF
similarity index 100%
rename from contrib/ipfilter/iplang/BNF
rename to iplang/BNF
diff --git a/contrib/ipfilter/iplang/Makefile b/iplang/Makefile
similarity index 100%
rename from contrib/ipfilter/iplang/Makefile
rename to iplang/Makefile
diff --git a/contrib/ipfilter/iplang/iplang.h b/iplang/iplang.h
similarity index 100%
rename from contrib/ipfilter/iplang/iplang.h
rename to iplang/iplang.h
diff --git a/contrib/ipfilter/iplang/iplang.tst b/iplang/iplang.tst
similarity index 100%
rename from contrib/ipfilter/iplang/iplang.tst
rename to iplang/iplang.tst
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/iplang/iplang_l.l
similarity index 100%
rename from contrib/ipfilter/iplang/iplang_l.l
rename to iplang/iplang_l.l
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/iplang/iplang_y.y
similarity index 100%
rename from contrib/ipfilter/iplang/iplang_y.y
rename to iplang/iplang_y.y
diff --git a/contrib/ipfilter/ipmon.c b/ipmon.c
similarity index 100%
rename from contrib/ipfilter/ipmon.c
rename to ipmon.c
diff --git a/contrib/ipfilter/ipmon.h b/ipmon.h
similarity index 100%
rename from contrib/ipfilter/ipmon.h
rename to ipmon.h
diff --git a/contrib/ipfilter/ipnat.c b/ipnat.c
similarity index 100%
rename from contrib/ipfilter/ipnat.c
rename to ipnat.c
diff --git a/contrib/ipfilter/ipsd/Celler/ip_compat.h b/ipsd/Celler/ip_compat.h
similarity index 100%
rename from contrib/ipfilter/ipsd/Celler/ip_compat.h
rename to ipsd/Celler/ip_compat.h
diff --git a/contrib/ipfilter/ipsd/Makefile b/ipsd/Makefile
similarity index 100%
rename from contrib/ipfilter/ipsd/Makefile
rename to ipsd/Makefile
diff --git a/contrib/ipfilter/ipsd/README b/ipsd/README
similarity index 100%
rename from contrib/ipfilter/ipsd/README
rename to ipsd/README
diff --git a/contrib/ipfilter/ipsd/ip_compat.h b/ipsd/ip_compat.h
similarity index 100%
rename from contrib/ipfilter/ipsd/ip_compat.h
rename to ipsd/ip_compat.h
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/ipsd/ipsd.c
similarity index 100%
rename from contrib/ipfilter/ipsd/ipsd.c
rename to ipsd/ipsd.c
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/ipsd/ipsd.h
similarity index 100%
rename from contrib/ipfilter/ipsd/ipsd.h
rename to ipsd/ipsd.h
diff --git a/contrib/ipfilter/ipsd/ipsd.sed b/ipsd/ipsd.sed
similarity index 100%
rename from contrib/ipfilter/ipsd/ipsd.sed
rename to ipsd/ipsd.sed
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/ipsd/ipsdr.c
similarity index 100%
rename from contrib/ipfilter/ipsd/ipsdr.c
rename to ipsd/ipsdr.c
diff --git a/contrib/ipfilter/ipsd/linux.h b/ipsd/linux.h
similarity index 100%
rename from contrib/ipfilter/ipsd/linux.h
rename to ipsd/linux.h
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/ipsd/sbpf.c
similarity index 100%
rename from contrib/ipfilter/ipsd/sbpf.c
rename to ipsd/sbpf.c
diff --git a/contrib/ipfilter/ipsd/sdlpi.c b/ipsd/sdlpi.c
similarity index 100%
rename from contrib/ipfilter/ipsd/sdlpi.c
rename to ipsd/sdlpi.c
diff --git a/contrib/ipfilter/ipsd/slinux.c b/ipsd/slinux.c
similarity index 100%
rename from contrib/ipfilter/ipsd/slinux.c
rename to ipsd/slinux.c
diff --git a/contrib/ipfilter/ipsd/snit.c b/ipsd/snit.c
similarity index 100%
rename from contrib/ipfilter/ipsd/snit.c
rename to ipsd/snit.c
diff --git a/contrib/ipfilter/ipsend/.OLD/ip_compat.h b/ipsend/.OLD/ip_compat.h
similarity index 100%
rename from contrib/ipfilter/ipsend/.OLD/ip_compat.h
rename to ipsend/.OLD/ip_compat.h
diff --git a/contrib/ipfilter/ipsend/.cvsignore b/ipsend/.cvsignore
similarity index 100%
rename from contrib/ipfilter/ipsend/.cvsignore
rename to ipsend/.cvsignore
diff --git a/contrib/ipfilter/ipsend/44arp.c b/ipsend/44arp.c
similarity index 100%
rename from contrib/ipfilter/ipsend/44arp.c
rename to ipsend/44arp.c
diff --git a/contrib/ipfilter/ipsend/Crashable b/ipsend/Crashable
similarity index 100%
rename from contrib/ipfilter/ipsend/Crashable
rename to ipsend/Crashable
diff --git a/contrib/ipfilter/ipsend/Makefile b/ipsend/Makefile
similarity index 100%
rename from contrib/ipfilter/ipsend/Makefile
rename to ipsend/Makefile
diff --git a/contrib/ipfilter/ipsend/README b/ipsend/README
similarity index 100%
rename from contrib/ipfilter/ipsend/README
rename to ipsend/README
diff --git a/contrib/ipfilter/ipsend/arp.c b/ipsend/arp.c
similarity index 100%
rename from contrib/ipfilter/ipsend/arp.c
rename to ipsend/arp.c
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/ipsend/dlcommon.c
similarity index 100%
rename from contrib/ipfilter/ipsend/dlcommon.c
rename to ipsend/dlcommon.c
diff --git a/contrib/ipfilter/ipsend/dltest.h b/ipsend/dltest.h
similarity index 100%
rename from contrib/ipfilter/ipsend/dltest.h
rename to ipsend/dltest.h
diff --git a/contrib/ipfilter/ipsend/hpux.c b/ipsend/hpux.c
similarity index 100%
rename from contrib/ipfilter/ipsend/hpux.c
rename to ipsend/hpux.c
diff --git a/contrib/ipfilter/ipsend/in_var.h b/ipsend/in_var.h
similarity index 100%
rename from contrib/ipfilter/ipsend/in_var.h
rename to ipsend/in_var.h
diff --git a/contrib/ipfilter/ipsend/ip.c b/ipsend/ip.c
similarity index 100%
rename from contrib/ipfilter/ipsend/ip.c
rename to ipsend/ip.c
diff --git a/contrib/ipfilter/ipsend/ip_compat.h b/ipsend/ip_compat.h
similarity index 100%
rename from contrib/ipfilter/ipsend/ip_compat.h
rename to ipsend/ip_compat.h
diff --git a/contrib/ipfilter/ipsend/ip_var.h b/ipsend/ip_var.h
similarity index 100%
rename from contrib/ipfilter/ipsend/ip_var.h
rename to ipsend/ip_var.h
diff --git a/contrib/ipfilter/ipsend/ipresend.1 b/ipsend/ipresend.1
similarity index 100%
rename from contrib/ipfilter/ipsend/ipresend.1
rename to ipsend/ipresend.1
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/ipsend/ipresend.c
similarity index 100%
rename from contrib/ipfilter/ipsend/ipresend.c
rename to ipsend/ipresend.c
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/ipsend/ipsend.1
similarity index 100%
rename from contrib/ipfilter/ipsend/ipsend.1
rename to ipsend/ipsend.1
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/ipsend/ipsend.5
similarity index 100%
rename from contrib/ipfilter/ipsend/ipsend.5
rename to ipsend/ipsend.5
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/ipsend/ipsend.c
similarity index 100%
rename from contrib/ipfilter/ipsend/ipsend.c
rename to ipsend/ipsend.c
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/ipsend/ipsend.h
similarity index 100%
rename from contrib/ipfilter/ipsend/ipsend.h
rename to ipsend/ipsend.h
diff --git a/contrib/ipfilter/ipsend/ipsend.sed b/ipsend/ipsend.sed
similarity index 100%
rename from contrib/ipfilter/ipsend/ipsend.sed
rename to ipsend/ipsend.sed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/ipsend/ipsopt.c
similarity index 100%
rename from contrib/ipfilter/ipsend/ipsopt.c
rename to ipsend/ipsopt.c
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/ipsend/iptest.1
similarity index 100%
rename from contrib/ipfilter/ipsend/iptest.1
rename to ipsend/iptest.1
diff --git a/contrib/ipfilter/ipsend/iptest.c b/ipsend/iptest.c
similarity index 100%
rename from contrib/ipfilter/ipsend/iptest.c
rename to ipsend/iptest.c
diff --git a/contrib/ipfilter/ipsend/iptests.c b/ipsend/iptests.c
similarity index 100%
rename from contrib/ipfilter/ipsend/iptests.c
rename to ipsend/iptests.c
diff --git a/contrib/ipfilter/ipsend/larp.c b/ipsend/larp.c
similarity index 100%
rename from contrib/ipfilter/ipsend/larp.c
rename to ipsend/larp.c
diff --git a/contrib/ipfilter/ipsend/linux.h b/ipsend/linux.h
similarity index 100%
rename from contrib/ipfilter/ipsend/linux.h
rename to ipsend/linux.h
diff --git a/contrib/ipfilter/ipsend/lsock.c b/ipsend/lsock.c
similarity index 100%
rename from contrib/ipfilter/ipsend/lsock.c
rename to ipsend/lsock.c
diff --git a/contrib/ipfilter/ipsend/resend.c b/ipsend/resend.c
similarity index 100%
rename from contrib/ipfilter/ipsend/resend.c
rename to ipsend/resend.c
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/ipsend/sbpf.c
similarity index 100%
rename from contrib/ipfilter/ipsend/sbpf.c
rename to ipsend/sbpf.c
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/ipsend/sdlpi.c
similarity index 100%
rename from contrib/ipfilter/ipsend/sdlpi.c
rename to ipsend/sdlpi.c
diff --git a/contrib/ipfilter/ipsend/sirix.c b/ipsend/sirix.c
similarity index 100%
rename from contrib/ipfilter/ipsend/sirix.c
rename to ipsend/sirix.c
diff --git a/contrib/ipfilter/ipsend/slinux.c b/ipsend/slinux.c
similarity index 100%
rename from contrib/ipfilter/ipsend/slinux.c
rename to ipsend/slinux.c
diff --git a/contrib/ipfilter/ipsend/snit.c b/ipsend/snit.c
similarity index 100%
rename from contrib/ipfilter/ipsend/snit.c
rename to ipsend/snit.c
diff --git a/contrib/ipfilter/ipsend/sock.c b/ipsend/sock.c
similarity index 100%
rename from contrib/ipfilter/ipsend/sock.c
rename to ipsend/sock.c
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/ipsend/sockraw.c
similarity index 100%
rename from contrib/ipfilter/ipsend/sockraw.c
rename to ipsend/sockraw.c
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/ipsend/tcpip.h
similarity index 100%
rename from contrib/ipfilter/ipsend/tcpip.h
rename to ipsend/tcpip.h
diff --git a/contrib/ipfilter/ipsend/ultrix.c b/ipsend/ultrix.c
similarity index 100%
rename from contrib/ipfilter/ipsend/ultrix.c
rename to ipsend/ultrix.c
diff --git a/contrib/ipfilter/ipt.c b/ipt.c
similarity index 100%
rename from contrib/ipfilter/ipt.c
rename to ipt.c
diff --git a/contrib/ipfilter/ipt.h b/ipt.h
similarity index 100%
rename from contrib/ipfilter/ipt.h
rename to ipt.h
diff --git a/contrib/ipfilter/kmem.c b/kmem.c
similarity index 100%
rename from contrib/ipfilter/kmem.c
rename to kmem.c
diff --git a/contrib/ipfilter/kmem.h b/kmem.h
similarity index 100%
rename from contrib/ipfilter/kmem.h
rename to kmem.h
diff --git a/contrib/ipfilter/l4check/Makefile b/l4check/Makefile
similarity index 100%
rename from contrib/ipfilter/l4check/Makefile
rename to l4check/Makefile
diff --git a/contrib/ipfilter/l4check/http.check b/l4check/http.check
similarity index 100%
rename from contrib/ipfilter/l4check/http.check
rename to l4check/http.check
diff --git a/contrib/ipfilter/l4check/http.ok b/l4check/http.ok
similarity index 100%
rename from contrib/ipfilter/l4check/http.ok
rename to l4check/http.ok
diff --git a/contrib/ipfilter/l4check/l4check.c b/l4check/l4check.c
similarity index 100%
rename from contrib/ipfilter/l4check/l4check.c
rename to l4check/l4check.c
diff --git a/contrib/ipfilter/l4check/l4check.conf b/l4check/l4check.conf
similarity index 100%
rename from contrib/ipfilter/l4check/l4check.conf
rename to l4check/l4check.conf
diff --git a/contrib/ipfilter/lib/Makefile b/lib/Makefile
similarity index 100%
rename from contrib/ipfilter/lib/Makefile
rename to lib/Makefile
diff --git a/contrib/ipfilter/lib/addicmp.c b/lib/addicmp.c
similarity index 100%
rename from contrib/ipfilter/lib/addicmp.c
rename to lib/addicmp.c
diff --git a/contrib/ipfilter/lib/addipopt.c b/lib/addipopt.c
similarity index 100%
rename from contrib/ipfilter/lib/addipopt.c
rename to lib/addipopt.c
diff --git a/contrib/ipfilter/lib/addkeep.c b/lib/addkeep.c
similarity index 100%
rename from contrib/ipfilter/lib/addkeep.c
rename to lib/addkeep.c
diff --git a/contrib/ipfilter/lib/alist_free.c b/lib/alist_free.c
similarity index 100%
rename from contrib/ipfilter/lib/alist_free.c
rename to lib/alist_free.c
diff --git a/contrib/ipfilter/lib/alist_new.c b/lib/alist_new.c
similarity index 100%
rename from contrib/ipfilter/lib/alist_new.c
rename to lib/alist_new.c
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/lib/bcopywrap.c
similarity index 100%
rename from contrib/ipfilter/lib/bcopywrap.c
rename to lib/bcopywrap.c
diff --git a/contrib/ipfilter/lib/binprint.c b/lib/binprint.c
similarity index 100%
rename from contrib/ipfilter/lib/binprint.c
rename to lib/binprint.c
diff --git a/contrib/ipfilter/lib/buildopts.c b/lib/buildopts.c
similarity index 100%
rename from contrib/ipfilter/lib/buildopts.c
rename to lib/buildopts.c
diff --git a/contrib/ipfilter/lib/checkrev.c b/lib/checkrev.c
similarity index 100%
rename from contrib/ipfilter/lib/checkrev.c
rename to lib/checkrev.c
diff --git a/contrib/ipfilter/lib/count4bits.c b/lib/count4bits.c
similarity index 100%
rename from contrib/ipfilter/lib/count4bits.c
rename to lib/count4bits.c
diff --git a/contrib/ipfilter/lib/count6bits.c b/lib/count6bits.c
similarity index 100%
rename from contrib/ipfilter/lib/count6bits.c
rename to lib/count6bits.c
diff --git a/contrib/ipfilter/lib/debug.c b/lib/debug.c
similarity index 100%
rename from contrib/ipfilter/lib/debug.c
rename to lib/debug.c
diff --git a/contrib/ipfilter/lib/extras.c b/lib/extras.c
similarity index 100%
rename from contrib/ipfilter/lib/extras.c
rename to lib/extras.c
diff --git a/contrib/ipfilter/lib/facpri.c b/lib/facpri.c
similarity index 100%
rename from contrib/ipfilter/lib/facpri.c
rename to lib/facpri.c
diff --git a/contrib/ipfilter/lib/facpri.h b/lib/facpri.h
similarity index 100%
rename from contrib/ipfilter/lib/facpri.h
rename to lib/facpri.h
diff --git a/contrib/ipfilter/lib/fill6bits.c b/lib/fill6bits.c
similarity index 100%
rename from contrib/ipfilter/lib/fill6bits.c
rename to lib/fill6bits.c
diff --git a/contrib/ipfilter/lib/flags.c b/lib/flags.c
similarity index 100%
rename from contrib/ipfilter/lib/flags.c
rename to lib/flags.c
diff --git a/contrib/ipfilter/lib/genmask.c b/lib/genmask.c
similarity index 100%
rename from contrib/ipfilter/lib/genmask.c
rename to lib/genmask.c
diff --git a/contrib/ipfilter/lib/gethost.c b/lib/gethost.c
similarity index 100%
rename from contrib/ipfilter/lib/gethost.c
rename to lib/gethost.c
diff --git a/contrib/ipfilter/lib/getifname.c b/lib/getifname.c
similarity index 100%
rename from contrib/ipfilter/lib/getifname.c
rename to lib/getifname.c
diff --git a/contrib/ipfilter/lib/getline.c b/lib/getline.c
similarity index 100%
rename from contrib/ipfilter/lib/getline.c
rename to lib/getline.c
diff --git a/contrib/ipfilter/lib/getnattype.c b/lib/getnattype.c
similarity index 100%
rename from contrib/ipfilter/lib/getnattype.c
rename to lib/getnattype.c
diff --git a/contrib/ipfilter/lib/getport.c b/lib/getport.c
similarity index 100%
rename from contrib/ipfilter/lib/getport.c
rename to lib/getport.c
diff --git a/contrib/ipfilter/lib/getportproto.c b/lib/getportproto.c
similarity index 100%
rename from contrib/ipfilter/lib/getportproto.c
rename to lib/getportproto.c
diff --git a/contrib/ipfilter/lib/getproto.c b/lib/getproto.c
similarity index 100%
rename from contrib/ipfilter/lib/getproto.c
rename to lib/getproto.c
diff --git a/contrib/ipfilter/lib/getsumd.c b/lib/getsumd.c
similarity index 100%
rename from contrib/ipfilter/lib/getsumd.c
rename to lib/getsumd.c
diff --git a/contrib/ipfilter/lib/hexdump.c b/lib/hexdump.c
similarity index 100%
rename from contrib/ipfilter/lib/hexdump.c
rename to lib/hexdump.c
diff --git a/contrib/ipfilter/lib/hostmask.c b/lib/hostmask.c
similarity index 100%
rename from contrib/ipfilter/lib/hostmask.c
rename to lib/hostmask.c
diff --git a/contrib/ipfilter/lib/hostname.c b/lib/hostname.c
similarity index 100%
rename from contrib/ipfilter/lib/hostname.c
rename to lib/hostname.c
diff --git a/contrib/ipfilter/lib/hostnum.c b/lib/hostnum.c
similarity index 100%
rename from contrib/ipfilter/lib/hostnum.c
rename to lib/hostnum.c
diff --git a/contrib/ipfilter/lib/icmpcode.c b/lib/icmpcode.c
similarity index 100%
rename from contrib/ipfilter/lib/icmpcode.c
rename to lib/icmpcode.c
diff --git a/contrib/ipfilter/lib/inet_addr.c b/lib/inet_addr.c
similarity index 100%
rename from contrib/ipfilter/lib/inet_addr.c
rename to lib/inet_addr.c
diff --git a/contrib/ipfilter/lib/initparse.c b/lib/initparse.c
similarity index 100%
rename from contrib/ipfilter/lib/initparse.c
rename to lib/initparse.c
diff --git a/contrib/ipfilter/lib/ionames.c b/lib/ionames.c
similarity index 100%
rename from contrib/ipfilter/lib/ionames.c
rename to lib/ionames.c
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/lib/ipf_dotuning.c
similarity index 100%
rename from contrib/ipfilter/lib/ipf_dotuning.c
rename to lib/ipf_dotuning.c
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/lib/ipft_ef.c
similarity index 100%
rename from contrib/ipfilter/lib/ipft_ef.c
rename to lib/ipft_ef.c
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/lib/ipft_hx.c
similarity index 100%
rename from contrib/ipfilter/lib/ipft_hx.c
rename to lib/ipft_hx.c
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/lib/ipft_pc.c
similarity index 100%
rename from contrib/ipfilter/lib/ipft_pc.c
rename to lib/ipft_pc.c
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/lib/ipft_sn.c
similarity index 100%
rename from contrib/ipfilter/lib/ipft_sn.c
rename to lib/ipft_sn.c
diff --git a/contrib/ipfilter/lib/ipft_td.c b/lib/ipft_td.c
similarity index 100%
rename from contrib/ipfilter/lib/ipft_td.c
rename to lib/ipft_td.c
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/lib/ipft_tx.c
similarity index 100%
rename from contrib/ipfilter/lib/ipft_tx.c
rename to lib/ipft_tx.c
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/lib/ipoptsec.c
similarity index 100%
rename from contrib/ipfilter/lib/ipoptsec.c
rename to lib/ipoptsec.c
diff --git a/contrib/ipfilter/lib/kmem.c b/lib/kmem.c
similarity index 100%
rename from contrib/ipfilter/lib/kmem.c
rename to lib/kmem.c
diff --git a/contrib/ipfilter/lib/kmem.h b/lib/kmem.h
similarity index 100%
rename from contrib/ipfilter/lib/kmem.h
rename to lib/kmem.h
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/lib/kmemcpywrap.c
similarity index 100%
rename from contrib/ipfilter/lib/kmemcpywrap.c
rename to lib/kmemcpywrap.c
diff --git a/contrib/ipfilter/lib/kvatoname.c b/lib/kvatoname.c
similarity index 100%
rename from contrib/ipfilter/lib/kvatoname.c
rename to lib/kvatoname.c
diff --git a/contrib/ipfilter/lib/load_file.c b/lib/load_file.c
similarity index 100%
rename from contrib/ipfilter/lib/load_file.c
rename to lib/load_file.c
diff --git a/contrib/ipfilter/lib/load_hash.c b/lib/load_hash.c
similarity index 100%
rename from contrib/ipfilter/lib/load_hash.c
rename to lib/load_hash.c
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/lib/load_hashnode.c
similarity index 100%
rename from contrib/ipfilter/lib/load_hashnode.c
rename to lib/load_hashnode.c
diff --git a/contrib/ipfilter/lib/load_http.c b/lib/load_http.c
similarity index 100%
rename from contrib/ipfilter/lib/load_http.c
rename to lib/load_http.c
diff --git a/contrib/ipfilter/lib/load_pool.c b/lib/load_pool.c
similarity index 100%
rename from contrib/ipfilter/lib/load_pool.c
rename to lib/load_pool.c
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/lib/load_poolnode.c
similarity index 100%
rename from contrib/ipfilter/lib/load_poolnode.c
rename to lib/load_poolnode.c
diff --git a/contrib/ipfilter/lib/load_url.c b/lib/load_url.c
similarity index 100%
rename from contrib/ipfilter/lib/load_url.c
rename to lib/load_url.c
diff --git a/contrib/ipfilter/lib/loglevel.c b/lib/loglevel.c
similarity index 100%
rename from contrib/ipfilter/lib/loglevel.c
rename to lib/loglevel.c
diff --git a/contrib/ipfilter/lib/make_range.c b/lib/make_range.c
similarity index 100%
rename from contrib/ipfilter/lib/make_range.c
rename to lib/make_range.c
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/lib/mutex_emul.c
similarity index 100%
rename from contrib/ipfilter/lib/mutex_emul.c
rename to lib/mutex_emul.c
diff --git a/contrib/ipfilter/lib/nametokva.c b/lib/nametokva.c
similarity index 100%
rename from contrib/ipfilter/lib/nametokva.c
rename to lib/nametokva.c
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/lib/nat_setgroupmap.c
similarity index 100%
rename from contrib/ipfilter/lib/nat_setgroupmap.c
rename to lib/nat_setgroupmap.c
diff --git a/contrib/ipfilter/lib/natparse.c b/lib/natparse.c
similarity index 100%
rename from contrib/ipfilter/lib/natparse.c
rename to lib/natparse.c
diff --git a/contrib/ipfilter/lib/ntomask.c b/lib/ntomask.c
similarity index 100%
rename from contrib/ipfilter/lib/ntomask.c
rename to lib/ntomask.c
diff --git a/contrib/ipfilter/lib/optname.c b/lib/optname.c
similarity index 100%
rename from contrib/ipfilter/lib/optname.c
rename to lib/optname.c
diff --git a/contrib/ipfilter/lib/optprint.c b/lib/optprint.c
similarity index 100%
rename from contrib/ipfilter/lib/optprint.c
rename to lib/optprint.c
diff --git a/contrib/ipfilter/lib/optprintv6.c b/lib/optprintv6.c
similarity index 100%
rename from contrib/ipfilter/lib/optprintv6.c
rename to lib/optprintv6.c
diff --git a/contrib/ipfilter/lib/optvalue.c b/lib/optvalue.c
similarity index 100%
rename from contrib/ipfilter/lib/optvalue.c
rename to lib/optvalue.c
diff --git a/contrib/ipfilter/lib/parse.c b/lib/parse.c
similarity index 100%
rename from contrib/ipfilter/lib/parse.c
rename to lib/parse.c
diff --git a/contrib/ipfilter/lib/portname.c b/lib/portname.c
similarity index 100%
rename from contrib/ipfilter/lib/portname.c
rename to lib/portname.c
diff --git a/contrib/ipfilter/lib/portnum.c b/lib/portnum.c
similarity index 100%
rename from contrib/ipfilter/lib/portnum.c
rename to lib/portnum.c
diff --git a/contrib/ipfilter/lib/ports.c b/lib/ports.c
similarity index 100%
rename from contrib/ipfilter/lib/ports.c
rename to lib/ports.c
diff --git a/contrib/ipfilter/lib/print_toif.c b/lib/print_toif.c
similarity index 100%
rename from contrib/ipfilter/lib/print_toif.c
rename to lib/print_toif.c
diff --git a/contrib/ipfilter/lib/printactivenat.c b/lib/printactivenat.c
similarity index 100%
rename from contrib/ipfilter/lib/printactivenat.c
rename to lib/printactivenat.c
diff --git a/contrib/ipfilter/lib/printaps.c b/lib/printaps.c
similarity index 100%
rename from contrib/ipfilter/lib/printaps.c
rename to lib/printaps.c
diff --git a/contrib/ipfilter/lib/printbuf.c b/lib/printbuf.c
similarity index 100%
rename from contrib/ipfilter/lib/printbuf.c
rename to lib/printbuf.c
diff --git a/contrib/ipfilter/lib/printfr.c b/lib/printfr.c
similarity index 100%
rename from contrib/ipfilter/lib/printfr.c
rename to lib/printfr.c
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/lib/printfraginfo.c
similarity index 100%
rename from contrib/ipfilter/lib/printfraginfo.c
rename to lib/printfraginfo.c
diff --git a/contrib/ipfilter/lib/printhash.c b/lib/printhash.c
similarity index 100%
rename from contrib/ipfilter/lib/printhash.c
rename to lib/printhash.c
diff --git a/contrib/ipfilter/lib/printhash_live.c b/lib/printhash_live.c
similarity index 100%
rename from contrib/ipfilter/lib/printhash_live.c
rename to lib/printhash_live.c
diff --git a/contrib/ipfilter/lib/printhashdata.c b/lib/printhashdata.c
similarity index 100%
rename from contrib/ipfilter/lib/printhashdata.c
rename to lib/printhashdata.c
diff --git a/contrib/ipfilter/lib/printhashnode.c b/lib/printhashnode.c
similarity index 100%
rename from contrib/ipfilter/lib/printhashnode.c
rename to lib/printhashnode.c
diff --git a/contrib/ipfilter/lib/printhostmap.c b/lib/printhostmap.c
similarity index 100%
rename from contrib/ipfilter/lib/printhostmap.c
rename to lib/printhostmap.c
diff --git a/contrib/ipfilter/lib/printhostmask.c b/lib/printhostmask.c
similarity index 100%
rename from contrib/ipfilter/lib/printhostmask.c
rename to lib/printhostmask.c
diff --git a/contrib/ipfilter/lib/printifname.c b/lib/printifname.c
similarity index 100%
rename from contrib/ipfilter/lib/printifname.c
rename to lib/printifname.c
diff --git a/contrib/ipfilter/lib/printip.c b/lib/printip.c
similarity index 100%
rename from contrib/ipfilter/lib/printip.c
rename to lib/printip.c
diff --git a/contrib/ipfilter/lib/printlog.c b/lib/printlog.c
similarity index 100%
rename from contrib/ipfilter/lib/printlog.c
rename to lib/printlog.c
diff --git a/contrib/ipfilter/lib/printmask.c b/lib/printmask.c
similarity index 100%
rename from contrib/ipfilter/lib/printmask.c
rename to lib/printmask.c
diff --git a/contrib/ipfilter/lib/printnat.c b/lib/printnat.c
similarity index 100%
rename from contrib/ipfilter/lib/printnat.c
rename to lib/printnat.c
diff --git a/contrib/ipfilter/lib/printpacket.c b/lib/printpacket.c
similarity index 100%
rename from contrib/ipfilter/lib/printpacket.c
rename to lib/printpacket.c
diff --git a/contrib/ipfilter/lib/printpacket6.c b/lib/printpacket6.c
similarity index 100%
rename from contrib/ipfilter/lib/printpacket6.c
rename to lib/printpacket6.c
diff --git a/contrib/ipfilter/lib/printpool.c b/lib/printpool.c
similarity index 100%
rename from contrib/ipfilter/lib/printpool.c
rename to lib/printpool.c
diff --git a/contrib/ipfilter/lib/printpool_live.c b/lib/printpool_live.c
similarity index 100%
rename from contrib/ipfilter/lib/printpool_live.c
rename to lib/printpool_live.c
diff --git a/contrib/ipfilter/lib/printpooldata.c b/lib/printpooldata.c
similarity index 100%
rename from contrib/ipfilter/lib/printpooldata.c
rename to lib/printpooldata.c
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/lib/printpoolnode.c
similarity index 100%
rename from contrib/ipfilter/lib/printpoolnode.c
rename to lib/printpoolnode.c
diff --git a/contrib/ipfilter/lib/printportcmp.c b/lib/printportcmp.c
similarity index 100%
rename from contrib/ipfilter/lib/printportcmp.c
rename to lib/printportcmp.c
diff --git a/contrib/ipfilter/lib/printproto.c b/lib/printproto.c
similarity index 100%
rename from contrib/ipfilter/lib/printproto.c
rename to lib/printproto.c
diff --git a/contrib/ipfilter/lib/printsbuf.c b/lib/printsbuf.c
similarity index 100%
rename from contrib/ipfilter/lib/printsbuf.c
rename to lib/printsbuf.c
diff --git a/contrib/ipfilter/lib/printstate.c b/lib/printstate.c
similarity index 100%
rename from contrib/ipfilter/lib/printstate.c
rename to lib/printstate.c
diff --git a/contrib/ipfilter/lib/printtqtable.c b/lib/printtqtable.c
similarity index 100%
rename from contrib/ipfilter/lib/printtqtable.c
rename to lib/printtqtable.c
diff --git a/contrib/ipfilter/lib/printtunable.c b/lib/printtunable.c
similarity index 100%
rename from contrib/ipfilter/lib/printtunable.c
rename to lib/printtunable.c
diff --git a/contrib/ipfilter/lib/ratoi.c b/lib/ratoi.c
similarity index 100%
rename from contrib/ipfilter/lib/ratoi.c
rename to lib/ratoi.c
diff --git a/contrib/ipfilter/lib/ratoui.c b/lib/ratoui.c
similarity index 100%
rename from contrib/ipfilter/lib/ratoui.c
rename to lib/ratoui.c
diff --git a/contrib/ipfilter/lib/remove_hash.c b/lib/remove_hash.c
similarity index 100%
rename from contrib/ipfilter/lib/remove_hash.c
rename to lib/remove_hash.c
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/lib/remove_hashnode.c
similarity index 100%
rename from contrib/ipfilter/lib/remove_hashnode.c
rename to lib/remove_hashnode.c
diff --git a/contrib/ipfilter/lib/remove_pool.c b/lib/remove_pool.c
similarity index 100%
rename from contrib/ipfilter/lib/remove_pool.c
rename to lib/remove_pool.c
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/lib/remove_poolnode.c
similarity index 100%
rename from contrib/ipfilter/lib/remove_poolnode.c
rename to lib/remove_poolnode.c
diff --git a/contrib/ipfilter/lib/resetlexer.c b/lib/resetlexer.c
similarity index 100%
rename from contrib/ipfilter/lib/resetlexer.c
rename to lib/resetlexer.c
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/lib/rwlock_emul.c
similarity index 100%
rename from contrib/ipfilter/lib/rwlock_emul.c
rename to lib/rwlock_emul.c
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/lib/tcp_flags.c
similarity index 100%
rename from contrib/ipfilter/lib/tcp_flags.c
rename to lib/tcp_flags.c
diff --git a/contrib/ipfilter/lib/tcpflags.c b/lib/tcpflags.c
similarity index 100%
rename from contrib/ipfilter/lib/tcpflags.c
rename to lib/tcpflags.c
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/lib/tcpoptnames.c
similarity index 100%
rename from contrib/ipfilter/lib/tcpoptnames.c
rename to lib/tcpoptnames.c
diff --git a/contrib/ipfilter/lib/to_interface.c b/lib/to_interface.c
similarity index 100%
rename from contrib/ipfilter/lib/to_interface.c
rename to lib/to_interface.c
diff --git a/contrib/ipfilter/lib/v6ionames.c b/lib/v6ionames.c
similarity index 100%
rename from contrib/ipfilter/lib/v6ionames.c
rename to lib/v6ionames.c
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/lib/v6optvalue.c
similarity index 100%
rename from contrib/ipfilter/lib/v6optvalue.c
rename to lib/v6optvalue.c
diff --git a/contrib/ipfilter/lib/var.c b/lib/var.c
similarity index 100%
rename from contrib/ipfilter/lib/var.c
rename to lib/var.c
diff --git a/contrib/ipfilter/lib/verbose.c b/lib/verbose.c
similarity index 100%
rename from contrib/ipfilter/lib/verbose.c
rename to lib/verbose.c
diff --git a/contrib/ipfilter/linux.h b/linux.h
similarity index 100%
rename from contrib/ipfilter/linux.h
rename to linux.h
diff --git a/contrib/ipfilter/man/Makefile b/man/Makefile
similarity index 100%
rename from contrib/ipfilter/man/Makefile
rename to man/Makefile
diff --git a/contrib/ipfilter/man/ipf.1 b/man/ipf.1
similarity index 100%
rename from contrib/ipfilter/man/ipf.1
rename to man/ipf.1
diff --git a/contrib/ipfilter/man/ipf.4 b/man/ipf.4
similarity index 100%
rename from contrib/ipfilter/man/ipf.4
rename to man/ipf.4
diff --git a/contrib/ipfilter/man/ipf.5 b/man/ipf.5
similarity index 100%
rename from contrib/ipfilter/man/ipf.5
rename to man/ipf.5
diff --git a/contrib/ipfilter/man/ipf.8 b/man/ipf.8
similarity index 100%
rename from contrib/ipfilter/man/ipf.8
rename to man/ipf.8
diff --git a/contrib/ipfilter/man/ipfilter.4 b/man/ipfilter.4
similarity index 100%
rename from contrib/ipfilter/man/ipfilter.4
rename to man/ipfilter.4
diff --git a/contrib/ipfilter/man/ipfilter.4.mandoc b/man/ipfilter.4.mandoc
similarity index 100%
rename from contrib/ipfilter/man/ipfilter.4.mandoc
rename to man/ipfilter.4.mandoc
diff --git a/contrib/ipfilter/man/ipfilter.5 b/man/ipfilter.5
similarity index 100%
rename from contrib/ipfilter/man/ipfilter.5
rename to man/ipfilter.5
diff --git a/contrib/ipfilter/man/ipfs.8 b/man/ipfs.8
similarity index 100%
rename from contrib/ipfilter/man/ipfs.8
rename to man/ipfs.8
diff --git a/contrib/ipfilter/man/ipfstat.8 b/man/ipfstat.8
similarity index 100%
rename from contrib/ipfilter/man/ipfstat.8
rename to man/ipfstat.8
diff --git a/contrib/ipfilter/man/ipftest.1 b/man/ipftest.1
similarity index 100%
rename from contrib/ipfilter/man/ipftest.1
rename to man/ipftest.1
diff --git a/contrib/ipfilter/man/ipl.4 b/man/ipl.4
similarity index 100%
rename from contrib/ipfilter/man/ipl.4
rename to man/ipl.4
diff --git a/contrib/ipfilter/man/ipmon.5 b/man/ipmon.5
similarity index 100%
rename from contrib/ipfilter/man/ipmon.5
rename to man/ipmon.5
diff --git a/contrib/ipfilter/man/ipmon.8 b/man/ipmon.8
similarity index 100%
rename from contrib/ipfilter/man/ipmon.8
rename to man/ipmon.8
diff --git a/contrib/ipfilter/man/ipnat.1 b/man/ipnat.1
similarity index 100%
rename from contrib/ipfilter/man/ipnat.1
rename to man/ipnat.1
diff --git a/contrib/ipfilter/man/ipnat.4 b/man/ipnat.4
similarity index 100%
rename from contrib/ipfilter/man/ipnat.4
rename to man/ipnat.4
diff --git a/contrib/ipfilter/man/ipnat.5 b/man/ipnat.5
similarity index 100%
rename from contrib/ipfilter/man/ipnat.5
rename to man/ipnat.5
diff --git a/contrib/ipfilter/man/ipnat.8 b/man/ipnat.8
similarity index 100%
rename from contrib/ipfilter/man/ipnat.8
rename to man/ipnat.8
diff --git a/contrib/ipfilter/man/ippool.5 b/man/ippool.5
similarity index 100%
rename from contrib/ipfilter/man/ippool.5
rename to man/ippool.5
diff --git a/contrib/ipfilter/man/ippool.8 b/man/ippool.8
similarity index 100%
rename from contrib/ipfilter/man/ippool.8
rename to man/ippool.8
diff --git a/contrib/ipfilter/man/ipscan.5 b/man/ipscan.5
similarity index 100%
rename from contrib/ipfilter/man/ipscan.5
rename to man/ipscan.5
diff --git a/contrib/ipfilter/man/ipscan.8 b/man/ipscan.8
similarity index 100%
rename from contrib/ipfilter/man/ipscan.8
rename to man/ipscan.8
diff --git a/contrib/ipfilter/man/man.sed b/man/man.sed
similarity index 100%
rename from contrib/ipfilter/man/man.sed
rename to man/man.sed
diff --git a/contrib/ipfilter/man/mkfilters.1 b/man/mkfilters.1
similarity index 100%
rename from contrib/ipfilter/man/mkfilters.1
rename to man/mkfilters.1
diff --git a/contrib/ipfilter/md5.c b/md5.c
similarity index 100%
rename from contrib/ipfilter/md5.c
rename to md5.c
diff --git a/contrib/ipfilter/md5.h b/md5.h
similarity index 100%
rename from contrib/ipfilter/md5.h
rename to md5.h
diff --git a/contrib/ipfilter/misc.c b/misc.c
similarity index 100%
rename from contrib/ipfilter/misc.c
rename to misc.c
diff --git a/contrib/ipfilter/mkfilters b/mkfilters
similarity index 100%
rename from contrib/ipfilter/mkfilters
rename to mkfilters
diff --git a/contrib/ipfilter/ml_ipl.c b/ml_ipl.c
similarity index 100%
rename from contrib/ipfilter/ml_ipl.c
rename to ml_ipl.c
diff --git a/contrib/ipfilter/mlf_ipl.c b/mlf_ipl.c
similarity index 100%
rename from contrib/ipfilter/mlf_ipl.c
rename to mlf_ipl.c
diff --git a/contrib/ipfilter/mlf_rule.c b/mlf_rule.c
similarity index 100%
rename from contrib/ipfilter/mlf_rule.c
rename to mlf_rule.c
diff --git a/contrib/ipfilter/mlfk_ipl.c b/mlfk_ipl.c
similarity index 100%
rename from contrib/ipfilter/mlfk_ipl.c
rename to mlfk_ipl.c
diff --git a/contrib/ipfilter/mlfk_rule.c b/mlfk_rule.c
similarity index 100%
rename from contrib/ipfilter/mlfk_rule.c
rename to mlfk_rule.c
diff --git a/contrib/ipfilter/mlh_rule.c b/mlh_rule.c
similarity index 100%
rename from contrib/ipfilter/mlh_rule.c
rename to mlh_rule.c
diff --git a/contrib/ipfilter/mli_ipl.c b/mli_ipl.c
similarity index 100%
rename from contrib/ipfilter/mli_ipl.c
rename to mli_ipl.c
diff --git a/contrib/ipfilter/mln_ipl.c b/mln_ipl.c
similarity index 100%
rename from contrib/ipfilter/mln_ipl.c
rename to mln_ipl.c
diff --git a/contrib/ipfilter/mls_ipl.c b/mls_ipl.c
similarity index 100%
rename from contrib/ipfilter/mls_ipl.c
rename to mls_ipl.c
diff --git a/contrib/ipfilter/natparse.c b/natparse.c
similarity index 100%
rename from contrib/ipfilter/natparse.c
rename to natparse.c
diff --git a/contrib/ipfilter/net/.cvsignore b/net/.cvsignore
similarity index 100%
rename from contrib/ipfilter/net/.cvsignore
rename to net/.cvsignore
diff --git a/contrib/ipfilter/opt.c b/opt.c
similarity index 100%
rename from contrib/ipfilter/opt.c
rename to opt.c
diff --git a/contrib/ipfilter/opt_inet6.h b/opt_inet6.h
similarity index 100%
rename from contrib/ipfilter/opt_inet6.h
rename to opt_inet6.h
diff --git a/contrib/ipfilter/opts.h b/opts.h
similarity index 100%
rename from contrib/ipfilter/opts.h
rename to opts.h
diff --git a/contrib/ipfilter/parse.c b/parse.c
similarity index 100%
rename from contrib/ipfilter/parse.c
rename to parse.c
diff --git a/contrib/ipfilter/pcap-ipf.h b/pcap-ipf.h
similarity index 100%
rename from contrib/ipfilter/pcap-ipf.h
rename to pcap-ipf.h
diff --git a/contrib/ipfilter/pcap.h b/pcap.h
similarity index 100%
rename from contrib/ipfilter/pcap.h
rename to pcap.h
diff --git a/contrib/ipfilter/perl/Ipfanaly.pl b/perl/Ipfanaly.pl
similarity index 100%
rename from contrib/ipfilter/perl/Ipfanaly.pl
rename to perl/Ipfanaly.pl
diff --git a/contrib/ipfilter/perl/Isbgraph b/perl/Isbgraph
similarity index 100%
rename from contrib/ipfilter/perl/Isbgraph
rename to perl/Isbgraph
diff --git a/contrib/ipfilter/perl/LICENSE b/perl/LICENSE
similarity index 100%
rename from contrib/ipfilter/perl/LICENSE
rename to perl/LICENSE
diff --git a/contrib/ipfilter/perl/Services b/perl/Services
similarity index 100%
rename from contrib/ipfilter/perl/Services
rename to perl/Services
diff --git a/contrib/ipfilter/perl/ipf-mrtg.pl b/perl/ipf-mrtg.pl
similarity index 100%
rename from contrib/ipfilter/perl/ipf-mrtg.pl
rename to perl/ipf-mrtg.pl
diff --git a/contrib/ipfilter/perl/ipfmeta.pl b/perl/ipfmeta.pl
similarity index 100%
rename from contrib/ipfilter/perl/ipfmeta.pl
rename to perl/ipfmeta.pl
diff --git a/contrib/ipfilter/perl/logfilter.pl b/perl/logfilter.pl
similarity index 100%
rename from contrib/ipfilter/perl/logfilter.pl
rename to perl/logfilter.pl
diff --git a/contrib/ipfilter/perl/plog b/perl/plog
similarity index 100%
rename from contrib/ipfilter/perl/plog
rename to perl/plog
diff --git a/contrib/ipfilter/printnat.c b/printnat.c
similarity index 100%
rename from contrib/ipfilter/printnat.c
rename to printnat.c
diff --git a/contrib/ipfilter/printstate.c b/printstate.c
similarity index 100%
rename from contrib/ipfilter/printstate.c
rename to printstate.c
diff --git a/contrib/ipfilter/radix.c b/radix.c
similarity index 100%
rename from contrib/ipfilter/radix.c
rename to radix.c
diff --git a/contrib/ipfilter/radix_ipf.h b/radix_ipf.h
similarity index 100%
rename from contrib/ipfilter/radix_ipf.h
rename to radix_ipf.h
diff --git a/contrib/ipfilter/relay.c b/relay.c
similarity index 100%
rename from contrib/ipfilter/relay.c
rename to relay.c
diff --git a/contrib/ipfilter/rules/.cvsignore b/rules/.cvsignore
similarity index 100%
rename from contrib/ipfilter/rules/.cvsignore
rename to rules/.cvsignore
diff --git a/contrib/ipfilter/rules/BASIC.NAT b/rules/BASIC.NAT
similarity index 100%
rename from contrib/ipfilter/rules/BASIC.NAT
rename to rules/BASIC.NAT
diff --git a/contrib/ipfilter/rules/BASIC_1.FW b/rules/BASIC_1.FW
similarity index 100%
rename from contrib/ipfilter/rules/BASIC_1.FW
rename to rules/BASIC_1.FW
diff --git a/contrib/ipfilter/rules/BASIC_2.FW b/rules/BASIC_2.FW
similarity index 100%
rename from contrib/ipfilter/rules/BASIC_2.FW
rename to rules/BASIC_2.FW
diff --git a/contrib/ipfilter/rules/example.1 b/rules/example.1
similarity index 100%
rename from contrib/ipfilter/rules/example.1
rename to rules/example.1
diff --git a/contrib/ipfilter/rules/example.10 b/rules/example.10
similarity index 100%
rename from contrib/ipfilter/rules/example.10
rename to rules/example.10
diff --git a/contrib/ipfilter/rules/example.11 b/rules/example.11
similarity index 100%
rename from contrib/ipfilter/rules/example.11
rename to rules/example.11
diff --git a/contrib/ipfilter/rules/example.12 b/rules/example.12
similarity index 100%
rename from contrib/ipfilter/rules/example.12
rename to rules/example.12
diff --git a/contrib/ipfilter/rules/example.13 b/rules/example.13
similarity index 100%
rename from contrib/ipfilter/rules/example.13
rename to rules/example.13
diff --git a/contrib/ipfilter/rules/example.2 b/rules/example.2
similarity index 100%
rename from contrib/ipfilter/rules/example.2
rename to rules/example.2
diff --git a/contrib/ipfilter/rules/example.3 b/rules/example.3
similarity index 100%
rename from contrib/ipfilter/rules/example.3
rename to rules/example.3
diff --git a/contrib/ipfilter/rules/example.4 b/rules/example.4
similarity index 100%
rename from contrib/ipfilter/rules/example.4
rename to rules/example.4
diff --git a/contrib/ipfilter/rules/example.5 b/rules/example.5
similarity index 100%
rename from contrib/ipfilter/rules/example.5
rename to rules/example.5
diff --git a/contrib/ipfilter/rules/example.6 b/rules/example.6
similarity index 100%
rename from contrib/ipfilter/rules/example.6
rename to rules/example.6
diff --git a/contrib/ipfilter/rules/example.7 b/rules/example.7
similarity index 100%
rename from contrib/ipfilter/rules/example.7
rename to rules/example.7
diff --git a/contrib/ipfilter/rules/example.8 b/rules/example.8
similarity index 100%
rename from contrib/ipfilter/rules/example.8
rename to rules/example.8
diff --git a/contrib/ipfilter/rules/example.9 b/rules/example.9
similarity index 100%
rename from contrib/ipfilter/rules/example.9
rename to rules/example.9
diff --git a/contrib/ipfilter/rules/example.sr b/rules/example.sr
similarity index 100%
rename from contrib/ipfilter/rules/example.sr
rename to rules/example.sr
diff --git a/contrib/ipfilter/rules/firewall b/rules/firewall
similarity index 100%
rename from contrib/ipfilter/rules/firewall
rename to rules/firewall
diff --git a/contrib/ipfilter/rules/ftp-proxy b/rules/ftp-proxy
similarity index 100%
rename from contrib/ipfilter/rules/ftp-proxy
rename to rules/ftp-proxy
diff --git a/contrib/ipfilter/rules/ftppxy b/rules/ftppxy
similarity index 100%
rename from contrib/ipfilter/rules/ftppxy
rename to rules/ftppxy
diff --git a/contrib/ipfilter/rules/ip_rules b/rules/ip_rules
similarity index 100%
rename from contrib/ipfilter/rules/ip_rules
rename to rules/ip_rules
diff --git a/contrib/ipfilter/rules/ipmon.conf b/rules/ipmon.conf
similarity index 100%
rename from contrib/ipfilter/rules/ipmon.conf
rename to rules/ipmon.conf
diff --git a/contrib/ipfilter/rules/nat-setup b/rules/nat-setup
similarity index 100%
rename from contrib/ipfilter/rules/nat-setup
rename to rules/nat-setup
diff --git a/contrib/ipfilter/rules/nat.eg b/rules/nat.eg
similarity index 100%
rename from contrib/ipfilter/rules/nat.eg
rename to rules/nat.eg
diff --git a/contrib/ipfilter/rules/pool.conf b/rules/pool.conf
similarity index 100%
rename from contrib/ipfilter/rules/pool.conf
rename to rules/pool.conf
diff --git a/contrib/ipfilter/rules/rules.sed b/rules/rules.sed
similarity index 100%
rename from contrib/ipfilter/rules/rules.sed
rename to rules/rules.sed
diff --git a/contrib/ipfilter/rules/server b/rules/server
similarity index 100%
rename from contrib/ipfilter/rules/server
rename to rules/server
diff --git a/contrib/ipfilter/rules/tcpstate b/rules/tcpstate
similarity index 100%
rename from contrib/ipfilter/rules/tcpstate
rename to rules/tcpstate
diff --git a/contrib/ipfilter/samples/.cvsignore b/samples/.cvsignore
similarity index 100%
rename from contrib/ipfilter/samples/.cvsignore
rename to samples/.cvsignore
diff --git a/contrib/ipfilter/samples/Makefile b/samples/Makefile
similarity index 100%
rename from contrib/ipfilter/samples/Makefile
rename to samples/Makefile
diff --git a/contrib/ipfilter/samples/ipfilter-pb.gif b/samples/ipfilter-pb.gif
similarity index 100%
rename from contrib/ipfilter/samples/ipfilter-pb.gif
rename to samples/ipfilter-pb.gif
diff --git a/contrib/ipfilter/samples/proxy.c b/samples/proxy.c
similarity index 100%
rename from contrib/ipfilter/samples/proxy.c
rename to samples/proxy.c
diff --git a/contrib/ipfilter/samples/relay.c b/samples/relay.c
similarity index 100%
rename from contrib/ipfilter/samples/relay.c
rename to samples/relay.c
diff --git a/contrib/ipfilter/samples/userauth.c b/samples/userauth.c
similarity index 100%
rename from contrib/ipfilter/samples/userauth.c
rename to samples/userauth.c
diff --git a/contrib/ipfilter/snoop.h b/snoop.h
similarity index 100%
rename from contrib/ipfilter/snoop.h
rename to snoop.h
diff --git a/contrib/ipfilter/solaris.c b/solaris.c
similarity index 100%
rename from contrib/ipfilter/solaris.c
rename to solaris.c
diff --git a/contrib/ipfilter/test/.cvsignore b/test/.cvsignore
similarity index 100%
rename from contrib/ipfilter/test/.cvsignore
rename to test/.cvsignore
diff --git a/contrib/ipfilter/test/Makefile b/test/Makefile
similarity index 100%
rename from contrib/ipfilter/test/Makefile
rename to test/Makefile
diff --git a/contrib/ipfilter/test/README.TXT b/test/README.TXT
similarity index 100%
rename from contrib/ipfilter/test/README.TXT
rename to test/README.TXT
diff --git a/contrib/ipfilter/test/bpftest b/test/bpftest
similarity index 100%
rename from contrib/ipfilter/test/bpftest
rename to test/bpftest
diff --git a/contrib/ipfilter/test/dotest b/test/dotest
similarity index 100%
rename from contrib/ipfilter/test/dotest
rename to test/dotest
diff --git a/contrib/ipfilter/test/dotest6 b/test/dotest6
similarity index 100%
rename from contrib/ipfilter/test/dotest6
rename to test/dotest6
diff --git a/contrib/ipfilter/test/expected/1 b/test/expected/1
similarity index 100%
rename from contrib/ipfilter/test/expected/1
rename to test/expected/1
diff --git a/contrib/ipfilter/test/expected/10 b/test/expected/10
similarity index 100%
rename from contrib/ipfilter/test/expected/10
rename to test/expected/10
diff --git a/contrib/ipfilter/test/expected/11 b/test/expected/11
similarity index 100%
rename from contrib/ipfilter/test/expected/11
rename to test/expected/11
diff --git a/contrib/ipfilter/test/expected/12 b/test/expected/12
similarity index 100%
rename from contrib/ipfilter/test/expected/12
rename to test/expected/12
diff --git a/contrib/ipfilter/test/expected/14 b/test/expected/14
similarity index 100%
rename from contrib/ipfilter/test/expected/14
rename to test/expected/14
diff --git a/contrib/ipfilter/test/expected/2 b/test/expected/2
similarity index 100%
rename from contrib/ipfilter/test/expected/2
rename to test/expected/2
diff --git a/contrib/ipfilter/test/expected/3 b/test/expected/3
similarity index 100%
rename from contrib/ipfilter/test/expected/3
rename to test/expected/3
diff --git a/contrib/ipfilter/test/expected/4 b/test/expected/4
similarity index 100%
rename from contrib/ipfilter/test/expected/4
rename to test/expected/4
diff --git a/contrib/ipfilter/test/expected/5 b/test/expected/5
similarity index 100%
rename from contrib/ipfilter/test/expected/5
rename to test/expected/5
diff --git a/contrib/ipfilter/test/expected/6 b/test/expected/6
similarity index 100%
rename from contrib/ipfilter/test/expected/6
rename to test/expected/6
diff --git a/contrib/ipfilter/test/expected/7 b/test/expected/7
similarity index 100%
rename from contrib/ipfilter/test/expected/7
rename to test/expected/7
diff --git a/contrib/ipfilter/test/expected/8 b/test/expected/8
similarity index 100%
rename from contrib/ipfilter/test/expected/8
rename to test/expected/8
diff --git a/contrib/ipfilter/test/expected/9 b/test/expected/9
similarity index 100%
rename from contrib/ipfilter/test/expected/9
rename to test/expected/9
diff --git a/contrib/ipfilter/test/expected/Makefile b/test/expected/Makefile
similarity index 100%
rename from contrib/ipfilter/test/expected/Makefile
rename to test/expected/Makefile
diff --git a/contrib/ipfilter/test/expected/bpf-f1 b/test/expected/bpf-f1
similarity index 100%
rename from contrib/ipfilter/test/expected/bpf-f1
rename to test/expected/bpf-f1
diff --git a/contrib/ipfilter/test/expected/bpf1 b/test/expected/bpf1
similarity index 100%
rename from contrib/ipfilter/test/expected/bpf1
rename to test/expected/bpf1
diff --git a/contrib/ipfilter/test/expected/expected.sed b/test/expected/expected.sed
similarity index 100%
rename from contrib/ipfilter/test/expected/expected.sed
rename to test/expected/expected.sed
diff --git a/contrib/ipfilter/test/expected/f1 b/test/expected/f1
similarity index 100%
rename from contrib/ipfilter/test/expected/f1
rename to test/expected/f1
diff --git a/contrib/ipfilter/test/expected/f10 b/test/expected/f10
similarity index 100%
rename from contrib/ipfilter/test/expected/f10
rename to test/expected/f10
diff --git a/contrib/ipfilter/test/expected/f11 b/test/expected/f11
similarity index 100%
rename from contrib/ipfilter/test/expected/f11
rename to test/expected/f11
diff --git a/contrib/ipfilter/test/expected/f12 b/test/expected/f12
similarity index 100%
rename from contrib/ipfilter/test/expected/f12
rename to test/expected/f12
diff --git a/contrib/ipfilter/test/expected/f13 b/test/expected/f13
similarity index 100%
rename from contrib/ipfilter/test/expected/f13
rename to test/expected/f13
diff --git a/contrib/ipfilter/test/expected/f14 b/test/expected/f14
similarity index 100%
rename from contrib/ipfilter/test/expected/f14
rename to test/expected/f14
diff --git a/contrib/ipfilter/test/expected/f15 b/test/expected/f15
similarity index 100%
rename from contrib/ipfilter/test/expected/f15
rename to test/expected/f15
diff --git a/contrib/ipfilter/test/expected/f16 b/test/expected/f16
similarity index 100%
rename from contrib/ipfilter/test/expected/f16
rename to test/expected/f16
diff --git a/contrib/ipfilter/test/expected/f17 b/test/expected/f17
similarity index 100%
rename from contrib/ipfilter/test/expected/f17
rename to test/expected/f17
diff --git a/contrib/ipfilter/test/expected/f18 b/test/expected/f18
similarity index 100%
rename from contrib/ipfilter/test/expected/f18
rename to test/expected/f18
diff --git a/contrib/ipfilter/test/expected/f19 b/test/expected/f19
similarity index 100%
rename from contrib/ipfilter/test/expected/f19
rename to test/expected/f19
diff --git a/contrib/ipfilter/test/expected/f2 b/test/expected/f2
similarity index 100%
rename from contrib/ipfilter/test/expected/f2
rename to test/expected/f2
diff --git a/contrib/ipfilter/test/expected/f20 b/test/expected/f20
similarity index 100%
rename from contrib/ipfilter/test/expected/f20
rename to test/expected/f20
diff --git a/contrib/ipfilter/test/expected/f24 b/test/expected/f24
similarity index 100%
rename from contrib/ipfilter/test/expected/f24
rename to test/expected/f24
diff --git a/contrib/ipfilter/test/expected/f3 b/test/expected/f3
similarity index 100%
rename from contrib/ipfilter/test/expected/f3
rename to test/expected/f3
diff --git a/contrib/ipfilter/test/expected/f4 b/test/expected/f4
similarity index 100%
rename from contrib/ipfilter/test/expected/f4
rename to test/expected/f4
diff --git a/contrib/ipfilter/test/expected/f5 b/test/expected/f5
similarity index 100%
rename from contrib/ipfilter/test/expected/f5
rename to test/expected/f5
diff --git a/contrib/ipfilter/test/expected/f6 b/test/expected/f6
similarity index 100%
rename from contrib/ipfilter/test/expected/f6
rename to test/expected/f6
diff --git a/contrib/ipfilter/test/expected/f7 b/test/expected/f7
similarity index 100%
rename from contrib/ipfilter/test/expected/f7
rename to test/expected/f7
diff --git a/contrib/ipfilter/test/expected/f8 b/test/expected/f8
similarity index 100%
rename from contrib/ipfilter/test/expected/f8
rename to test/expected/f8
diff --git a/contrib/ipfilter/test/expected/f9 b/test/expected/f9
similarity index 100%
rename from contrib/ipfilter/test/expected/f9
rename to test/expected/f9
diff --git a/contrib/ipfilter/test/expected/i1 b/test/expected/i1
similarity index 100%
rename from contrib/ipfilter/test/expected/i1
rename to test/expected/i1
diff --git a/contrib/ipfilter/test/expected/i10 b/test/expected/i10
similarity index 100%
rename from contrib/ipfilter/test/expected/i10
rename to test/expected/i10
diff --git a/contrib/ipfilter/test/expected/i11 b/test/expected/i11
similarity index 100%
rename from contrib/ipfilter/test/expected/i11
rename to test/expected/i11
diff --git a/contrib/ipfilter/test/expected/i12 b/test/expected/i12
similarity index 100%
rename from contrib/ipfilter/test/expected/i12
rename to test/expected/i12
diff --git a/contrib/ipfilter/test/expected/i13 b/test/expected/i13
similarity index 100%
rename from contrib/ipfilter/test/expected/i13
rename to test/expected/i13
diff --git a/contrib/ipfilter/test/expected/i14 b/test/expected/i14
similarity index 100%
rename from contrib/ipfilter/test/expected/i14
rename to test/expected/i14
diff --git a/contrib/ipfilter/test/expected/i15 b/test/expected/i15
similarity index 100%
rename from contrib/ipfilter/test/expected/i15
rename to test/expected/i15
diff --git a/contrib/ipfilter/test/expected/i16 b/test/expected/i16
similarity index 100%
rename from contrib/ipfilter/test/expected/i16
rename to test/expected/i16
diff --git a/contrib/ipfilter/test/expected/i17 b/test/expected/i17
similarity index 100%
rename from contrib/ipfilter/test/expected/i17
rename to test/expected/i17
diff --git a/contrib/ipfilter/test/expected/i18 b/test/expected/i18
similarity index 100%
rename from contrib/ipfilter/test/expected/i18
rename to test/expected/i18
diff --git a/contrib/ipfilter/test/expected/i19 b/test/expected/i19
similarity index 100%
rename from contrib/ipfilter/test/expected/i19
rename to test/expected/i19
diff --git a/contrib/ipfilter/test/expected/i19.dist b/test/expected/i19.dist
similarity index 100%
rename from contrib/ipfilter/test/expected/i19.dist
rename to test/expected/i19.dist
diff --git a/contrib/ipfilter/test/expected/i2 b/test/expected/i2
similarity index 100%
rename from contrib/ipfilter/test/expected/i2
rename to test/expected/i2
diff --git a/contrib/ipfilter/test/expected/i20 b/test/expected/i20
similarity index 100%
rename from contrib/ipfilter/test/expected/i20
rename to test/expected/i20
diff --git a/contrib/ipfilter/test/expected/i21 b/test/expected/i21
similarity index 100%
rename from contrib/ipfilter/test/expected/i21
rename to test/expected/i21
diff --git a/contrib/ipfilter/test/expected/i3 b/test/expected/i3
similarity index 100%
rename from contrib/ipfilter/test/expected/i3
rename to test/expected/i3
diff --git a/contrib/ipfilter/test/expected/i4 b/test/expected/i4
similarity index 100%
rename from contrib/ipfilter/test/expected/i4
rename to test/expected/i4
diff --git a/contrib/ipfilter/test/expected/i5 b/test/expected/i5
similarity index 100%
rename from contrib/ipfilter/test/expected/i5
rename to test/expected/i5
diff --git a/contrib/ipfilter/test/expected/i6 b/test/expected/i6
similarity index 100%
rename from contrib/ipfilter/test/expected/i6
rename to test/expected/i6
diff --git a/contrib/ipfilter/test/expected/i7 b/test/expected/i7
similarity index 100%
rename from contrib/ipfilter/test/expected/i7
rename to test/expected/i7
diff --git a/contrib/ipfilter/test/expected/i8 b/test/expected/i8
similarity index 100%
rename from contrib/ipfilter/test/expected/i8
rename to test/expected/i8
diff --git a/contrib/ipfilter/test/expected/i9 b/test/expected/i9
similarity index 100%
rename from contrib/ipfilter/test/expected/i9
rename to test/expected/i9
diff --git a/contrib/ipfilter/test/expected/in1 b/test/expected/in1
similarity index 100%
rename from contrib/ipfilter/test/expected/in1
rename to test/expected/in1
diff --git a/contrib/ipfilter/test/expected/in2 b/test/expected/in2
similarity index 100%
rename from contrib/ipfilter/test/expected/in2
rename to test/expected/in2
diff --git a/contrib/ipfilter/test/expected/in3 b/test/expected/in3
similarity index 100%
rename from contrib/ipfilter/test/expected/in3
rename to test/expected/in3
diff --git a/contrib/ipfilter/test/expected/in4 b/test/expected/in4
similarity index 100%
rename from contrib/ipfilter/test/expected/in4
rename to test/expected/in4
diff --git a/contrib/ipfilter/test/expected/in5 b/test/expected/in5
similarity index 100%
rename from contrib/ipfilter/test/expected/in5
rename to test/expected/in5
diff --git a/contrib/ipfilter/test/expected/in6 b/test/expected/in6
similarity index 100%
rename from contrib/ipfilter/test/expected/in6
rename to test/expected/in6
diff --git a/contrib/ipfilter/test/expected/ip1 b/test/expected/ip1
similarity index 100%
rename from contrib/ipfilter/test/expected/ip1
rename to test/expected/ip1
diff --git a/contrib/ipfilter/test/expected/ip2 b/test/expected/ip2
similarity index 100%
rename from contrib/ipfilter/test/expected/ip2
rename to test/expected/ip2
diff --git a/contrib/ipfilter/test/expected/ipv6.1 b/test/expected/ipv6.1
similarity index 100%
rename from contrib/ipfilter/test/expected/ipv6.1
rename to test/expected/ipv6.1
diff --git a/contrib/ipfilter/test/expected/ipv6.2 b/test/expected/ipv6.2
similarity index 100%
rename from contrib/ipfilter/test/expected/ipv6.2
rename to test/expected/ipv6.2
diff --git a/contrib/ipfilter/test/expected/ipv6.3 b/test/expected/ipv6.3
similarity index 100%
rename from contrib/ipfilter/test/expected/ipv6.3
rename to test/expected/ipv6.3
diff --git a/contrib/ipfilter/test/expected/ipv6.5 b/test/expected/ipv6.5
similarity index 100%
rename from contrib/ipfilter/test/expected/ipv6.5
rename to test/expected/ipv6.5
diff --git a/contrib/ipfilter/test/expected/ipv6.6 b/test/expected/ipv6.6
similarity index 100%
rename from contrib/ipfilter/test/expected/ipv6.6
rename to test/expected/ipv6.6
diff --git a/contrib/ipfilter/test/expected/l1 b/test/expected/l1
similarity index 100%
rename from contrib/ipfilter/test/expected/l1
rename to test/expected/l1
diff --git a/contrib/ipfilter/test/expected/l1.b b/test/expected/l1.b
similarity index 100%
rename from contrib/ipfilter/test/expected/l1.b
rename to test/expected/l1.b
diff --git a/contrib/ipfilter/test/expected/n1 b/test/expected/n1
similarity index 100%
rename from contrib/ipfilter/test/expected/n1
rename to test/expected/n1
diff --git a/contrib/ipfilter/test/expected/n10 b/test/expected/n10
similarity index 100%
rename from contrib/ipfilter/test/expected/n10
rename to test/expected/n10
diff --git a/contrib/ipfilter/test/expected/n11 b/test/expected/n11
similarity index 100%
rename from contrib/ipfilter/test/expected/n11
rename to test/expected/n11
diff --git a/contrib/ipfilter/test/expected/n12 b/test/expected/n12
similarity index 100%
rename from contrib/ipfilter/test/expected/n12
rename to test/expected/n12
diff --git a/contrib/ipfilter/test/expected/n13 b/test/expected/n13
similarity index 100%
rename from contrib/ipfilter/test/expected/n13
rename to test/expected/n13
diff --git a/contrib/ipfilter/test/expected/n14 b/test/expected/n14
similarity index 100%
rename from contrib/ipfilter/test/expected/n14
rename to test/expected/n14
diff --git a/contrib/ipfilter/test/expected/n16 b/test/expected/n16
similarity index 100%
rename from contrib/ipfilter/test/expected/n16
rename to test/expected/n16
diff --git a/contrib/ipfilter/test/expected/n2 b/test/expected/n2
similarity index 100%
rename from contrib/ipfilter/test/expected/n2
rename to test/expected/n2
diff --git a/contrib/ipfilter/test/expected/n3 b/test/expected/n3
similarity index 100%
rename from contrib/ipfilter/test/expected/n3
rename to test/expected/n3
diff --git a/contrib/ipfilter/test/expected/n4 b/test/expected/n4
similarity index 100%
rename from contrib/ipfilter/test/expected/n4
rename to test/expected/n4
diff --git a/contrib/ipfilter/test/expected/n5 b/test/expected/n5
similarity index 100%
rename from contrib/ipfilter/test/expected/n5
rename to test/expected/n5
diff --git a/contrib/ipfilter/test/expected/n6 b/test/expected/n6
similarity index 100%
rename from contrib/ipfilter/test/expected/n6
rename to test/expected/n6
diff --git a/contrib/ipfilter/test/expected/n7 b/test/expected/n7
similarity index 100%
rename from contrib/ipfilter/test/expected/n7
rename to test/expected/n7
diff --git a/contrib/ipfilter/test/expected/n8 b/test/expected/n8
similarity index 100%
rename from contrib/ipfilter/test/expected/n8
rename to test/expected/n8
diff --git a/contrib/ipfilter/test/expected/n9 b/test/expected/n9
similarity index 100%
rename from contrib/ipfilter/test/expected/n9
rename to test/expected/n9
diff --git a/contrib/ipfilter/test/expected/ni1 b/test/expected/ni1
similarity index 100%
rename from contrib/ipfilter/test/expected/ni1
rename to test/expected/ni1
diff --git a/contrib/ipfilter/test/expected/ni10 b/test/expected/ni10
similarity index 100%
rename from contrib/ipfilter/test/expected/ni10
rename to test/expected/ni10
diff --git a/contrib/ipfilter/test/expected/ni11 b/test/expected/ni11
similarity index 100%
rename from contrib/ipfilter/test/expected/ni11
rename to test/expected/ni11
diff --git a/contrib/ipfilter/test/expected/ni12 b/test/expected/ni12
similarity index 100%
rename from contrib/ipfilter/test/expected/ni12
rename to test/expected/ni12
diff --git a/contrib/ipfilter/test/expected/ni13 b/test/expected/ni13
similarity index 100%
rename from contrib/ipfilter/test/expected/ni13
rename to test/expected/ni13
diff --git a/contrib/ipfilter/test/expected/ni14 b/test/expected/ni14
similarity index 100%
rename from contrib/ipfilter/test/expected/ni14
rename to test/expected/ni14
diff --git a/contrib/ipfilter/test/expected/ni15 b/test/expected/ni15
similarity index 100%
rename from contrib/ipfilter/test/expected/ni15
rename to test/expected/ni15
diff --git a/contrib/ipfilter/test/expected/ni16 b/test/expected/ni16
similarity index 100%
rename from contrib/ipfilter/test/expected/ni16
rename to test/expected/ni16
diff --git a/contrib/ipfilter/test/expected/ni19 b/test/expected/ni19
similarity index 100%
rename from contrib/ipfilter/test/expected/ni19
rename to test/expected/ni19
diff --git a/contrib/ipfilter/test/expected/ni2 b/test/expected/ni2
similarity index 100%
rename from contrib/ipfilter/test/expected/ni2
rename to test/expected/ni2
diff --git a/contrib/ipfilter/test/expected/ni20 b/test/expected/ni20
similarity index 100%
rename from contrib/ipfilter/test/expected/ni20
rename to test/expected/ni20
diff --git a/contrib/ipfilter/test/expected/ni21 b/test/expected/ni21
similarity index 100%
rename from contrib/ipfilter/test/expected/ni21
rename to test/expected/ni21
diff --git a/contrib/ipfilter/test/expected/ni23 b/test/expected/ni23
similarity index 100%
rename from contrib/ipfilter/test/expected/ni23
rename to test/expected/ni23
diff --git a/contrib/ipfilter/test/expected/ni3 b/test/expected/ni3
similarity index 100%
rename from contrib/ipfilter/test/expected/ni3
rename to test/expected/ni3
diff --git a/contrib/ipfilter/test/expected/ni4 b/test/expected/ni4
similarity index 100%
rename from contrib/ipfilter/test/expected/ni4
rename to test/expected/ni4
diff --git a/contrib/ipfilter/test/expected/ni5 b/test/expected/ni5
similarity index 100%
rename from contrib/ipfilter/test/expected/ni5
rename to test/expected/ni5
diff --git a/contrib/ipfilter/test/expected/ni6 b/test/expected/ni6
similarity index 100%
rename from contrib/ipfilter/test/expected/ni6
rename to test/expected/ni6
diff --git a/contrib/ipfilter/test/expected/ni7 b/test/expected/ni7
similarity index 100%
rename from contrib/ipfilter/test/expected/ni7
rename to test/expected/ni7
diff --git a/contrib/ipfilter/test/expected/ni8 b/test/expected/ni8
similarity index 100%
rename from contrib/ipfilter/test/expected/ni8
rename to test/expected/ni8
diff --git a/contrib/ipfilter/test/expected/ni9 b/test/expected/ni9
similarity index 100%
rename from contrib/ipfilter/test/expected/ni9
rename to test/expected/ni9
diff --git a/contrib/ipfilter/test/expected/p1 b/test/expected/p1
similarity index 100%
rename from contrib/ipfilter/test/expected/p1
rename to test/expected/p1
diff --git a/contrib/ipfilter/test/expected/p2 b/test/expected/p2
similarity index 100%
rename from contrib/ipfilter/test/expected/p2
rename to test/expected/p2
diff --git a/contrib/ipfilter/test/expected/p3 b/test/expected/p3
similarity index 100%
rename from contrib/ipfilter/test/expected/p3
rename to test/expected/p3
diff --git a/contrib/ipfilter/test/expected/p5 b/test/expected/p5
similarity index 100%
rename from contrib/ipfilter/test/expected/p5
rename to test/expected/p5
diff --git a/contrib/ipfilter/test/hextest b/test/hextest
similarity index 100%
rename from contrib/ipfilter/test/hextest
rename to test/hextest
diff --git a/contrib/ipfilter/test/input/1 b/test/input/1
similarity index 100%
rename from contrib/ipfilter/test/input/1
rename to test/input/1
diff --git a/contrib/ipfilter/test/input/10 b/test/input/10
similarity index 100%
rename from contrib/ipfilter/test/input/10
rename to test/input/10
diff --git a/contrib/ipfilter/test/input/11 b/test/input/11
similarity index 100%
rename from contrib/ipfilter/test/input/11
rename to test/input/11
diff --git a/contrib/ipfilter/test/input/12 b/test/input/12
similarity index 100%
rename from contrib/ipfilter/test/input/12
rename to test/input/12
diff --git a/contrib/ipfilter/test/input/13 b/test/input/13
similarity index 100%
rename from contrib/ipfilter/test/input/13
rename to test/input/13
diff --git a/contrib/ipfilter/test/input/14 b/test/input/14
similarity index 100%
rename from contrib/ipfilter/test/input/14
rename to test/input/14
diff --git a/contrib/ipfilter/test/input/2 b/test/input/2
similarity index 100%
rename from contrib/ipfilter/test/input/2
rename to test/input/2
diff --git a/contrib/ipfilter/test/input/3 b/test/input/3
similarity index 100%
rename from contrib/ipfilter/test/input/3
rename to test/input/3
diff --git a/contrib/ipfilter/test/input/4 b/test/input/4
similarity index 100%
rename from contrib/ipfilter/test/input/4
rename to test/input/4
diff --git a/contrib/ipfilter/test/input/5 b/test/input/5
similarity index 100%
rename from contrib/ipfilter/test/input/5
rename to test/input/5
diff --git a/contrib/ipfilter/test/input/6 b/test/input/6
similarity index 100%
rename from contrib/ipfilter/test/input/6
rename to test/input/6
diff --git a/contrib/ipfilter/test/input/7 b/test/input/7
similarity index 100%
rename from contrib/ipfilter/test/input/7
rename to test/input/7
diff --git a/contrib/ipfilter/test/input/8 b/test/input/8
similarity index 100%
rename from contrib/ipfilter/test/input/8
rename to test/input/8
diff --git a/contrib/ipfilter/test/input/9 b/test/input/9
similarity index 100%
rename from contrib/ipfilter/test/input/9
rename to test/input/9
diff --git a/contrib/ipfilter/test/input/f1 b/test/input/f1
similarity index 100%
rename from contrib/ipfilter/test/input/f1
rename to test/input/f1
diff --git a/contrib/ipfilter/test/input/f10 b/test/input/f10
similarity index 100%
rename from contrib/ipfilter/test/input/f10
rename to test/input/f10
diff --git a/contrib/ipfilter/test/input/f11 b/test/input/f11
similarity index 100%
rename from contrib/ipfilter/test/input/f11
rename to test/input/f11
diff --git a/contrib/ipfilter/test/input/f12 b/test/input/f12
similarity index 100%
rename from contrib/ipfilter/test/input/f12
rename to test/input/f12
diff --git a/contrib/ipfilter/test/input/f13 b/test/input/f13
similarity index 100%
rename from contrib/ipfilter/test/input/f13
rename to test/input/f13
diff --git a/contrib/ipfilter/test/input/f14 b/test/input/f14
similarity index 100%
rename from contrib/ipfilter/test/input/f14
rename to test/input/f14
diff --git a/contrib/ipfilter/test/input/f15 b/test/input/f15
similarity index 100%
rename from contrib/ipfilter/test/input/f15
rename to test/input/f15
diff --git a/contrib/ipfilter/test/input/f16 b/test/input/f16
similarity index 100%
rename from contrib/ipfilter/test/input/f16
rename to test/input/f16
diff --git a/contrib/ipfilter/test/input/f17 b/test/input/f17
similarity index 100%
rename from contrib/ipfilter/test/input/f17
rename to test/input/f17
diff --git a/contrib/ipfilter/test/input/f18 b/test/input/f18
similarity index 100%
rename from contrib/ipfilter/test/input/f18
rename to test/input/f18
diff --git a/contrib/ipfilter/test/input/f19 b/test/input/f19
similarity index 100%
rename from contrib/ipfilter/test/input/f19
rename to test/input/f19
diff --git a/contrib/ipfilter/test/input/f2 b/test/input/f2
similarity index 100%
rename from contrib/ipfilter/test/input/f2
rename to test/input/f2
diff --git a/contrib/ipfilter/test/input/f20 b/test/input/f20
similarity index 100%
rename from contrib/ipfilter/test/input/f20
rename to test/input/f20
diff --git a/contrib/ipfilter/test/input/f24 b/test/input/f24
similarity index 100%
rename from contrib/ipfilter/test/input/f24
rename to test/input/f24
diff --git a/contrib/ipfilter/test/input/f3 b/test/input/f3
similarity index 100%
rename from contrib/ipfilter/test/input/f3
rename to test/input/f3
diff --git a/contrib/ipfilter/test/input/f4 b/test/input/f4
similarity index 100%
rename from contrib/ipfilter/test/input/f4
rename to test/input/f4
diff --git a/contrib/ipfilter/test/input/f5 b/test/input/f5
similarity index 100%
rename from contrib/ipfilter/test/input/f5
rename to test/input/f5
diff --git a/contrib/ipfilter/test/input/f6 b/test/input/f6
similarity index 100%
rename from contrib/ipfilter/test/input/f6
rename to test/input/f6
diff --git a/contrib/ipfilter/test/input/f7 b/test/input/f7
similarity index 100%
rename from contrib/ipfilter/test/input/f7
rename to test/input/f7
diff --git a/contrib/ipfilter/test/input/f8 b/test/input/f8
similarity index 100%
rename from contrib/ipfilter/test/input/f8
rename to test/input/f8
diff --git a/contrib/ipfilter/test/input/f9 b/test/input/f9
similarity index 100%
rename from contrib/ipfilter/test/input/f9
rename to test/input/f9
diff --git a/contrib/ipfilter/test/input/input.sed b/test/input/input.sed
similarity index 100%
rename from contrib/ipfilter/test/input/input.sed
rename to test/input/input.sed
diff --git a/contrib/ipfilter/test/input/ip2.data b/test/input/ip2.data
similarity index 100%
rename from contrib/ipfilter/test/input/ip2.data
rename to test/input/ip2.data
diff --git a/contrib/ipfilter/test/input/ipf6-1 b/test/input/ipf6-1
similarity index 100%
rename from contrib/ipfilter/test/input/ipf6-1
rename to test/input/ipf6-1
diff --git a/contrib/ipfilter/test/input/ipv6.1 b/test/input/ipv6.1
similarity index 100%
rename from contrib/ipfilter/test/input/ipv6.1
rename to test/input/ipv6.1
diff --git a/contrib/ipfilter/test/input/ipv6.2 b/test/input/ipv6.2
similarity index 100%
rename from contrib/ipfilter/test/input/ipv6.2
rename to test/input/ipv6.2
diff --git a/contrib/ipfilter/test/input/ipv6.3 b/test/input/ipv6.3
similarity index 100%
rename from contrib/ipfilter/test/input/ipv6.3
rename to test/input/ipv6.3
diff --git a/contrib/ipfilter/test/input/ipv6.5 b/test/input/ipv6.5
similarity index 100%
rename from contrib/ipfilter/test/input/ipv6.5
rename to test/input/ipv6.5
diff --git a/contrib/ipfilter/test/input/ipv6.6 b/test/input/ipv6.6
similarity index 100%
rename from contrib/ipfilter/test/input/ipv6.6
rename to test/input/ipv6.6
diff --git a/contrib/ipfilter/test/input/l1 b/test/input/l1
similarity index 100%
rename from contrib/ipfilter/test/input/l1
rename to test/input/l1
diff --git a/contrib/ipfilter/test/input/n1 b/test/input/n1
similarity index 100%
rename from contrib/ipfilter/test/input/n1
rename to test/input/n1
diff --git a/contrib/ipfilter/test/input/n10 b/test/input/n10
similarity index 100%
rename from contrib/ipfilter/test/input/n10
rename to test/input/n10
diff --git a/contrib/ipfilter/test/input/n11 b/test/input/n11
similarity index 100%
rename from contrib/ipfilter/test/input/n11
rename to test/input/n11
diff --git a/contrib/ipfilter/test/input/n12 b/test/input/n12
similarity index 100%
rename from contrib/ipfilter/test/input/n12
rename to test/input/n12
diff --git a/contrib/ipfilter/test/input/n13 b/test/input/n13
similarity index 100%
rename from contrib/ipfilter/test/input/n13
rename to test/input/n13
diff --git a/contrib/ipfilter/test/input/n14 b/test/input/n14
similarity index 100%
rename from contrib/ipfilter/test/input/n14
rename to test/input/n14
diff --git a/contrib/ipfilter/test/input/n16 b/test/input/n16
similarity index 100%
rename from contrib/ipfilter/test/input/n16
rename to test/input/n16
diff --git a/contrib/ipfilter/test/input/n2 b/test/input/n2
similarity index 100%
rename from contrib/ipfilter/test/input/n2
rename to test/input/n2
diff --git a/contrib/ipfilter/test/input/n3 b/test/input/n3
similarity index 100%
rename from contrib/ipfilter/test/input/n3
rename to test/input/n3
diff --git a/contrib/ipfilter/test/input/n4 b/test/input/n4
similarity index 100%
rename from contrib/ipfilter/test/input/n4
rename to test/input/n4
diff --git a/contrib/ipfilter/test/input/n5 b/test/input/n5
similarity index 100%
rename from contrib/ipfilter/test/input/n5
rename to test/input/n5
diff --git a/contrib/ipfilter/test/input/n6 b/test/input/n6
similarity index 100%
rename from contrib/ipfilter/test/input/n6
rename to test/input/n6
diff --git a/contrib/ipfilter/test/input/n7 b/test/input/n7
similarity index 100%
rename from contrib/ipfilter/test/input/n7
rename to test/input/n7
diff --git a/contrib/ipfilter/test/input/n8 b/test/input/n8
similarity index 100%
rename from contrib/ipfilter/test/input/n8
rename to test/input/n8
diff --git a/contrib/ipfilter/test/input/n9 b/test/input/n9
similarity index 100%
rename from contrib/ipfilter/test/input/n9
rename to test/input/n9
diff --git a/contrib/ipfilter/test/input/ni1 b/test/input/ni1
similarity index 100%
rename from contrib/ipfilter/test/input/ni1
rename to test/input/ni1
diff --git a/contrib/ipfilter/test/input/ni10 b/test/input/ni10
similarity index 100%
rename from contrib/ipfilter/test/input/ni10
rename to test/input/ni10
diff --git a/contrib/ipfilter/test/input/ni11 b/test/input/ni11
similarity index 100%
rename from contrib/ipfilter/test/input/ni11
rename to test/input/ni11
diff --git a/contrib/ipfilter/test/input/ni12 b/test/input/ni12
similarity index 100%
rename from contrib/ipfilter/test/input/ni12
rename to test/input/ni12
diff --git a/contrib/ipfilter/test/input/ni13 b/test/input/ni13
similarity index 100%
rename from contrib/ipfilter/test/input/ni13
rename to test/input/ni13
diff --git a/contrib/ipfilter/test/input/ni14 b/test/input/ni14
similarity index 100%
rename from contrib/ipfilter/test/input/ni14
rename to test/input/ni14
diff --git a/contrib/ipfilter/test/input/ni15 b/test/input/ni15
similarity index 100%
rename from contrib/ipfilter/test/input/ni15
rename to test/input/ni15
diff --git a/contrib/ipfilter/test/input/ni16 b/test/input/ni16
similarity index 100%
rename from contrib/ipfilter/test/input/ni16
rename to test/input/ni16
diff --git a/contrib/ipfilter/test/input/ni17 b/test/input/ni17
similarity index 100%
rename from contrib/ipfilter/test/input/ni17
rename to test/input/ni17
diff --git a/contrib/ipfilter/test/input/ni19 b/test/input/ni19
similarity index 100%
rename from contrib/ipfilter/test/input/ni19
rename to test/input/ni19
diff --git a/contrib/ipfilter/test/input/ni2 b/test/input/ni2
similarity index 100%
rename from contrib/ipfilter/test/input/ni2
rename to test/input/ni2
diff --git a/contrib/ipfilter/test/input/ni20 b/test/input/ni20
similarity index 100%
rename from contrib/ipfilter/test/input/ni20
rename to test/input/ni20
diff --git a/contrib/ipfilter/test/input/ni21 b/test/input/ni21
similarity index 100%
rename from contrib/ipfilter/test/input/ni21
rename to test/input/ni21
diff --git a/contrib/ipfilter/test/input/ni23 b/test/input/ni23
similarity index 100%
rename from contrib/ipfilter/test/input/ni23
rename to test/input/ni23
diff --git a/contrib/ipfilter/test/input/ni3 b/test/input/ni3
similarity index 100%
rename from contrib/ipfilter/test/input/ni3
rename to test/input/ni3
diff --git a/contrib/ipfilter/test/input/ni4 b/test/input/ni4
similarity index 100%
rename from contrib/ipfilter/test/input/ni4
rename to test/input/ni4
diff --git a/contrib/ipfilter/test/input/ni5 b/test/input/ni5
similarity index 100%
rename from contrib/ipfilter/test/input/ni5
rename to test/input/ni5
diff --git a/contrib/ipfilter/test/input/ni6 b/test/input/ni6
similarity index 100%
rename from contrib/ipfilter/test/input/ni6
rename to test/input/ni6
diff --git a/contrib/ipfilter/test/input/ni7 b/test/input/ni7
similarity index 100%
rename from contrib/ipfilter/test/input/ni7
rename to test/input/ni7
diff --git a/contrib/ipfilter/test/input/ni8 b/test/input/ni8
similarity index 100%
rename from contrib/ipfilter/test/input/ni8
rename to test/input/ni8
diff --git a/contrib/ipfilter/test/input/ni9 b/test/input/ni9
similarity index 100%
rename from contrib/ipfilter/test/input/ni9
rename to test/input/ni9
diff --git a/contrib/ipfilter/test/input/p1 b/test/input/p1
similarity index 100%
rename from contrib/ipfilter/test/input/p1
rename to test/input/p1
diff --git a/contrib/ipfilter/test/input/p2 b/test/input/p2
similarity index 100%
rename from contrib/ipfilter/test/input/p2
rename to test/input/p2
diff --git a/contrib/ipfilter/test/input/p3 b/test/input/p3
similarity index 100%
rename from contrib/ipfilter/test/input/p3
rename to test/input/p3
diff --git a/contrib/ipfilter/test/input/p5 b/test/input/p5
similarity index 100%
rename from contrib/ipfilter/test/input/p5
rename to test/input/p5
diff --git a/contrib/ipfilter/test/intest b/test/intest
similarity index 100%
rename from contrib/ipfilter/test/intest
rename to test/intest
diff --git a/contrib/ipfilter/test/iptest b/test/iptest
similarity index 100%
rename from contrib/ipfilter/test/iptest
rename to test/iptest
diff --git a/contrib/ipfilter/test/itest b/test/itest
similarity index 100%
rename from contrib/ipfilter/test/itest
rename to test/itest
diff --git a/contrib/ipfilter/test/logtest b/test/logtest
similarity index 100%
rename from contrib/ipfilter/test/logtest
rename to test/logtest
diff --git a/contrib/ipfilter/test/mhtest b/test/mhtest
similarity index 100%
rename from contrib/ipfilter/test/mhtest
rename to test/mhtest
diff --git a/contrib/ipfilter/test/mtest b/test/mtest
similarity index 100%
rename from contrib/ipfilter/test/mtest
rename to test/mtest
diff --git a/contrib/ipfilter/test/natipftest b/test/natipftest
similarity index 100%
rename from contrib/ipfilter/test/natipftest
rename to test/natipftest
diff --git a/contrib/ipfilter/test/nattest b/test/nattest
similarity index 100%
rename from contrib/ipfilter/test/nattest
rename to test/nattest
diff --git a/contrib/ipfilter/test/ptest b/test/ptest
similarity index 100%
rename from contrib/ipfilter/test/ptest
rename to test/ptest
diff --git a/contrib/ipfilter/test/regress/1 b/test/regress/1
similarity index 100%
rename from contrib/ipfilter/test/regress/1
rename to test/regress/1
diff --git a/contrib/ipfilter/test/regress/10 b/test/regress/10
similarity index 100%
rename from contrib/ipfilter/test/regress/10
rename to test/regress/10
diff --git a/contrib/ipfilter/test/regress/11 b/test/regress/11
similarity index 100%
rename from contrib/ipfilter/test/regress/11
rename to test/regress/11
diff --git a/contrib/ipfilter/test/regress/12 b/test/regress/12
similarity index 100%
rename from contrib/ipfilter/test/regress/12
rename to test/regress/12
diff --git a/contrib/ipfilter/test/regress/13 b/test/regress/13
similarity index 100%
rename from contrib/ipfilter/test/regress/13
rename to test/regress/13
diff --git a/contrib/ipfilter/test/regress/14 b/test/regress/14
similarity index 100%
rename from contrib/ipfilter/test/regress/14
rename to test/regress/14
diff --git a/contrib/ipfilter/test/regress/2 b/test/regress/2
similarity index 100%
rename from contrib/ipfilter/test/regress/2
rename to test/regress/2
diff --git a/contrib/ipfilter/test/regress/3 b/test/regress/3
similarity index 100%
rename from contrib/ipfilter/test/regress/3
rename to test/regress/3
diff --git a/contrib/ipfilter/test/regress/4 b/test/regress/4
similarity index 100%
rename from contrib/ipfilter/test/regress/4
rename to test/regress/4
diff --git a/contrib/ipfilter/test/regress/5 b/test/regress/5
similarity index 100%
rename from contrib/ipfilter/test/regress/5
rename to test/regress/5
diff --git a/contrib/ipfilter/test/regress/6 b/test/regress/6
similarity index 100%
rename from contrib/ipfilter/test/regress/6
rename to test/regress/6
diff --git a/contrib/ipfilter/test/regress/7 b/test/regress/7
similarity index 100%
rename from contrib/ipfilter/test/regress/7
rename to test/regress/7
diff --git a/contrib/ipfilter/test/regress/8 b/test/regress/8
similarity index 100%
rename from contrib/ipfilter/test/regress/8
rename to test/regress/8
diff --git a/contrib/ipfilter/test/regress/9 b/test/regress/9
similarity index 100%
rename from contrib/ipfilter/test/regress/9
rename to test/regress/9
diff --git a/contrib/ipfilter/test/regress/bpf-f1 b/test/regress/bpf-f1
similarity index 100%
rename from contrib/ipfilter/test/regress/bpf-f1
rename to test/regress/bpf-f1
diff --git a/contrib/ipfilter/test/regress/bpf1 b/test/regress/bpf1
similarity index 100%
rename from contrib/ipfilter/test/regress/bpf1
rename to test/regress/bpf1
diff --git a/contrib/ipfilter/test/regress/f1 b/test/regress/f1
similarity index 100%
rename from contrib/ipfilter/test/regress/f1
rename to test/regress/f1
diff --git a/contrib/ipfilter/test/regress/f10 b/test/regress/f10
similarity index 100%
rename from contrib/ipfilter/test/regress/f10
rename to test/regress/f10
diff --git a/contrib/ipfilter/test/regress/f11 b/test/regress/f11
similarity index 100%
rename from contrib/ipfilter/test/regress/f11
rename to test/regress/f11
diff --git a/contrib/ipfilter/test/regress/f12 b/test/regress/f12
similarity index 100%
rename from contrib/ipfilter/test/regress/f12
rename to test/regress/f12
diff --git a/contrib/ipfilter/test/regress/f13 b/test/regress/f13
similarity index 100%
rename from contrib/ipfilter/test/regress/f13
rename to test/regress/f13
diff --git a/contrib/ipfilter/test/regress/f14 b/test/regress/f14
similarity index 100%
rename from contrib/ipfilter/test/regress/f14
rename to test/regress/f14
diff --git a/contrib/ipfilter/test/regress/f15 b/test/regress/f15
similarity index 100%
rename from contrib/ipfilter/test/regress/f15
rename to test/regress/f15
diff --git a/contrib/ipfilter/test/regress/f16 b/test/regress/f16
similarity index 100%
rename from contrib/ipfilter/test/regress/f16
rename to test/regress/f16
diff --git a/contrib/ipfilter/test/regress/f17 b/test/regress/f17
similarity index 100%
rename from contrib/ipfilter/test/regress/f17
rename to test/regress/f17
diff --git a/contrib/ipfilter/test/regress/f18 b/test/regress/f18
similarity index 100%
rename from contrib/ipfilter/test/regress/f18
rename to test/regress/f18
diff --git a/contrib/ipfilter/test/regress/f19 b/test/regress/f19
similarity index 100%
rename from contrib/ipfilter/test/regress/f19
rename to test/regress/f19
diff --git a/contrib/ipfilter/test/regress/f2 b/test/regress/f2
similarity index 100%
rename from contrib/ipfilter/test/regress/f2
rename to test/regress/f2
diff --git a/contrib/ipfilter/test/regress/f20 b/test/regress/f20
similarity index 100%
rename from contrib/ipfilter/test/regress/f20
rename to test/regress/f20
diff --git a/contrib/ipfilter/test/regress/f24 b/test/regress/f24
similarity index 100%
rename from contrib/ipfilter/test/regress/f24
rename to test/regress/f24
diff --git a/contrib/ipfilter/test/regress/f3 b/test/regress/f3
similarity index 100%
rename from contrib/ipfilter/test/regress/f3
rename to test/regress/f3
diff --git a/contrib/ipfilter/test/regress/f4 b/test/regress/f4
similarity index 100%
rename from contrib/ipfilter/test/regress/f4
rename to test/regress/f4
diff --git a/contrib/ipfilter/test/regress/f5 b/test/regress/f5
similarity index 100%
rename from contrib/ipfilter/test/regress/f5
rename to test/regress/f5
diff --git a/contrib/ipfilter/test/regress/f6 b/test/regress/f6
similarity index 100%
rename from contrib/ipfilter/test/regress/f6
rename to test/regress/f6
diff --git a/contrib/ipfilter/test/regress/f7 b/test/regress/f7
similarity index 100%
rename from contrib/ipfilter/test/regress/f7
rename to test/regress/f7
diff --git a/contrib/ipfilter/test/regress/f8 b/test/regress/f8
similarity index 100%
rename from contrib/ipfilter/test/regress/f8
rename to test/regress/f8
diff --git a/contrib/ipfilter/test/regress/f9 b/test/regress/f9
similarity index 100%
rename from contrib/ipfilter/test/regress/f9
rename to test/regress/f9
diff --git a/contrib/ipfilter/test/regress/i1 b/test/regress/i1
similarity index 100%
rename from contrib/ipfilter/test/regress/i1
rename to test/regress/i1
diff --git a/contrib/ipfilter/test/regress/i10 b/test/regress/i10
similarity index 100%
rename from contrib/ipfilter/test/regress/i10
rename to test/regress/i10
diff --git a/contrib/ipfilter/test/regress/i11 b/test/regress/i11
similarity index 100%
rename from contrib/ipfilter/test/regress/i11
rename to test/regress/i11
diff --git a/contrib/ipfilter/test/regress/i12 b/test/regress/i12
similarity index 100%
rename from contrib/ipfilter/test/regress/i12
rename to test/regress/i12
diff --git a/contrib/ipfilter/test/regress/i13 b/test/regress/i13
similarity index 100%
rename from contrib/ipfilter/test/regress/i13
rename to test/regress/i13
diff --git a/contrib/ipfilter/test/regress/i14 b/test/regress/i14
similarity index 100%
rename from contrib/ipfilter/test/regress/i14
rename to test/regress/i14
diff --git a/contrib/ipfilter/test/regress/i15 b/test/regress/i15
similarity index 100%
rename from contrib/ipfilter/test/regress/i15
rename to test/regress/i15
diff --git a/contrib/ipfilter/test/regress/i16 b/test/regress/i16
similarity index 100%
rename from contrib/ipfilter/test/regress/i16
rename to test/regress/i16
diff --git a/contrib/ipfilter/test/regress/i17 b/test/regress/i17
similarity index 100%
rename from contrib/ipfilter/test/regress/i17
rename to test/regress/i17
diff --git a/contrib/ipfilter/test/regress/i18 b/test/regress/i18
similarity index 100%
rename from contrib/ipfilter/test/regress/i18
rename to test/regress/i18
diff --git a/contrib/ipfilter/test/regress/i19 b/test/regress/i19
similarity index 100%
rename from contrib/ipfilter/test/regress/i19
rename to test/regress/i19
diff --git a/contrib/ipfilter/test/regress/i2 b/test/regress/i2
similarity index 100%
rename from contrib/ipfilter/test/regress/i2
rename to test/regress/i2
diff --git a/contrib/ipfilter/test/regress/i20 b/test/regress/i20
similarity index 100%
rename from contrib/ipfilter/test/regress/i20
rename to test/regress/i20
diff --git a/contrib/ipfilter/test/regress/i21 b/test/regress/i21
similarity index 100%
rename from contrib/ipfilter/test/regress/i21
rename to test/regress/i21
diff --git a/contrib/ipfilter/test/regress/i3 b/test/regress/i3
similarity index 100%
rename from contrib/ipfilter/test/regress/i3
rename to test/regress/i3
diff --git a/contrib/ipfilter/test/regress/i4 b/test/regress/i4
similarity index 100%
rename from contrib/ipfilter/test/regress/i4
rename to test/regress/i4
diff --git a/contrib/ipfilter/test/regress/i5 b/test/regress/i5
similarity index 100%
rename from contrib/ipfilter/test/regress/i5
rename to test/regress/i5
diff --git a/contrib/ipfilter/test/regress/i6 b/test/regress/i6
similarity index 100%
rename from contrib/ipfilter/test/regress/i6
rename to test/regress/i6
diff --git a/contrib/ipfilter/test/regress/i7 b/test/regress/i7
similarity index 100%
rename from contrib/ipfilter/test/regress/i7
rename to test/regress/i7
diff --git a/contrib/ipfilter/test/regress/i8 b/test/regress/i8
similarity index 100%
rename from contrib/ipfilter/test/regress/i8
rename to test/regress/i8
diff --git a/contrib/ipfilter/test/regress/i9 b/test/regress/i9
similarity index 100%
rename from contrib/ipfilter/test/regress/i9
rename to test/regress/i9
diff --git a/contrib/ipfilter/test/regress/in1 b/test/regress/in1
similarity index 100%
rename from contrib/ipfilter/test/regress/in1
rename to test/regress/in1
diff --git a/contrib/ipfilter/test/regress/in2 b/test/regress/in2
similarity index 100%
rename from contrib/ipfilter/test/regress/in2
rename to test/regress/in2
diff --git a/contrib/ipfilter/test/regress/in3 b/test/regress/in3
similarity index 100%
rename from contrib/ipfilter/test/regress/in3
rename to test/regress/in3
diff --git a/contrib/ipfilter/test/regress/in4 b/test/regress/in4
similarity index 100%
rename from contrib/ipfilter/test/regress/in4
rename to test/regress/in4
diff --git a/contrib/ipfilter/test/regress/in5 b/test/regress/in5
similarity index 100%
rename from contrib/ipfilter/test/regress/in5
rename to test/regress/in5
diff --git a/contrib/ipfilter/test/regress/in6 b/test/regress/in6
similarity index 100%
rename from contrib/ipfilter/test/regress/in6
rename to test/regress/in6
diff --git a/contrib/ipfilter/test/regress/ip1 b/test/regress/ip1
similarity index 100%
rename from contrib/ipfilter/test/regress/ip1
rename to test/regress/ip1
diff --git a/contrib/ipfilter/test/regress/ip2 b/test/regress/ip2
similarity index 100%
rename from contrib/ipfilter/test/regress/ip2
rename to test/regress/ip2
diff --git a/contrib/ipfilter/test/regress/ipf6-1 b/test/regress/ipf6-1
similarity index 100%
rename from contrib/ipfilter/test/regress/ipf6-1
rename to test/regress/ipf6-1
diff --git a/contrib/ipfilter/test/regress/ipv6.1 b/test/regress/ipv6.1
similarity index 100%
rename from contrib/ipfilter/test/regress/ipv6.1
rename to test/regress/ipv6.1
diff --git a/contrib/ipfilter/test/regress/ipv6.2 b/test/regress/ipv6.2
similarity index 100%
rename from contrib/ipfilter/test/regress/ipv6.2
rename to test/regress/ipv6.2
diff --git a/contrib/ipfilter/test/regress/ipv6.3 b/test/regress/ipv6.3
similarity index 100%
rename from contrib/ipfilter/test/regress/ipv6.3
rename to test/regress/ipv6.3
diff --git a/contrib/ipfilter/test/regress/ipv6.5 b/test/regress/ipv6.5
similarity index 100%
rename from contrib/ipfilter/test/regress/ipv6.5
rename to test/regress/ipv6.5
diff --git a/contrib/ipfilter/test/regress/ipv6.6 b/test/regress/ipv6.6
similarity index 100%
rename from contrib/ipfilter/test/regress/ipv6.6
rename to test/regress/ipv6.6
diff --git a/contrib/ipfilter/test/regress/l1 b/test/regress/l1
similarity index 100%
rename from contrib/ipfilter/test/regress/l1
rename to test/regress/l1
diff --git a/contrib/ipfilter/test/regress/n1 b/test/regress/n1
similarity index 100%
rename from contrib/ipfilter/test/regress/n1
rename to test/regress/n1
diff --git a/contrib/ipfilter/test/regress/n10 b/test/regress/n10
similarity index 100%
rename from contrib/ipfilter/test/regress/n10
rename to test/regress/n10
diff --git a/contrib/ipfilter/test/regress/n11 b/test/regress/n11
similarity index 100%
rename from contrib/ipfilter/test/regress/n11
rename to test/regress/n11
diff --git a/contrib/ipfilter/test/regress/n12 b/test/regress/n12
similarity index 100%
rename from contrib/ipfilter/test/regress/n12
rename to test/regress/n12
diff --git a/contrib/ipfilter/test/regress/n13 b/test/regress/n13
similarity index 100%
rename from contrib/ipfilter/test/regress/n13
rename to test/regress/n13
diff --git a/contrib/ipfilter/test/regress/n14 b/test/regress/n14
similarity index 100%
rename from contrib/ipfilter/test/regress/n14
rename to test/regress/n14
diff --git a/contrib/ipfilter/test/regress/n16 b/test/regress/n16
similarity index 100%
rename from contrib/ipfilter/test/regress/n16
rename to test/regress/n16
diff --git a/contrib/ipfilter/test/regress/n2 b/test/regress/n2
similarity index 100%
rename from contrib/ipfilter/test/regress/n2
rename to test/regress/n2
diff --git a/contrib/ipfilter/test/regress/n3 b/test/regress/n3
similarity index 100%
rename from contrib/ipfilter/test/regress/n3
rename to test/regress/n3
diff --git a/contrib/ipfilter/test/regress/n4 b/test/regress/n4
similarity index 100%
rename from contrib/ipfilter/test/regress/n4
rename to test/regress/n4
diff --git a/contrib/ipfilter/test/regress/n5 b/test/regress/n5
similarity index 100%
rename from contrib/ipfilter/test/regress/n5
rename to test/regress/n5
diff --git a/contrib/ipfilter/test/regress/n6 b/test/regress/n6
similarity index 100%
rename from contrib/ipfilter/test/regress/n6
rename to test/regress/n6
diff --git a/contrib/ipfilter/test/regress/n7 b/test/regress/n7
similarity index 100%
rename from contrib/ipfilter/test/regress/n7
rename to test/regress/n7
diff --git a/contrib/ipfilter/test/regress/n8 b/test/regress/n8
similarity index 100%
rename from contrib/ipfilter/test/regress/n8
rename to test/regress/n8
diff --git a/contrib/ipfilter/test/regress/n9 b/test/regress/n9
similarity index 100%
rename from contrib/ipfilter/test/regress/n9
rename to test/regress/n9
diff --git a/contrib/ipfilter/test/regress/ni1.ipf b/test/regress/ni1.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni1.ipf
rename to test/regress/ni1.ipf
diff --git a/contrib/ipfilter/test/regress/ni1.nat b/test/regress/ni1.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni1.nat
rename to test/regress/ni1.nat
diff --git a/contrib/ipfilter/test/regress/ni10.ipf b/test/regress/ni10.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni10.ipf
rename to test/regress/ni10.ipf
diff --git a/contrib/ipfilter/test/regress/ni10.nat b/test/regress/ni10.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni10.nat
rename to test/regress/ni10.nat
diff --git a/contrib/ipfilter/test/regress/ni11.ipf b/test/regress/ni11.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni11.ipf
rename to test/regress/ni11.ipf
diff --git a/contrib/ipfilter/test/regress/ni11.nat b/test/regress/ni11.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni11.nat
rename to test/regress/ni11.nat
diff --git a/contrib/ipfilter/test/regress/ni12.ipf b/test/regress/ni12.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni12.ipf
rename to test/regress/ni12.ipf
diff --git a/contrib/ipfilter/test/regress/ni12.nat b/test/regress/ni12.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni12.nat
rename to test/regress/ni12.nat
diff --git a/contrib/ipfilter/test/regress/ni13.ipf b/test/regress/ni13.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni13.ipf
rename to test/regress/ni13.ipf
diff --git a/contrib/ipfilter/test/regress/ni13.nat b/test/regress/ni13.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni13.nat
rename to test/regress/ni13.nat
diff --git a/contrib/ipfilter/test/regress/ni14.ipf b/test/regress/ni14.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni14.ipf
rename to test/regress/ni14.ipf
diff --git a/contrib/ipfilter/test/regress/ni14.nat b/test/regress/ni14.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni14.nat
rename to test/regress/ni14.nat
diff --git a/contrib/ipfilter/test/regress/ni15.ipf b/test/regress/ni15.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni15.ipf
rename to test/regress/ni15.ipf
diff --git a/contrib/ipfilter/test/regress/ni15.nat b/test/regress/ni15.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni15.nat
rename to test/regress/ni15.nat
diff --git a/contrib/ipfilter/test/regress/ni16.ipf b/test/regress/ni16.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni16.ipf
rename to test/regress/ni16.ipf
diff --git a/contrib/ipfilter/test/regress/ni16.nat b/test/regress/ni16.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni16.nat
rename to test/regress/ni16.nat
diff --git a/contrib/ipfilter/test/regress/ni17.nat b/test/regress/ni17.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni17.nat
rename to test/regress/ni17.nat
diff --git a/contrib/ipfilter/test/regress/ni19.ipf b/test/regress/ni19.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni19.ipf
rename to test/regress/ni19.ipf
diff --git a/contrib/ipfilter/test/regress/ni19.nat b/test/regress/ni19.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni19.nat
rename to test/regress/ni19.nat
diff --git a/contrib/ipfilter/test/regress/ni2.ipf b/test/regress/ni2.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni2.ipf
rename to test/regress/ni2.ipf
diff --git a/contrib/ipfilter/test/regress/ni2.nat b/test/regress/ni2.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni2.nat
rename to test/regress/ni2.nat
diff --git a/contrib/ipfilter/test/regress/ni20.ipf b/test/regress/ni20.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni20.ipf
rename to test/regress/ni20.ipf
diff --git a/contrib/ipfilter/test/regress/ni20.nat b/test/regress/ni20.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni20.nat
rename to test/regress/ni20.nat
diff --git a/contrib/ipfilter/test/regress/ni21.ipf b/test/regress/ni21.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni21.ipf
rename to test/regress/ni21.ipf
diff --git a/contrib/ipfilter/test/regress/ni21.nat b/test/regress/ni21.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni21.nat
rename to test/regress/ni21.nat
diff --git a/contrib/ipfilter/test/regress/ni23.ipf b/test/regress/ni23.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni23.ipf
rename to test/regress/ni23.ipf
diff --git a/contrib/ipfilter/test/regress/ni23.nat b/test/regress/ni23.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni23.nat
rename to test/regress/ni23.nat
diff --git a/contrib/ipfilter/test/regress/ni3.ipf b/test/regress/ni3.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni3.ipf
rename to test/regress/ni3.ipf
diff --git a/contrib/ipfilter/test/regress/ni3.nat b/test/regress/ni3.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni3.nat
rename to test/regress/ni3.nat
diff --git a/contrib/ipfilter/test/regress/ni4.ipf b/test/regress/ni4.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni4.ipf
rename to test/regress/ni4.ipf
diff --git a/contrib/ipfilter/test/regress/ni4.nat b/test/regress/ni4.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni4.nat
rename to test/regress/ni4.nat
diff --git a/contrib/ipfilter/test/regress/ni5.ipf b/test/regress/ni5.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni5.ipf
rename to test/regress/ni5.ipf
diff --git a/contrib/ipfilter/test/regress/ni5.nat b/test/regress/ni5.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni5.nat
rename to test/regress/ni5.nat
diff --git a/contrib/ipfilter/test/regress/ni6.ipf b/test/regress/ni6.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni6.ipf
rename to test/regress/ni6.ipf
diff --git a/contrib/ipfilter/test/regress/ni6.nat b/test/regress/ni6.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni6.nat
rename to test/regress/ni6.nat
diff --git a/contrib/ipfilter/test/regress/ni7.ipf b/test/regress/ni7.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni7.ipf
rename to test/regress/ni7.ipf
diff --git a/contrib/ipfilter/test/regress/ni7.nat b/test/regress/ni7.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni7.nat
rename to test/regress/ni7.nat
diff --git a/contrib/ipfilter/test/regress/ni8.ipf b/test/regress/ni8.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni8.ipf
rename to test/regress/ni8.ipf
diff --git a/contrib/ipfilter/test/regress/ni8.nat b/test/regress/ni8.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni8.nat
rename to test/regress/ni8.nat
diff --git a/contrib/ipfilter/test/regress/ni9.ipf b/test/regress/ni9.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/ni9.ipf
rename to test/regress/ni9.ipf
diff --git a/contrib/ipfilter/test/regress/ni9.nat b/test/regress/ni9.nat
similarity index 100%
rename from contrib/ipfilter/test/regress/ni9.nat
rename to test/regress/ni9.nat
diff --git a/contrib/ipfilter/test/regress/p1.ipf b/test/regress/p1.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/p1.ipf
rename to test/regress/p1.ipf
diff --git a/contrib/ipfilter/test/regress/p1.pool b/test/regress/p1.pool
similarity index 100%
rename from contrib/ipfilter/test/regress/p1.pool
rename to test/regress/p1.pool
diff --git a/contrib/ipfilter/test/regress/p2.ipf b/test/regress/p2.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/p2.ipf
rename to test/regress/p2.ipf
diff --git a/contrib/ipfilter/test/regress/p3.ipf b/test/regress/p3.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/p3.ipf
rename to test/regress/p3.ipf
diff --git a/contrib/ipfilter/test/regress/p3.pool b/test/regress/p3.pool
similarity index 100%
rename from contrib/ipfilter/test/regress/p3.pool
rename to test/regress/p3.pool
diff --git a/contrib/ipfilter/test/regress/p5.ipf b/test/regress/p5.ipf
similarity index 100%
rename from contrib/ipfilter/test/regress/p5.ipf
rename to test/regress/p5.ipf
diff --git a/contrib/ipfilter/test/regress/p5.pool b/test/regress/p5.pool
similarity index 100%
rename from contrib/ipfilter/test/regress/p5.pool
rename to test/regress/p5.pool
diff --git a/contrib/ipfilter/test/regress/regress.sed b/test/regress/regress.sed
similarity index 100%
rename from contrib/ipfilter/test/regress/regress.sed
rename to test/regress/regress.sed
diff --git a/contrib/ipfilter/test/test.format b/test/test.format
similarity index 100%
rename from contrib/ipfilter/test/test.format
rename to test/test.format
diff --git a/contrib/ipfilter/test/test.sed b/test/test.sed
similarity index 100%
rename from contrib/ipfilter/test/test.sed
rename to test/test.sed
diff --git a/contrib/ipfilter/test/vfycksum.pl b/test/vfycksum.pl
similarity index 100%
rename from contrib/ipfilter/test/vfycksum.pl
rename to test/vfycksum.pl
diff --git a/contrib/ipfilter/todo b/todo
similarity index 100%
rename from contrib/ipfilter/todo
rename to todo
diff --git a/contrib/ipfilter/tools/BNF.ipf b/tools/BNF.ipf
similarity index 100%
rename from contrib/ipfilter/tools/BNF.ipf
rename to tools/BNF.ipf
diff --git a/contrib/ipfilter/tools/BNF.ipnat b/tools/BNF.ipnat
similarity index 100%
rename from contrib/ipfilter/tools/BNF.ipnat
rename to tools/BNF.ipnat
diff --git a/contrib/ipfilter/tools/Makefile b/tools/Makefile
similarity index 100%
rename from contrib/ipfilter/tools/Makefile
rename to tools/Makefile
diff --git a/contrib/ipfilter/tools/ipf.c b/tools/ipf.c
similarity index 100%
rename from contrib/ipfilter/tools/ipf.c
rename to tools/ipf.c
diff --git a/contrib/ipfilter/tools/ipf_y.y b/tools/ipf_y.y
similarity index 100%
rename from contrib/ipfilter/tools/ipf_y.y
rename to tools/ipf_y.y
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/tools/ipfcomp.c
similarity index 100%
rename from contrib/ipfilter/tools/ipfcomp.c
rename to tools/ipfcomp.c
diff --git a/contrib/ipfilter/tools/ipfs.c b/tools/ipfs.c
similarity index 100%
rename from contrib/ipfilter/tools/ipfs.c
rename to tools/ipfs.c
diff --git a/contrib/ipfilter/tools/ipfstat.c b/tools/ipfstat.c
similarity index 100%
rename from contrib/ipfilter/tools/ipfstat.c
rename to tools/ipfstat.c
diff --git a/contrib/ipfilter/tools/ipftest.c b/tools/ipftest.c
similarity index 100%
rename from contrib/ipfilter/tools/ipftest.c
rename to tools/ipftest.c
diff --git a/contrib/ipfilter/tools/ipmon.c b/tools/ipmon.c
similarity index 100%
rename from contrib/ipfilter/tools/ipmon.c
rename to tools/ipmon.c
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/tools/ipmon_y.y
similarity index 100%
rename from contrib/ipfilter/tools/ipmon_y.y
rename to tools/ipmon_y.y
diff --git a/contrib/ipfilter/tools/ipnat.c b/tools/ipnat.c
similarity index 100%
rename from contrib/ipfilter/tools/ipnat.c
rename to tools/ipnat.c
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/tools/ipnat_y.y
similarity index 100%
rename from contrib/ipfilter/tools/ipnat_y.y
rename to tools/ipnat_y.y
diff --git a/contrib/ipfilter/tools/ippool.c b/tools/ippool.c
similarity index 100%
rename from contrib/ipfilter/tools/ippool.c
rename to tools/ippool.c
diff --git a/contrib/ipfilter/tools/ippool_y.y b/tools/ippool_y.y
similarity index 100%
rename from contrib/ipfilter/tools/ippool_y.y
rename to tools/ippool_y.y
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/tools/ipscan_y.y
similarity index 100%
rename from contrib/ipfilter/tools/ipscan_y.y
rename to tools/ipscan_y.y
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/tools/ipsyncm.c
similarity index 100%
rename from contrib/ipfilter/tools/ipsyncm.c
rename to tools/ipsyncm.c
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/tools/ipsyncs.c
similarity index 100%
rename from contrib/ipfilter/tools/ipsyncs.c
rename to tools/ipsyncs.c
diff --git a/contrib/ipfilter/tools/lex_var.h b/tools/lex_var.h
similarity index 100%
rename from contrib/ipfilter/tools/lex_var.h
rename to tools/lex_var.h
diff --git a/contrib/ipfilter/tools/lexer.c b/tools/lexer.c
similarity index 100%
rename from contrib/ipfilter/tools/lexer.c
rename to tools/lexer.c
diff --git a/contrib/ipfilter/tools/lexer.h b/tools/lexer.h
similarity index 100%
rename from contrib/ipfilter/tools/lexer.h
rename to tools/lexer.h