diff --git a/contrib/pf/authpf/authpf.8 b/authpf/authpf.8
similarity index 100%
rename from contrib/pf/authpf/authpf.8
rename to authpf/authpf.8
diff --git a/contrib/pf/authpf/authpf.c b/authpf/authpf.c
similarity index 100%
rename from contrib/pf/authpf/authpf.c
rename to authpf/authpf.c
diff --git a/contrib/pf/authpf/pathnames.h b/authpf/pathnames.h
similarity index 100%
rename from contrib/pf/authpf/pathnames.h
rename to authpf/pathnames.h
diff --git a/contrib/pf/ftp-proxy/filter.c b/ftp-proxy/filter.c
similarity index 100%
rename from contrib/pf/ftp-proxy/filter.c
rename to ftp-proxy/filter.c
diff --git a/contrib/pf/ftp-proxy/filter.h b/ftp-proxy/filter.h
similarity index 100%
rename from contrib/pf/ftp-proxy/filter.h
rename to ftp-proxy/filter.h
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.8 b/ftp-proxy/ftp-proxy.8
similarity index 100%
rename from contrib/pf/ftp-proxy/ftp-proxy.8
rename to ftp-proxy/ftp-proxy.8
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.c b/ftp-proxy/ftp-proxy.c
similarity index 100%
rename from contrib/pf/ftp-proxy/ftp-proxy.c
rename to ftp-proxy/ftp-proxy.c
diff --git a/contrib/pf/ftp-proxy/getline.c b/ftp-proxy/getline.c
similarity index 100%
rename from contrib/pf/ftp-proxy/getline.c
rename to ftp-proxy/getline.c
diff --git a/contrib/pf/ftp-proxy/util.c b/ftp-proxy/util.c
similarity index 100%
rename from contrib/pf/ftp-proxy/util.c
rename to ftp-proxy/util.c
diff --git a/contrib/pf/ftp-proxy/util.h b/ftp-proxy/util.h
similarity index 100%
rename from contrib/pf/ftp-proxy/util.h
rename to ftp-proxy/util.h
diff --git a/contrib/pf/libevent/buffer.c b/libevent/buffer.c
similarity index 100%
rename from contrib/pf/libevent/buffer.c
rename to libevent/buffer.c
diff --git a/contrib/pf/libevent/evbuffer.c b/libevent/evbuffer.c
similarity index 100%
rename from contrib/pf/libevent/evbuffer.c
rename to libevent/evbuffer.c
diff --git a/contrib/pf/libevent/event-internal.h b/libevent/event-internal.h
similarity index 100%
rename from contrib/pf/libevent/event-internal.h
rename to libevent/event-internal.h
diff --git a/contrib/pf/libevent/event.c b/libevent/event.c
similarity index 100%
rename from contrib/pf/libevent/event.c
rename to libevent/event.c
diff --git a/contrib/pf/libevent/event.h b/libevent/event.h
similarity index 100%
rename from contrib/pf/libevent/event.h
rename to libevent/event.h
diff --git a/contrib/pf/libevent/evsignal.h b/libevent/evsignal.h
similarity index 100%
rename from contrib/pf/libevent/evsignal.h
rename to libevent/evsignal.h
diff --git a/contrib/pf/libevent/kqueue.c b/libevent/kqueue.c
similarity index 100%
rename from contrib/pf/libevent/kqueue.c
rename to libevent/kqueue.c
diff --git a/contrib/pf/libevent/log.c b/libevent/log.c
similarity index 100%
rename from contrib/pf/libevent/log.c
rename to libevent/log.c
diff --git a/contrib/pf/libevent/log.h b/libevent/log.h
similarity index 100%
rename from contrib/pf/libevent/log.h
rename to libevent/log.h
diff --git a/contrib/pf/libevent/poll.c b/libevent/poll.c
similarity index 100%
rename from contrib/pf/libevent/poll.c
rename to libevent/poll.c
diff --git a/contrib/pf/libevent/select.c b/libevent/select.c
similarity index 100%
rename from contrib/pf/libevent/select.c
rename to libevent/select.c
diff --git a/contrib/pf/libevent/signal.c b/libevent/signal.c
similarity index 100%
rename from contrib/pf/libevent/signal.c
rename to libevent/signal.c
diff --git a/contrib/pf/man/pf.4 b/man/pf.4
similarity index 100%
rename from contrib/pf/man/pf.4
rename to man/pf.4
diff --git a/contrib/pf/man/pf.conf.5 b/man/pf.conf.5
similarity index 100%
rename from contrib/pf/man/pf.conf.5
rename to man/pf.conf.5
diff --git a/contrib/pf/man/pf.os.5 b/man/pf.os.5
similarity index 100%
rename from contrib/pf/man/pf.os.5
rename to man/pf.os.5
diff --git a/contrib/pf/man/pflog.4 b/man/pflog.4
similarity index 100%
rename from contrib/pf/man/pflog.4
rename to man/pflog.4
diff --git a/contrib/pf/man/pfsync.4 b/man/pfsync.4
similarity index 100%
rename from contrib/pf/man/pfsync.4
rename to man/pfsync.4
diff --git a/contrib/pf/pfctl/parse.y b/pfctl/parse.y
similarity index 100%
rename from contrib/pf/pfctl/parse.y
rename to pfctl/parse.y
diff --git a/contrib/pf/pfctl/pf_print_state.c b/pfctl/pf_print_state.c
similarity index 100%
rename from contrib/pf/pfctl/pf_print_state.c
rename to pfctl/pf_print_state.c
diff --git a/contrib/pf/pfctl/pfctl.8 b/pfctl/pfctl.8
similarity index 100%
rename from contrib/pf/pfctl/pfctl.8
rename to pfctl/pfctl.8
diff --git a/contrib/pf/pfctl/pfctl.c b/pfctl/pfctl.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl.c
rename to pfctl/pfctl.c
diff --git a/contrib/pf/pfctl/pfctl.h b/pfctl/pfctl.h
similarity index 100%
rename from contrib/pf/pfctl/pfctl.h
rename to pfctl/pfctl.h
diff --git a/contrib/pf/pfctl/pfctl_altq.c b/pfctl/pfctl_altq.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_altq.c
rename to pfctl/pfctl_altq.c
diff --git a/contrib/pf/pfctl/pfctl_optimize.c b/pfctl/pfctl_optimize.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_optimize.c
rename to pfctl/pfctl_optimize.c
diff --git a/contrib/pf/pfctl/pfctl_osfp.c b/pfctl/pfctl_osfp.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_osfp.c
rename to pfctl/pfctl_osfp.c
diff --git a/contrib/pf/pfctl/pfctl_parser.c b/pfctl/pfctl_parser.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_parser.c
rename to pfctl/pfctl_parser.c
diff --git a/contrib/pf/pfctl/pfctl_parser.h b/pfctl/pfctl_parser.h
similarity index 100%
rename from contrib/pf/pfctl/pfctl_parser.h
rename to pfctl/pfctl_parser.h
diff --git a/contrib/pf/pfctl/pfctl_qstats.c b/pfctl/pfctl_qstats.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_qstats.c
rename to pfctl/pfctl_qstats.c
diff --git a/contrib/pf/pfctl/pfctl_radix.c b/pfctl/pfctl_radix.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_radix.c
rename to pfctl/pfctl_radix.c
diff --git a/contrib/pf/pfctl/pfctl_table.c b/pfctl/pfctl_table.c
similarity index 100%
rename from contrib/pf/pfctl/pfctl_table.c
rename to pfctl/pfctl_table.c
diff --git a/contrib/pf/pflogd/pflogd.8 b/pflogd/pflogd.8
similarity index 100%
rename from contrib/pf/pflogd/pflogd.8
rename to pflogd/pflogd.8
diff --git a/contrib/pf/pflogd/pflogd.c b/pflogd/pflogd.c
similarity index 100%
rename from contrib/pf/pflogd/pflogd.c
rename to pflogd/pflogd.c
diff --git a/contrib/pf/pflogd/pflogd.h b/pflogd/pflogd.h
similarity index 100%
rename from contrib/pf/pflogd/pflogd.h
rename to pflogd/pflogd.h
diff --git a/contrib/pf/pflogd/pidfile.c b/pflogd/pidfile.c
similarity index 100%
rename from contrib/pf/pflogd/pidfile.c
rename to pflogd/pidfile.c
diff --git a/contrib/pf/pflogd/pidfile.h b/pflogd/pidfile.h
similarity index 100%
rename from contrib/pf/pflogd/pidfile.h
rename to pflogd/pidfile.h
diff --git a/contrib/pf/pflogd/privsep.c b/pflogd/privsep.c
similarity index 100%
rename from contrib/pf/pflogd/privsep.c
rename to pflogd/privsep.c
diff --git a/contrib/pf/pflogd/privsep_fdpass.c b/pflogd/privsep_fdpass.c
similarity index 100%
rename from contrib/pf/pflogd/privsep_fdpass.c
rename to pflogd/privsep_fdpass.c
diff --git a/contrib/pf/tftp-proxy/filter.c b/tftp-proxy/filter.c
similarity index 100%
rename from contrib/pf/tftp-proxy/filter.c
rename to tftp-proxy/filter.c
diff --git a/contrib/pf/tftp-proxy/filter.h b/tftp-proxy/filter.h
similarity index 100%
rename from contrib/pf/tftp-proxy/filter.h
rename to tftp-proxy/filter.h
diff --git a/contrib/pf/tftp-proxy/tftp-proxy.8 b/tftp-proxy/tftp-proxy.8
similarity index 100%
rename from contrib/pf/tftp-proxy/tftp-proxy.8
rename to tftp-proxy/tftp-proxy.8
diff --git a/contrib/pf/tftp-proxy/tftp-proxy.c b/tftp-proxy/tftp-proxy.c
similarity index 100%
rename from contrib/pf/tftp-proxy/tftp-proxy.c
rename to tftp-proxy/tftp-proxy.c