[rtems-libbsd commit] Move files to match FreeBSD layout

Sebastian Huber sebh at rtems.org
Thu Oct 10 07:13:07 UTC 2013


Module:    rtems-libbsd
Branch:    master
Commit:    bceabc95c1c85d793200446fa85f1ddc6313ea29
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=bceabc95c1c85d793200446fa85f1ddc6313ea29

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Oct  9 22:42:09 2013 +0200

Move files to match FreeBSD layout

---

 {freebsd-userspace => freebsd}/include/arpa/ftp.h  |    0
 {freebsd-userspace => freebsd}/include/arpa/inet.h |    0
 .../include/arpa/nameser.h                         |    0
 .../include/arpa/nameser_compat.h                  |    0
 {freebsd-userspace => freebsd}/include/db.h        |    0
 {freebsd-userspace => freebsd}/include/err.h       |    0
 {freebsd-userspace => freebsd}/include/ifaddrs.h   |    0
 {freebsd-userspace => freebsd}/include/mpool.h     |    0
 {freebsd-userspace => freebsd}/include/netconfig.h |    0
 .../rtems => freebsd}/include/netdb.h              |    0
 {freebsd-userspace => freebsd}/include/nlist.h     |    0
 {freebsd-userspace => freebsd}/include/nsswitch.h  |    0
 .../include/res_update.h                           |    0
 {freebsd-userspace => freebsd}/include/resolv.h    |    0
 {freebsd-userspace => freebsd}/include/rpc/auth.h  |    0
 .../include/rpc/auth_des.h                         |    0
 .../include/rpc/auth_unix.h                        |    0
 .../rtems => freebsd}/include/rpc/clnt.h           |    0
 .../include/rpc/clnt_soc.h                         |    0
 .../include/rpc/clnt_stat.h                        |    0
 .../include/rpc/pmap_clnt.h                        |    0
 .../include/rpc/pmap_prot.h                        |    0
 .../rtems => freebsd}/include/rpc/rpc.h            |    0
 .../include/rpc/rpc_msg.h                          |    0
 .../include/rpc/rpcb_clnt.h                        |    0
 .../include/rpc/rpcb_prot.x                        |    0
 .../include/rpc/rpcent.h                           |    0
 {freebsd-userspace => freebsd}/include/rpc/svc.h   |    0
 .../include/rpc/svc_auth.h                         |    0
 .../include/rpc/svc_soc.h                          |    0
 {freebsd-userspace => freebsd}/include/rpc/xdr.h   |    0
 {freebsd-userspace => freebsd}/include/sysexits.h  |    0
 .../lib/libc/db/btree/bt_close.c                   |    0
 .../lib/libc/db/btree/bt_conv.c                    |    0
 .../lib/libc/db/btree/bt_debug.c                   |    0
 .../lib/libc/db/btree/bt_delete.c                  |    0
 .../lib/libc/db/btree/bt_get.c                     |    0
 .../lib/libc/db/btree/bt_open.c                    |    0
 .../lib/libc/db/btree/bt_overflow.c                |    0
 .../lib/libc/db/btree/bt_page.c                    |    0
 .../lib/libc/db/btree/bt_put.c                     |    0
 .../lib/libc/db/btree/bt_search.c                  |    0
 .../lib/libc/db/btree/bt_seq.c                     |    0
 .../lib/libc/db/btree/bt_split.c                   |    0
 .../lib/libc/db/btree/bt_utils.c                   |    0
 .../lib/libc/db/btree/btree.h                      |    0
 .../lib/libc/db/btree/extern.h                     |    0
 {freebsd-userspace => freebsd}/lib/libc/db/db/db.c |    0
 .../lib/libc/db/mpool/mpool-compat.c               |    0
 .../lib/libc/db/mpool/mpool.c                      |    0
 .../lib/libc/db/recno/extern.h                     |    0
 .../lib/libc/db/recno/rec_close.c                  |    0
 .../lib/libc/db/recno/rec_delete.c                 |    0
 .../lib/libc/db/recno/rec_get.c                    |    0
 .../lib/libc/db/recno/rec_open.c                   |    0
 .../lib/libc/db/recno/rec_put.c                    |    0
 .../lib/libc/db/recno/rec_search.c                 |    0
 .../lib/libc/db/recno/rec_seq.c                    |    0
 .../lib/libc/db/recno/rec_utils.c                  |    0
 .../lib/libc/db/recno/recno.h                      |    0
 {freebsd-userspace => freebsd}/lib/libc/gen/err.c  |    0
 .../lib/libc/gen/gethostname.c                     |    0
 .../lib/libc}/include/isc/eventlib.h               |    0
 .../rtems => freebsd/lib/libc}/include/isc/list.h  |    0
 .../lib/libc}/include/isc/platform.h               |    0
 .../lib/libc/include/libc_private.h                |    0
 .../rtems => freebsd/lib/libc}/include/namespace.h |    0
 .../lib/libc/include/nss_tls.h                     |    0
 .../lib/libc/include}/port_after.h                 |    0
 .../lib/libc/include}/port_before.h                |    0
 .../lib/libc/include/reentrant.h                   |    0
 .../lib/libc/include/resolv_mt.h                   |    0
 .../lib/libc/include/spinlock.h                    |    0
 .../lib/libc}/include/un-namespace.h               |    0
 .../lib/libc/inet/inet_addr.c                      |    0
 .../lib/libc/inet/inet_cidr_ntop.c                 |    0
 .../lib/libc/inet/inet_cidr_pton.c                 |    0
 .../lib/libc/inet/inet_lnaof.c                     |    0
 .../lib/libc/inet/inet_makeaddr.c                  |    0
 .../lib/libc/inet/inet_net_ntop.c                  |    0
 .../lib/libc/inet/inet_net_pton.c                  |    0
 .../lib/libc/inet/inet_neta.c                      |    0
 .../lib/libc/inet/inet_netof.c                     |    0
 .../lib/libc/inet/inet_network.c                   |    0
 .../lib/libc/inet/inet_ntoa.c                      |    0
 .../lib/libc/inet/inet_ntop.c                      |    0
 .../lib/libc/inet/inet_pton.c                      |    0
 .../lib/libc/inet/nsap_addr.c                      |    0
 .../lib/libc/isc/ev_streams.c                      |    0
 .../lib/libc/isc/ev_timers.c                       |    0
 .../lib/libc/isc/eventlib_p.h                      |    0
 .../lib/libc/nameser/ns_name.c                     |    0
 .../lib/libc/nameser/ns_netint.c                   |    0
 .../lib/libc/nameser/ns_parse.c                    |    0
 .../lib/libc/nameser/ns_print.c                    |    0
 .../lib/libc/nameser/ns_samedomain.c               |    0
 .../lib/libc/nameser/ns_ttl.c                      |    0
 .../lib/libc/net/base64.c                          |    0
 .../lib/libc/net/ether_addr.c                      |    0
 .../lib/libc/net/gai_strerror.c                    |    0
 .../lib/libc/net/getaddrinfo.c                     |    0
 .../lib/libc/net/gethostbydns.c                    |    0
 .../lib/libc/net/gethostbyht.c                     |    0
 .../lib/libc/net/gethostbynis.c                    |    0
 .../lib/libc/net/gethostnamadr.c                   |    0
 .../lib/libc/net/getifaddrs.c                      |    0
 .../lib/libc/net/getifmaddrs.c                     |    0
 .../lib/libc/net/getnameinfo.c                     |    0
 .../lib/libc/net/getnetbydns.c                     |    0
 .../lib/libc/net/getnetbyht.c                      |    0
 .../lib/libc/net/getnetbynis.c                     |    0
 .../lib/libc/net/getnetnamadr.c                    |    0
 .../lib/libc/net/getproto.c                        |    0
 .../lib/libc/net/getprotoent.c                     |    0
 .../lib/libc/net/getprotoname.c                    |    0
 .../lib/libc/net/getservent.c                      |    0
 .../lib/libc/net/if_indextoname.c                  |    0
 .../lib/libc/net/if_nameindex.c                    |    0
 .../lib/libc/net/if_nametoindex.c                  |    0
 .../lib/libc/net/linkaddr.c                        |    0
 .../lib/libc/net/map_v4v6.c                        |    0
 .../lib/libc/net/name6.c                           |    0
 .../lib/libc/net/netdb_private.h                   |    0
 .../lib/libc/net/nsdispatch.c                      |    0
 .../lib/libc/net/nslexer.l                         |    0
 .../lib/libc/net/nsparser.y                        |    0
 .../lib/libc/net/nss_backends.h                    |    0
 {freebsd-userspace => freebsd}/lib/libc/net/rcmd.c |    0
 {freebsd-userspace => freebsd}/lib/libc/net/recv.c |    0
 .../lib/libc/net/res_config.h                      |    0
 {freebsd-userspace => freebsd}/lib/libc/net/send.c |    0
 .../lib/libc/resolv/h_errno.c                      |    0
 .../lib/libc/resolv/herror.c                       |    0
 .../lib/libc/resolv/mtctxres.c                     |    0
 .../lib/libc/resolv/res_comp.c                     |    0
 .../lib/libc/resolv/res_data.c                     |    0
 .../lib/libc/resolv/res_debug.c                    |    0
 .../lib/libc/resolv/res_debug.h                    |    0
 .../lib/libc/resolv/res_findzonecut.c              |    0
 .../lib/libc/resolv/res_init.c                     |    0
 .../lib/libc/resolv/res_mkquery.c                  |    0
 .../lib/libc/resolv/res_mkupdate.c                 |    0
 .../lib/libc/resolv/res_private.h                  |    0
 .../lib/libc/resolv/res_query.c                    |    0
 .../lib/libc/resolv/res_send.c                     |    0
 .../lib/libc/resolv/res_state.c                    |    0
 .../lib/libc/resolv/res_update.c                   |    0
 .../lib/libc/stdio/fgetln.c                        |    0
 .../lib/libc/stdio/local.h                         |    0
 .../lib/libc/stdlib/strtonum.c                     |    0
 .../lib/libc/string/strsep.c                       |    0
 .../lib/libipsec/ipsec_dump_policy.c               |    0
 .../lib/libipsec/ipsec_get_policylen.c             |    0
 .../lib/libipsec/ipsec_strerror.c                  |    0
 .../lib/libipsec/ipsec_strerror.h                  |    0
 .../lib/libipsec/libpfkey.h                        |    0
 .../lib/libipsec/pfkey.c                           |    0
 .../lib/libipsec/pfkey_dump.c                      |    0
 .../lib/libipsec/policy_parse.y                    |    0
 .../lib/libipsec/policy_token.l                    |    0
 {freebsd-userspace => freebsd}/lib/libkvm/kvm.h    |    0
 .../lib/libmemstat/memstat.c                       |    0
 .../lib/libmemstat/memstat.h                       |    0
 .../lib/libmemstat/memstat_all.c                   |    0
 .../lib/libmemstat/memstat_internal.h              |    0
 .../lib/libmemstat/memstat_malloc.c                |    0
 .../lib/libmemstat/memstat_uma.c                   |    0
 .../lib/libutil/expand_number.c                    |    0
 .../lib/libutil/humanize_number.c                  |    0
 .../lib/libutil/libutil.h                          |    0
 .../lib/libutil/trimdomain.c                       |    0
 .../commands => freebsd}/sbin/dhclient/alloc.c     |    0
 .../commands => freebsd}/sbin/dhclient/bpf.c       |    0
 .../commands => freebsd}/sbin/dhclient/clparse.c   |    0
 .../commands => freebsd}/sbin/dhclient/conflex.c   |    0
 .../commands => freebsd}/sbin/dhclient/convert.c   |    0
 .../commands => freebsd}/sbin/dhclient/dhclient.c  |    0
 .../commands => freebsd}/sbin/dhclient/dhcp.h      |    0
 .../commands => freebsd}/sbin/dhclient/dhcpd.h     |    0
 .../commands => freebsd}/sbin/dhclient/dhctoken.h  |    0
 .../commands => freebsd}/sbin/dhclient/dispatch.c  |    0
 .../commands => freebsd}/sbin/dhclient/errwarn.c   |    0
 .../commands => freebsd}/sbin/dhclient/hash.c      |    0
 .../commands => freebsd}/sbin/dhclient/inet.c      |    0
 .../commands => freebsd}/sbin/dhclient/options.c   |    0
 .../commands => freebsd}/sbin/dhclient/packet.c    |    0
 .../commands => freebsd}/sbin/dhclient/parse.c     |    0
 .../commands => freebsd}/sbin/dhclient/privsep.c   |    0
 .../commands => freebsd}/sbin/dhclient/privsep.h   |    0
 .../commands => freebsd}/sbin/dhclient/tables.c    |    0
 .../commands => freebsd}/sbin/dhclient/tree.c      |    0
 .../commands => freebsd}/sbin/dhclient/tree.h      |    0
 .../commands => freebsd}/sbin/ifconfig/af_atalk.c  |    0
 .../commands => freebsd}/sbin/ifconfig/af_inet.c   |    0
 .../commands => freebsd}/sbin/ifconfig/af_inet6.c  |    0
 .../commands => freebsd}/sbin/ifconfig/af_link.c   |    0
 .../commands => freebsd}/sbin/ifconfig/af_nd6.c    |    0
 .../commands => freebsd}/sbin/ifconfig/ifbridge.c  |    0
 .../commands => freebsd}/sbin/ifconfig/ifcarp.c    |    0
 .../commands => freebsd}/sbin/ifconfig/ifclone.c   |    0
 .../commands => freebsd}/sbin/ifconfig/ifconfig.c  |    0
 .../commands => freebsd}/sbin/ifconfig/ifconfig.h  |    0
 .../commands => freebsd}/sbin/ifconfig/ifgif.c     |    0
 .../commands => freebsd}/sbin/ifconfig/ifgre.c     |    0
 .../commands => freebsd}/sbin/ifconfig/ifgroup.c   |    0
 .../sbin/ifconfig/ifieee80211.c                    |    0
 .../commands => freebsd}/sbin/ifconfig/iflagg.c    |    0
 .../commands => freebsd}/sbin/ifconfig/ifmac.c     |    0
 .../commands => freebsd}/sbin/ifconfig/ifmedia.c   |    0
 .../commands => freebsd}/sbin/ifconfig/ifpfsync.c  |    0
 .../commands => freebsd}/sbin/ifconfig/ifvlan.c    |    0
 .../commands => freebsd}/sbin/ifconfig/regdomain.h |    0
 .../commands => freebsd}/sbin/ping/ping.c          |    0
 .../commands => freebsd}/sbin/ping6/ping6.c        |    0
 .../commands => freebsd}/sbin/route/keywords       |    0
 .../commands => freebsd}/sbin/route/route.c        |    0
 freebsd/{ => sys}/arm/arm/in_cksum.c               |    0
 .../freebsd => sys/arm/include}/machine/cpufunc.h  |    0
 .../freebsd => sys/arm/include}/machine/in_cksum.h |    0
 .../arm/include}/machine/legacyvar.h               |    0
 .../arm/include}/machine/pci_cfgreg.h              |    0
 freebsd/{i386 => sys/arm}/pci/pci_bus.c            |    0
 .../freebsd => sys/avr/include}/machine/in_cksum.h |    0
 .../sys/avr/pci/pci_bus.c                          |    0
 .../bfin/include}/machine/in_cksum.h               |    0
 freebsd/{ => sys}/bsm/audit.h                      |    0
 freebsd/{ => sys}/bsm/audit_kevents.h              |    0
 freebsd/{ => sys}/cam/ata/ata_all.h                |    0
 freebsd/{ => sys}/cam/cam.c                        |    0
 freebsd/{ => sys}/cam/cam.h                        |    0
 freebsd/{ => sys}/cam/cam_ccb.h                    |    0
 freebsd/{ => sys}/cam/cam_debug.h                  |    0
 freebsd/{ => sys}/cam/cam_periph.h                 |    0
 freebsd/{ => sys}/cam/cam_sim.h                    |    0
 freebsd/{ => sys}/cam/cam_xpt.h                    |    0
 freebsd/{ => sys}/cam/cam_xpt_sim.h                |    0
 freebsd/{ => sys}/cam/scsi/scsi_all.c              |    0
 freebsd/{ => sys}/cam/scsi/scsi_all.h              |    0
 freebsd/{ => sys}/cam/scsi/scsi_da.h               |    0
 .../sys/contrib/altq}/altq/altq.h                  |    0
 .../sys/contrib/altq}/altq/altq_cbq.c              |    0
 .../sys/contrib/altq}/altq/altq_cbq.h              |    0
 .../sys/contrib/altq}/altq/altq_cdnr.c             |    0
 .../sys/contrib/altq}/altq/altq_cdnr.h             |    0
 .../sys/contrib/altq}/altq/altq_classq.h           |    0
 .../sys/contrib/altq}/altq/altq_hfsc.c             |    0
 .../sys/contrib/altq}/altq/altq_hfsc.h             |    0
 .../sys/contrib/altq}/altq/altq_priq.c             |    0
 .../sys/contrib/altq}/altq/altq_priq.h             |    0
 .../sys/contrib/altq}/altq/altq_red.c              |    0
 .../sys/contrib/altq}/altq/altq_red.h              |    0
 .../sys/contrib/altq}/altq/altq_rio.c              |    0
 .../sys/contrib/altq}/altq/altq_rio.h              |    0
 .../sys/contrib/altq}/altq/altq_rmclass.c          |    0
 .../sys/contrib/altq}/altq/altq_rmclass.h          |    0
 .../sys/contrib/altq}/altq/altq_rmclass_debug.h    |    0
 .../sys/contrib/altq}/altq/altq_subr.c             |    0
 .../sys/contrib/altq}/altq/altq_var.h              |    0
 .../sys/contrib/altq}/altq/altqconf.h              |    0
 .../sys/contrib/altq}/altq/if_altq.h               |    0
 .../sys/contrib/pf}/net/if_pflog.c                 |    0
 .../sys/contrib/pf}/net/if_pflog.h                 |    0
 .../sys/contrib/pf}/net/if_pfsync.c                |    0
 .../sys/contrib/pf}/net/if_pfsync.h                |    0
 .../pf/freebsd => freebsd/sys/contrib/pf}/net/pf.c |    0
 .../freebsd => freebsd/sys/contrib/pf}/net/pf_if.c |    0
 .../sys/contrib/pf}/net/pf_ioctl.c                 |    0
 .../sys/contrib/pf}/net/pf_mtag.h                  |    0
 .../sys/contrib/pf}/net/pf_norm.c                  |    0
 .../sys/contrib/pf}/net/pf_osfp.c                  |    0
 .../sys/contrib/pf}/net/pf_ruleset.c               |    0
 .../sys/contrib/pf}/net/pf_subr.c                  |    0
 .../sys/contrib/pf}/net/pf_table.c                 |    0
 .../freebsd => freebsd/sys/contrib/pf}/net/pfvar.h |    0
 .../sys/contrib/pf}/netinet/in4_cksum.c            |    0
 freebsd/{ => sys}/crypto/blowfish/bf_ecb.c         |    0
 freebsd/{ => sys}/crypto/blowfish/bf_enc.c         |    0
 freebsd/{ => sys}/crypto/blowfish/bf_locl.h        |    0
 freebsd/{ => sys}/crypto/blowfish/bf_pi.h          |    0
 freebsd/{ => sys}/crypto/blowfish/bf_skey.c        |    0
 freebsd/{ => sys}/crypto/blowfish/blowfish.h       |    0
 freebsd/{ => sys}/crypto/camellia/camellia-api.c   |    0
 freebsd/{ => sys}/crypto/camellia/camellia.c       |    0
 freebsd/{ => sys}/crypto/camellia/camellia.h       |    0
 freebsd/{ => sys}/crypto/des/des.h                 |    0
 freebsd/{ => sys}/crypto/des/des_ecb.c             |    0
 freebsd/{ => sys}/crypto/des/des_enc.c             |    0
 freebsd/{ => sys}/crypto/des/des_locl.h            |    0
 freebsd/{ => sys}/crypto/des/des_setkey.c          |    0
 freebsd/{ => sys}/crypto/des/podd.h                |    0
 freebsd/{ => sys}/crypto/des/sk.h                  |    0
 freebsd/{ => sys}/crypto/des/spr.h                 |    0
 freebsd/{ => sys}/crypto/rc4/rc4.c                 |    0
 freebsd/{ => sys}/crypto/rc4/rc4.h                 |    0
 .../{ => sys}/crypto/rijndael/rijndael-alg-fst.c   |    0
 .../{ => sys}/crypto/rijndael/rijndael-api-fst.c   |    0
 .../{ => sys}/crypto/rijndael/rijndael-api-fst.h   |    0
 freebsd/{ => sys}/crypto/rijndael/rijndael-api.c   |    0
 freebsd/{ => sys}/crypto/rijndael/rijndael.h       |    0
 freebsd/{ => sys}/crypto/rijndael/rijndael_local.h |    0
 freebsd/{ => sys}/crypto/sha1.c                    |    0
 freebsd/{ => sys}/crypto/sha1.h                    |    0
 freebsd/{ => sys}/crypto/sha2/sha2.c               |    0
 freebsd/{ => sys}/crypto/sha2/sha2.h               |    0
 freebsd/{ => sys}/dev/bce/if_bce.c                 |    0
 freebsd/{ => sys}/dev/bce/if_bcefw.h               |    0
 freebsd/{ => sys}/dev/bce/if_bcereg.h              |    0
 freebsd/{ => sys}/dev/bfe/if_bfe.c                 |    0
 freebsd/{ => sys}/dev/bfe/if_bfereg.h              |    0
 freebsd/{ => sys}/dev/bge/if_bge.c                 |    0
 freebsd/{ => sys}/dev/bge/if_bgereg.h              |    0
 freebsd/{ => sys}/dev/dc/dcphy.c                   |    0
 freebsd/{ => sys}/dev/dc/if_dc.c                   |    0
 freebsd/{ => sys}/dev/dc/if_dcreg.h                |    0
 freebsd/{ => sys}/dev/dc/pnphy.c                   |    0
 freebsd/{ => sys}/dev/e1000/e1000_80003es2lan.c    |    0
 freebsd/{ => sys}/dev/e1000/e1000_80003es2lan.h    |    0
 freebsd/{ => sys}/dev/e1000/e1000_82540.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82541.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82541.h          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82542.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82543.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82543.h          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82571.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82571.h          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82575.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_82575.h          |    0
 freebsd/{ => sys}/dev/e1000/e1000_api.c            |    0
 freebsd/{ => sys}/dev/e1000/e1000_api.h            |    0
 freebsd/{ => sys}/dev/e1000/e1000_defines.h        |    0
 freebsd/{ => sys}/dev/e1000/e1000_hw.h             |    0
 freebsd/{ => sys}/dev/e1000/e1000_ich8lan.c        |    0
 freebsd/{ => sys}/dev/e1000/e1000_ich8lan.h        |    0
 freebsd/{ => sys}/dev/e1000/e1000_mac.c            |    0
 freebsd/{ => sys}/dev/e1000/e1000_mac.h            |    0
 freebsd/{ => sys}/dev/e1000/e1000_manage.c         |    0
 freebsd/{ => sys}/dev/e1000/e1000_manage.h         |    0
 freebsd/{ => sys}/dev/e1000/e1000_mbx.c            |    0
 freebsd/{ => sys}/dev/e1000/e1000_mbx.h            |    0
 freebsd/{ => sys}/dev/e1000/e1000_nvm.c            |    0
 freebsd/{ => sys}/dev/e1000/e1000_nvm.h            |    0
 freebsd/{ => sys}/dev/e1000/e1000_osdep.c          |    0
 freebsd/{ => sys}/dev/e1000/e1000_osdep.h          |    0
 freebsd/{ => sys}/dev/e1000/e1000_phy.c            |    0
 freebsd/{ => sys}/dev/e1000/e1000_phy.h            |    0
 freebsd/{ => sys}/dev/e1000/e1000_regs.h           |    0
 freebsd/{ => sys}/dev/e1000/e1000_vf.c             |    0
 freebsd/{ => sys}/dev/e1000/e1000_vf.h             |    0
 freebsd/{ => sys}/dev/e1000/if_em.c                |    0
 freebsd/{ => sys}/dev/e1000/if_em.h                |    0
 freebsd/{ => sys}/dev/e1000/if_igb.c               |    0
 freebsd/{ => sys}/dev/e1000/if_igb.h               |    0
 freebsd/{ => sys}/dev/e1000/if_lem.c               |    0
 freebsd/{ => sys}/dev/e1000/if_lem.h               |    0
 freebsd/{ => sys}/dev/fxp/if_fxp.c                 |    0
 freebsd/{ => sys}/dev/fxp/if_fxpreg.h              |    0
 freebsd/{ => sys}/dev/fxp/if_fxpvar.h              |    0
 freebsd/{ => sys}/dev/fxp/rcvbundl.h               |    0
 freebsd/{ => sys}/dev/led/led.c                    |    0
 freebsd/{ => sys}/dev/led/led.h                    |    0
 freebsd/{ => sys}/dev/mii/brgphy.c                 |    0
 freebsd/{ => sys}/dev/mii/brgphyreg.h              |    0
 freebsd/{ => sys}/dev/mii/icsphy.c                 |    0
 freebsd/{ => sys}/dev/mii/icsphyreg.h              |    0
 freebsd/{ => sys}/dev/mii/mii.c                    |    0
 freebsd/{ => sys}/dev/mii/mii.h                    |    0
 freebsd/{ => sys}/dev/mii/mii_physubr.c            |    0
 freebsd/{ => sys}/dev/mii/miivar.h                 |    0
 freebsd/{ => sys}/dev/pci/pci.c                    |    0
 freebsd/{ => sys}/dev/pci/pci_pci.c                |    0
 freebsd/{ => sys}/dev/pci/pci_private.h            |    0
 freebsd/{ => sys}/dev/pci/pci_user.c               |    0
 freebsd/{ => sys}/dev/pci/pcib_private.h           |    0
 freebsd/{ => sys}/dev/pci/pcireg.h                 |    0
 freebsd/{ => sys}/dev/pci/pcivar.h                 |    0
 freebsd/{ => sys}/dev/random/harvest.c             |    0
 freebsd/{ => sys}/dev/random/randomdev_soft.h      |    0
 freebsd/{ => sys}/dev/re/if_re.c                   |    0
 freebsd/{ => sys}/dev/smc/if_smc.c                 |    0
 freebsd/{ => sys}/dev/smc/if_smcreg.h              |    0
 freebsd/{ => sys}/dev/smc/if_smcvar.h              |    0
 freebsd/{ => sys}/dev/usb/controller/ehci.c        |    0
 freebsd/{ => sys}/dev/usb/controller/ehci.h        |    0
 freebsd/{ => sys}/dev/usb/controller/ehcireg.h     |    0
 freebsd/{ => sys}/dev/usb/controller/ohci.c        |    0
 freebsd/{ => sys}/dev/usb/controller/ohci.h        |    0
 freebsd/{ => sys}/dev/usb/controller/ohcireg.h     |    0
 .../{ => sys}/dev/usb/controller/usb_controller.c  |    0
 freebsd/{ => sys}/dev/usb/quirk/usb_quirk.c        |    0
 freebsd/{ => sys}/dev/usb/quirk/usb_quirk.h        |    0
 freebsd/{ => sys}/dev/usb/storage/umass.c          |    0
 freebsd/{ => sys}/dev/usb/ufm_ioctl.h              |    0
 freebsd/{ => sys}/dev/usb/usb.h                    |    0
 freebsd/{ => sys}/dev/usb/usb_bus.h                |    0
 freebsd/{ => sys}/dev/usb/usb_busdma.c             |    0
 freebsd/{ => sys}/dev/usb/usb_busdma.h             |    0
 freebsd/{ => sys}/dev/usb/usb_cdc.h                |    0
 freebsd/{ => sys}/dev/usb/usb_controller.h         |    0
 freebsd/{ => sys}/dev/usb/usb_core.c               |    0
 freebsd/{ => sys}/dev/usb/usb_core.h               |    0
 freebsd/{ => sys}/dev/usb/usb_debug.c              |    0
 freebsd/{ => sys}/dev/usb/usb_debug.h              |    0
 freebsd/{ => sys}/dev/usb/usb_dev.c                |    0
 freebsd/{ => sys}/dev/usb/usb_dev.h                |    0
 freebsd/{ => sys}/dev/usb/usb_device.c             |    0
 freebsd/{ => sys}/dev/usb/usb_device.h             |    0
 freebsd/{ => sys}/dev/usb/usb_dynamic.c            |    0
 freebsd/{ => sys}/dev/usb/usb_dynamic.h            |    0
 freebsd/{ => sys}/dev/usb/usb_endian.h             |    0
 freebsd/{ => sys}/dev/usb/usb_error.c              |    0
 freebsd/{ => sys}/dev/usb/usb_freebsd.h            |    0
 freebsd/{ => sys}/dev/usb/usb_generic.c            |    0
 freebsd/{ => sys}/dev/usb/usb_generic.h            |    0
 freebsd/{ => sys}/dev/usb/usb_handle_request.c     |    0
 freebsd/{ => sys}/dev/usb/usb_hid.c                |    0
 freebsd/{ => sys}/dev/usb/usb_hub.c                |    0
 freebsd/{ => sys}/dev/usb/usb_hub.h                |    0
 freebsd/{ => sys}/dev/usb/usb_ioctl.h              |    0
 freebsd/{ => sys}/dev/usb/usb_lookup.c             |    0
 freebsd/{ => sys}/dev/usb/usb_mbuf.c               |    0
 freebsd/{ => sys}/dev/usb/usb_mbuf.h               |    0
 freebsd/{ => sys}/dev/usb/usb_msctest.c            |    0
 freebsd/{ => sys}/dev/usb/usb_msctest.h            |    0
 freebsd/{ => sys}/dev/usb/usb_parse.c              |    0
 freebsd/{ => sys}/dev/usb/usb_process.c            |    0
 freebsd/{ => sys}/dev/usb/usb_process.h            |    0
 freebsd/{ => sys}/dev/usb/usb_request.c            |    0
 freebsd/{ => sys}/dev/usb/usb_request.h            |    0
 freebsd/{ => sys}/dev/usb/usb_transfer.c           |    0
 freebsd/{ => sys}/dev/usb/usb_transfer.h           |    0
 freebsd/{ => sys}/dev/usb/usb_util.c               |    0
 freebsd/{ => sys}/dev/usb/usb_util.h               |    0
 freebsd/{ => sys}/dev/usb/usbdi.h                  |    0
 freebsd/{ => sys}/dev/usb/usbdi_util.h             |    0
 freebsd/{ => sys}/dev/usb/usbhid.h                 |    0
 freebsd/{ => sys}/fs/devfs/devfs_int.h             |    0
 .../h8300/include}/machine/in_cksum.h              |    0
 freebsd/{ => sys}/i386/i386/in_cksum.c             |    0
 freebsd/{ => sys}/i386/i386/legacy.c               |    0
 .../freebsd => sys/i386/include}/machine/cpufunc.h |    0
 .../i386/include}/machine/in_cksum.h               |    0
 .../i386/include}/machine/intr_machdep.h           |    0
 .../freebsd => sys/i386/include}/machine/md_var.h  |    0
 .../i386/include}/machine/specialreg.h             |    0
 freebsd/{ => sys}/isa/isavar.h                     |    0
 freebsd/{ => sys}/isa/pnpvar.h                     |    0
 freebsd/{ => sys}/kern/init_main.c                 |    0
 freebsd/{ => sys}/kern/kern_descrip.c              |    0
 freebsd/{ => sys}/kern/kern_environment.c          |    0
 freebsd/{ => sys}/kern/kern_event.c                |    0
 freebsd/{ => sys}/kern/kern_intr.c                 |    0
 freebsd/{ => sys}/kern/kern_linker.c               |    0
 freebsd/{ => sys}/kern/kern_mbuf.c                 |    0
 freebsd/{ => sys}/kern/kern_mib.c                  |    0
 freebsd/{ => sys}/kern/kern_module.c               |    0
 freebsd/{ => sys}/kern/kern_mtxpool.c              |    0
 freebsd/{ => sys}/kern/kern_ntptime.c              |    0
 freebsd/{ => sys}/kern/kern_proc.c                 |    0
 freebsd/{ => sys}/kern/kern_prot.c                 |    0
 freebsd/{ => sys}/kern/kern_resource.c             |    0
 freebsd/{ => sys}/kern/kern_subr.c                 |    0
 freebsd/{ => sys}/kern/kern_sysctl.c               |    0
 freebsd/{ => sys}/kern/kern_tc.c                   |    0
 freebsd/{ => sys}/kern/kern_time.c                 |    0
 freebsd/{ => sys}/kern/kern_timeout.c              |    0
 freebsd/{ => sys}/kern/subr_bufring.c              |    0
 freebsd/{ => sys}/kern/subr_bus.c                  |    0
 freebsd/{ => sys}/kern/subr_eventhandler.c         |    0
 freebsd/{ => sys}/kern/subr_hints.c                |    0
 freebsd/{ => sys}/kern/subr_kobj.c                 |    0
 freebsd/{ => sys}/kern/subr_module.c               |    0
 freebsd/{ => sys}/kern/subr_rman.c                 |    0
 freebsd/{ => sys}/kern/subr_sbuf.c                 |    0
 freebsd/{ => sys}/kern/subr_unit.c                 |    0
 freebsd/{ => sys}/kern/sys_generic.c               |    0
 freebsd/{ => sys}/kern/uipc_accf.c                 |    0
 freebsd/{ => sys}/kern/uipc_domain.c               |    0
 freebsd/{ => sys}/kern/uipc_mbuf.c                 |    0
 freebsd/{ => sys}/kern/uipc_mbuf2.c                |    0
 freebsd/{ => sys}/kern/uipc_sockbuf.c              |    0
 freebsd/{ => sys}/kern/uipc_socket.c               |    0
 freebsd/{ => sys}/libkern/arc4random.c             |    0
 freebsd/{ => sys}/libkern/fls.c                    |    0
 freebsd/{ => sys}/libkern/inet_ntoa.c              |    0
 freebsd/{ => sys}/libkern/random.c                 |    0
 .../freebsd => sys/mips/include}/machine/cpufunc.h |    0
 .../freebsd => sys/mips/include}/machine/cpuregs.h |    0
 freebsd/{ => sys}/mips/mips/in_cksum.c             |    0
 freebsd/{ => sys}/net/bpf.c                        |    0
 freebsd/{ => sys}/net/bpf.h                        |    0
 freebsd/{ => sys}/net/bpf_buffer.c                 |    0
 freebsd/{ => sys}/net/bpf_buffer.h                 |    0
 freebsd/{ => sys}/net/bpf_filter.c                 |    0
 freebsd/{ => sys}/net/bpf_jitter.c                 |    0
 freebsd/{ => sys}/net/bpf_jitter.h                 |    0
 freebsd/{ => sys}/net/bpf_zerocopy.h               |    0
 freebsd/{ => sys}/net/bpfdesc.h                    |    0
 freebsd/{ => sys}/net/bridgestp.c                  |    0
 freebsd/{ => sys}/net/bridgestp.h                  |    0
 .../include => freebsd/sys}/net/ethernet.h         |    0
 freebsd/{ => sys}/net/fddi.h                       |    0
 freebsd/{ => sys}/net/firewire.h                   |    0
 freebsd/{ => sys}/net/flowtable.h                  |    0
 freebsd/{ => sys}/net/ieee8023ad_lacp.c            |    0
 freebsd/{ => sys}/net/ieee8023ad_lacp.h            |    0
 freebsd/{ => sys}/net/if.c                         |    0
 .../include => freebsd/sys}/net/if.h               |    0
 freebsd/{ => sys}/net/if_arc.h                     |    0
 freebsd/{ => sys}/net/if_arcsubr.c                 |    0
 .../include => freebsd/sys}/net/if_arp.h           |    0
 freebsd/{ => sys}/net/if_atm.h                     |    0
 freebsd/{ => sys}/net/if_atmsubr.c                 |    0
 freebsd/{ => sys}/net/if_bridge.c                  |    0
 freebsd/{ => sys}/net/if_bridgevar.h               |    0
 freebsd/{ => sys}/net/if_clone.c                   |    0
 freebsd/{ => sys}/net/if_clone.h                   |    0
 freebsd/{ => sys}/net/if_dead.c                    |    0
 freebsd/{ => sys}/net/if_disc.c                    |    0
 .../include => freebsd/sys}/net/if_dl.h            |    0
 freebsd/{ => sys}/net/if_edsc.c                    |    0
 freebsd/{ => sys}/net/if_ef.c                      |    0
 freebsd/{ => sys}/net/if_enc.c                     |    0
 freebsd/{ => sys}/net/if_enc.h                     |    0
 freebsd/{ => sys}/net/if_epair.c                   |    0
 freebsd/{ => sys}/net/if_ethersubr.c               |    0
 freebsd/{ => sys}/net/if_faith.c                   |    0
 freebsd/{ => sys}/net/if_fddisubr.c                |    0
 freebsd/{ => sys}/net/if_fwsubr.c                  |    0
 freebsd/{ => sys}/net/if_gif.c                     |    0
 freebsd/{ => sys}/net/if_gif.h                     |    0
 freebsd/{ => sys}/net/if_gre.c                     |    0
 freebsd/{ => sys}/net/if_gre.h                     |    0
 freebsd/{ => sys}/net/if_iso88025subr.c            |    0
 freebsd/{ => sys}/net/if_lagg.c                    |    0
 freebsd/{ => sys}/net/if_lagg.h                    |    0
 freebsd/{ => sys}/net/if_llatbl.c                  |    0
 freebsd/{ => sys}/net/if_llatbl.h                  |    0
 freebsd/{ => sys}/net/if_llc.h                     |    0
 freebsd/{ => sys}/net/if_loop.c                    |    0
 freebsd/{ => sys}/net/if_media.c                   |    0
 freebsd/{ => sys}/net/if_media.h                   |    0
 freebsd/{ => sys}/net/if_mib.c                     |    0
 freebsd/{ => sys}/net/if_mib.h                     |    0
 freebsd/{ => sys}/net/if_sppp.h                    |    0
 freebsd/{ => sys}/net/if_spppfr.c                  |    0
 freebsd/{ => sys}/net/if_spppsubr.c                |    0
 freebsd/{ => sys}/net/if_stf.c                     |    0
 freebsd/{ => sys}/net/if_stf.h                     |    0
 freebsd/{ => sys}/net/if_tap.c                     |    0
 freebsd/{ => sys}/net/if_tap.h                     |    0
 freebsd/{ => sys}/net/if_tapvar.h                  |    0
 freebsd/{ => sys}/net/if_tun.c                     |    0
 freebsd/{ => sys}/net/if_tun.h                     |    0
 .../include => freebsd/sys}/net/if_types.h         |    0
 freebsd/{ => sys}/net/if_var.h                     |    0
 freebsd/{ => sys}/net/if_vlan.c                    |    0
 freebsd/{ => sys}/net/if_vlan_var.h                |    0
 freebsd/{ => sys}/net/iso88025.h                   |    0
 freebsd/{ => sys}/net/netisr.c                     |    0
 freebsd/{ => sys}/net/netisr.h                     |    0
 freebsd/{ => sys}/net/pfil.c                       |    0
 freebsd/{ => sys}/net/pfil.h                       |    0
 freebsd/{ => sys}/net/pfkeyv2.h                    |    0
 freebsd/{ => sys}/net/ppp_defs.h                   |    0
 freebsd/{ => sys}/net/radix.c                      |    0
 freebsd/{ => sys}/net/radix.h                      |    0
 freebsd/{ => sys}/net/radix_mpath.c                |    0
 freebsd/{ => sys}/net/radix_mpath.h                |    0
 freebsd/{ => sys}/net/raw_cb.c                     |    0
 freebsd/{ => sys}/net/raw_cb.h                     |    0
 freebsd/{ => sys}/net/raw_usrreq.c                 |    0
 freebsd/{ => sys}/net/route.c                      |    0
 .../include => freebsd/sys}/net/route.h            |    0
 freebsd/{ => sys}/net/rtsock.c                     |    0
 freebsd/{ => sys}/net/slcompress.c                 |    0
 freebsd/{ => sys}/net/slcompress.h                 |    0
 freebsd/{ => sys}/net/vnet.h                       |    0
 freebsd/{ => sys}/net/zlib.c                       |    0
 freebsd/{ => sys}/net/zlib.h                       |    0
 freebsd/{ => sys}/net80211/_ieee80211.h            |    0
 freebsd/{ => sys}/net80211/ieee80211.c             |    0
 freebsd/{ => sys}/net80211/ieee80211.h             |    0
 freebsd/{ => sys}/net80211/ieee80211_acl.c         |    0
 freebsd/{ => sys}/net80211/ieee80211_action.c      |    0
 freebsd/{ => sys}/net80211/ieee80211_action.h      |    0
 freebsd/{ => sys}/net80211/ieee80211_adhoc.c       |    0
 freebsd/{ => sys}/net80211/ieee80211_adhoc.h       |    0
 freebsd/{ => sys}/net80211/ieee80211_ageq.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_ageq.h        |    0
 freebsd/{ => sys}/net80211/ieee80211_amrr.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_amrr.h        |    0
 freebsd/{ => sys}/net80211/ieee80211_crypto.c      |    0
 freebsd/{ => sys}/net80211/ieee80211_crypto.h      |    0
 freebsd/{ => sys}/net80211/ieee80211_crypto_ccmp.c |    0
 freebsd/{ => sys}/net80211/ieee80211_crypto_none.c |    0
 freebsd/{ => sys}/net80211/ieee80211_crypto_tkip.c |    0
 freebsd/{ => sys}/net80211/ieee80211_crypto_wep.c  |    0
 freebsd/{ => sys}/net80211/ieee80211_ddb.c         |    0
 freebsd/{ => sys}/net80211/ieee80211_dfs.c         |    0
 freebsd/{ => sys}/net80211/ieee80211_dfs.h         |    0
 freebsd/{ => sys}/net80211/ieee80211_freebsd.c     |    0
 freebsd/{ => sys}/net80211/ieee80211_freebsd.h     |    0
 freebsd/{ => sys}/net80211/ieee80211_hostap.c      |    0
 freebsd/{ => sys}/net80211/ieee80211_hostap.h      |    0
 freebsd/{ => sys}/net80211/ieee80211_ht.c          |    0
 freebsd/{ => sys}/net80211/ieee80211_ht.h          |    0
 freebsd/{ => sys}/net80211/ieee80211_hwmp.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_input.c       |    0
 freebsd/{ => sys}/net80211/ieee80211_input.h       |    0
 freebsd/{ => sys}/net80211/ieee80211_ioctl.c       |    0
 freebsd/{ => sys}/net80211/ieee80211_ioctl.h       |    0
 freebsd/{ => sys}/net80211/ieee80211_mesh.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_mesh.h        |    0
 freebsd/{ => sys}/net80211/ieee80211_monitor.c     |    0
 freebsd/{ => sys}/net80211/ieee80211_monitor.h     |    0
 freebsd/{ => sys}/net80211/ieee80211_node.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_node.h        |    0
 freebsd/{ => sys}/net80211/ieee80211_output.c      |    0
 freebsd/{ => sys}/net80211/ieee80211_phy.c         |    0
 freebsd/{ => sys}/net80211/ieee80211_phy.h         |    0
 freebsd/{ => sys}/net80211/ieee80211_power.c       |    0
 freebsd/{ => sys}/net80211/ieee80211_power.h       |    0
 freebsd/{ => sys}/net80211/ieee80211_proto.c       |    0
 freebsd/{ => sys}/net80211/ieee80211_proto.h       |    0
 freebsd/{ => sys}/net80211/ieee80211_radiotap.c    |    0
 freebsd/{ => sys}/net80211/ieee80211_radiotap.h    |    0
 freebsd/{ => sys}/net80211/ieee80211_ratectl.c     |    0
 freebsd/{ => sys}/net80211/ieee80211_ratectl.h     |    0
 .../{ => sys}/net80211/ieee80211_ratectl_none.c    |    0
 freebsd/{ => sys}/net80211/ieee80211_regdomain.c   |    0
 freebsd/{ => sys}/net80211/ieee80211_regdomain.h   |    0
 freebsd/{ => sys}/net80211/ieee80211_rssadapt.c    |    0
 freebsd/{ => sys}/net80211/ieee80211_rssadapt.h    |    0
 freebsd/{ => sys}/net80211/ieee80211_scan.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_scan.h        |    0
 freebsd/{ => sys}/net80211/ieee80211_scan_sta.c    |    0
 freebsd/{ => sys}/net80211/ieee80211_sta.c         |    0
 freebsd/{ => sys}/net80211/ieee80211_sta.h         |    0
 freebsd/{ => sys}/net80211/ieee80211_superg.c      |    0
 freebsd/{ => sys}/net80211/ieee80211_superg.h      |    0
 freebsd/{ => sys}/net80211/ieee80211_tdma.c        |    0
 freebsd/{ => sys}/net80211/ieee80211_tdma.h        |    0
 freebsd/{ => sys}/net80211/ieee80211_var.h         |    0
 freebsd/{ => sys}/net80211/ieee80211_wds.c         |    0
 freebsd/{ => sys}/net80211/ieee80211_wds.h         |    0
 freebsd/{ => sys}/net80211/ieee80211_xauth.c       |    0
 freebsd/{ => sys}/netatalk/aarp.c                  |    0
 freebsd/{ => sys}/netatalk/aarp.h                  |    0
 .../include => freebsd/sys}/netatalk/at.h          |    0
 freebsd/{ => sys}/netatalk/at_control.c            |    0
 freebsd/{ => sys}/netatalk/at_extern.h             |    0
 freebsd/{ => sys}/netatalk/at_proto.c              |    0
 freebsd/{ => sys}/netatalk/at_rmx.c                |    0
 freebsd/{ => sys}/netatalk/at_var.h                |    0
 freebsd/{ => sys}/netatalk/ddp.h                   |    0
 freebsd/{ => sys}/netatalk/ddp_input.c             |    0
 freebsd/{ => sys}/netatalk/ddp_output.c            |    0
 freebsd/{ => sys}/netatalk/ddp_pcb.c               |    0
 freebsd/{ => sys}/netatalk/ddp_pcb.h               |    0
 freebsd/{ => sys}/netatalk/ddp_usrreq.c            |    0
 freebsd/{ => sys}/netatalk/ddp_var.h               |    0
 freebsd/{ => sys}/netatalk/endian.h                |    0
 freebsd/{ => sys}/netatalk/phase2.h                |    0
 freebsd/{ => sys}/netinet/accf_data.c              |    0
 freebsd/{ => sys}/netinet/accf_dns.c               |    0
 freebsd/{ => sys}/netinet/accf_http.c              |    0
 .../include => freebsd/sys}/netinet/icmp6.h        |    0
 freebsd/{ => sys}/netinet/icmp_var.h               |    0
 freebsd/{ => sys}/netinet/if_atm.c                 |    0
 freebsd/{ => sys}/netinet/if_atm.h                 |    0
 freebsd/{ => sys}/netinet/if_ether.c               |    0
 .../include => freebsd/sys}/netinet/if_ether.h     |    0
 freebsd/{ => sys}/netinet/igmp.c                   |    0
 .../include => freebsd/sys}/netinet/igmp.h         |    0
 freebsd/{ => sys}/netinet/igmp_var.h               |    0
 freebsd/{ => sys}/netinet/in.c                     |    0
 .../include => freebsd/sys}/netinet/in.h           |    0
 freebsd/{ => sys}/netinet/in_gif.c                 |    0
 freebsd/{ => sys}/netinet/in_gif.h                 |    0
 freebsd/{ => sys}/netinet/in_mcast.c               |    0
 freebsd/{ => sys}/netinet/in_pcb.c                 |    0
 freebsd/{ => sys}/netinet/in_pcb.h                 |    0
 freebsd/{ => sys}/netinet/in_proto.c               |    0
 freebsd/{ => sys}/netinet/in_rmx.c                 |    0
 .../include => freebsd/sys}/netinet/in_systm.h     |    0
 freebsd/{ => sys}/netinet/in_var.h                 |    0
 .../include => freebsd/sys}/netinet/ip.h           |    0
 .../include => freebsd/sys}/netinet/ip6.h          |    0
 freebsd/{ => sys}/netinet/ip_carp.c                |    0
 freebsd/{ => sys}/netinet/ip_carp.h                |    0
 freebsd/{ => sys}/netinet/ip_divert.c              |    0
 freebsd/{ => sys}/netinet/ip_divert.h              |    0
 freebsd/{ => sys}/netinet/ip_dummynet.h            |    0
 freebsd/{ => sys}/netinet/ip_ecn.c                 |    0
 freebsd/{ => sys}/netinet/ip_ecn.h                 |    0
 freebsd/{ => sys}/netinet/ip_encap.c               |    0
 freebsd/{ => sys}/netinet/ip_encap.h               |    0
 freebsd/{ => sys}/netinet/ip_fastfwd.c             |    0
 freebsd/{ => sys}/netinet/ip_fw.h                  |    0
 freebsd/{ => sys}/netinet/ip_gre.c                 |    0
 freebsd/{ => sys}/netinet/ip_gre.h                 |    0
 freebsd/{ => sys}/netinet/ip_icmp.c                |    0
 .../include => freebsd/sys}/netinet/ip_icmp.h      |    0
 freebsd/{ => sys}/netinet/ip_id.c                  |    0
 freebsd/{ => sys}/netinet/ip_input.c               |    0
 freebsd/{ => sys}/netinet/ip_ipsec.c               |    0
 freebsd/{ => sys}/netinet/ip_ipsec.h               |    0
 freebsd/{ => sys}/netinet/ip_mroute.c              |    0
 freebsd/{ => sys}/netinet/ip_mroute.h              |    0
 freebsd/{ => sys}/netinet/ip_options.c             |    0
 freebsd/{ => sys}/netinet/ip_options.h             |    0
 freebsd/{ => sys}/netinet/ip_output.c              |    0
 freebsd/{ => sys}/netinet/ip_var.h                 |    0
 freebsd/{ => sys}/netinet/ipfw/dn_heap.c           |    0
 freebsd/{ => sys}/netinet/ipfw/dn_heap.h           |    0
 freebsd/{ => sys}/netinet/ipfw/dn_sched.h          |    0
 freebsd/{ => sys}/netinet/ipfw/dn_sched_fifo.c     |    0
 freebsd/{ => sys}/netinet/ipfw/dn_sched_prio.c     |    0
 freebsd/{ => sys}/netinet/ipfw/dn_sched_qfq.c      |    0
 freebsd/{ => sys}/netinet/ipfw/dn_sched_rr.c       |    0
 freebsd/{ => sys}/netinet/ipfw/dn_sched_wf2q.c     |    0
 freebsd/{ => sys}/netinet/ipfw/ip_dn_glue.c        |    0
 freebsd/{ => sys}/netinet/ipfw/ip_dn_io.c          |    0
 freebsd/{ => sys}/netinet/ipfw/ip_dn_private.h     |    0
 freebsd/{ => sys}/netinet/ipfw/ip_dummynet.c       |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw2.c            |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw_log.c         |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw_nat.c         |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw_pfil.c        |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw_private.h     |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw_sockopt.c     |    0
 freebsd/{ => sys}/netinet/ipfw/ip_fw_table.c       |    0
 freebsd/{ => sys}/netinet/libalias/alias.c         |    0
 freebsd/{ => sys}/netinet/libalias/alias.h         |    0
 freebsd/{ => sys}/netinet/libalias/alias_cuseeme.c |    0
 freebsd/{ => sys}/netinet/libalias/alias_db.c      |    0
 freebsd/{ => sys}/netinet/libalias/alias_dummy.c   |    0
 freebsd/{ => sys}/netinet/libalias/alias_ftp.c     |    0
 freebsd/{ => sys}/netinet/libalias/alias_irc.c     |    0
 freebsd/{ => sys}/netinet/libalias/alias_local.h   |    0
 freebsd/{ => sys}/netinet/libalias/alias_mod.c     |    0
 freebsd/{ => sys}/netinet/libalias/alias_mod.h     |    0
 freebsd/{ => sys}/netinet/libalias/alias_nbt.c     |    0
 freebsd/{ => sys}/netinet/libalias/alias_pptp.c    |    0
 freebsd/{ => sys}/netinet/libalias/alias_proxy.c   |    0
 freebsd/{ => sys}/netinet/libalias/alias_sctp.c    |    0
 freebsd/{ => sys}/netinet/libalias/alias_sctp.h    |    0
 freebsd/{ => sys}/netinet/libalias/alias_skinny.c  |    0
 freebsd/{ => sys}/netinet/libalias/alias_smedia.c  |    0
 freebsd/{ => sys}/netinet/libalias/alias_util.c    |    0
 freebsd/{ => sys}/netinet/pim.h                    |    0
 freebsd/{ => sys}/netinet/pim_var.h                |    0
 freebsd/{ => sys}/netinet/raw_ip.c                 |    0
 freebsd/{ => sys}/netinet/sctp.h                   |    0
 freebsd/{ => sys}/netinet/sctp_asconf.c            |    0
 freebsd/{ => sys}/netinet/sctp_asconf.h            |    0
 freebsd/{ => sys}/netinet/sctp_auth.c              |    0
 freebsd/{ => sys}/netinet/sctp_auth.h              |    0
 freebsd/{ => sys}/netinet/sctp_bsd_addr.c          |    0
 freebsd/{ => sys}/netinet/sctp_bsd_addr.h          |    0
 freebsd/{ => sys}/netinet/sctp_cc_functions.c      |    0
 freebsd/{ => sys}/netinet/sctp_cc_functions.h      |    0
 freebsd/{ => sys}/netinet/sctp_constants.h         |    0
 freebsd/{ => sys}/netinet/sctp_crc32.c             |    0
 freebsd/{ => sys}/netinet/sctp_crc32.h             |    0
 freebsd/{ => sys}/netinet/sctp_header.h            |    0
 freebsd/{ => sys}/netinet/sctp_indata.c            |    0
 freebsd/{ => sys}/netinet/sctp_indata.h            |    0
 freebsd/{ => sys}/netinet/sctp_input.c             |    0
 freebsd/{ => sys}/netinet/sctp_input.h             |    0
 freebsd/{ => sys}/netinet/sctp_lock_bsd.h          |    0
 freebsd/{ => sys}/netinet/sctp_os.h                |    0
 freebsd/{ => sys}/netinet/sctp_os_bsd.h            |    0
 freebsd/{ => sys}/netinet/sctp_output.c            |    0
 freebsd/{ => sys}/netinet/sctp_output.h            |    0
 freebsd/{ => sys}/netinet/sctp_pcb.c               |    0
 freebsd/{ => sys}/netinet/sctp_pcb.h               |    0
 freebsd/{ => sys}/netinet/sctp_peeloff.c           |    0
 freebsd/{ => sys}/netinet/sctp_peeloff.h           |    0
 freebsd/{ => sys}/netinet/sctp_structs.h           |    0
 freebsd/{ => sys}/netinet/sctp_sysctl.c            |    0
 freebsd/{ => sys}/netinet/sctp_sysctl.h            |    0
 freebsd/{ => sys}/netinet/sctp_timer.c             |    0
 freebsd/{ => sys}/netinet/sctp_timer.h             |    0
 freebsd/{ => sys}/netinet/sctp_uio.h               |    0
 freebsd/{ => sys}/netinet/sctp_usrreq.c            |    0
 freebsd/{ => sys}/netinet/sctp_var.h               |    0
 freebsd/{ => sys}/netinet/sctputil.c               |    0
 freebsd/{ => sys}/netinet/sctputil.h               |    0
 .../include => freebsd/sys}/netinet/tcp.h          |    0
 freebsd/{ => sys}/netinet/tcp_debug.c              |    0
 freebsd/{ => sys}/netinet/tcp_debug.h              |    0
 freebsd/{ => sys}/netinet/tcp_fsm.h                |    0
 freebsd/{ => sys}/netinet/tcp_hostcache.c          |    0
 freebsd/{ => sys}/netinet/tcp_hostcache.h          |    0
 freebsd/{ => sys}/netinet/tcp_input.c              |    0
 freebsd/{ => sys}/netinet/tcp_lro.c                |    0
 freebsd/{ => sys}/netinet/tcp_lro.h                |    0
 freebsd/{ => sys}/netinet/tcp_offload.c            |    0
 freebsd/{ => sys}/netinet/tcp_offload.h            |    0
 freebsd/{ => sys}/netinet/tcp_output.c             |    0
 freebsd/{ => sys}/netinet/tcp_reass.c              |    0
 freebsd/{ => sys}/netinet/tcp_sack.c               |    0
 freebsd/{ => sys}/netinet/tcp_seq.h                |    0
 freebsd/{ => sys}/netinet/tcp_subr.c               |    0
 freebsd/{ => sys}/netinet/tcp_syncache.c           |    0
 freebsd/{ => sys}/netinet/tcp_syncache.h           |    0
 freebsd/{ => sys}/netinet/tcp_timer.c              |    0
 freebsd/{ => sys}/netinet/tcp_timer.h              |    0
 freebsd/{ => sys}/netinet/tcp_timewait.c           |    0
 freebsd/{ => sys}/netinet/tcp_usrreq.c             |    0
 freebsd/{ => sys}/netinet/tcp_var.h                |    0
 freebsd/{ => sys}/netinet/tcpip.h                  |    0
 freebsd/{ => sys}/netinet/toedev.h                 |    0
 .../include => freebsd/sys}/netinet/udp.h          |    0
 freebsd/{ => sys}/netinet/udp_usrreq.c             |    0
 freebsd/{ => sys}/netinet/udp_var.h                |    0
 freebsd/{ => sys}/netinet6/dest6.c                 |    0
 freebsd/{ => sys}/netinet6/frag6.c                 |    0
 freebsd/{ => sys}/netinet6/icmp6.c                 |    0
 freebsd/{ => sys}/netinet6/icmp6.h                 |    0
 freebsd/{ => sys}/netinet6/in6.c                   |    0
 freebsd/{ => sys}/netinet6/in6.h                   |    0
 freebsd/{ => sys}/netinet6/in6_cksum.c             |    0
 freebsd/{ => sys}/netinet6/in6_gif.c               |    0
 freebsd/{ => sys}/netinet6/in6_gif.h               |    0
 freebsd/{ => sys}/netinet6/in6_ifattach.c          |    0
 freebsd/{ => sys}/netinet6/in6_ifattach.h          |    0
 freebsd/{ => sys}/netinet6/in6_mcast.c             |    0
 freebsd/{ => sys}/netinet6/in6_pcb.c               |    0
 freebsd/{ => sys}/netinet6/in6_pcb.h               |    0
 freebsd/{ => sys}/netinet6/in6_proto.c             |    0
 freebsd/{ => sys}/netinet6/in6_rmx.c               |    0
 freebsd/{ => sys}/netinet6/in6_src.c               |    0
 freebsd/{ => sys}/netinet6/in6_var.h               |    0
 freebsd/{ => sys}/netinet6/ip6.h                   |    0
 freebsd/{ => sys}/netinet6/ip6_ecn.h               |    0
 freebsd/{ => sys}/netinet6/ip6_forward.c           |    0
 freebsd/{ => sys}/netinet6/ip6_id.c                |    0
 freebsd/{ => sys}/netinet6/ip6_input.c             |    0
 freebsd/{ => sys}/netinet6/ip6_ipsec.c             |    0
 freebsd/{ => sys}/netinet6/ip6_ipsec.h             |    0
 freebsd/{ => sys}/netinet6/ip6_mroute.c            |    0
 freebsd/{ => sys}/netinet6/ip6_mroute.h            |    0
 freebsd/{ => sys}/netinet6/ip6_output.c            |    0
 freebsd/{ => sys}/netinet6/ip6_var.h               |    0
 freebsd/{ => sys}/netinet6/ip6protosw.h            |    0
 freebsd/{ => sys}/netinet6/mld6.c                  |    0
 freebsd/{ => sys}/netinet6/mld6.h                  |    0
 freebsd/{ => sys}/netinet6/mld6_var.h              |    0
 freebsd/{ => sys}/netinet6/nd6.c                   |    0
 freebsd/{ => sys}/netinet6/nd6.h                   |    0
 freebsd/{ => sys}/netinet6/nd6_nbr.c               |    0
 freebsd/{ => sys}/netinet6/nd6_rtr.c               |    0
 freebsd/{ => sys}/netinet6/pim6.h                  |    0
 freebsd/{ => sys}/netinet6/pim6_var.h              |    0
 freebsd/{ => sys}/netinet6/raw_ip6.c               |    0
 freebsd/{ => sys}/netinet6/raw_ip6.h               |    0
 freebsd/{ => sys}/netinet6/route6.c                |    0
 freebsd/{ => sys}/netinet6/scope6.c                |    0
 freebsd/{ => sys}/netinet6/scope6_var.h            |    0
 freebsd/{ => sys}/netinet6/sctp6_usrreq.c          |    0
 freebsd/{ => sys}/netinet6/sctp6_var.h             |    0
 freebsd/{ => sys}/netinet6/tcp6_var.h              |    0
 freebsd/{ => sys}/netinet6/udp6_usrreq.c           |    0
 freebsd/{ => sys}/netinet6/udp6_var.h              |    0
 freebsd/{ => sys}/netipsec/ah.h                    |    0
 freebsd/{ => sys}/netipsec/ah_var.h                |    0
 freebsd/{ => sys}/netipsec/esp.h                   |    0
 freebsd/{ => sys}/netipsec/esp_var.h               |    0
 freebsd/{ => sys}/netipsec/ipcomp.h                |    0
 freebsd/{ => sys}/netipsec/ipcomp_var.h            |    0
 freebsd/{ => sys}/netipsec/ipip_var.h              |    0
 freebsd/{ => sys}/netipsec/ipsec.c                 |    0
 freebsd/{ => sys}/netipsec/ipsec.h                 |    0
 freebsd/{ => sys}/netipsec/ipsec6.h                |    0
 freebsd/{ => sys}/netipsec/ipsec_input.c           |    0
 freebsd/{ => sys}/netipsec/ipsec_mbuf.c            |    0
 freebsd/{ => sys}/netipsec/ipsec_output.c          |    0
 freebsd/{ => sys}/netipsec/key.c                   |    0
 freebsd/{ => sys}/netipsec/key.h                   |    0
 freebsd/{ => sys}/netipsec/key_debug.c             |    0
 freebsd/{ => sys}/netipsec/key_debug.h             |    0
 freebsd/{ => sys}/netipsec/key_var.h               |    0
 freebsd/{ => sys}/netipsec/keydb.h                 |    0
 freebsd/{ => sys}/netipsec/keysock.c               |    0
 freebsd/{ => sys}/netipsec/keysock.h               |    0
 freebsd/{ => sys}/netipsec/xform.h                 |    0
 freebsd/{ => sys}/netipsec/xform_ah.c              |    0
 freebsd/{ => sys}/netipsec/xform_esp.c             |    0
 freebsd/{ => sys}/netipsec/xform_ipcomp.c          |    0
 freebsd/{ => sys}/netipsec/xform_ipip.c            |    0
 freebsd/{ => sys}/netipsec/xform_tcp.c             |    0
 freebsd/{ => sys}/opencrypto/cast.c                |    0
 freebsd/{ => sys}/opencrypto/cast.h                |    0
 freebsd/{ => sys}/opencrypto/castsb.h              |    0
 freebsd/{ => sys}/opencrypto/criov.c               |    0
 freebsd/{ => sys}/opencrypto/crypto.c              |    0
 freebsd/{ => sys}/opencrypto/cryptodev.c           |    0
 freebsd/{ => sys}/opencrypto/cryptodev.h           |    0
 freebsd/{ => sys}/opencrypto/cryptosoft.c          |    0
 freebsd/{ => sys}/opencrypto/cryptosoft.h          |    0
 freebsd/{ => sys}/opencrypto/deflate.c             |    0
 freebsd/{ => sys}/opencrypto/deflate.h             |    0
 freebsd/{ => sys}/opencrypto/rmd160.c              |    0
 freebsd/{ => sys}/opencrypto/rmd160.h              |    0
 freebsd/{ => sys}/opencrypto/skipjack.c            |    0
 freebsd/{ => sys}/opencrypto/skipjack.h            |    0
 freebsd/{ => sys}/opencrypto/xform.c               |    0
 freebsd/{ => sys}/opencrypto/xform.h               |    0
 freebsd/{ => sys}/pci/if_rlreg.h                   |    0
 .../powerpc/include}/machine/cpufunc.h             |    0
 .../freebsd => sys/powerpc/include}/machine/psl.h  |    0
 .../freebsd => sys/powerpc/include}/machine/spr.h  |    0
 freebsd/{ => sys}/powerpc/powerpc/in_cksum.c       |    0
 {freebsd-userspace => freebsd}/sys/rpc/types.h     |    0
 freebsd/{ => sys}/security/mac/mac_framework.h     |    0
 .../freebsd => sys/sparc64/include}/machine/asi.h  |    0
 .../sparc64/include}/machine/cpufunc.h             |    0
 .../sparc64/include}/machine/pstate.h              |    0
 freebsd/{ => sys}/sparc64/sparc64/in_cksum.c       |    0
 freebsd/sys/{ => }/sys/_bus_dma.h                  |    0
 freebsd/sys/{ => }/sys/_lock.h                     |    0
 freebsd/sys/{ => }/sys/_lockmgr.h                  |    0
 freebsd/sys/{ => }/sys/_mutex.h                    |    0
 {freebsd-userspace => freebsd}/sys/sys/_null.h     |    0
 freebsd/sys/{ => }/sys/_rmlock.h                   |    0
 freebsd/sys/{ => }/sys/_rwlock.h                   |    0
 freebsd/sys/{ => }/sys/_semaphore.h                |    0
 freebsd/sys/{ => }/sys/_sigset.h                   |    0
 freebsd/sys/{ => }/sys/_sx.h                       |    0
 freebsd/sys/{ => }/sys/_task.h                     |    0
 freebsd/sys/{ => }/sys/_timeval.h                  |    0
 freebsd/sys/{ => }/sys/acl.h                       |    0
 freebsd/sys/{ => }/sys/aio.h                       |    0
 freebsd/sys/{ => }/sys/ata.h                       |    0
 freebsd/sys/{ => }/sys/bitstring.h                 |    0
 freebsd/sys/{ => }/sys/buf.h                       |    0
 freebsd/sys/{ => }/sys/buf_ring.h                  |    0
 freebsd/sys/{ => }/sys/bufobj.h                    |    0
 freebsd/sys/{ => }/sys/bus.h                       |    0
 freebsd/sys/{ => }/sys/bus_dma.h                   |    0
 freebsd/sys/{ => }/sys/callout.h                   |    0
 freebsd/sys/{ => }/sys/condvar.h                   |    0
 freebsd/sys/{ => }/sys/conf.h                      |    0
 freebsd/sys/{ => }/sys/cpu.h                       |    0
 freebsd/sys/{ => }/sys/ctype.h                     |    0
 freebsd/sys/{ => }/sys/domain.h                    |    0
 freebsd/sys/{ => }/sys/endian.h                    |    0
 freebsd/sys/{ => }/sys/event.h                     |    0
 freebsd/sys/{ => }/sys/eventhandler.h              |    0
 freebsd/sys/{ => }/sys/eventvar.h                  |    0
 freebsd/sys/{ => }/sys/fcntl.h                     |    0
 freebsd/sys/{ => }/sys/file.h                      |    0
 freebsd/sys/{ => }/sys/filedesc.h                  |    0
 freebsd/sys/{ => }/sys/filio.h                     |    0
 freebsd/sys/{ => }/sys/fnv_hash.h                  |    0
 freebsd/sys/{ => }/sys/hash.h                      |    0
 freebsd/sys/{ => }/sys/interrupt.h                 |    0
 freebsd/sys/{ => }/sys/jail.h                      |    0
 freebsd/sys/{ => }/sys/kenv.h                      |    0
 freebsd/sys/{ => }/sys/kernel.h                    |    0
 freebsd/sys/{ => }/sys/kobj.h                      |    0
 freebsd/sys/{ => }/sys/kthread.h                   |    0
 freebsd/sys/{ => }/sys/ktr.h                       |    0
 freebsd/sys/{ => }/sys/libkern.h                   |    0
 {rtemsbsd/freebsd => freebsd/sys}/sys/limits.h     |    0
 freebsd/sys/{ => }/sys/linker.h                    |    0
 freebsd/sys/{ => }/sys/linker_set.h                |    0
 freebsd/sys/{ => }/sys/lock_profile.h              |    0
 freebsd/sys/{ => }/sys/lockmgr.h                   |    0
 freebsd/sys/{ => }/sys/lockstat.h                  |    0
 freebsd/sys/{ => }/sys/mac.h                       |    0
 freebsd/sys/{ => }/sys/malloc.h                    |    0
 freebsd/sys/{ => }/sys/mbuf.h                      |    0
 freebsd/sys/{ => }/sys/md5.h                       |    0
 .../include => freebsd/sys}/sys/mman.h             |    0
 freebsd/sys/{ => }/sys/module.h                    |    0
 freebsd/sys/{ => }/sys/mount.h                     |    0
 freebsd/sys/{ => }/sys/mqueue.h                    |    0
 freebsd/sys/{ => }/sys/mutex.h                     |    0
 .../sys/sys/nlist_aout.h                           |    0
 freebsd/sys/{ => }/sys/osd.h                       |    0
 freebsd/sys/{ => }/sys/pciio.h                     |    0
 freebsd/sys/{ => }/sys/pcpu.h                      |    0
 freebsd/sys/{ => }/sys/poll.h                      |    0
 freebsd/sys/{ => }/sys/priority.h                  |    0
 freebsd/sys/{ => }/sys/priv.h                      |    0
 freebsd/sys/{ => }/sys/proc.h                      |    0
 freebsd/sys/{ => }/sys/protosw.h                   |    0
 freebsd/sys/{ => }/sys/queue.h                     |    0
 freebsd/sys/{ => }/sys/random.h                    |    0
 freebsd/sys/{ => }/sys/reboot.h                    |    0
 freebsd/sys/{ => }/sys/refcount.h                  |    0
 freebsd/sys/{ => }/sys/resourcevar.h               |    0
 freebsd/sys/{ => }/sys/rman.h                      |    0
 freebsd/sys/{ => }/sys/rmlock.h                    |    0
 freebsd/sys/{ => }/sys/rtprio.h                    |    0
 freebsd/sys/{ => }/sys/runq.h                      |    0
 freebsd/sys/{ => }/sys/rwlock.h                    |    0
 freebsd/sys/{ => }/sys/sbuf.h                      |    0
 freebsd/sys/{ => }/sys/sdt.h                       |    0
 .../include => freebsd/sys}/sys/select.h           |    0
 freebsd/sys/{ => }/sys/selinfo.h                   |    0
 freebsd/sys/{ => }/sys/sf_buf.h                    |    0
 freebsd/sys/{ => }/sys/sigio.h                     |    0
 freebsd/sys/{ => }/sys/smp.h                       |    0
 freebsd/sys/{ => }/sys/sockbuf.h                   |    0
 .../include => freebsd/sys}/sys/socket.h           |    0
 .../include => freebsd/sys}/sys/socketvar.h        |    0
 freebsd/sys/{ => }/sys/sockio.h                    |    0
 freebsd/sys/{ => }/sys/sockopt.h                   |    0
 freebsd/sys/{ => }/sys/sockstate.h                 |    0
 freebsd/sys/{ => }/sys/stddef.h                    |    0
 freebsd/sys/{ => }/sys/stdint.h                    |    0
 freebsd/sys/{ => }/sys/sx.h                        |    0
 .../include => freebsd/sys}/sys/sysctl.h           |    0
 .../rtems/include => freebsd/sys}/sys/syslog.h     |    0
 freebsd/sys/{ => }/sys/systm.h                     |    0
 freebsd/sys/{ => }/sys/taskqueue.h                 |    0
 freebsd/sys/{ => }/sys/timepps.h                   |    0
 freebsd/sys/{ => }/sys/timetc.h                    |    0
 freebsd/sys/{ => }/sys/timex.h                     |    0
 freebsd/sys/{ => }/sys/tree.h                      |    0
 freebsd/sys/{ => }/sys/tty.h                       |    0
 freebsd/sys/{ => }/sys/ttycom.h                    |    0
 freebsd/sys/{ => }/sys/ttydevsw.h                  |    0
 freebsd/sys/{ => }/sys/ttydisc.h                   |    0
 freebsd/sys/{ => }/sys/ttyhook.h                   |    0
 freebsd/sys/{ => }/sys/ttyqueue.h                  |    0
 freebsd/sys/{ => }/sys/ucred.h                     |    0
 {freebsd-userspace => freebsd}/sys/sys/un.h        |    0
 freebsd/sys/{ => }/sys/user.h                      |    0
 freebsd/sys/{ => }/sys/vmmeter.h                   |    0
 freebsd/{ => sys}/vm/uma.h                         |    0
 freebsd/{ => sys}/vm/uma_core.c                    |    0
 freebsd/{ => sys}/vm/uma_dbg.h                     |    0
 freebsd/{ => sys}/vm/uma_int.h                     |    0
 freebsd/{ => sys}/vm/vm.h                          |    0
 .../commands => freebsd}/usr.bin/netstat/atalk.c   |    0
 .../commands => freebsd}/usr.bin/netstat/bpf.c     |    0
 .../commands => freebsd}/usr.bin/netstat/if.c      |    0
 .../commands => freebsd}/usr.bin/netstat/inet.c    |    0
 .../commands => freebsd}/usr.bin/netstat/inet6.c   |    0
 .../commands => freebsd}/usr.bin/netstat/ipsec.c   |    0
 .../commands => freebsd}/usr.bin/netstat/main.c    |    0
 .../commands => freebsd}/usr.bin/netstat/mbuf.c    |    0
 .../commands => freebsd}/usr.bin/netstat/mroute.c  |    0
 .../commands => freebsd}/usr.bin/netstat/mroute6.c |    0
 .../commands => freebsd}/usr.bin/netstat/netstat.h |    0
 .../commands => freebsd}/usr.bin/netstat/pfkey.c   |    0
 .../usr.bin/netstat/route.c                        |    0
 .../commands => freebsd}/usr.bin/netstat/sctp.c    |    0
 .../commands => freebsd}/usr.bin/netstat/unix.c    |    0
 {freebsd => rtemsbsd/include}/cam/cam_queue.h      |    0
 {freebsd => rtemsbsd/include}/ddb/db_sym.h         |    0
 {freebsd => rtemsbsd/include}/ddb/ddb.h            |    0
 {freebsd => rtemsbsd/include}/geom/geom_disk.h     |    0
 rtemsbsd/{freebsd => include}/local/pmap.h         |    0
 rtemsbsd/{freebsd => include}/machine/_bus.h       |    0
 rtemsbsd/{freebsd => include}/machine/_limits.h    |    0
 rtemsbsd/{freebsd => include}/machine/atomic.h     |    0
 rtemsbsd/{freebsd => include}/machine/bus.h        |    0
 rtemsbsd/{freebsd => include}/machine/bus_dma.h    |    0
 .../{freebsd => include}/machine/bus_space-i386.h  |    0
 .../machine/bus_space-simple_memory.h              |    0
 rtemsbsd/{freebsd => include}/machine/clock.h      |    0
 rtemsbsd/{freebsd => include}/machine/cpu.h        |    0
 .../include/freebsd => include}/machine/cpufunc.h  |    0
 {freebsd => rtemsbsd/include}/machine/elf.h        |    0
 rtemsbsd/{freebsd => include}/machine/mutex.h      |    0
 {freebsd => rtemsbsd/include}/machine/pcb.h        |    0
 rtemsbsd/{freebsd => include}/machine/pcpu.h       |    0
 rtemsbsd/{freebsd => include}/machine/proc.h       |    0
 {freebsd => rtemsbsd/include}/machine/resource.h   |    0
 .../machine/rtems-bsd-bus-dma.h                    |    0
 .../{freebsd => include}/machine/rtems-bsd-cache.h |    0
 .../machine/rtems-bsd-config.h.in                  |    0
 .../machine/rtems-bsd-devicet.h                    |    0
 .../machine/rtems-bsd-symbols.h                    |    0
 .../machine/rtems-bsd-sysinit.h                    |    0
 .../machine/rtems-bsd-taskqueue.h                  |    0
 rtemsbsd/{freebsd => include}/machine/runq.h       |    0
 rtemsbsd/{freebsd => include}/machine/signal.h     |    0
 {freebsd => rtemsbsd/include}/machine/smp.h        |    0
 rtemsbsd/{freebsd => include}/machine/stdarg.h     |    0
 rtemsbsd/{freebsd => include}/machine/ucontext.h   |    0
 {freebsd => rtemsbsd/include}/machine/vm.h         |    0
 {freebsd => rtemsbsd/include}/netgraph/ng_ipfw.h   |    0
 {freebsd-userspace => rtemsbsd}/include/poll.h     |    0
 rtemsbsd/{freebsd => include/rtems/bsd}/bsd.h      |    0
 .../include/rtems/bsd}/local/bus_if.h              |    0
 .../include/rtems/bsd}/local/cryptodev_if.h        |    0
 .../include/rtems/bsd}/local/device_if.h           |    0
 .../include/rtems/bsd}/local/linker_if.h           |    0
 .../include/rtems/bsd}/local/miibus_if.h           |    0
 .../include/rtems/bsd}/local/miidevs.h             |    0
 .../include/rtems/bsd}/local/opt_altq.h            |    0
 .../include/rtems/bsd}/local/opt_atalk.h           |    0
 .../include/rtems/bsd}/local/opt_bce.h             |    0
 .../include/rtems/bsd}/local/opt_bootp.h           |    0
 .../include/rtems/bsd}/local/opt_bpf.h             |    0
 .../include/rtems/bsd}/local/opt_bus.h             |    0
 .../include/rtems/bsd}/local/opt_cam.h             |    0
 .../include/rtems/bsd}/local/opt_carp.h            |    0
 .../include/rtems/bsd}/local/opt_compat.h          |    0
 .../include/rtems/bsd}/local/opt_config.h          |    0
 .../include/rtems/bsd}/local/opt_cpu.h             |    0
 .../include/rtems/bsd}/local/opt_ddb.h             |    0
 .../include/rtems/bsd}/local/opt_device_polling.h  |    0
 .../include/rtems/bsd}/local/opt_ef.h              |    0
 .../include/rtems/bsd}/local/opt_enc.h             |    0
 .../include/rtems/bsd}/local/opt_hwpmc_hooks.h     |    0
 .../include/rtems/bsd}/local/opt_inet.h            |    0
 .../include/rtems/bsd}/local/opt_inet6.h           |    0
 .../include/rtems/bsd}/local/opt_init_path.h       |    0
 .../include/rtems/bsd}/local/opt_ipdivert.h        |    0
 .../include/rtems/bsd}/local/opt_ipdn.h            |    0
 .../include/rtems/bsd}/local/opt_ipfw.h            |    0
 .../include/rtems/bsd}/local/opt_ipsec.h           |    0
 .../include/rtems/bsd}/local/opt_ipstealth.h       |    0
 .../include/rtems/bsd}/local/opt_ipx.h             |    0
 .../include/rtems/bsd}/local/opt_kdb.h             |    0
 .../include/rtems/bsd}/local/opt_kdtrace.h         |    0
 .../include/rtems/bsd}/local/opt_ktrace.h          |    0
 .../include/rtems/bsd}/local/opt_mbuf_profiling.h  |    0
 .../rtems/bsd}/local/opt_mbuf_stress_test.h        |    0
 .../include/rtems/bsd}/local/opt_mpath.h           |    0
 .../include/rtems/bsd}/local/opt_mrouting.h        |    0
 .../include/rtems/bsd}/local/opt_natm.h            |    0
 .../include/rtems/bsd}/local/opt_netgraph.h        |    0
 .../include/rtems/bsd}/local/opt_ntp.h             |    0
 .../include/rtems/bsd}/local/opt_param.h           |    0
 .../include/rtems/bsd}/local/opt_pf.h              |    0
 .../include/rtems/bsd}/local/opt_posix.h           |    0
 .../include/rtems/bsd}/local/opt_printf.h          |    0
 .../include/rtems/bsd}/local/opt_route.h           |    0
 .../include/rtems/bsd}/local/opt_scsi.h            |    0
 .../include/rtems/bsd}/local/opt_sctp.h            |    0
 .../include/rtems/bsd}/local/opt_tcpdebug.h        |    0
 .../include/rtems/bsd}/local/opt_tdma.h            |    0
 .../include/rtems/bsd}/local/opt_usb.h             |    0
 .../include/rtems/bsd}/local/opt_vlan.h            |    0
 .../include/rtems/bsd}/local/opt_wlan.h            |    0
 .../include/rtems/bsd}/local/opt_zero.h            |    0
 .../include/rtems/bsd}/local/pci_if.h              |    0
 .../include/rtems/bsd}/local/pcib_if.h             |    0
 .../include/rtems/bsd}/local/usb_if.h              |    0
 .../include/rtems/bsd}/local/usbdevs.h             |    0
 .../include/rtems/bsd}/local/usbdevs_data.h        |    0
 .../include/rtems/bsd}/local/vnode_if.h            |    0
 .../include/rtems/bsd}/local/vnode_if_newproto.h   |    0
 .../include/rtems/bsd}/local/vnode_if_typedef.h    |    0
 .../include/rtems/bsd}/sys/_types.h                |    0
 .../include/rtems/bsd}/sys/errno.h                 |    0
 {freebsd => rtemsbsd/include/rtems/bsd}/sys/lock.h |    0
 .../include/rtems/bsd}/sys/param.h                 |    0
 .../include/rtems/bsd}/sys/resource.h              |    0
 {freebsd => rtemsbsd/include/rtems/bsd}/sys/time.h |    0
 .../{freebsd => include/rtems/bsd}/sys/timespec.h  |    0
 .../include/rtems/bsd}/sys/types.h                 |    0
 .../include/rtems/bsd}/sys/unistd.h                |    0
 .../include/rtems/netcmds-config.h                 |    0
 .../include/rtems/rtems_bsdnet.h                   |    0
 .../include}/security/audit/audit.h                |    0
 .../local => rtemsbsd/include}/sys/_pthreadtypes.h |    0
 {freebsd => rtemsbsd/include}/sys/bio.h            |    0
 {freebsd => rtemsbsd/include}/sys/copyright.h      |    0
 {freebsd => rtemsbsd/include}/sys/cpuset.h         |    0
 {freebsd => rtemsbsd/include}/sys/exec.h           |    0
 {freebsd => rtemsbsd/include}/sys/fail.h           |    0
 {freebsd => rtemsbsd/include}/sys/namei.h          |    0
 rtemsbsd/{freebsd => include}/sys/signalvar.h      |    0
 {freebsd => rtemsbsd/include}/sys/sleepqueue.h     |    0
 {freebsd => rtemsbsd/include}/sys/syscallsubr.h    |    0
 {freebsd => rtemsbsd/include}/sys/sysent.h         |    0
 {freebsd => rtemsbsd/include}/sys/sysproto.h       |    0
 {freebsd => rtemsbsd/include}/sys/ucontext.h       |    0
 {freebsd => rtemsbsd/include}/sys/vnode.h          |    0
 .../local => rtemsbsd/include}/syslog.h            |    0
 {freebsd => rtemsbsd/include}/vm/pmap.h            |    0
 {freebsd => rtemsbsd/include}/vm/vm_map.h          |    0
 {freebsd => rtemsbsd/include}/vm/vm_param.h        |    0
 {freebsd => rtemsbsd}/local/bus_if.c               |    0
 {freebsd => rtemsbsd}/local/cryptodev_if.c         |    0
 {freebsd => rtemsbsd}/local/device_if.c            |    0
 {freebsd => rtemsbsd}/local/miibus_if.c            |    0
 {freebsd => rtemsbsd}/local/pci_if.c               |    0
 {freebsd => rtemsbsd}/local/pcib_if.c              |    0
 {freebsd => rtemsbsd}/local/usb_if.c               |    0
 .../rtems/generate_kvm_symbols                     |    0
 .../rtems/ipsec_get_policylen.c                    |    0
 .../rtems/kvm_private.h                            |    0
 rtemsbsd/{src => rtems}/rtems-bsd-assert.c         |    0
 rtemsbsd/{src => rtems}/rtems-bsd-autoconf.c       |    0
 rtemsbsd/{src => rtems}/rtems-bsd-bus-dma-mbuf.c   |    0
 rtemsbsd/{src => rtems}/rtems-bsd-bus-dma.c        |    0
 rtemsbsd/{src => rtems}/rtems-bsd-cam.c            |    0
 rtemsbsd/{src => rtems}/rtems-bsd-condvar.c        |    0
 rtemsbsd/{src => rtems}/rtems-bsd-conf.c           |    0
 rtemsbsd/{src => rtems}/rtems-bsd-copyinout.c      |    0
 rtemsbsd/{src => rtems}/rtems-bsd-delay.c          |    0
 rtemsbsd/{src => rtems}/rtems-bsd-descrip.c        |    0
 rtemsbsd/{src => rtems}/rtems-bsd-generic.c        |    0
 rtemsbsd/{src => rtems}/rtems-bsd-init-with-irq.c  |    0
 rtemsbsd/{src => rtems}/rtems-bsd-init.c           |    0
 rtemsbsd/{src => rtems}/rtems-bsd-jail.c           |    0
 rtemsbsd/{src => rtems}/rtems-bsd-lock.c           |    0
 rtemsbsd/{src => rtems}/rtems-bsd-log.c            |    0
 rtemsbsd/{src => rtems}/rtems-bsd-malloc.c         |    0
 rtemsbsd/{src => rtems}/rtems-bsd-mutex.c          |    0
 rtemsbsd/{src => rtems}/rtems-bsd-newproc.c        |    0
 rtemsbsd/{src => rtems}/rtems-bsd-nexus.c          |    0
 rtemsbsd/{src => rtems}/rtems-bsd-page.c           |    0
 rtemsbsd/{src => rtems}/rtems-bsd-panic.c          |    0
 rtemsbsd/{src => rtems}/rtems-bsd-pci_cfgreg.c     |    0
 rtemsbsd/{src => rtems}/rtems-bsd-rwlock.c         |    0
 rtemsbsd/{src => rtems}/rtems-bsd-shell.c          |    0
 rtemsbsd/{src => rtems}/rtems-bsd-signal.c         |    0
 rtemsbsd/{src => rtems}/rtems-bsd-smp.c            |    0
 rtemsbsd/{src => rtems}/rtems-bsd-subr_param.c     |    0
 rtemsbsd/{src => rtems}/rtems-bsd-support.c        |    0
 rtemsbsd/{src => rtems}/rtems-bsd-sx.c             |    0
 rtemsbsd/{src => rtems}/rtems-bsd-synch.c          |    0
 rtemsbsd/{src => rtems}/rtems-bsd-syscalls.c       |    0
 rtemsbsd/{src => rtems}/rtems-bsd-sysctl.c         |    0
 rtemsbsd/{src => rtems}/rtems-bsd-sysctlbyname.c   |    0
 .../{src => rtems}/rtems-bsd-sysctlnametomib.c     |    0
 rtemsbsd/{src => rtems}/rtems-bsd-taskqueue.c      |    0
 rtemsbsd/{src => rtems}/rtems-bsd-thread.c         |    0
 rtemsbsd/{src => rtems}/rtems-bsd-thread0-ucred.c  |    0
 rtemsbsd/{src => rtems}/rtems-bsd-timesupport.c    |    0
 rtemsbsd/{src => rtems}/rtems-bsd-vm_glue.c        |    0
 .../rtems/rtems-getprogname.c                      |    0
 {freebsd-userspace => rtemsbsd}/rtems/rtems-kvm.c  |    0
 .../rtems/rtems-net-setup.c                        |    0
 .../rtems/rtems-shell.c                            |    0
 .../rtems/rtems-syslog-initialize.c                |    0
 .../rtems/rtems-syspoll.c                          |    0
 .../rtems/rtems-uthread_kevent.c                   |    0
 .../rtems/rtems-uthread_kqueue.c                   |    0
 {freebsd-userspace => rtemsbsd}/rtems/syslog.c     |    0
 .../{ => sys}/dev/usb/controller/ehci_mpc83xx.c    |    0
 .../{ => sys}/dev/usb/controller/ohci_lpc24xx.c    |    0
 .../{ => sys}/dev/usb/controller/ohci_lpc32xx.c    |    0
 .../rtems/bsd/test}/nic-sysinit.h                  |    0
 1246 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/freebsd-userspace/include/arpa/ftp.h b/freebsd/include/arpa/ftp.h
similarity index 100%
rename from freebsd-userspace/include/arpa/ftp.h
rename to freebsd/include/arpa/ftp.h
diff --git a/freebsd-userspace/include/arpa/inet.h b/freebsd/include/arpa/inet.h
similarity index 100%
rename from freebsd-userspace/include/arpa/inet.h
rename to freebsd/include/arpa/inet.h
diff --git a/freebsd-userspace/include/arpa/nameser.h b/freebsd/include/arpa/nameser.h
similarity index 100%
rename from freebsd-userspace/include/arpa/nameser.h
rename to freebsd/include/arpa/nameser.h
diff --git a/freebsd-userspace/include/arpa/nameser_compat.h b/freebsd/include/arpa/nameser_compat.h
similarity index 100%
rename from freebsd-userspace/include/arpa/nameser_compat.h
rename to freebsd/include/arpa/nameser_compat.h
diff --git a/freebsd-userspace/include/db.h b/freebsd/include/db.h
similarity index 100%
rename from freebsd-userspace/include/db.h
rename to freebsd/include/db.h
diff --git a/freebsd-userspace/include/err.h b/freebsd/include/err.h
similarity index 100%
rename from freebsd-userspace/include/err.h
rename to freebsd/include/err.h
diff --git a/freebsd-userspace/include/ifaddrs.h b/freebsd/include/ifaddrs.h
similarity index 100%
rename from freebsd-userspace/include/ifaddrs.h
rename to freebsd/include/ifaddrs.h
diff --git a/freebsd-userspace/include/mpool.h b/freebsd/include/mpool.h
similarity index 100%
rename from freebsd-userspace/include/mpool.h
rename to freebsd/include/mpool.h
diff --git a/freebsd-userspace/include/netconfig.h b/freebsd/include/netconfig.h
similarity index 100%
rename from freebsd-userspace/include/netconfig.h
rename to freebsd/include/netconfig.h
diff --git a/freebsd-userspace/rtems/include/netdb.h b/freebsd/include/netdb.h
similarity index 100%
rename from freebsd-userspace/rtems/include/netdb.h
rename to freebsd/include/netdb.h
diff --git a/freebsd-userspace/include/nlist.h b/freebsd/include/nlist.h
similarity index 100%
rename from freebsd-userspace/include/nlist.h
rename to freebsd/include/nlist.h
diff --git a/freebsd-userspace/include/nsswitch.h b/freebsd/include/nsswitch.h
similarity index 100%
rename from freebsd-userspace/include/nsswitch.h
rename to freebsd/include/nsswitch.h
diff --git a/freebsd-userspace/include/res_update.h b/freebsd/include/res_update.h
similarity index 100%
rename from freebsd-userspace/include/res_update.h
rename to freebsd/include/res_update.h
diff --git a/freebsd-userspace/include/resolv.h b/freebsd/include/resolv.h
similarity index 100%
rename from freebsd-userspace/include/resolv.h
rename to freebsd/include/resolv.h
diff --git a/freebsd-userspace/include/rpc/auth.h b/freebsd/include/rpc/auth.h
similarity index 100%
rename from freebsd-userspace/include/rpc/auth.h
rename to freebsd/include/rpc/auth.h
diff --git a/freebsd-userspace/include/rpc/auth_des.h b/freebsd/include/rpc/auth_des.h
similarity index 100%
rename from freebsd-userspace/include/rpc/auth_des.h
rename to freebsd/include/rpc/auth_des.h
diff --git a/freebsd-userspace/include/rpc/auth_unix.h b/freebsd/include/rpc/auth_unix.h
similarity index 100%
rename from freebsd-userspace/include/rpc/auth_unix.h
rename to freebsd/include/rpc/auth_unix.h
diff --git a/freebsd-userspace/rtems/include/rpc/clnt.h b/freebsd/include/rpc/clnt.h
similarity index 100%
rename from freebsd-userspace/rtems/include/rpc/clnt.h
rename to freebsd/include/rpc/clnt.h
diff --git a/freebsd-userspace/include/rpc/clnt_soc.h b/freebsd/include/rpc/clnt_soc.h
similarity index 100%
rename from freebsd-userspace/include/rpc/clnt_soc.h
rename to freebsd/include/rpc/clnt_soc.h
diff --git a/freebsd-userspace/include/rpc/clnt_stat.h b/freebsd/include/rpc/clnt_stat.h
similarity index 100%
rename from freebsd-userspace/include/rpc/clnt_stat.h
rename to freebsd/include/rpc/clnt_stat.h
diff --git a/freebsd-userspace/include/rpc/pmap_clnt.h b/freebsd/include/rpc/pmap_clnt.h
similarity index 100%
rename from freebsd-userspace/include/rpc/pmap_clnt.h
rename to freebsd/include/rpc/pmap_clnt.h
diff --git a/freebsd-userspace/include/rpc/pmap_prot.h b/freebsd/include/rpc/pmap_prot.h
similarity index 100%
rename from freebsd-userspace/include/rpc/pmap_prot.h
rename to freebsd/include/rpc/pmap_prot.h
diff --git a/freebsd-userspace/rtems/include/rpc/rpc.h b/freebsd/include/rpc/rpc.h
similarity index 100%
rename from freebsd-userspace/rtems/include/rpc/rpc.h
rename to freebsd/include/rpc/rpc.h
diff --git a/freebsd-userspace/include/rpc/rpc_msg.h b/freebsd/include/rpc/rpc_msg.h
similarity index 100%
rename from freebsd-userspace/include/rpc/rpc_msg.h
rename to freebsd/include/rpc/rpc_msg.h
diff --git a/freebsd-userspace/include/rpc/rpcb_clnt.h b/freebsd/include/rpc/rpcb_clnt.h
similarity index 100%
rename from freebsd-userspace/include/rpc/rpcb_clnt.h
rename to freebsd/include/rpc/rpcb_clnt.h
diff --git a/freebsd-userspace/include/rpc/rpcb_prot.x b/freebsd/include/rpc/rpcb_prot.x
similarity index 100%
rename from freebsd-userspace/include/rpc/rpcb_prot.x
rename to freebsd/include/rpc/rpcb_prot.x
diff --git a/freebsd-userspace/include/rpc/rpcent.h b/freebsd/include/rpc/rpcent.h
similarity index 100%
rename from freebsd-userspace/include/rpc/rpcent.h
rename to freebsd/include/rpc/rpcent.h
diff --git a/freebsd-userspace/include/rpc/svc.h b/freebsd/include/rpc/svc.h
similarity index 100%
rename from freebsd-userspace/include/rpc/svc.h
rename to freebsd/include/rpc/svc.h
diff --git a/freebsd-userspace/include/rpc/svc_auth.h b/freebsd/include/rpc/svc_auth.h
similarity index 100%
rename from freebsd-userspace/include/rpc/svc_auth.h
rename to freebsd/include/rpc/svc_auth.h
diff --git a/freebsd-userspace/include/rpc/svc_soc.h b/freebsd/include/rpc/svc_soc.h
similarity index 100%
rename from freebsd-userspace/include/rpc/svc_soc.h
rename to freebsd/include/rpc/svc_soc.h
diff --git a/freebsd-userspace/include/rpc/xdr.h b/freebsd/include/rpc/xdr.h
similarity index 100%
rename from freebsd-userspace/include/rpc/xdr.h
rename to freebsd/include/rpc/xdr.h
diff --git a/freebsd-userspace/include/sysexits.h b/freebsd/include/sysexits.h
similarity index 100%
rename from freebsd-userspace/include/sysexits.h
rename to freebsd/include/sysexits.h
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_close.c b/freebsd/lib/libc/db/btree/bt_close.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_close.c
rename to freebsd/lib/libc/db/btree/bt_close.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_conv.c b/freebsd/lib/libc/db/btree/bt_conv.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_conv.c
rename to freebsd/lib/libc/db/btree/bt_conv.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_debug.c b/freebsd/lib/libc/db/btree/bt_debug.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_debug.c
rename to freebsd/lib/libc/db/btree/bt_debug.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_delete.c b/freebsd/lib/libc/db/btree/bt_delete.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_delete.c
rename to freebsd/lib/libc/db/btree/bt_delete.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_get.c b/freebsd/lib/libc/db/btree/bt_get.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_get.c
rename to freebsd/lib/libc/db/btree/bt_get.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_open.c b/freebsd/lib/libc/db/btree/bt_open.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_open.c
rename to freebsd/lib/libc/db/btree/bt_open.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_overflow.c b/freebsd/lib/libc/db/btree/bt_overflow.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_overflow.c
rename to freebsd/lib/libc/db/btree/bt_overflow.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_page.c b/freebsd/lib/libc/db/btree/bt_page.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_page.c
rename to freebsd/lib/libc/db/btree/bt_page.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_put.c b/freebsd/lib/libc/db/btree/bt_put.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_put.c
rename to freebsd/lib/libc/db/btree/bt_put.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_search.c b/freebsd/lib/libc/db/btree/bt_search.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_search.c
rename to freebsd/lib/libc/db/btree/bt_search.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_seq.c b/freebsd/lib/libc/db/btree/bt_seq.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_seq.c
rename to freebsd/lib/libc/db/btree/bt_seq.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_split.c b/freebsd/lib/libc/db/btree/bt_split.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_split.c
rename to freebsd/lib/libc/db/btree/bt_split.c
diff --git a/freebsd-userspace/lib/libc/db/btree/bt_utils.c b/freebsd/lib/libc/db/btree/bt_utils.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/bt_utils.c
rename to freebsd/lib/libc/db/btree/bt_utils.c
diff --git a/freebsd-userspace/lib/libc/db/btree/btree.h b/freebsd/lib/libc/db/btree/btree.h
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/btree.h
rename to freebsd/lib/libc/db/btree/btree.h
diff --git a/freebsd-userspace/lib/libc/db/btree/extern.h b/freebsd/lib/libc/db/btree/extern.h
similarity index 100%
rename from freebsd-userspace/lib/libc/db/btree/extern.h
rename to freebsd/lib/libc/db/btree/extern.h
diff --git a/freebsd-userspace/lib/libc/db/db/db.c b/freebsd/lib/libc/db/db/db.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/db/db.c
rename to freebsd/lib/libc/db/db/db.c
diff --git a/freebsd-userspace/lib/libc/db/mpool/mpool-compat.c b/freebsd/lib/libc/db/mpool/mpool-compat.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/mpool/mpool-compat.c
rename to freebsd/lib/libc/db/mpool/mpool-compat.c
diff --git a/freebsd-userspace/lib/libc/db/mpool/mpool.c b/freebsd/lib/libc/db/mpool/mpool.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/mpool/mpool.c
rename to freebsd/lib/libc/db/mpool/mpool.c
diff --git a/freebsd-userspace/lib/libc/db/recno/extern.h b/freebsd/lib/libc/db/recno/extern.h
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/extern.h
rename to freebsd/lib/libc/db/recno/extern.h
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_close.c b/freebsd/lib/libc/db/recno/rec_close.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_close.c
rename to freebsd/lib/libc/db/recno/rec_close.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_delete.c b/freebsd/lib/libc/db/recno/rec_delete.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_delete.c
rename to freebsd/lib/libc/db/recno/rec_delete.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_get.c b/freebsd/lib/libc/db/recno/rec_get.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_get.c
rename to freebsd/lib/libc/db/recno/rec_get.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_open.c b/freebsd/lib/libc/db/recno/rec_open.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_open.c
rename to freebsd/lib/libc/db/recno/rec_open.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_put.c b/freebsd/lib/libc/db/recno/rec_put.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_put.c
rename to freebsd/lib/libc/db/recno/rec_put.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_search.c b/freebsd/lib/libc/db/recno/rec_search.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_search.c
rename to freebsd/lib/libc/db/recno/rec_search.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_seq.c b/freebsd/lib/libc/db/recno/rec_seq.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_seq.c
rename to freebsd/lib/libc/db/recno/rec_seq.c
diff --git a/freebsd-userspace/lib/libc/db/recno/rec_utils.c b/freebsd/lib/libc/db/recno/rec_utils.c
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/rec_utils.c
rename to freebsd/lib/libc/db/recno/rec_utils.c
diff --git a/freebsd-userspace/lib/libc/db/recno/recno.h b/freebsd/lib/libc/db/recno/recno.h
similarity index 100%
rename from freebsd-userspace/lib/libc/db/recno/recno.h
rename to freebsd/lib/libc/db/recno/recno.h
diff --git a/freebsd-userspace/lib/libc/gen/err.c b/freebsd/lib/libc/gen/err.c
similarity index 100%
rename from freebsd-userspace/lib/libc/gen/err.c
rename to freebsd/lib/libc/gen/err.c
diff --git a/freebsd-userspace/lib/libc/gen/gethostname.c b/freebsd/lib/libc/gen/gethostname.c
similarity index 100%
rename from freebsd-userspace/lib/libc/gen/gethostname.c
rename to freebsd/lib/libc/gen/gethostname.c
diff --git a/freebsd-userspace/rtems/include/isc/eventlib.h b/freebsd/lib/libc/include/isc/eventlib.h
similarity index 100%
rename from freebsd-userspace/rtems/include/isc/eventlib.h
rename to freebsd/lib/libc/include/isc/eventlib.h
diff --git a/freebsd-userspace/rtems/include/isc/list.h b/freebsd/lib/libc/include/isc/list.h
similarity index 100%
rename from freebsd-userspace/rtems/include/isc/list.h
rename to freebsd/lib/libc/include/isc/list.h
diff --git a/freebsd-userspace/rtems/include/isc/platform.h b/freebsd/lib/libc/include/isc/platform.h
similarity index 100%
rename from freebsd-userspace/rtems/include/isc/platform.h
rename to freebsd/lib/libc/include/isc/platform.h
diff --git a/freebsd-userspace/lib/libc/include/libc_private.h b/freebsd/lib/libc/include/libc_private.h
similarity index 100%
rename from freebsd-userspace/lib/libc/include/libc_private.h
rename to freebsd/lib/libc/include/libc_private.h
diff --git a/freebsd-userspace/rtems/include/namespace.h b/freebsd/lib/libc/include/namespace.h
similarity index 100%
rename from freebsd-userspace/rtems/include/namespace.h
rename to freebsd/lib/libc/include/namespace.h
diff --git a/freebsd-userspace/lib/libc/include/nss_tls.h b/freebsd/lib/libc/include/nss_tls.h
similarity index 100%
rename from freebsd-userspace/lib/libc/include/nss_tls.h
rename to freebsd/lib/libc/include/nss_tls.h
diff --git a/freebsd-userspace/local/port_after.h b/freebsd/lib/libc/include/port_after.h
similarity index 100%
rename from freebsd-userspace/local/port_after.h
rename to freebsd/lib/libc/include/port_after.h
diff --git a/freebsd-userspace/local/port_before.h b/freebsd/lib/libc/include/port_before.h
similarity index 100%
rename from freebsd-userspace/local/port_before.h
rename to freebsd/lib/libc/include/port_before.h
diff --git a/freebsd-userspace/lib/libc/include/reentrant.h b/freebsd/lib/libc/include/reentrant.h
similarity index 100%
rename from freebsd-userspace/lib/libc/include/reentrant.h
rename to freebsd/lib/libc/include/reentrant.h
diff --git a/freebsd-userspace/lib/libc/include/resolv_mt.h b/freebsd/lib/libc/include/resolv_mt.h
similarity index 100%
rename from freebsd-userspace/lib/libc/include/resolv_mt.h
rename to freebsd/lib/libc/include/resolv_mt.h
diff --git a/freebsd-userspace/lib/libc/include/spinlock.h b/freebsd/lib/libc/include/spinlock.h
similarity index 100%
rename from freebsd-userspace/lib/libc/include/spinlock.h
rename to freebsd/lib/libc/include/spinlock.h
diff --git a/freebsd-userspace/rtems/include/un-namespace.h b/freebsd/lib/libc/include/un-namespace.h
similarity index 100%
rename from freebsd-userspace/rtems/include/un-namespace.h
rename to freebsd/lib/libc/include/un-namespace.h
diff --git a/freebsd-userspace/lib/libc/inet/inet_addr.c b/freebsd/lib/libc/inet/inet_addr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_addr.c
rename to freebsd/lib/libc/inet/inet_addr.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_cidr_ntop.c b/freebsd/lib/libc/inet/inet_cidr_ntop.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_cidr_ntop.c
rename to freebsd/lib/libc/inet/inet_cidr_ntop.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_cidr_pton.c b/freebsd/lib/libc/inet/inet_cidr_pton.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_cidr_pton.c
rename to freebsd/lib/libc/inet/inet_cidr_pton.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_lnaof.c b/freebsd/lib/libc/inet/inet_lnaof.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_lnaof.c
rename to freebsd/lib/libc/inet/inet_lnaof.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_makeaddr.c b/freebsd/lib/libc/inet/inet_makeaddr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_makeaddr.c
rename to freebsd/lib/libc/inet/inet_makeaddr.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_net_ntop.c b/freebsd/lib/libc/inet/inet_net_ntop.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_net_ntop.c
rename to freebsd/lib/libc/inet/inet_net_ntop.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_net_pton.c b/freebsd/lib/libc/inet/inet_net_pton.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_net_pton.c
rename to freebsd/lib/libc/inet/inet_net_pton.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_neta.c b/freebsd/lib/libc/inet/inet_neta.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_neta.c
rename to freebsd/lib/libc/inet/inet_neta.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_netof.c b/freebsd/lib/libc/inet/inet_netof.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_netof.c
rename to freebsd/lib/libc/inet/inet_netof.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_network.c b/freebsd/lib/libc/inet/inet_network.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_network.c
rename to freebsd/lib/libc/inet/inet_network.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_ntoa.c b/freebsd/lib/libc/inet/inet_ntoa.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_ntoa.c
rename to freebsd/lib/libc/inet/inet_ntoa.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_ntop.c b/freebsd/lib/libc/inet/inet_ntop.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_ntop.c
rename to freebsd/lib/libc/inet/inet_ntop.c
diff --git a/freebsd-userspace/lib/libc/inet/inet_pton.c b/freebsd/lib/libc/inet/inet_pton.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/inet_pton.c
rename to freebsd/lib/libc/inet/inet_pton.c
diff --git a/freebsd-userspace/lib/libc/inet/nsap_addr.c b/freebsd/lib/libc/inet/nsap_addr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/inet/nsap_addr.c
rename to freebsd/lib/libc/inet/nsap_addr.c
diff --git a/freebsd-userspace/lib/libc/isc/ev_streams.c b/freebsd/lib/libc/isc/ev_streams.c
similarity index 100%
rename from freebsd-userspace/lib/libc/isc/ev_streams.c
rename to freebsd/lib/libc/isc/ev_streams.c
diff --git a/freebsd-userspace/lib/libc/isc/ev_timers.c b/freebsd/lib/libc/isc/ev_timers.c
similarity index 100%
rename from freebsd-userspace/lib/libc/isc/ev_timers.c
rename to freebsd/lib/libc/isc/ev_timers.c
diff --git a/freebsd-userspace/lib/libc/isc/eventlib_p.h b/freebsd/lib/libc/isc/eventlib_p.h
similarity index 100%
rename from freebsd-userspace/lib/libc/isc/eventlib_p.h
rename to freebsd/lib/libc/isc/eventlib_p.h
diff --git a/freebsd-userspace/lib/libc/nameser/ns_name.c b/freebsd/lib/libc/nameser/ns_name.c
similarity index 100%
rename from freebsd-userspace/lib/libc/nameser/ns_name.c
rename to freebsd/lib/libc/nameser/ns_name.c
diff --git a/freebsd-userspace/lib/libc/nameser/ns_netint.c b/freebsd/lib/libc/nameser/ns_netint.c
similarity index 100%
rename from freebsd-userspace/lib/libc/nameser/ns_netint.c
rename to freebsd/lib/libc/nameser/ns_netint.c
diff --git a/freebsd-userspace/lib/libc/nameser/ns_parse.c b/freebsd/lib/libc/nameser/ns_parse.c
similarity index 100%
rename from freebsd-userspace/lib/libc/nameser/ns_parse.c
rename to freebsd/lib/libc/nameser/ns_parse.c
diff --git a/freebsd-userspace/lib/libc/nameser/ns_print.c b/freebsd/lib/libc/nameser/ns_print.c
similarity index 100%
rename from freebsd-userspace/lib/libc/nameser/ns_print.c
rename to freebsd/lib/libc/nameser/ns_print.c
diff --git a/freebsd-userspace/lib/libc/nameser/ns_samedomain.c b/freebsd/lib/libc/nameser/ns_samedomain.c
similarity index 100%
rename from freebsd-userspace/lib/libc/nameser/ns_samedomain.c
rename to freebsd/lib/libc/nameser/ns_samedomain.c
diff --git a/freebsd-userspace/lib/libc/nameser/ns_ttl.c b/freebsd/lib/libc/nameser/ns_ttl.c
similarity index 100%
rename from freebsd-userspace/lib/libc/nameser/ns_ttl.c
rename to freebsd/lib/libc/nameser/ns_ttl.c
diff --git a/freebsd-userspace/lib/libc/net/base64.c b/freebsd/lib/libc/net/base64.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/base64.c
rename to freebsd/lib/libc/net/base64.c
diff --git a/freebsd-userspace/lib/libc/net/ether_addr.c b/freebsd/lib/libc/net/ether_addr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/ether_addr.c
rename to freebsd/lib/libc/net/ether_addr.c
diff --git a/freebsd-userspace/lib/libc/net/gai_strerror.c b/freebsd/lib/libc/net/gai_strerror.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/gai_strerror.c
rename to freebsd/lib/libc/net/gai_strerror.c
diff --git a/freebsd-userspace/lib/libc/net/getaddrinfo.c b/freebsd/lib/libc/net/getaddrinfo.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getaddrinfo.c
rename to freebsd/lib/libc/net/getaddrinfo.c
diff --git a/freebsd-userspace/lib/libc/net/gethostbydns.c b/freebsd/lib/libc/net/gethostbydns.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/gethostbydns.c
rename to freebsd/lib/libc/net/gethostbydns.c
diff --git a/freebsd-userspace/lib/libc/net/gethostbyht.c b/freebsd/lib/libc/net/gethostbyht.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/gethostbyht.c
rename to freebsd/lib/libc/net/gethostbyht.c
diff --git a/freebsd-userspace/lib/libc/net/gethostbynis.c b/freebsd/lib/libc/net/gethostbynis.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/gethostbynis.c
rename to freebsd/lib/libc/net/gethostbynis.c
diff --git a/freebsd-userspace/lib/libc/net/gethostnamadr.c b/freebsd/lib/libc/net/gethostnamadr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/gethostnamadr.c
rename to freebsd/lib/libc/net/gethostnamadr.c
diff --git a/freebsd-userspace/lib/libc/net/getifaddrs.c b/freebsd/lib/libc/net/getifaddrs.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getifaddrs.c
rename to freebsd/lib/libc/net/getifaddrs.c
diff --git a/freebsd-userspace/lib/libc/net/getifmaddrs.c b/freebsd/lib/libc/net/getifmaddrs.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getifmaddrs.c
rename to freebsd/lib/libc/net/getifmaddrs.c
diff --git a/freebsd-userspace/lib/libc/net/getnameinfo.c b/freebsd/lib/libc/net/getnameinfo.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getnameinfo.c
rename to freebsd/lib/libc/net/getnameinfo.c
diff --git a/freebsd-userspace/lib/libc/net/getnetbydns.c b/freebsd/lib/libc/net/getnetbydns.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getnetbydns.c
rename to freebsd/lib/libc/net/getnetbydns.c
diff --git a/freebsd-userspace/lib/libc/net/getnetbyht.c b/freebsd/lib/libc/net/getnetbyht.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getnetbyht.c
rename to freebsd/lib/libc/net/getnetbyht.c
diff --git a/freebsd-userspace/lib/libc/net/getnetbynis.c b/freebsd/lib/libc/net/getnetbynis.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getnetbynis.c
rename to freebsd/lib/libc/net/getnetbynis.c
diff --git a/freebsd-userspace/lib/libc/net/getnetnamadr.c b/freebsd/lib/libc/net/getnetnamadr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getnetnamadr.c
rename to freebsd/lib/libc/net/getnetnamadr.c
diff --git a/freebsd-userspace/lib/libc/net/getproto.c b/freebsd/lib/libc/net/getproto.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getproto.c
rename to freebsd/lib/libc/net/getproto.c
diff --git a/freebsd-userspace/lib/libc/net/getprotoent.c b/freebsd/lib/libc/net/getprotoent.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getprotoent.c
rename to freebsd/lib/libc/net/getprotoent.c
diff --git a/freebsd-userspace/lib/libc/net/getprotoname.c b/freebsd/lib/libc/net/getprotoname.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getprotoname.c
rename to freebsd/lib/libc/net/getprotoname.c
diff --git a/freebsd-userspace/lib/libc/net/getservent.c b/freebsd/lib/libc/net/getservent.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/getservent.c
rename to freebsd/lib/libc/net/getservent.c
diff --git a/freebsd-userspace/lib/libc/net/if_indextoname.c b/freebsd/lib/libc/net/if_indextoname.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/if_indextoname.c
rename to freebsd/lib/libc/net/if_indextoname.c
diff --git a/freebsd-userspace/lib/libc/net/if_nameindex.c b/freebsd/lib/libc/net/if_nameindex.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/if_nameindex.c
rename to freebsd/lib/libc/net/if_nameindex.c
diff --git a/freebsd-userspace/lib/libc/net/if_nametoindex.c b/freebsd/lib/libc/net/if_nametoindex.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/if_nametoindex.c
rename to freebsd/lib/libc/net/if_nametoindex.c
diff --git a/freebsd-userspace/lib/libc/net/linkaddr.c b/freebsd/lib/libc/net/linkaddr.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/linkaddr.c
rename to freebsd/lib/libc/net/linkaddr.c
diff --git a/freebsd-userspace/lib/libc/net/map_v4v6.c b/freebsd/lib/libc/net/map_v4v6.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/map_v4v6.c
rename to freebsd/lib/libc/net/map_v4v6.c
diff --git a/freebsd-userspace/lib/libc/net/name6.c b/freebsd/lib/libc/net/name6.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/name6.c
rename to freebsd/lib/libc/net/name6.c
diff --git a/freebsd-userspace/lib/libc/net/netdb_private.h b/freebsd/lib/libc/net/netdb_private.h
similarity index 100%
rename from freebsd-userspace/lib/libc/net/netdb_private.h
rename to freebsd/lib/libc/net/netdb_private.h
diff --git a/freebsd-userspace/lib/libc/net/nsdispatch.c b/freebsd/lib/libc/net/nsdispatch.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/nsdispatch.c
rename to freebsd/lib/libc/net/nsdispatch.c
diff --git a/freebsd-userspace/lib/libc/net/nslexer.l b/freebsd/lib/libc/net/nslexer.l
similarity index 100%
rename from freebsd-userspace/lib/libc/net/nslexer.l
rename to freebsd/lib/libc/net/nslexer.l
diff --git a/freebsd-userspace/lib/libc/net/nsparser.y b/freebsd/lib/libc/net/nsparser.y
similarity index 100%
rename from freebsd-userspace/lib/libc/net/nsparser.y
rename to freebsd/lib/libc/net/nsparser.y
diff --git a/freebsd-userspace/lib/libc/net/nss_backends.h b/freebsd/lib/libc/net/nss_backends.h
similarity index 100%
rename from freebsd-userspace/lib/libc/net/nss_backends.h
rename to freebsd/lib/libc/net/nss_backends.h
diff --git a/freebsd-userspace/lib/libc/net/rcmd.c b/freebsd/lib/libc/net/rcmd.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/rcmd.c
rename to freebsd/lib/libc/net/rcmd.c
diff --git a/freebsd-userspace/lib/libc/net/recv.c b/freebsd/lib/libc/net/recv.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/recv.c
rename to freebsd/lib/libc/net/recv.c
diff --git a/freebsd-userspace/lib/libc/net/res_config.h b/freebsd/lib/libc/net/res_config.h
similarity index 100%
rename from freebsd-userspace/lib/libc/net/res_config.h
rename to freebsd/lib/libc/net/res_config.h
diff --git a/freebsd-userspace/lib/libc/net/send.c b/freebsd/lib/libc/net/send.c
similarity index 100%
rename from freebsd-userspace/lib/libc/net/send.c
rename to freebsd/lib/libc/net/send.c
diff --git a/freebsd-userspace/lib/libc/resolv/h_errno.c b/freebsd/lib/libc/resolv/h_errno.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/h_errno.c
rename to freebsd/lib/libc/resolv/h_errno.c
diff --git a/freebsd-userspace/lib/libc/resolv/herror.c b/freebsd/lib/libc/resolv/herror.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/herror.c
rename to freebsd/lib/libc/resolv/herror.c
diff --git a/freebsd-userspace/lib/libc/resolv/mtctxres.c b/freebsd/lib/libc/resolv/mtctxres.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/mtctxres.c
rename to freebsd/lib/libc/resolv/mtctxres.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_comp.c b/freebsd/lib/libc/resolv/res_comp.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_comp.c
rename to freebsd/lib/libc/resolv/res_comp.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_data.c
rename to freebsd/lib/libc/resolv/res_data.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_debug.c b/freebsd/lib/libc/resolv/res_debug.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_debug.c
rename to freebsd/lib/libc/resolv/res_debug.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_debug.h b/freebsd/lib/libc/resolv/res_debug.h
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_debug.h
rename to freebsd/lib/libc/resolv/res_debug.h
diff --git a/freebsd-userspace/lib/libc/resolv/res_findzonecut.c b/freebsd/lib/libc/resolv/res_findzonecut.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_findzonecut.c
rename to freebsd/lib/libc/resolv/res_findzonecut.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_init.c b/freebsd/lib/libc/resolv/res_init.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_init.c
rename to freebsd/lib/libc/resolv/res_init.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_mkquery.c b/freebsd/lib/libc/resolv/res_mkquery.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_mkquery.c
rename to freebsd/lib/libc/resolv/res_mkquery.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_mkupdate.c b/freebsd/lib/libc/resolv/res_mkupdate.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_mkupdate.c
rename to freebsd/lib/libc/resolv/res_mkupdate.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_private.h b/freebsd/lib/libc/resolv/res_private.h
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_private.h
rename to freebsd/lib/libc/resolv/res_private.h
diff --git a/freebsd-userspace/lib/libc/resolv/res_query.c b/freebsd/lib/libc/resolv/res_query.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_query.c
rename to freebsd/lib/libc/resolv/res_query.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_send.c b/freebsd/lib/libc/resolv/res_send.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_send.c
rename to freebsd/lib/libc/resolv/res_send.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_state.c b/freebsd/lib/libc/resolv/res_state.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_state.c
rename to freebsd/lib/libc/resolv/res_state.c
diff --git a/freebsd-userspace/lib/libc/resolv/res_update.c b/freebsd/lib/libc/resolv/res_update.c
similarity index 100%
rename from freebsd-userspace/lib/libc/resolv/res_update.c
rename to freebsd/lib/libc/resolv/res_update.c
diff --git a/freebsd-userspace/lib/libc/stdio/fgetln.c b/freebsd/lib/libc/stdio/fgetln.c
similarity index 100%
rename from freebsd-userspace/lib/libc/stdio/fgetln.c
rename to freebsd/lib/libc/stdio/fgetln.c
diff --git a/freebsd-userspace/lib/libc/stdio/local.h b/freebsd/lib/libc/stdio/local.h
similarity index 100%
rename from freebsd-userspace/lib/libc/stdio/local.h
rename to freebsd/lib/libc/stdio/local.h
diff --git a/freebsd-userspace/lib/libc/stdlib/strtonum.c b/freebsd/lib/libc/stdlib/strtonum.c
similarity index 100%
rename from freebsd-userspace/lib/libc/stdlib/strtonum.c
rename to freebsd/lib/libc/stdlib/strtonum.c
diff --git a/freebsd-userspace/lib/libc/string/strsep.c b/freebsd/lib/libc/string/strsep.c
similarity index 100%
rename from freebsd-userspace/lib/libc/string/strsep.c
rename to freebsd/lib/libc/string/strsep.c
diff --git a/freebsd-userspace/lib/libipsec/ipsec_dump_policy.c b/freebsd/lib/libipsec/ipsec_dump_policy.c
similarity index 100%
rename from freebsd-userspace/lib/libipsec/ipsec_dump_policy.c
rename to freebsd/lib/libipsec/ipsec_dump_policy.c
diff --git a/freebsd-userspace/lib/libipsec/ipsec_get_policylen.c b/freebsd/lib/libipsec/ipsec_get_policylen.c
similarity index 100%
rename from freebsd-userspace/lib/libipsec/ipsec_get_policylen.c
rename to freebsd/lib/libipsec/ipsec_get_policylen.c
diff --git a/freebsd-userspace/lib/libipsec/ipsec_strerror.c b/freebsd/lib/libipsec/ipsec_strerror.c
similarity index 100%
rename from freebsd-userspace/lib/libipsec/ipsec_strerror.c
rename to freebsd/lib/libipsec/ipsec_strerror.c
diff --git a/freebsd-userspace/lib/libipsec/ipsec_strerror.h b/freebsd/lib/libipsec/ipsec_strerror.h
similarity index 100%
rename from freebsd-userspace/lib/libipsec/ipsec_strerror.h
rename to freebsd/lib/libipsec/ipsec_strerror.h
diff --git a/freebsd-userspace/lib/libipsec/libpfkey.h b/freebsd/lib/libipsec/libpfkey.h
similarity index 100%
rename from freebsd-userspace/lib/libipsec/libpfkey.h
rename to freebsd/lib/libipsec/libpfkey.h
diff --git a/freebsd-userspace/lib/libipsec/pfkey.c b/freebsd/lib/libipsec/pfkey.c
similarity index 100%
rename from freebsd-userspace/lib/libipsec/pfkey.c
rename to freebsd/lib/libipsec/pfkey.c
diff --git a/freebsd-userspace/lib/libipsec/pfkey_dump.c b/freebsd/lib/libipsec/pfkey_dump.c
similarity index 100%
rename from freebsd-userspace/lib/libipsec/pfkey_dump.c
rename to freebsd/lib/libipsec/pfkey_dump.c
diff --git a/freebsd-userspace/lib/libipsec/policy_parse.y b/freebsd/lib/libipsec/policy_parse.y
similarity index 100%
rename from freebsd-userspace/lib/libipsec/policy_parse.y
rename to freebsd/lib/libipsec/policy_parse.y
diff --git a/freebsd-userspace/lib/libipsec/policy_token.l b/freebsd/lib/libipsec/policy_token.l
similarity index 100%
rename from freebsd-userspace/lib/libipsec/policy_token.l
rename to freebsd/lib/libipsec/policy_token.l
diff --git a/freebsd-userspace/lib/libkvm/kvm.h b/freebsd/lib/libkvm/kvm.h
similarity index 100%
rename from freebsd-userspace/lib/libkvm/kvm.h
rename to freebsd/lib/libkvm/kvm.h
diff --git a/freebsd-userspace/lib/libmemstat/memstat.c b/freebsd/lib/libmemstat/memstat.c
similarity index 100%
rename from freebsd-userspace/lib/libmemstat/memstat.c
rename to freebsd/lib/libmemstat/memstat.c
diff --git a/freebsd-userspace/lib/libmemstat/memstat.h b/freebsd/lib/libmemstat/memstat.h
similarity index 100%
rename from freebsd-userspace/lib/libmemstat/memstat.h
rename to freebsd/lib/libmemstat/memstat.h
diff --git a/freebsd-userspace/lib/libmemstat/memstat_all.c b/freebsd/lib/libmemstat/memstat_all.c
similarity index 100%
rename from freebsd-userspace/lib/libmemstat/memstat_all.c
rename to freebsd/lib/libmemstat/memstat_all.c
diff --git a/freebsd-userspace/lib/libmemstat/memstat_internal.h b/freebsd/lib/libmemstat/memstat_internal.h
similarity index 100%
rename from freebsd-userspace/lib/libmemstat/memstat_internal.h
rename to freebsd/lib/libmemstat/memstat_internal.h
diff --git a/freebsd-userspace/lib/libmemstat/memstat_malloc.c b/freebsd/lib/libmemstat/memstat_malloc.c
similarity index 100%
rename from freebsd-userspace/lib/libmemstat/memstat_malloc.c
rename to freebsd/lib/libmemstat/memstat_malloc.c
diff --git a/freebsd-userspace/lib/libmemstat/memstat_uma.c b/freebsd/lib/libmemstat/memstat_uma.c
similarity index 100%
rename from freebsd-userspace/lib/libmemstat/memstat_uma.c
rename to freebsd/lib/libmemstat/memstat_uma.c
diff --git a/freebsd-userspace/lib/libutil/expand_number.c b/freebsd/lib/libutil/expand_number.c
similarity index 100%
rename from freebsd-userspace/lib/libutil/expand_number.c
rename to freebsd/lib/libutil/expand_number.c
diff --git a/freebsd-userspace/lib/libutil/humanize_number.c b/freebsd/lib/libutil/humanize_number.c
similarity index 100%
rename from freebsd-userspace/lib/libutil/humanize_number.c
rename to freebsd/lib/libutil/humanize_number.c
diff --git a/freebsd-userspace/lib/libutil/libutil.h b/freebsd/lib/libutil/libutil.h
similarity index 100%
rename from freebsd-userspace/lib/libutil/libutil.h
rename to freebsd/lib/libutil/libutil.h
diff --git a/freebsd-userspace/lib/libutil/trimdomain.c b/freebsd/lib/libutil/trimdomain.c
similarity index 100%
rename from freebsd-userspace/lib/libutil/trimdomain.c
rename to freebsd/lib/libutil/trimdomain.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/alloc.c b/freebsd/sbin/dhclient/alloc.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/alloc.c
rename to freebsd/sbin/dhclient/alloc.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/bpf.c b/freebsd/sbin/dhclient/bpf.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/bpf.c
rename to freebsd/sbin/dhclient/bpf.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/clparse.c b/freebsd/sbin/dhclient/clparse.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/clparse.c
rename to freebsd/sbin/dhclient/clparse.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/conflex.c b/freebsd/sbin/dhclient/conflex.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/conflex.c
rename to freebsd/sbin/dhclient/conflex.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/convert.c b/freebsd/sbin/dhclient/convert.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/convert.c
rename to freebsd/sbin/dhclient/convert.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/dhclient.c b/freebsd/sbin/dhclient/dhclient.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/dhclient.c
rename to freebsd/sbin/dhclient/dhclient.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/dhcp.h b/freebsd/sbin/dhclient/dhcp.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/dhcp.h
rename to freebsd/sbin/dhclient/dhcp.h
diff --git a/freebsd-userspace/commands/sbin/dhclient/dhcpd.h b/freebsd/sbin/dhclient/dhcpd.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/dhcpd.h
rename to freebsd/sbin/dhclient/dhcpd.h
diff --git a/freebsd-userspace/commands/sbin/dhclient/dhctoken.h b/freebsd/sbin/dhclient/dhctoken.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/dhctoken.h
rename to freebsd/sbin/dhclient/dhctoken.h
diff --git a/freebsd-userspace/commands/sbin/dhclient/dispatch.c b/freebsd/sbin/dhclient/dispatch.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/dispatch.c
rename to freebsd/sbin/dhclient/dispatch.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/errwarn.c b/freebsd/sbin/dhclient/errwarn.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/errwarn.c
rename to freebsd/sbin/dhclient/errwarn.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/hash.c b/freebsd/sbin/dhclient/hash.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/hash.c
rename to freebsd/sbin/dhclient/hash.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/inet.c b/freebsd/sbin/dhclient/inet.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/inet.c
rename to freebsd/sbin/dhclient/inet.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/options.c b/freebsd/sbin/dhclient/options.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/options.c
rename to freebsd/sbin/dhclient/options.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/packet.c b/freebsd/sbin/dhclient/packet.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/packet.c
rename to freebsd/sbin/dhclient/packet.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/parse.c b/freebsd/sbin/dhclient/parse.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/parse.c
rename to freebsd/sbin/dhclient/parse.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/privsep.c b/freebsd/sbin/dhclient/privsep.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/privsep.c
rename to freebsd/sbin/dhclient/privsep.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/privsep.h b/freebsd/sbin/dhclient/privsep.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/privsep.h
rename to freebsd/sbin/dhclient/privsep.h
diff --git a/freebsd-userspace/commands/sbin/dhclient/tables.c b/freebsd/sbin/dhclient/tables.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/tables.c
rename to freebsd/sbin/dhclient/tables.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/tree.c b/freebsd/sbin/dhclient/tree.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/tree.c
rename to freebsd/sbin/dhclient/tree.c
diff --git a/freebsd-userspace/commands/sbin/dhclient/tree.h b/freebsd/sbin/dhclient/tree.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/dhclient/tree.h
rename to freebsd/sbin/dhclient/tree.h
diff --git a/freebsd-userspace/commands/sbin/ifconfig/af_atalk.c b/freebsd/sbin/ifconfig/af_atalk.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/af_atalk.c
rename to freebsd/sbin/ifconfig/af_atalk.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/af_inet.c b/freebsd/sbin/ifconfig/af_inet.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/af_inet.c
rename to freebsd/sbin/ifconfig/af_inet.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/af_inet6.c b/freebsd/sbin/ifconfig/af_inet6.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/af_inet6.c
rename to freebsd/sbin/ifconfig/af_inet6.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/af_link.c b/freebsd/sbin/ifconfig/af_link.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/af_link.c
rename to freebsd/sbin/ifconfig/af_link.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/af_nd6.c b/freebsd/sbin/ifconfig/af_nd6.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/af_nd6.c
rename to freebsd/sbin/ifconfig/af_nd6.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifbridge.c b/freebsd/sbin/ifconfig/ifbridge.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifbridge.c
rename to freebsd/sbin/ifconfig/ifbridge.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifcarp.c b/freebsd/sbin/ifconfig/ifcarp.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifcarp.c
rename to freebsd/sbin/ifconfig/ifcarp.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifclone.c b/freebsd/sbin/ifconfig/ifclone.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifclone.c
rename to freebsd/sbin/ifconfig/ifclone.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifconfig.c b/freebsd/sbin/ifconfig/ifconfig.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifconfig.c
rename to freebsd/sbin/ifconfig/ifconfig.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifconfig.h b/freebsd/sbin/ifconfig/ifconfig.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifconfig.h
rename to freebsd/sbin/ifconfig/ifconfig.h
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifgif.c b/freebsd/sbin/ifconfig/ifgif.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifgif.c
rename to freebsd/sbin/ifconfig/ifgif.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifgre.c b/freebsd/sbin/ifconfig/ifgre.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifgre.c
rename to freebsd/sbin/ifconfig/ifgre.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifgroup.c b/freebsd/sbin/ifconfig/ifgroup.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifgroup.c
rename to freebsd/sbin/ifconfig/ifgroup.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifieee80211.c b/freebsd/sbin/ifconfig/ifieee80211.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifieee80211.c
rename to freebsd/sbin/ifconfig/ifieee80211.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/iflagg.c b/freebsd/sbin/ifconfig/iflagg.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/iflagg.c
rename to freebsd/sbin/ifconfig/iflagg.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifmac.c b/freebsd/sbin/ifconfig/ifmac.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifmac.c
rename to freebsd/sbin/ifconfig/ifmac.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifmedia.c b/freebsd/sbin/ifconfig/ifmedia.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifmedia.c
rename to freebsd/sbin/ifconfig/ifmedia.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifpfsync.c b/freebsd/sbin/ifconfig/ifpfsync.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifpfsync.c
rename to freebsd/sbin/ifconfig/ifpfsync.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/ifvlan.c b/freebsd/sbin/ifconfig/ifvlan.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/ifvlan.c
rename to freebsd/sbin/ifconfig/ifvlan.c
diff --git a/freebsd-userspace/commands/sbin/ifconfig/regdomain.h b/freebsd/sbin/ifconfig/regdomain.h
similarity index 100%
rename from freebsd-userspace/commands/sbin/ifconfig/regdomain.h
rename to freebsd/sbin/ifconfig/regdomain.h
diff --git a/freebsd-userspace/commands/sbin/ping/ping.c b/freebsd/sbin/ping/ping.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ping/ping.c
rename to freebsd/sbin/ping/ping.c
diff --git a/freebsd-userspace/commands/sbin/ping6/ping6.c b/freebsd/sbin/ping6/ping6.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/ping6/ping6.c
rename to freebsd/sbin/ping6/ping6.c
diff --git a/freebsd-userspace/commands/sbin/route/keywords b/freebsd/sbin/route/keywords
similarity index 100%
rename from freebsd-userspace/commands/sbin/route/keywords
rename to freebsd/sbin/route/keywords
diff --git a/freebsd-userspace/commands/sbin/route/route.c b/freebsd/sbin/route/route.c
similarity index 100%
rename from freebsd-userspace/commands/sbin/route/route.c
rename to freebsd/sbin/route/route.c
diff --git a/freebsd/arm/arm/in_cksum.c b/freebsd/sys/arm/arm/in_cksum.c
similarity index 100%
rename from freebsd/arm/arm/in_cksum.c
rename to freebsd/sys/arm/arm/in_cksum.c
diff --git a/freebsd/arm/include/freebsd/machine/cpufunc.h b/freebsd/sys/arm/include/machine/cpufunc.h
similarity index 100%
rename from freebsd/arm/include/freebsd/machine/cpufunc.h
rename to freebsd/sys/arm/include/machine/cpufunc.h
diff --git a/freebsd/arm/include/freebsd/machine/in_cksum.h b/freebsd/sys/arm/include/machine/in_cksum.h
similarity index 100%
rename from freebsd/arm/include/freebsd/machine/in_cksum.h
rename to freebsd/sys/arm/include/machine/in_cksum.h
diff --git a/freebsd/i386/include/freebsd/machine/legacyvar.h b/freebsd/sys/arm/include/machine/legacyvar.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/legacyvar.h
rename to freebsd/sys/arm/include/machine/legacyvar.h
diff --git a/freebsd/i386/include/freebsd/machine/pci_cfgreg.h b/freebsd/sys/arm/include/machine/pci_cfgreg.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/pci_cfgreg.h
rename to freebsd/sys/arm/include/machine/pci_cfgreg.h
diff --git a/freebsd/i386/pci/pci_bus.c b/freebsd/sys/arm/pci/pci_bus.c
similarity index 100%
rename from freebsd/i386/pci/pci_bus.c
rename to freebsd/sys/arm/pci/pci_bus.c
diff --git a/freebsd/i386/include/freebsd/machine/in_cksum.h b/freebsd/sys/avr/include/machine/in_cksum.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/in_cksum.h
rename to freebsd/sys/avr/include/machine/in_cksum.h
diff --git a/rtemsbsd/src/rtems-bsd-pci_bus.c b/freebsd/sys/avr/pci/pci_bus.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-pci_bus.c
rename to freebsd/sys/avr/pci/pci_bus.c
diff --git a/freebsd/mips/include/freebsd/machine/in_cksum.h b/freebsd/sys/bfin/include/machine/in_cksum.h
similarity index 100%
rename from freebsd/mips/include/freebsd/machine/in_cksum.h
rename to freebsd/sys/bfin/include/machine/in_cksum.h
diff --git a/freebsd/bsm/audit.h b/freebsd/sys/bsm/audit.h
similarity index 100%
rename from freebsd/bsm/audit.h
rename to freebsd/sys/bsm/audit.h
diff --git a/freebsd/bsm/audit_kevents.h b/freebsd/sys/bsm/audit_kevents.h
similarity index 100%
rename from freebsd/bsm/audit_kevents.h
rename to freebsd/sys/bsm/audit_kevents.h
diff --git a/freebsd/cam/ata/ata_all.h b/freebsd/sys/cam/ata/ata_all.h
similarity index 100%
rename from freebsd/cam/ata/ata_all.h
rename to freebsd/sys/cam/ata/ata_all.h
diff --git a/freebsd/cam/cam.c b/freebsd/sys/cam/cam.c
similarity index 100%
rename from freebsd/cam/cam.c
rename to freebsd/sys/cam/cam.c
diff --git a/freebsd/cam/cam.h b/freebsd/sys/cam/cam.h
similarity index 100%
rename from freebsd/cam/cam.h
rename to freebsd/sys/cam/cam.h
diff --git a/freebsd/cam/cam_ccb.h b/freebsd/sys/cam/cam_ccb.h
similarity index 100%
rename from freebsd/cam/cam_ccb.h
rename to freebsd/sys/cam/cam_ccb.h
diff --git a/freebsd/cam/cam_debug.h b/freebsd/sys/cam/cam_debug.h
similarity index 100%
rename from freebsd/cam/cam_debug.h
rename to freebsd/sys/cam/cam_debug.h
diff --git a/freebsd/cam/cam_periph.h b/freebsd/sys/cam/cam_periph.h
similarity index 100%
rename from freebsd/cam/cam_periph.h
rename to freebsd/sys/cam/cam_periph.h
diff --git a/freebsd/cam/cam_sim.h b/freebsd/sys/cam/cam_sim.h
similarity index 100%
rename from freebsd/cam/cam_sim.h
rename to freebsd/sys/cam/cam_sim.h
diff --git a/freebsd/cam/cam_xpt.h b/freebsd/sys/cam/cam_xpt.h
similarity index 100%
rename from freebsd/cam/cam_xpt.h
rename to freebsd/sys/cam/cam_xpt.h
diff --git a/freebsd/cam/cam_xpt_sim.h b/freebsd/sys/cam/cam_xpt_sim.h
similarity index 100%
rename from freebsd/cam/cam_xpt_sim.h
rename to freebsd/sys/cam/cam_xpt_sim.h
diff --git a/freebsd/cam/scsi/scsi_all.c b/freebsd/sys/cam/scsi/scsi_all.c
similarity index 100%
rename from freebsd/cam/scsi/scsi_all.c
rename to freebsd/sys/cam/scsi/scsi_all.c
diff --git a/freebsd/cam/scsi/scsi_all.h b/freebsd/sys/cam/scsi/scsi_all.h
similarity index 100%
rename from freebsd/cam/scsi/scsi_all.h
rename to freebsd/sys/cam/scsi/scsi_all.h
diff --git a/freebsd/cam/scsi/scsi_da.h b/freebsd/sys/cam/scsi/scsi_da.h
similarity index 100%
rename from freebsd/cam/scsi/scsi_da.h
rename to freebsd/sys/cam/scsi/scsi_da.h
diff --git a/contrib/altq/freebsd/altq/altq.h b/freebsd/sys/contrib/altq/altq/altq.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq.h
rename to freebsd/sys/contrib/altq/altq/altq.h
diff --git a/contrib/altq/freebsd/altq/altq_cbq.c b/freebsd/sys/contrib/altq/altq/altq_cbq.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_cbq.c
rename to freebsd/sys/contrib/altq/altq/altq_cbq.c
diff --git a/contrib/altq/freebsd/altq/altq_cbq.h b/freebsd/sys/contrib/altq/altq/altq_cbq.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_cbq.h
rename to freebsd/sys/contrib/altq/altq/altq_cbq.h
diff --git a/contrib/altq/freebsd/altq/altq_cdnr.c b/freebsd/sys/contrib/altq/altq/altq_cdnr.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_cdnr.c
rename to freebsd/sys/contrib/altq/altq/altq_cdnr.c
diff --git a/contrib/altq/freebsd/altq/altq_cdnr.h b/freebsd/sys/contrib/altq/altq/altq_cdnr.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_cdnr.h
rename to freebsd/sys/contrib/altq/altq/altq_cdnr.h
diff --git a/contrib/altq/freebsd/altq/altq_classq.h b/freebsd/sys/contrib/altq/altq/altq_classq.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_classq.h
rename to freebsd/sys/contrib/altq/altq/altq_classq.h
diff --git a/contrib/altq/freebsd/altq/altq_hfsc.c b/freebsd/sys/contrib/altq/altq/altq_hfsc.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_hfsc.c
rename to freebsd/sys/contrib/altq/altq/altq_hfsc.c
diff --git a/contrib/altq/freebsd/altq/altq_hfsc.h b/freebsd/sys/contrib/altq/altq/altq_hfsc.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_hfsc.h
rename to freebsd/sys/contrib/altq/altq/altq_hfsc.h
diff --git a/contrib/altq/freebsd/altq/altq_priq.c b/freebsd/sys/contrib/altq/altq/altq_priq.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_priq.c
rename to freebsd/sys/contrib/altq/altq/altq_priq.c
diff --git a/contrib/altq/freebsd/altq/altq_priq.h b/freebsd/sys/contrib/altq/altq/altq_priq.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_priq.h
rename to freebsd/sys/contrib/altq/altq/altq_priq.h
diff --git a/contrib/altq/freebsd/altq/altq_red.c b/freebsd/sys/contrib/altq/altq/altq_red.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_red.c
rename to freebsd/sys/contrib/altq/altq/altq_red.c
diff --git a/contrib/altq/freebsd/altq/altq_red.h b/freebsd/sys/contrib/altq/altq/altq_red.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_red.h
rename to freebsd/sys/contrib/altq/altq/altq_red.h
diff --git a/contrib/altq/freebsd/altq/altq_rio.c b/freebsd/sys/contrib/altq/altq/altq_rio.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_rio.c
rename to freebsd/sys/contrib/altq/altq/altq_rio.c
diff --git a/contrib/altq/freebsd/altq/altq_rio.h b/freebsd/sys/contrib/altq/altq/altq_rio.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_rio.h
rename to freebsd/sys/contrib/altq/altq/altq_rio.h
diff --git a/contrib/altq/freebsd/altq/altq_rmclass.c b/freebsd/sys/contrib/altq/altq/altq_rmclass.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_rmclass.c
rename to freebsd/sys/contrib/altq/altq/altq_rmclass.c
diff --git a/contrib/altq/freebsd/altq/altq_rmclass.h b/freebsd/sys/contrib/altq/altq/altq_rmclass.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_rmclass.h
rename to freebsd/sys/contrib/altq/altq/altq_rmclass.h
diff --git a/contrib/altq/freebsd/altq/altq_rmclass_debug.h b/freebsd/sys/contrib/altq/altq/altq_rmclass_debug.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_rmclass_debug.h
rename to freebsd/sys/contrib/altq/altq/altq_rmclass_debug.h
diff --git a/contrib/altq/freebsd/altq/altq_subr.c b/freebsd/sys/contrib/altq/altq/altq_subr.c
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_subr.c
rename to freebsd/sys/contrib/altq/altq/altq_subr.c
diff --git a/contrib/altq/freebsd/altq/altq_var.h b/freebsd/sys/contrib/altq/altq/altq_var.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altq_var.h
rename to freebsd/sys/contrib/altq/altq/altq_var.h
diff --git a/contrib/altq/freebsd/altq/altqconf.h b/freebsd/sys/contrib/altq/altq/altqconf.h
similarity index 100%
rename from contrib/altq/freebsd/altq/altqconf.h
rename to freebsd/sys/contrib/altq/altq/altqconf.h
diff --git a/contrib/altq/freebsd/altq/if_altq.h b/freebsd/sys/contrib/altq/altq/if_altq.h
similarity index 100%
rename from contrib/altq/freebsd/altq/if_altq.h
rename to freebsd/sys/contrib/altq/altq/if_altq.h
diff --git a/contrib/pf/freebsd/net/if_pflog.c b/freebsd/sys/contrib/pf/net/if_pflog.c
similarity index 100%
rename from contrib/pf/freebsd/net/if_pflog.c
rename to freebsd/sys/contrib/pf/net/if_pflog.c
diff --git a/contrib/pf/freebsd/net/if_pflog.h b/freebsd/sys/contrib/pf/net/if_pflog.h
similarity index 100%
rename from contrib/pf/freebsd/net/if_pflog.h
rename to freebsd/sys/contrib/pf/net/if_pflog.h
diff --git a/contrib/pf/freebsd/net/if_pfsync.c b/freebsd/sys/contrib/pf/net/if_pfsync.c
similarity index 100%
rename from contrib/pf/freebsd/net/if_pfsync.c
rename to freebsd/sys/contrib/pf/net/if_pfsync.c
diff --git a/contrib/pf/freebsd/net/if_pfsync.h b/freebsd/sys/contrib/pf/net/if_pfsync.h
similarity index 100%
rename from contrib/pf/freebsd/net/if_pfsync.h
rename to freebsd/sys/contrib/pf/net/if_pfsync.h
diff --git a/contrib/pf/freebsd/net/pf.c b/freebsd/sys/contrib/pf/net/pf.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf.c
rename to freebsd/sys/contrib/pf/net/pf.c
diff --git a/contrib/pf/freebsd/net/pf_if.c b/freebsd/sys/contrib/pf/net/pf_if.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_if.c
rename to freebsd/sys/contrib/pf/net/pf_if.c
diff --git a/contrib/pf/freebsd/net/pf_ioctl.c b/freebsd/sys/contrib/pf/net/pf_ioctl.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_ioctl.c
rename to freebsd/sys/contrib/pf/net/pf_ioctl.c
diff --git a/contrib/pf/freebsd/net/pf_mtag.h b/freebsd/sys/contrib/pf/net/pf_mtag.h
similarity index 100%
rename from contrib/pf/freebsd/net/pf_mtag.h
rename to freebsd/sys/contrib/pf/net/pf_mtag.h
diff --git a/contrib/pf/freebsd/net/pf_norm.c b/freebsd/sys/contrib/pf/net/pf_norm.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_norm.c
rename to freebsd/sys/contrib/pf/net/pf_norm.c
diff --git a/contrib/pf/freebsd/net/pf_osfp.c b/freebsd/sys/contrib/pf/net/pf_osfp.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_osfp.c
rename to freebsd/sys/contrib/pf/net/pf_osfp.c
diff --git a/contrib/pf/freebsd/net/pf_ruleset.c b/freebsd/sys/contrib/pf/net/pf_ruleset.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_ruleset.c
rename to freebsd/sys/contrib/pf/net/pf_ruleset.c
diff --git a/contrib/pf/freebsd/net/pf_subr.c b/freebsd/sys/contrib/pf/net/pf_subr.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_subr.c
rename to freebsd/sys/contrib/pf/net/pf_subr.c
diff --git a/contrib/pf/freebsd/net/pf_table.c b/freebsd/sys/contrib/pf/net/pf_table.c
similarity index 100%
rename from contrib/pf/freebsd/net/pf_table.c
rename to freebsd/sys/contrib/pf/net/pf_table.c
diff --git a/contrib/pf/freebsd/net/pfvar.h b/freebsd/sys/contrib/pf/net/pfvar.h
similarity index 100%
rename from contrib/pf/freebsd/net/pfvar.h
rename to freebsd/sys/contrib/pf/net/pfvar.h
diff --git a/contrib/pf/freebsd/netinet/in4_cksum.c b/freebsd/sys/contrib/pf/netinet/in4_cksum.c
similarity index 100%
rename from contrib/pf/freebsd/netinet/in4_cksum.c
rename to freebsd/sys/contrib/pf/netinet/in4_cksum.c
diff --git a/freebsd/crypto/blowfish/bf_ecb.c b/freebsd/sys/crypto/blowfish/bf_ecb.c
similarity index 100%
rename from freebsd/crypto/blowfish/bf_ecb.c
rename to freebsd/sys/crypto/blowfish/bf_ecb.c
diff --git a/freebsd/crypto/blowfish/bf_enc.c b/freebsd/sys/crypto/blowfish/bf_enc.c
similarity index 100%
rename from freebsd/crypto/blowfish/bf_enc.c
rename to freebsd/sys/crypto/blowfish/bf_enc.c
diff --git a/freebsd/crypto/blowfish/bf_locl.h b/freebsd/sys/crypto/blowfish/bf_locl.h
similarity index 100%
rename from freebsd/crypto/blowfish/bf_locl.h
rename to freebsd/sys/crypto/blowfish/bf_locl.h
diff --git a/freebsd/crypto/blowfish/bf_pi.h b/freebsd/sys/crypto/blowfish/bf_pi.h
similarity index 100%
rename from freebsd/crypto/blowfish/bf_pi.h
rename to freebsd/sys/crypto/blowfish/bf_pi.h
diff --git a/freebsd/crypto/blowfish/bf_skey.c b/freebsd/sys/crypto/blowfish/bf_skey.c
similarity index 100%
rename from freebsd/crypto/blowfish/bf_skey.c
rename to freebsd/sys/crypto/blowfish/bf_skey.c
diff --git a/freebsd/crypto/blowfish/blowfish.h b/freebsd/sys/crypto/blowfish/blowfish.h
similarity index 100%
rename from freebsd/crypto/blowfish/blowfish.h
rename to freebsd/sys/crypto/blowfish/blowfish.h
diff --git a/freebsd/crypto/camellia/camellia-api.c b/freebsd/sys/crypto/camellia/camellia-api.c
similarity index 100%
rename from freebsd/crypto/camellia/camellia-api.c
rename to freebsd/sys/crypto/camellia/camellia-api.c
diff --git a/freebsd/crypto/camellia/camellia.c b/freebsd/sys/crypto/camellia/camellia.c
similarity index 100%
rename from freebsd/crypto/camellia/camellia.c
rename to freebsd/sys/crypto/camellia/camellia.c
diff --git a/freebsd/crypto/camellia/camellia.h b/freebsd/sys/crypto/camellia/camellia.h
similarity index 100%
rename from freebsd/crypto/camellia/camellia.h
rename to freebsd/sys/crypto/camellia/camellia.h
diff --git a/freebsd/crypto/des/des.h b/freebsd/sys/crypto/des/des.h
similarity index 100%
rename from freebsd/crypto/des/des.h
rename to freebsd/sys/crypto/des/des.h
diff --git a/freebsd/crypto/des/des_ecb.c b/freebsd/sys/crypto/des/des_ecb.c
similarity index 100%
rename from freebsd/crypto/des/des_ecb.c
rename to freebsd/sys/crypto/des/des_ecb.c
diff --git a/freebsd/crypto/des/des_enc.c b/freebsd/sys/crypto/des/des_enc.c
similarity index 100%
rename from freebsd/crypto/des/des_enc.c
rename to freebsd/sys/crypto/des/des_enc.c
diff --git a/freebsd/crypto/des/des_locl.h b/freebsd/sys/crypto/des/des_locl.h
similarity index 100%
rename from freebsd/crypto/des/des_locl.h
rename to freebsd/sys/crypto/des/des_locl.h
diff --git a/freebsd/crypto/des/des_setkey.c b/freebsd/sys/crypto/des/des_setkey.c
similarity index 100%
rename from freebsd/crypto/des/des_setkey.c
rename to freebsd/sys/crypto/des/des_setkey.c
diff --git a/freebsd/crypto/des/podd.h b/freebsd/sys/crypto/des/podd.h
similarity index 100%
rename from freebsd/crypto/des/podd.h
rename to freebsd/sys/crypto/des/podd.h
diff --git a/freebsd/crypto/des/sk.h b/freebsd/sys/crypto/des/sk.h
similarity index 100%
rename from freebsd/crypto/des/sk.h
rename to freebsd/sys/crypto/des/sk.h
diff --git a/freebsd/crypto/des/spr.h b/freebsd/sys/crypto/des/spr.h
similarity index 100%
rename from freebsd/crypto/des/spr.h
rename to freebsd/sys/crypto/des/spr.h
diff --git a/freebsd/crypto/rc4/rc4.c b/freebsd/sys/crypto/rc4/rc4.c
similarity index 100%
rename from freebsd/crypto/rc4/rc4.c
rename to freebsd/sys/crypto/rc4/rc4.c
diff --git a/freebsd/crypto/rc4/rc4.h b/freebsd/sys/crypto/rc4/rc4.h
similarity index 100%
rename from freebsd/crypto/rc4/rc4.h
rename to freebsd/sys/crypto/rc4/rc4.h
diff --git a/freebsd/crypto/rijndael/rijndael-alg-fst.c b/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
similarity index 100%
rename from freebsd/crypto/rijndael/rijndael-alg-fst.c
rename to freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
diff --git a/freebsd/crypto/rijndael/rijndael-api-fst.c b/freebsd/sys/crypto/rijndael/rijndael-api-fst.c
similarity index 100%
rename from freebsd/crypto/rijndael/rijndael-api-fst.c
rename to freebsd/sys/crypto/rijndael/rijndael-api-fst.c
diff --git a/freebsd/crypto/rijndael/rijndael-api-fst.h b/freebsd/sys/crypto/rijndael/rijndael-api-fst.h
similarity index 100%
rename from freebsd/crypto/rijndael/rijndael-api-fst.h
rename to freebsd/sys/crypto/rijndael/rijndael-api-fst.h
diff --git a/freebsd/crypto/rijndael/rijndael-api.c b/freebsd/sys/crypto/rijndael/rijndael-api.c
similarity index 100%
rename from freebsd/crypto/rijndael/rijndael-api.c
rename to freebsd/sys/crypto/rijndael/rijndael-api.c
diff --git a/freebsd/crypto/rijndael/rijndael.h b/freebsd/sys/crypto/rijndael/rijndael.h
similarity index 100%
rename from freebsd/crypto/rijndael/rijndael.h
rename to freebsd/sys/crypto/rijndael/rijndael.h
diff --git a/freebsd/crypto/rijndael/rijndael_local.h b/freebsd/sys/crypto/rijndael/rijndael_local.h
similarity index 100%
rename from freebsd/crypto/rijndael/rijndael_local.h
rename to freebsd/sys/crypto/rijndael/rijndael_local.h
diff --git a/freebsd/crypto/sha1.c b/freebsd/sys/crypto/sha1.c
similarity index 100%
rename from freebsd/crypto/sha1.c
rename to freebsd/sys/crypto/sha1.c
diff --git a/freebsd/crypto/sha1.h b/freebsd/sys/crypto/sha1.h
similarity index 100%
rename from freebsd/crypto/sha1.h
rename to freebsd/sys/crypto/sha1.h
diff --git a/freebsd/crypto/sha2/sha2.c b/freebsd/sys/crypto/sha2/sha2.c
similarity index 100%
rename from freebsd/crypto/sha2/sha2.c
rename to freebsd/sys/crypto/sha2/sha2.c
diff --git a/freebsd/crypto/sha2/sha2.h b/freebsd/sys/crypto/sha2/sha2.h
similarity index 100%
rename from freebsd/crypto/sha2/sha2.h
rename to freebsd/sys/crypto/sha2/sha2.h
diff --git a/freebsd/dev/bce/if_bce.c b/freebsd/sys/dev/bce/if_bce.c
similarity index 100%
rename from freebsd/dev/bce/if_bce.c
rename to freebsd/sys/dev/bce/if_bce.c
diff --git a/freebsd/dev/bce/if_bcefw.h b/freebsd/sys/dev/bce/if_bcefw.h
similarity index 100%
rename from freebsd/dev/bce/if_bcefw.h
rename to freebsd/sys/dev/bce/if_bcefw.h
diff --git a/freebsd/dev/bce/if_bcereg.h b/freebsd/sys/dev/bce/if_bcereg.h
similarity index 100%
rename from freebsd/dev/bce/if_bcereg.h
rename to freebsd/sys/dev/bce/if_bcereg.h
diff --git a/freebsd/dev/bfe/if_bfe.c b/freebsd/sys/dev/bfe/if_bfe.c
similarity index 100%
rename from freebsd/dev/bfe/if_bfe.c
rename to freebsd/sys/dev/bfe/if_bfe.c
diff --git a/freebsd/dev/bfe/if_bfereg.h b/freebsd/sys/dev/bfe/if_bfereg.h
similarity index 100%
rename from freebsd/dev/bfe/if_bfereg.h
rename to freebsd/sys/dev/bfe/if_bfereg.h
diff --git a/freebsd/dev/bge/if_bge.c b/freebsd/sys/dev/bge/if_bge.c
similarity index 100%
rename from freebsd/dev/bge/if_bge.c
rename to freebsd/sys/dev/bge/if_bge.c
diff --git a/freebsd/dev/bge/if_bgereg.h b/freebsd/sys/dev/bge/if_bgereg.h
similarity index 100%
rename from freebsd/dev/bge/if_bgereg.h
rename to freebsd/sys/dev/bge/if_bgereg.h
diff --git a/freebsd/dev/dc/dcphy.c b/freebsd/sys/dev/dc/dcphy.c
similarity index 100%
rename from freebsd/dev/dc/dcphy.c
rename to freebsd/sys/dev/dc/dcphy.c
diff --git a/freebsd/dev/dc/if_dc.c b/freebsd/sys/dev/dc/if_dc.c
similarity index 100%
rename from freebsd/dev/dc/if_dc.c
rename to freebsd/sys/dev/dc/if_dc.c
diff --git a/freebsd/dev/dc/if_dcreg.h b/freebsd/sys/dev/dc/if_dcreg.h
similarity index 100%
rename from freebsd/dev/dc/if_dcreg.h
rename to freebsd/sys/dev/dc/if_dcreg.h
diff --git a/freebsd/dev/dc/pnphy.c b/freebsd/sys/dev/dc/pnphy.c
similarity index 100%
rename from freebsd/dev/dc/pnphy.c
rename to freebsd/sys/dev/dc/pnphy.c
diff --git a/freebsd/dev/e1000/e1000_80003es2lan.c b/freebsd/sys/dev/e1000/e1000_80003es2lan.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_80003es2lan.c
rename to freebsd/sys/dev/e1000/e1000_80003es2lan.c
diff --git a/freebsd/dev/e1000/e1000_80003es2lan.h b/freebsd/sys/dev/e1000/e1000_80003es2lan.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_80003es2lan.h
rename to freebsd/sys/dev/e1000/e1000_80003es2lan.h
diff --git a/freebsd/dev/e1000/e1000_82540.c b/freebsd/sys/dev/e1000/e1000_82540.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_82540.c
rename to freebsd/sys/dev/e1000/e1000_82540.c
diff --git a/freebsd/dev/e1000/e1000_82541.c b/freebsd/sys/dev/e1000/e1000_82541.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_82541.c
rename to freebsd/sys/dev/e1000/e1000_82541.c
diff --git a/freebsd/dev/e1000/e1000_82541.h b/freebsd/sys/dev/e1000/e1000_82541.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_82541.h
rename to freebsd/sys/dev/e1000/e1000_82541.h
diff --git a/freebsd/dev/e1000/e1000_82542.c b/freebsd/sys/dev/e1000/e1000_82542.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_82542.c
rename to freebsd/sys/dev/e1000/e1000_82542.c
diff --git a/freebsd/dev/e1000/e1000_82543.c b/freebsd/sys/dev/e1000/e1000_82543.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_82543.c
rename to freebsd/sys/dev/e1000/e1000_82543.c
diff --git a/freebsd/dev/e1000/e1000_82543.h b/freebsd/sys/dev/e1000/e1000_82543.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_82543.h
rename to freebsd/sys/dev/e1000/e1000_82543.h
diff --git a/freebsd/dev/e1000/e1000_82571.c b/freebsd/sys/dev/e1000/e1000_82571.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_82571.c
rename to freebsd/sys/dev/e1000/e1000_82571.c
diff --git a/freebsd/dev/e1000/e1000_82571.h b/freebsd/sys/dev/e1000/e1000_82571.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_82571.h
rename to freebsd/sys/dev/e1000/e1000_82571.h
diff --git a/freebsd/dev/e1000/e1000_82575.c b/freebsd/sys/dev/e1000/e1000_82575.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_82575.c
rename to freebsd/sys/dev/e1000/e1000_82575.c
diff --git a/freebsd/dev/e1000/e1000_82575.h b/freebsd/sys/dev/e1000/e1000_82575.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_82575.h
rename to freebsd/sys/dev/e1000/e1000_82575.h
diff --git a/freebsd/dev/e1000/e1000_api.c b/freebsd/sys/dev/e1000/e1000_api.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_api.c
rename to freebsd/sys/dev/e1000/e1000_api.c
diff --git a/freebsd/dev/e1000/e1000_api.h b/freebsd/sys/dev/e1000/e1000_api.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_api.h
rename to freebsd/sys/dev/e1000/e1000_api.h
diff --git a/freebsd/dev/e1000/e1000_defines.h b/freebsd/sys/dev/e1000/e1000_defines.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_defines.h
rename to freebsd/sys/dev/e1000/e1000_defines.h
diff --git a/freebsd/dev/e1000/e1000_hw.h b/freebsd/sys/dev/e1000/e1000_hw.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_hw.h
rename to freebsd/sys/dev/e1000/e1000_hw.h
diff --git a/freebsd/dev/e1000/e1000_ich8lan.c b/freebsd/sys/dev/e1000/e1000_ich8lan.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_ich8lan.c
rename to freebsd/sys/dev/e1000/e1000_ich8lan.c
diff --git a/freebsd/dev/e1000/e1000_ich8lan.h b/freebsd/sys/dev/e1000/e1000_ich8lan.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_ich8lan.h
rename to freebsd/sys/dev/e1000/e1000_ich8lan.h
diff --git a/freebsd/dev/e1000/e1000_mac.c b/freebsd/sys/dev/e1000/e1000_mac.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_mac.c
rename to freebsd/sys/dev/e1000/e1000_mac.c
diff --git a/freebsd/dev/e1000/e1000_mac.h b/freebsd/sys/dev/e1000/e1000_mac.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_mac.h
rename to freebsd/sys/dev/e1000/e1000_mac.h
diff --git a/freebsd/dev/e1000/e1000_manage.c b/freebsd/sys/dev/e1000/e1000_manage.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_manage.c
rename to freebsd/sys/dev/e1000/e1000_manage.c
diff --git a/freebsd/dev/e1000/e1000_manage.h b/freebsd/sys/dev/e1000/e1000_manage.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_manage.h
rename to freebsd/sys/dev/e1000/e1000_manage.h
diff --git a/freebsd/dev/e1000/e1000_mbx.c b/freebsd/sys/dev/e1000/e1000_mbx.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_mbx.c
rename to freebsd/sys/dev/e1000/e1000_mbx.c
diff --git a/freebsd/dev/e1000/e1000_mbx.h b/freebsd/sys/dev/e1000/e1000_mbx.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_mbx.h
rename to freebsd/sys/dev/e1000/e1000_mbx.h
diff --git a/freebsd/dev/e1000/e1000_nvm.c b/freebsd/sys/dev/e1000/e1000_nvm.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_nvm.c
rename to freebsd/sys/dev/e1000/e1000_nvm.c
diff --git a/freebsd/dev/e1000/e1000_nvm.h b/freebsd/sys/dev/e1000/e1000_nvm.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_nvm.h
rename to freebsd/sys/dev/e1000/e1000_nvm.h
diff --git a/freebsd/dev/e1000/e1000_osdep.c b/freebsd/sys/dev/e1000/e1000_osdep.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_osdep.c
rename to freebsd/sys/dev/e1000/e1000_osdep.c
diff --git a/freebsd/dev/e1000/e1000_osdep.h b/freebsd/sys/dev/e1000/e1000_osdep.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_osdep.h
rename to freebsd/sys/dev/e1000/e1000_osdep.h
diff --git a/freebsd/dev/e1000/e1000_phy.c b/freebsd/sys/dev/e1000/e1000_phy.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_phy.c
rename to freebsd/sys/dev/e1000/e1000_phy.c
diff --git a/freebsd/dev/e1000/e1000_phy.h b/freebsd/sys/dev/e1000/e1000_phy.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_phy.h
rename to freebsd/sys/dev/e1000/e1000_phy.h
diff --git a/freebsd/dev/e1000/e1000_regs.h b/freebsd/sys/dev/e1000/e1000_regs.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_regs.h
rename to freebsd/sys/dev/e1000/e1000_regs.h
diff --git a/freebsd/dev/e1000/e1000_vf.c b/freebsd/sys/dev/e1000/e1000_vf.c
similarity index 100%
rename from freebsd/dev/e1000/e1000_vf.c
rename to freebsd/sys/dev/e1000/e1000_vf.c
diff --git a/freebsd/dev/e1000/e1000_vf.h b/freebsd/sys/dev/e1000/e1000_vf.h
similarity index 100%
rename from freebsd/dev/e1000/e1000_vf.h
rename to freebsd/sys/dev/e1000/e1000_vf.h
diff --git a/freebsd/dev/e1000/if_em.c b/freebsd/sys/dev/e1000/if_em.c
similarity index 100%
rename from freebsd/dev/e1000/if_em.c
rename to freebsd/sys/dev/e1000/if_em.c
diff --git a/freebsd/dev/e1000/if_em.h b/freebsd/sys/dev/e1000/if_em.h
similarity index 100%
rename from freebsd/dev/e1000/if_em.h
rename to freebsd/sys/dev/e1000/if_em.h
diff --git a/freebsd/dev/e1000/if_igb.c b/freebsd/sys/dev/e1000/if_igb.c
similarity index 100%
rename from freebsd/dev/e1000/if_igb.c
rename to freebsd/sys/dev/e1000/if_igb.c
diff --git a/freebsd/dev/e1000/if_igb.h b/freebsd/sys/dev/e1000/if_igb.h
similarity index 100%
rename from freebsd/dev/e1000/if_igb.h
rename to freebsd/sys/dev/e1000/if_igb.h
diff --git a/freebsd/dev/e1000/if_lem.c b/freebsd/sys/dev/e1000/if_lem.c
similarity index 100%
rename from freebsd/dev/e1000/if_lem.c
rename to freebsd/sys/dev/e1000/if_lem.c
diff --git a/freebsd/dev/e1000/if_lem.h b/freebsd/sys/dev/e1000/if_lem.h
similarity index 100%
rename from freebsd/dev/e1000/if_lem.h
rename to freebsd/sys/dev/e1000/if_lem.h
diff --git a/freebsd/dev/fxp/if_fxp.c b/freebsd/sys/dev/fxp/if_fxp.c
similarity index 100%
rename from freebsd/dev/fxp/if_fxp.c
rename to freebsd/sys/dev/fxp/if_fxp.c
diff --git a/freebsd/dev/fxp/if_fxpreg.h b/freebsd/sys/dev/fxp/if_fxpreg.h
similarity index 100%
rename from freebsd/dev/fxp/if_fxpreg.h
rename to freebsd/sys/dev/fxp/if_fxpreg.h
diff --git a/freebsd/dev/fxp/if_fxpvar.h b/freebsd/sys/dev/fxp/if_fxpvar.h
similarity index 100%
rename from freebsd/dev/fxp/if_fxpvar.h
rename to freebsd/sys/dev/fxp/if_fxpvar.h
diff --git a/freebsd/dev/fxp/rcvbundl.h b/freebsd/sys/dev/fxp/rcvbundl.h
similarity index 100%
rename from freebsd/dev/fxp/rcvbundl.h
rename to freebsd/sys/dev/fxp/rcvbundl.h
diff --git a/freebsd/dev/led/led.c b/freebsd/sys/dev/led/led.c
similarity index 100%
rename from freebsd/dev/led/led.c
rename to freebsd/sys/dev/led/led.c
diff --git a/freebsd/dev/led/led.h b/freebsd/sys/dev/led/led.h
similarity index 100%
rename from freebsd/dev/led/led.h
rename to freebsd/sys/dev/led/led.h
diff --git a/freebsd/dev/mii/brgphy.c b/freebsd/sys/dev/mii/brgphy.c
similarity index 100%
rename from freebsd/dev/mii/brgphy.c
rename to freebsd/sys/dev/mii/brgphy.c
diff --git a/freebsd/dev/mii/brgphyreg.h b/freebsd/sys/dev/mii/brgphyreg.h
similarity index 100%
rename from freebsd/dev/mii/brgphyreg.h
rename to freebsd/sys/dev/mii/brgphyreg.h
diff --git a/freebsd/dev/mii/icsphy.c b/freebsd/sys/dev/mii/icsphy.c
similarity index 100%
rename from freebsd/dev/mii/icsphy.c
rename to freebsd/sys/dev/mii/icsphy.c
diff --git a/freebsd/dev/mii/icsphyreg.h b/freebsd/sys/dev/mii/icsphyreg.h
similarity index 100%
rename from freebsd/dev/mii/icsphyreg.h
rename to freebsd/sys/dev/mii/icsphyreg.h
diff --git a/freebsd/dev/mii/mii.c b/freebsd/sys/dev/mii/mii.c
similarity index 100%
rename from freebsd/dev/mii/mii.c
rename to freebsd/sys/dev/mii/mii.c
diff --git a/freebsd/dev/mii/mii.h b/freebsd/sys/dev/mii/mii.h
similarity index 100%
rename from freebsd/dev/mii/mii.h
rename to freebsd/sys/dev/mii/mii.h
diff --git a/freebsd/dev/mii/mii_physubr.c b/freebsd/sys/dev/mii/mii_physubr.c
similarity index 100%
rename from freebsd/dev/mii/mii_physubr.c
rename to freebsd/sys/dev/mii/mii_physubr.c
diff --git a/freebsd/dev/mii/miivar.h b/freebsd/sys/dev/mii/miivar.h
similarity index 100%
rename from freebsd/dev/mii/miivar.h
rename to freebsd/sys/dev/mii/miivar.h
diff --git a/freebsd/dev/pci/pci.c b/freebsd/sys/dev/pci/pci.c
similarity index 100%
rename from freebsd/dev/pci/pci.c
rename to freebsd/sys/dev/pci/pci.c
diff --git a/freebsd/dev/pci/pci_pci.c b/freebsd/sys/dev/pci/pci_pci.c
similarity index 100%
rename from freebsd/dev/pci/pci_pci.c
rename to freebsd/sys/dev/pci/pci_pci.c
diff --git a/freebsd/dev/pci/pci_private.h b/freebsd/sys/dev/pci/pci_private.h
similarity index 100%
rename from freebsd/dev/pci/pci_private.h
rename to freebsd/sys/dev/pci/pci_private.h
diff --git a/freebsd/dev/pci/pci_user.c b/freebsd/sys/dev/pci/pci_user.c
similarity index 100%
rename from freebsd/dev/pci/pci_user.c
rename to freebsd/sys/dev/pci/pci_user.c
diff --git a/freebsd/dev/pci/pcib_private.h b/freebsd/sys/dev/pci/pcib_private.h
similarity index 100%
rename from freebsd/dev/pci/pcib_private.h
rename to freebsd/sys/dev/pci/pcib_private.h
diff --git a/freebsd/dev/pci/pcireg.h b/freebsd/sys/dev/pci/pcireg.h
similarity index 100%
rename from freebsd/dev/pci/pcireg.h
rename to freebsd/sys/dev/pci/pcireg.h
diff --git a/freebsd/dev/pci/pcivar.h b/freebsd/sys/dev/pci/pcivar.h
similarity index 100%
rename from freebsd/dev/pci/pcivar.h
rename to freebsd/sys/dev/pci/pcivar.h
diff --git a/freebsd/dev/random/harvest.c b/freebsd/sys/dev/random/harvest.c
similarity index 100%
rename from freebsd/dev/random/harvest.c
rename to freebsd/sys/dev/random/harvest.c
diff --git a/freebsd/dev/random/randomdev_soft.h b/freebsd/sys/dev/random/randomdev_soft.h
similarity index 100%
rename from freebsd/dev/random/randomdev_soft.h
rename to freebsd/sys/dev/random/randomdev_soft.h
diff --git a/freebsd/dev/re/if_re.c b/freebsd/sys/dev/re/if_re.c
similarity index 100%
rename from freebsd/dev/re/if_re.c
rename to freebsd/sys/dev/re/if_re.c
diff --git a/freebsd/dev/smc/if_smc.c b/freebsd/sys/dev/smc/if_smc.c
similarity index 100%
rename from freebsd/dev/smc/if_smc.c
rename to freebsd/sys/dev/smc/if_smc.c
diff --git a/freebsd/dev/smc/if_smcreg.h b/freebsd/sys/dev/smc/if_smcreg.h
similarity index 100%
rename from freebsd/dev/smc/if_smcreg.h
rename to freebsd/sys/dev/smc/if_smcreg.h
diff --git a/freebsd/dev/smc/if_smcvar.h b/freebsd/sys/dev/smc/if_smcvar.h
similarity index 100%
rename from freebsd/dev/smc/if_smcvar.h
rename to freebsd/sys/dev/smc/if_smcvar.h
diff --git a/freebsd/dev/usb/controller/ehci.c b/freebsd/sys/dev/usb/controller/ehci.c
similarity index 100%
rename from freebsd/dev/usb/controller/ehci.c
rename to freebsd/sys/dev/usb/controller/ehci.c
diff --git a/freebsd/dev/usb/controller/ehci.h b/freebsd/sys/dev/usb/controller/ehci.h
similarity index 100%
rename from freebsd/dev/usb/controller/ehci.h
rename to freebsd/sys/dev/usb/controller/ehci.h
diff --git a/freebsd/dev/usb/controller/ehcireg.h b/freebsd/sys/dev/usb/controller/ehcireg.h
similarity index 100%
rename from freebsd/dev/usb/controller/ehcireg.h
rename to freebsd/sys/dev/usb/controller/ehcireg.h
diff --git a/freebsd/dev/usb/controller/ohci.c b/freebsd/sys/dev/usb/controller/ohci.c
similarity index 100%
rename from freebsd/dev/usb/controller/ohci.c
rename to freebsd/sys/dev/usb/controller/ohci.c
diff --git a/freebsd/dev/usb/controller/ohci.h b/freebsd/sys/dev/usb/controller/ohci.h
similarity index 100%
rename from freebsd/dev/usb/controller/ohci.h
rename to freebsd/sys/dev/usb/controller/ohci.h
diff --git a/freebsd/dev/usb/controller/ohcireg.h b/freebsd/sys/dev/usb/controller/ohcireg.h
similarity index 100%
rename from freebsd/dev/usb/controller/ohcireg.h
rename to freebsd/sys/dev/usb/controller/ohcireg.h
diff --git a/freebsd/dev/usb/controller/usb_controller.c b/freebsd/sys/dev/usb/controller/usb_controller.c
similarity index 100%
rename from freebsd/dev/usb/controller/usb_controller.c
rename to freebsd/sys/dev/usb/controller/usb_controller.c
diff --git a/freebsd/dev/usb/quirk/usb_quirk.c b/freebsd/sys/dev/usb/quirk/usb_quirk.c
similarity index 100%
rename from freebsd/dev/usb/quirk/usb_quirk.c
rename to freebsd/sys/dev/usb/quirk/usb_quirk.c
diff --git a/freebsd/dev/usb/quirk/usb_quirk.h b/freebsd/sys/dev/usb/quirk/usb_quirk.h
similarity index 100%
rename from freebsd/dev/usb/quirk/usb_quirk.h
rename to freebsd/sys/dev/usb/quirk/usb_quirk.h
diff --git a/freebsd/dev/usb/storage/umass.c b/freebsd/sys/dev/usb/storage/umass.c
similarity index 100%
rename from freebsd/dev/usb/storage/umass.c
rename to freebsd/sys/dev/usb/storage/umass.c
diff --git a/freebsd/dev/usb/ufm_ioctl.h b/freebsd/sys/dev/usb/ufm_ioctl.h
similarity index 100%
rename from freebsd/dev/usb/ufm_ioctl.h
rename to freebsd/sys/dev/usb/ufm_ioctl.h
diff --git a/freebsd/dev/usb/usb.h b/freebsd/sys/dev/usb/usb.h
similarity index 100%
rename from freebsd/dev/usb/usb.h
rename to freebsd/sys/dev/usb/usb.h
diff --git a/freebsd/dev/usb/usb_bus.h b/freebsd/sys/dev/usb/usb_bus.h
similarity index 100%
rename from freebsd/dev/usb/usb_bus.h
rename to freebsd/sys/dev/usb/usb_bus.h
diff --git a/freebsd/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c
similarity index 100%
rename from freebsd/dev/usb/usb_busdma.c
rename to freebsd/sys/dev/usb/usb_busdma.c
diff --git a/freebsd/dev/usb/usb_busdma.h b/freebsd/sys/dev/usb/usb_busdma.h
similarity index 100%
rename from freebsd/dev/usb/usb_busdma.h
rename to freebsd/sys/dev/usb/usb_busdma.h
diff --git a/freebsd/dev/usb/usb_cdc.h b/freebsd/sys/dev/usb/usb_cdc.h
similarity index 100%
rename from freebsd/dev/usb/usb_cdc.h
rename to freebsd/sys/dev/usb/usb_cdc.h
diff --git a/freebsd/dev/usb/usb_controller.h b/freebsd/sys/dev/usb/usb_controller.h
similarity index 100%
rename from freebsd/dev/usb/usb_controller.h
rename to freebsd/sys/dev/usb/usb_controller.h
diff --git a/freebsd/dev/usb/usb_core.c b/freebsd/sys/dev/usb/usb_core.c
similarity index 100%
rename from freebsd/dev/usb/usb_core.c
rename to freebsd/sys/dev/usb/usb_core.c
diff --git a/freebsd/dev/usb/usb_core.h b/freebsd/sys/dev/usb/usb_core.h
similarity index 100%
rename from freebsd/dev/usb/usb_core.h
rename to freebsd/sys/dev/usb/usb_core.h
diff --git a/freebsd/dev/usb/usb_debug.c b/freebsd/sys/dev/usb/usb_debug.c
similarity index 100%
rename from freebsd/dev/usb/usb_debug.c
rename to freebsd/sys/dev/usb/usb_debug.c
diff --git a/freebsd/dev/usb/usb_debug.h b/freebsd/sys/dev/usb/usb_debug.h
similarity index 100%
rename from freebsd/dev/usb/usb_debug.h
rename to freebsd/sys/dev/usb/usb_debug.h
diff --git a/freebsd/dev/usb/usb_dev.c b/freebsd/sys/dev/usb/usb_dev.c
similarity index 100%
rename from freebsd/dev/usb/usb_dev.c
rename to freebsd/sys/dev/usb/usb_dev.c
diff --git a/freebsd/dev/usb/usb_dev.h b/freebsd/sys/dev/usb/usb_dev.h
similarity index 100%
rename from freebsd/dev/usb/usb_dev.h
rename to freebsd/sys/dev/usb/usb_dev.h
diff --git a/freebsd/dev/usb/usb_device.c b/freebsd/sys/dev/usb/usb_device.c
similarity index 100%
rename from freebsd/dev/usb/usb_device.c
rename to freebsd/sys/dev/usb/usb_device.c
diff --git a/freebsd/dev/usb/usb_device.h b/freebsd/sys/dev/usb/usb_device.h
similarity index 100%
rename from freebsd/dev/usb/usb_device.h
rename to freebsd/sys/dev/usb/usb_device.h
diff --git a/freebsd/dev/usb/usb_dynamic.c b/freebsd/sys/dev/usb/usb_dynamic.c
similarity index 100%
rename from freebsd/dev/usb/usb_dynamic.c
rename to freebsd/sys/dev/usb/usb_dynamic.c
diff --git a/freebsd/dev/usb/usb_dynamic.h b/freebsd/sys/dev/usb/usb_dynamic.h
similarity index 100%
rename from freebsd/dev/usb/usb_dynamic.h
rename to freebsd/sys/dev/usb/usb_dynamic.h
diff --git a/freebsd/dev/usb/usb_endian.h b/freebsd/sys/dev/usb/usb_endian.h
similarity index 100%
rename from freebsd/dev/usb/usb_endian.h
rename to freebsd/sys/dev/usb/usb_endian.h
diff --git a/freebsd/dev/usb/usb_error.c b/freebsd/sys/dev/usb/usb_error.c
similarity index 100%
rename from freebsd/dev/usb/usb_error.c
rename to freebsd/sys/dev/usb/usb_error.c
diff --git a/freebsd/dev/usb/usb_freebsd.h b/freebsd/sys/dev/usb/usb_freebsd.h
similarity index 100%
rename from freebsd/dev/usb/usb_freebsd.h
rename to freebsd/sys/dev/usb/usb_freebsd.h
diff --git a/freebsd/dev/usb/usb_generic.c b/freebsd/sys/dev/usb/usb_generic.c
similarity index 100%
rename from freebsd/dev/usb/usb_generic.c
rename to freebsd/sys/dev/usb/usb_generic.c
diff --git a/freebsd/dev/usb/usb_generic.h b/freebsd/sys/dev/usb/usb_generic.h
similarity index 100%
rename from freebsd/dev/usb/usb_generic.h
rename to freebsd/sys/dev/usb/usb_generic.h
diff --git a/freebsd/dev/usb/usb_handle_request.c b/freebsd/sys/dev/usb/usb_handle_request.c
similarity index 100%
rename from freebsd/dev/usb/usb_handle_request.c
rename to freebsd/sys/dev/usb/usb_handle_request.c
diff --git a/freebsd/dev/usb/usb_hid.c b/freebsd/sys/dev/usb/usb_hid.c
similarity index 100%
rename from freebsd/dev/usb/usb_hid.c
rename to freebsd/sys/dev/usb/usb_hid.c
diff --git a/freebsd/dev/usb/usb_hub.c b/freebsd/sys/dev/usb/usb_hub.c
similarity index 100%
rename from freebsd/dev/usb/usb_hub.c
rename to freebsd/sys/dev/usb/usb_hub.c
diff --git a/freebsd/dev/usb/usb_hub.h b/freebsd/sys/dev/usb/usb_hub.h
similarity index 100%
rename from freebsd/dev/usb/usb_hub.h
rename to freebsd/sys/dev/usb/usb_hub.h
diff --git a/freebsd/dev/usb/usb_ioctl.h b/freebsd/sys/dev/usb/usb_ioctl.h
similarity index 100%
rename from freebsd/dev/usb/usb_ioctl.h
rename to freebsd/sys/dev/usb/usb_ioctl.h
diff --git a/freebsd/dev/usb/usb_lookup.c b/freebsd/sys/dev/usb/usb_lookup.c
similarity index 100%
rename from freebsd/dev/usb/usb_lookup.c
rename to freebsd/sys/dev/usb/usb_lookup.c
diff --git a/freebsd/dev/usb/usb_mbuf.c b/freebsd/sys/dev/usb/usb_mbuf.c
similarity index 100%
rename from freebsd/dev/usb/usb_mbuf.c
rename to freebsd/sys/dev/usb/usb_mbuf.c
diff --git a/freebsd/dev/usb/usb_mbuf.h b/freebsd/sys/dev/usb/usb_mbuf.h
similarity index 100%
rename from freebsd/dev/usb/usb_mbuf.h
rename to freebsd/sys/dev/usb/usb_mbuf.h
diff --git a/freebsd/dev/usb/usb_msctest.c b/freebsd/sys/dev/usb/usb_msctest.c
similarity index 100%
rename from freebsd/dev/usb/usb_msctest.c
rename to freebsd/sys/dev/usb/usb_msctest.c
diff --git a/freebsd/dev/usb/usb_msctest.h b/freebsd/sys/dev/usb/usb_msctest.h
similarity index 100%
rename from freebsd/dev/usb/usb_msctest.h
rename to freebsd/sys/dev/usb/usb_msctest.h
diff --git a/freebsd/dev/usb/usb_parse.c b/freebsd/sys/dev/usb/usb_parse.c
similarity index 100%
rename from freebsd/dev/usb/usb_parse.c
rename to freebsd/sys/dev/usb/usb_parse.c
diff --git a/freebsd/dev/usb/usb_process.c b/freebsd/sys/dev/usb/usb_process.c
similarity index 100%
rename from freebsd/dev/usb/usb_process.c
rename to freebsd/sys/dev/usb/usb_process.c
diff --git a/freebsd/dev/usb/usb_process.h b/freebsd/sys/dev/usb/usb_process.h
similarity index 100%
rename from freebsd/dev/usb/usb_process.h
rename to freebsd/sys/dev/usb/usb_process.h
diff --git a/freebsd/dev/usb/usb_request.c b/freebsd/sys/dev/usb/usb_request.c
similarity index 100%
rename from freebsd/dev/usb/usb_request.c
rename to freebsd/sys/dev/usb/usb_request.c
diff --git a/freebsd/dev/usb/usb_request.h b/freebsd/sys/dev/usb/usb_request.h
similarity index 100%
rename from freebsd/dev/usb/usb_request.h
rename to freebsd/sys/dev/usb/usb_request.h
diff --git a/freebsd/dev/usb/usb_transfer.c b/freebsd/sys/dev/usb/usb_transfer.c
similarity index 100%
rename from freebsd/dev/usb/usb_transfer.c
rename to freebsd/sys/dev/usb/usb_transfer.c
diff --git a/freebsd/dev/usb/usb_transfer.h b/freebsd/sys/dev/usb/usb_transfer.h
similarity index 100%
rename from freebsd/dev/usb/usb_transfer.h
rename to freebsd/sys/dev/usb/usb_transfer.h
diff --git a/freebsd/dev/usb/usb_util.c b/freebsd/sys/dev/usb/usb_util.c
similarity index 100%
rename from freebsd/dev/usb/usb_util.c
rename to freebsd/sys/dev/usb/usb_util.c
diff --git a/freebsd/dev/usb/usb_util.h b/freebsd/sys/dev/usb/usb_util.h
similarity index 100%
rename from freebsd/dev/usb/usb_util.h
rename to freebsd/sys/dev/usb/usb_util.h
diff --git a/freebsd/dev/usb/usbdi.h b/freebsd/sys/dev/usb/usbdi.h
similarity index 100%
rename from freebsd/dev/usb/usbdi.h
rename to freebsd/sys/dev/usb/usbdi.h
diff --git a/freebsd/dev/usb/usbdi_util.h b/freebsd/sys/dev/usb/usbdi_util.h
similarity index 100%
rename from freebsd/dev/usb/usbdi_util.h
rename to freebsd/sys/dev/usb/usbdi_util.h
diff --git a/freebsd/dev/usb/usbhid.h b/freebsd/sys/dev/usb/usbhid.h
similarity index 100%
rename from freebsd/dev/usb/usbhid.h
rename to freebsd/sys/dev/usb/usbhid.h
diff --git a/freebsd/fs/devfs/devfs_int.h b/freebsd/sys/fs/devfs/devfs_int.h
similarity index 100%
rename from freebsd/fs/devfs/devfs_int.h
rename to freebsd/sys/fs/devfs/devfs_int.h
diff --git a/freebsd/powerpc/include/freebsd/machine/in_cksum.h b/freebsd/sys/h8300/include/machine/in_cksum.h
similarity index 100%
rename from freebsd/powerpc/include/freebsd/machine/in_cksum.h
rename to freebsd/sys/h8300/include/machine/in_cksum.h
diff --git a/freebsd/i386/i386/in_cksum.c b/freebsd/sys/i386/i386/in_cksum.c
similarity index 100%
rename from freebsd/i386/i386/in_cksum.c
rename to freebsd/sys/i386/i386/in_cksum.c
diff --git a/freebsd/i386/i386/legacy.c b/freebsd/sys/i386/i386/legacy.c
similarity index 100%
rename from freebsd/i386/i386/legacy.c
rename to freebsd/sys/i386/i386/legacy.c
diff --git a/freebsd/i386/include/freebsd/machine/cpufunc.h b/freebsd/sys/i386/include/machine/cpufunc.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/cpufunc.h
rename to freebsd/sys/i386/include/machine/cpufunc.h
diff --git a/freebsd/sparc64/include/freebsd/machine/in_cksum.h b/freebsd/sys/i386/include/machine/in_cksum.h
similarity index 100%
rename from freebsd/sparc64/include/freebsd/machine/in_cksum.h
rename to freebsd/sys/i386/include/machine/in_cksum.h
diff --git a/freebsd/i386/include/freebsd/machine/intr_machdep.h b/freebsd/sys/i386/include/machine/intr_machdep.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/intr_machdep.h
rename to freebsd/sys/i386/include/machine/intr_machdep.h
diff --git a/freebsd/i386/include/freebsd/machine/md_var.h b/freebsd/sys/i386/include/machine/md_var.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/md_var.h
rename to freebsd/sys/i386/include/machine/md_var.h
diff --git a/freebsd/i386/include/freebsd/machine/specialreg.h b/freebsd/sys/i386/include/machine/specialreg.h
similarity index 100%
rename from freebsd/i386/include/freebsd/machine/specialreg.h
rename to freebsd/sys/i386/include/machine/specialreg.h
diff --git a/freebsd/isa/isavar.h b/freebsd/sys/isa/isavar.h
similarity index 100%
rename from freebsd/isa/isavar.h
rename to freebsd/sys/isa/isavar.h
diff --git a/freebsd/isa/pnpvar.h b/freebsd/sys/isa/pnpvar.h
similarity index 100%
rename from freebsd/isa/pnpvar.h
rename to freebsd/sys/isa/pnpvar.h
diff --git a/freebsd/kern/init_main.c b/freebsd/sys/kern/init_main.c
similarity index 100%
rename from freebsd/kern/init_main.c
rename to freebsd/sys/kern/init_main.c
diff --git a/freebsd/kern/kern_descrip.c b/freebsd/sys/kern/kern_descrip.c
similarity index 100%
rename from freebsd/kern/kern_descrip.c
rename to freebsd/sys/kern/kern_descrip.c
diff --git a/freebsd/kern/kern_environment.c b/freebsd/sys/kern/kern_environment.c
similarity index 100%
rename from freebsd/kern/kern_environment.c
rename to freebsd/sys/kern/kern_environment.c
diff --git a/freebsd/kern/kern_event.c b/freebsd/sys/kern/kern_event.c
similarity index 100%
rename from freebsd/kern/kern_event.c
rename to freebsd/sys/kern/kern_event.c
diff --git a/freebsd/kern/kern_intr.c b/freebsd/sys/kern/kern_intr.c
similarity index 100%
rename from freebsd/kern/kern_intr.c
rename to freebsd/sys/kern/kern_intr.c
diff --git a/freebsd/kern/kern_linker.c b/freebsd/sys/kern/kern_linker.c
similarity index 100%
rename from freebsd/kern/kern_linker.c
rename to freebsd/sys/kern/kern_linker.c
diff --git a/freebsd/kern/kern_mbuf.c b/freebsd/sys/kern/kern_mbuf.c
similarity index 100%
rename from freebsd/kern/kern_mbuf.c
rename to freebsd/sys/kern/kern_mbuf.c
diff --git a/freebsd/kern/kern_mib.c b/freebsd/sys/kern/kern_mib.c
similarity index 100%
rename from freebsd/kern/kern_mib.c
rename to freebsd/sys/kern/kern_mib.c
diff --git a/freebsd/kern/kern_module.c b/freebsd/sys/kern/kern_module.c
similarity index 100%
rename from freebsd/kern/kern_module.c
rename to freebsd/sys/kern/kern_module.c
diff --git a/freebsd/kern/kern_mtxpool.c b/freebsd/sys/kern/kern_mtxpool.c
similarity index 100%
rename from freebsd/kern/kern_mtxpool.c
rename to freebsd/sys/kern/kern_mtxpool.c
diff --git a/freebsd/kern/kern_ntptime.c b/freebsd/sys/kern/kern_ntptime.c
similarity index 100%
rename from freebsd/kern/kern_ntptime.c
rename to freebsd/sys/kern/kern_ntptime.c
diff --git a/freebsd/kern/kern_proc.c b/freebsd/sys/kern/kern_proc.c
similarity index 100%
rename from freebsd/kern/kern_proc.c
rename to freebsd/sys/kern/kern_proc.c
diff --git a/freebsd/kern/kern_prot.c b/freebsd/sys/kern/kern_prot.c
similarity index 100%
rename from freebsd/kern/kern_prot.c
rename to freebsd/sys/kern/kern_prot.c
diff --git a/freebsd/kern/kern_resource.c b/freebsd/sys/kern/kern_resource.c
similarity index 100%
rename from freebsd/kern/kern_resource.c
rename to freebsd/sys/kern/kern_resource.c
diff --git a/freebsd/kern/kern_subr.c b/freebsd/sys/kern/kern_subr.c
similarity index 100%
rename from freebsd/kern/kern_subr.c
rename to freebsd/sys/kern/kern_subr.c
diff --git a/freebsd/kern/kern_sysctl.c b/freebsd/sys/kern/kern_sysctl.c
similarity index 100%
rename from freebsd/kern/kern_sysctl.c
rename to freebsd/sys/kern/kern_sysctl.c
diff --git a/freebsd/kern/kern_tc.c b/freebsd/sys/kern/kern_tc.c
similarity index 100%
rename from freebsd/kern/kern_tc.c
rename to freebsd/sys/kern/kern_tc.c
diff --git a/freebsd/kern/kern_time.c b/freebsd/sys/kern/kern_time.c
similarity index 100%
rename from freebsd/kern/kern_time.c
rename to freebsd/sys/kern/kern_time.c
diff --git a/freebsd/kern/kern_timeout.c b/freebsd/sys/kern/kern_timeout.c
similarity index 100%
rename from freebsd/kern/kern_timeout.c
rename to freebsd/sys/kern/kern_timeout.c
diff --git a/freebsd/kern/subr_bufring.c b/freebsd/sys/kern/subr_bufring.c
similarity index 100%
rename from freebsd/kern/subr_bufring.c
rename to freebsd/sys/kern/subr_bufring.c
diff --git a/freebsd/kern/subr_bus.c b/freebsd/sys/kern/subr_bus.c
similarity index 100%
rename from freebsd/kern/subr_bus.c
rename to freebsd/sys/kern/subr_bus.c
diff --git a/freebsd/kern/subr_eventhandler.c b/freebsd/sys/kern/subr_eventhandler.c
similarity index 100%
rename from freebsd/kern/subr_eventhandler.c
rename to freebsd/sys/kern/subr_eventhandler.c
diff --git a/freebsd/kern/subr_hints.c b/freebsd/sys/kern/subr_hints.c
similarity index 100%
rename from freebsd/kern/subr_hints.c
rename to freebsd/sys/kern/subr_hints.c
diff --git a/freebsd/kern/subr_kobj.c b/freebsd/sys/kern/subr_kobj.c
similarity index 100%
rename from freebsd/kern/subr_kobj.c
rename to freebsd/sys/kern/subr_kobj.c
diff --git a/freebsd/kern/subr_module.c b/freebsd/sys/kern/subr_module.c
similarity index 100%
rename from freebsd/kern/subr_module.c
rename to freebsd/sys/kern/subr_module.c
diff --git a/freebsd/kern/subr_rman.c b/freebsd/sys/kern/subr_rman.c
similarity index 100%
rename from freebsd/kern/subr_rman.c
rename to freebsd/sys/kern/subr_rman.c
diff --git a/freebsd/kern/subr_sbuf.c b/freebsd/sys/kern/subr_sbuf.c
similarity index 100%
rename from freebsd/kern/subr_sbuf.c
rename to freebsd/sys/kern/subr_sbuf.c
diff --git a/freebsd/kern/subr_unit.c b/freebsd/sys/kern/subr_unit.c
similarity index 100%
rename from freebsd/kern/subr_unit.c
rename to freebsd/sys/kern/subr_unit.c
diff --git a/freebsd/kern/sys_generic.c b/freebsd/sys/kern/sys_generic.c
similarity index 100%
rename from freebsd/kern/sys_generic.c
rename to freebsd/sys/kern/sys_generic.c
diff --git a/freebsd/kern/uipc_accf.c b/freebsd/sys/kern/uipc_accf.c
similarity index 100%
rename from freebsd/kern/uipc_accf.c
rename to freebsd/sys/kern/uipc_accf.c
diff --git a/freebsd/kern/uipc_domain.c b/freebsd/sys/kern/uipc_domain.c
similarity index 100%
rename from freebsd/kern/uipc_domain.c
rename to freebsd/sys/kern/uipc_domain.c
diff --git a/freebsd/kern/uipc_mbuf.c b/freebsd/sys/kern/uipc_mbuf.c
similarity index 100%
rename from freebsd/kern/uipc_mbuf.c
rename to freebsd/sys/kern/uipc_mbuf.c
diff --git a/freebsd/kern/uipc_mbuf2.c b/freebsd/sys/kern/uipc_mbuf2.c
similarity index 100%
rename from freebsd/kern/uipc_mbuf2.c
rename to freebsd/sys/kern/uipc_mbuf2.c
diff --git a/freebsd/kern/uipc_sockbuf.c b/freebsd/sys/kern/uipc_sockbuf.c
similarity index 100%
rename from freebsd/kern/uipc_sockbuf.c
rename to freebsd/sys/kern/uipc_sockbuf.c
diff --git a/freebsd/kern/uipc_socket.c b/freebsd/sys/kern/uipc_socket.c
similarity index 100%
rename from freebsd/kern/uipc_socket.c
rename to freebsd/sys/kern/uipc_socket.c
diff --git a/freebsd/libkern/arc4random.c b/freebsd/sys/libkern/arc4random.c
similarity index 100%
rename from freebsd/libkern/arc4random.c
rename to freebsd/sys/libkern/arc4random.c
diff --git a/freebsd/libkern/fls.c b/freebsd/sys/libkern/fls.c
similarity index 100%
rename from freebsd/libkern/fls.c
rename to freebsd/sys/libkern/fls.c
diff --git a/freebsd/libkern/inet_ntoa.c b/freebsd/sys/libkern/inet_ntoa.c
similarity index 100%
rename from freebsd/libkern/inet_ntoa.c
rename to freebsd/sys/libkern/inet_ntoa.c
diff --git a/freebsd/libkern/random.c b/freebsd/sys/libkern/random.c
similarity index 100%
rename from freebsd/libkern/random.c
rename to freebsd/sys/libkern/random.c
diff --git a/freebsd/mips/include/freebsd/machine/cpufunc.h b/freebsd/sys/mips/include/machine/cpufunc.h
similarity index 100%
rename from freebsd/mips/include/freebsd/machine/cpufunc.h
rename to freebsd/sys/mips/include/machine/cpufunc.h
diff --git a/freebsd/mips/include/freebsd/machine/cpuregs.h b/freebsd/sys/mips/include/machine/cpuregs.h
similarity index 100%
rename from freebsd/mips/include/freebsd/machine/cpuregs.h
rename to freebsd/sys/mips/include/machine/cpuregs.h
diff --git a/freebsd/mips/mips/in_cksum.c b/freebsd/sys/mips/mips/in_cksum.c
similarity index 100%
rename from freebsd/mips/mips/in_cksum.c
rename to freebsd/sys/mips/mips/in_cksum.c
diff --git a/freebsd/net/bpf.c b/freebsd/sys/net/bpf.c
similarity index 100%
rename from freebsd/net/bpf.c
rename to freebsd/sys/net/bpf.c
diff --git a/freebsd/net/bpf.h b/freebsd/sys/net/bpf.h
similarity index 100%
rename from freebsd/net/bpf.h
rename to freebsd/sys/net/bpf.h
diff --git a/freebsd/net/bpf_buffer.c b/freebsd/sys/net/bpf_buffer.c
similarity index 100%
rename from freebsd/net/bpf_buffer.c
rename to freebsd/sys/net/bpf_buffer.c
diff --git a/freebsd/net/bpf_buffer.h b/freebsd/sys/net/bpf_buffer.h
similarity index 100%
rename from freebsd/net/bpf_buffer.h
rename to freebsd/sys/net/bpf_buffer.h
diff --git a/freebsd/net/bpf_filter.c b/freebsd/sys/net/bpf_filter.c
similarity index 100%
rename from freebsd/net/bpf_filter.c
rename to freebsd/sys/net/bpf_filter.c
diff --git a/freebsd/net/bpf_jitter.c b/freebsd/sys/net/bpf_jitter.c
similarity index 100%
rename from freebsd/net/bpf_jitter.c
rename to freebsd/sys/net/bpf_jitter.c
diff --git a/freebsd/net/bpf_jitter.h b/freebsd/sys/net/bpf_jitter.h
similarity index 100%
rename from freebsd/net/bpf_jitter.h
rename to freebsd/sys/net/bpf_jitter.h
diff --git a/freebsd/net/bpf_zerocopy.h b/freebsd/sys/net/bpf_zerocopy.h
similarity index 100%
rename from freebsd/net/bpf_zerocopy.h
rename to freebsd/sys/net/bpf_zerocopy.h
diff --git a/freebsd/net/bpfdesc.h b/freebsd/sys/net/bpfdesc.h
similarity index 100%
rename from freebsd/net/bpfdesc.h
rename to freebsd/sys/net/bpfdesc.h
diff --git a/freebsd/net/bridgestp.c b/freebsd/sys/net/bridgestp.c
similarity index 100%
rename from freebsd/net/bridgestp.c
rename to freebsd/sys/net/bridgestp.c
diff --git a/freebsd/net/bridgestp.h b/freebsd/sys/net/bridgestp.h
similarity index 100%
rename from freebsd/net/bridgestp.h
rename to freebsd/sys/net/bridgestp.h
diff --git a/freebsd-userspace/include/net/ethernet.h b/freebsd/sys/net/ethernet.h
similarity index 100%
rename from freebsd-userspace/include/net/ethernet.h
rename to freebsd/sys/net/ethernet.h
diff --git a/freebsd/net/fddi.h b/freebsd/sys/net/fddi.h
similarity index 100%
rename from freebsd/net/fddi.h
rename to freebsd/sys/net/fddi.h
diff --git a/freebsd/net/firewire.h b/freebsd/sys/net/firewire.h
similarity index 100%
rename from freebsd/net/firewire.h
rename to freebsd/sys/net/firewire.h
diff --git a/freebsd/net/flowtable.h b/freebsd/sys/net/flowtable.h
similarity index 100%
rename from freebsd/net/flowtable.h
rename to freebsd/sys/net/flowtable.h
diff --git a/freebsd/net/ieee8023ad_lacp.c b/freebsd/sys/net/ieee8023ad_lacp.c
similarity index 100%
rename from freebsd/net/ieee8023ad_lacp.c
rename to freebsd/sys/net/ieee8023ad_lacp.c
diff --git a/freebsd/net/ieee8023ad_lacp.h b/freebsd/sys/net/ieee8023ad_lacp.h
similarity index 100%
rename from freebsd/net/ieee8023ad_lacp.h
rename to freebsd/sys/net/ieee8023ad_lacp.h
diff --git a/freebsd/net/if.c b/freebsd/sys/net/if.c
similarity index 100%
rename from freebsd/net/if.c
rename to freebsd/sys/net/if.c
diff --git a/freebsd-userspace/include/net/if.h b/freebsd/sys/net/if.h
similarity index 100%
rename from freebsd-userspace/include/net/if.h
rename to freebsd/sys/net/if.h
diff --git a/freebsd/net/if_arc.h b/freebsd/sys/net/if_arc.h
similarity index 100%
rename from freebsd/net/if_arc.h
rename to freebsd/sys/net/if_arc.h
diff --git a/freebsd/net/if_arcsubr.c b/freebsd/sys/net/if_arcsubr.c
similarity index 100%
rename from freebsd/net/if_arcsubr.c
rename to freebsd/sys/net/if_arcsubr.c
diff --git a/freebsd-userspace/include/net/if_arp.h b/freebsd/sys/net/if_arp.h
similarity index 100%
rename from freebsd-userspace/include/net/if_arp.h
rename to freebsd/sys/net/if_arp.h
diff --git a/freebsd/net/if_atm.h b/freebsd/sys/net/if_atm.h
similarity index 100%
rename from freebsd/net/if_atm.h
rename to freebsd/sys/net/if_atm.h
diff --git a/freebsd/net/if_atmsubr.c b/freebsd/sys/net/if_atmsubr.c
similarity index 100%
rename from freebsd/net/if_atmsubr.c
rename to freebsd/sys/net/if_atmsubr.c
diff --git a/freebsd/net/if_bridge.c b/freebsd/sys/net/if_bridge.c
similarity index 100%
rename from freebsd/net/if_bridge.c
rename to freebsd/sys/net/if_bridge.c
diff --git a/freebsd/net/if_bridgevar.h b/freebsd/sys/net/if_bridgevar.h
similarity index 100%
rename from freebsd/net/if_bridgevar.h
rename to freebsd/sys/net/if_bridgevar.h
diff --git a/freebsd/net/if_clone.c b/freebsd/sys/net/if_clone.c
similarity index 100%
rename from freebsd/net/if_clone.c
rename to freebsd/sys/net/if_clone.c
diff --git a/freebsd/net/if_clone.h b/freebsd/sys/net/if_clone.h
similarity index 100%
rename from freebsd/net/if_clone.h
rename to freebsd/sys/net/if_clone.h
diff --git a/freebsd/net/if_dead.c b/freebsd/sys/net/if_dead.c
similarity index 100%
rename from freebsd/net/if_dead.c
rename to freebsd/sys/net/if_dead.c
diff --git a/freebsd/net/if_disc.c b/freebsd/sys/net/if_disc.c
similarity index 100%
rename from freebsd/net/if_disc.c
rename to freebsd/sys/net/if_disc.c
diff --git a/freebsd-userspace/include/net/if_dl.h b/freebsd/sys/net/if_dl.h
similarity index 100%
rename from freebsd-userspace/include/net/if_dl.h
rename to freebsd/sys/net/if_dl.h
diff --git a/freebsd/net/if_edsc.c b/freebsd/sys/net/if_edsc.c
similarity index 100%
rename from freebsd/net/if_edsc.c
rename to freebsd/sys/net/if_edsc.c
diff --git a/freebsd/net/if_ef.c b/freebsd/sys/net/if_ef.c
similarity index 100%
rename from freebsd/net/if_ef.c
rename to freebsd/sys/net/if_ef.c
diff --git a/freebsd/net/if_enc.c b/freebsd/sys/net/if_enc.c
similarity index 100%
rename from freebsd/net/if_enc.c
rename to freebsd/sys/net/if_enc.c
diff --git a/freebsd/net/if_enc.h b/freebsd/sys/net/if_enc.h
similarity index 100%
rename from freebsd/net/if_enc.h
rename to freebsd/sys/net/if_enc.h
diff --git a/freebsd/net/if_epair.c b/freebsd/sys/net/if_epair.c
similarity index 100%
rename from freebsd/net/if_epair.c
rename to freebsd/sys/net/if_epair.c
diff --git a/freebsd/net/if_ethersubr.c b/freebsd/sys/net/if_ethersubr.c
similarity index 100%
rename from freebsd/net/if_ethersubr.c
rename to freebsd/sys/net/if_ethersubr.c
diff --git a/freebsd/net/if_faith.c b/freebsd/sys/net/if_faith.c
similarity index 100%
rename from freebsd/net/if_faith.c
rename to freebsd/sys/net/if_faith.c
diff --git a/freebsd/net/if_fddisubr.c b/freebsd/sys/net/if_fddisubr.c
similarity index 100%
rename from freebsd/net/if_fddisubr.c
rename to freebsd/sys/net/if_fddisubr.c
diff --git a/freebsd/net/if_fwsubr.c b/freebsd/sys/net/if_fwsubr.c
similarity index 100%
rename from freebsd/net/if_fwsubr.c
rename to freebsd/sys/net/if_fwsubr.c
diff --git a/freebsd/net/if_gif.c b/freebsd/sys/net/if_gif.c
similarity index 100%
rename from freebsd/net/if_gif.c
rename to freebsd/sys/net/if_gif.c
diff --git a/freebsd/net/if_gif.h b/freebsd/sys/net/if_gif.h
similarity index 100%
rename from freebsd/net/if_gif.h
rename to freebsd/sys/net/if_gif.h
diff --git a/freebsd/net/if_gre.c b/freebsd/sys/net/if_gre.c
similarity index 100%
rename from freebsd/net/if_gre.c
rename to freebsd/sys/net/if_gre.c
diff --git a/freebsd/net/if_gre.h b/freebsd/sys/net/if_gre.h
similarity index 100%
rename from freebsd/net/if_gre.h
rename to freebsd/sys/net/if_gre.h
diff --git a/freebsd/net/if_iso88025subr.c b/freebsd/sys/net/if_iso88025subr.c
similarity index 100%
rename from freebsd/net/if_iso88025subr.c
rename to freebsd/sys/net/if_iso88025subr.c
diff --git a/freebsd/net/if_lagg.c b/freebsd/sys/net/if_lagg.c
similarity index 100%
rename from freebsd/net/if_lagg.c
rename to freebsd/sys/net/if_lagg.c
diff --git a/freebsd/net/if_lagg.h b/freebsd/sys/net/if_lagg.h
similarity index 100%
rename from freebsd/net/if_lagg.h
rename to freebsd/sys/net/if_lagg.h
diff --git a/freebsd/net/if_llatbl.c b/freebsd/sys/net/if_llatbl.c
similarity index 100%
rename from freebsd/net/if_llatbl.c
rename to freebsd/sys/net/if_llatbl.c
diff --git a/freebsd/net/if_llatbl.h b/freebsd/sys/net/if_llatbl.h
similarity index 100%
rename from freebsd/net/if_llatbl.h
rename to freebsd/sys/net/if_llatbl.h
diff --git a/freebsd/net/if_llc.h b/freebsd/sys/net/if_llc.h
similarity index 100%
rename from freebsd/net/if_llc.h
rename to freebsd/sys/net/if_llc.h
diff --git a/freebsd/net/if_loop.c b/freebsd/sys/net/if_loop.c
similarity index 100%
rename from freebsd/net/if_loop.c
rename to freebsd/sys/net/if_loop.c
diff --git a/freebsd/net/if_media.c b/freebsd/sys/net/if_media.c
similarity index 100%
rename from freebsd/net/if_media.c
rename to freebsd/sys/net/if_media.c
diff --git a/freebsd/net/if_media.h b/freebsd/sys/net/if_media.h
similarity index 100%
rename from freebsd/net/if_media.h
rename to freebsd/sys/net/if_media.h
diff --git a/freebsd/net/if_mib.c b/freebsd/sys/net/if_mib.c
similarity index 100%
rename from freebsd/net/if_mib.c
rename to freebsd/sys/net/if_mib.c
diff --git a/freebsd/net/if_mib.h b/freebsd/sys/net/if_mib.h
similarity index 100%
rename from freebsd/net/if_mib.h
rename to freebsd/sys/net/if_mib.h
diff --git a/freebsd/net/if_sppp.h b/freebsd/sys/net/if_sppp.h
similarity index 100%
rename from freebsd/net/if_sppp.h
rename to freebsd/sys/net/if_sppp.h
diff --git a/freebsd/net/if_spppfr.c b/freebsd/sys/net/if_spppfr.c
similarity index 100%
rename from freebsd/net/if_spppfr.c
rename to freebsd/sys/net/if_spppfr.c
diff --git a/freebsd/net/if_spppsubr.c b/freebsd/sys/net/if_spppsubr.c
similarity index 100%
rename from freebsd/net/if_spppsubr.c
rename to freebsd/sys/net/if_spppsubr.c
diff --git a/freebsd/net/if_stf.c b/freebsd/sys/net/if_stf.c
similarity index 100%
rename from freebsd/net/if_stf.c
rename to freebsd/sys/net/if_stf.c
diff --git a/freebsd/net/if_stf.h b/freebsd/sys/net/if_stf.h
similarity index 100%
rename from freebsd/net/if_stf.h
rename to freebsd/sys/net/if_stf.h
diff --git a/freebsd/net/if_tap.c b/freebsd/sys/net/if_tap.c
similarity index 100%
rename from freebsd/net/if_tap.c
rename to freebsd/sys/net/if_tap.c
diff --git a/freebsd/net/if_tap.h b/freebsd/sys/net/if_tap.h
similarity index 100%
rename from freebsd/net/if_tap.h
rename to freebsd/sys/net/if_tap.h
diff --git a/freebsd/net/if_tapvar.h b/freebsd/sys/net/if_tapvar.h
similarity index 100%
rename from freebsd/net/if_tapvar.h
rename to freebsd/sys/net/if_tapvar.h
diff --git a/freebsd/net/if_tun.c b/freebsd/sys/net/if_tun.c
similarity index 100%
rename from freebsd/net/if_tun.c
rename to freebsd/sys/net/if_tun.c
diff --git a/freebsd/net/if_tun.h b/freebsd/sys/net/if_tun.h
similarity index 100%
rename from freebsd/net/if_tun.h
rename to freebsd/sys/net/if_tun.h
diff --git a/freebsd-userspace/include/net/if_types.h b/freebsd/sys/net/if_types.h
similarity index 100%
rename from freebsd-userspace/include/net/if_types.h
rename to freebsd/sys/net/if_types.h
diff --git a/freebsd/net/if_var.h b/freebsd/sys/net/if_var.h
similarity index 100%
rename from freebsd/net/if_var.h
rename to freebsd/sys/net/if_var.h
diff --git a/freebsd/net/if_vlan.c b/freebsd/sys/net/if_vlan.c
similarity index 100%
rename from freebsd/net/if_vlan.c
rename to freebsd/sys/net/if_vlan.c
diff --git a/freebsd/net/if_vlan_var.h b/freebsd/sys/net/if_vlan_var.h
similarity index 100%
rename from freebsd/net/if_vlan_var.h
rename to freebsd/sys/net/if_vlan_var.h
diff --git a/freebsd/net/iso88025.h b/freebsd/sys/net/iso88025.h
similarity index 100%
rename from freebsd/net/iso88025.h
rename to freebsd/sys/net/iso88025.h
diff --git a/freebsd/net/netisr.c b/freebsd/sys/net/netisr.c
similarity index 100%
rename from freebsd/net/netisr.c
rename to freebsd/sys/net/netisr.c
diff --git a/freebsd/net/netisr.h b/freebsd/sys/net/netisr.h
similarity index 100%
rename from freebsd/net/netisr.h
rename to freebsd/sys/net/netisr.h
diff --git a/freebsd/net/pfil.c b/freebsd/sys/net/pfil.c
similarity index 100%
rename from freebsd/net/pfil.c
rename to freebsd/sys/net/pfil.c
diff --git a/freebsd/net/pfil.h b/freebsd/sys/net/pfil.h
similarity index 100%
rename from freebsd/net/pfil.h
rename to freebsd/sys/net/pfil.h
diff --git a/freebsd/net/pfkeyv2.h b/freebsd/sys/net/pfkeyv2.h
similarity index 100%
rename from freebsd/net/pfkeyv2.h
rename to freebsd/sys/net/pfkeyv2.h
diff --git a/freebsd/net/ppp_defs.h b/freebsd/sys/net/ppp_defs.h
similarity index 100%
rename from freebsd/net/ppp_defs.h
rename to freebsd/sys/net/ppp_defs.h
diff --git a/freebsd/net/radix.c b/freebsd/sys/net/radix.c
similarity index 100%
rename from freebsd/net/radix.c
rename to freebsd/sys/net/radix.c
diff --git a/freebsd/net/radix.h b/freebsd/sys/net/radix.h
similarity index 100%
rename from freebsd/net/radix.h
rename to freebsd/sys/net/radix.h
diff --git a/freebsd/net/radix_mpath.c b/freebsd/sys/net/radix_mpath.c
similarity index 100%
rename from freebsd/net/radix_mpath.c
rename to freebsd/sys/net/radix_mpath.c
diff --git a/freebsd/net/radix_mpath.h b/freebsd/sys/net/radix_mpath.h
similarity index 100%
rename from freebsd/net/radix_mpath.h
rename to freebsd/sys/net/radix_mpath.h
diff --git a/freebsd/net/raw_cb.c b/freebsd/sys/net/raw_cb.c
similarity index 100%
rename from freebsd/net/raw_cb.c
rename to freebsd/sys/net/raw_cb.c
diff --git a/freebsd/net/raw_cb.h b/freebsd/sys/net/raw_cb.h
similarity index 100%
rename from freebsd/net/raw_cb.h
rename to freebsd/sys/net/raw_cb.h
diff --git a/freebsd/net/raw_usrreq.c b/freebsd/sys/net/raw_usrreq.c
similarity index 100%
rename from freebsd/net/raw_usrreq.c
rename to freebsd/sys/net/raw_usrreq.c
diff --git a/freebsd/net/route.c b/freebsd/sys/net/route.c
similarity index 100%
rename from freebsd/net/route.c
rename to freebsd/sys/net/route.c
diff --git a/freebsd-userspace/include/net/route.h b/freebsd/sys/net/route.h
similarity index 100%
rename from freebsd-userspace/include/net/route.h
rename to freebsd/sys/net/route.h
diff --git a/freebsd/net/rtsock.c b/freebsd/sys/net/rtsock.c
similarity index 100%
rename from freebsd/net/rtsock.c
rename to freebsd/sys/net/rtsock.c
diff --git a/freebsd/net/slcompress.c b/freebsd/sys/net/slcompress.c
similarity index 100%
rename from freebsd/net/slcompress.c
rename to freebsd/sys/net/slcompress.c
diff --git a/freebsd/net/slcompress.h b/freebsd/sys/net/slcompress.h
similarity index 100%
rename from freebsd/net/slcompress.h
rename to freebsd/sys/net/slcompress.h
diff --git a/freebsd/net/vnet.h b/freebsd/sys/net/vnet.h
similarity index 100%
rename from freebsd/net/vnet.h
rename to freebsd/sys/net/vnet.h
diff --git a/freebsd/net/zlib.c b/freebsd/sys/net/zlib.c
similarity index 100%
rename from freebsd/net/zlib.c
rename to freebsd/sys/net/zlib.c
diff --git a/freebsd/net/zlib.h b/freebsd/sys/net/zlib.h
similarity index 100%
rename from freebsd/net/zlib.h
rename to freebsd/sys/net/zlib.h
diff --git a/freebsd/net80211/_ieee80211.h b/freebsd/sys/net80211/_ieee80211.h
similarity index 100%
rename from freebsd/net80211/_ieee80211.h
rename to freebsd/sys/net80211/_ieee80211.h
diff --git a/freebsd/net80211/ieee80211.c b/freebsd/sys/net80211/ieee80211.c
similarity index 100%
rename from freebsd/net80211/ieee80211.c
rename to freebsd/sys/net80211/ieee80211.c
diff --git a/freebsd/net80211/ieee80211.h b/freebsd/sys/net80211/ieee80211.h
similarity index 100%
rename from freebsd/net80211/ieee80211.h
rename to freebsd/sys/net80211/ieee80211.h
diff --git a/freebsd/net80211/ieee80211_acl.c b/freebsd/sys/net80211/ieee80211_acl.c
similarity index 100%
rename from freebsd/net80211/ieee80211_acl.c
rename to freebsd/sys/net80211/ieee80211_acl.c
diff --git a/freebsd/net80211/ieee80211_action.c b/freebsd/sys/net80211/ieee80211_action.c
similarity index 100%
rename from freebsd/net80211/ieee80211_action.c
rename to freebsd/sys/net80211/ieee80211_action.c
diff --git a/freebsd/net80211/ieee80211_action.h b/freebsd/sys/net80211/ieee80211_action.h
similarity index 100%
rename from freebsd/net80211/ieee80211_action.h
rename to freebsd/sys/net80211/ieee80211_action.h
diff --git a/freebsd/net80211/ieee80211_adhoc.c b/freebsd/sys/net80211/ieee80211_adhoc.c
similarity index 100%
rename from freebsd/net80211/ieee80211_adhoc.c
rename to freebsd/sys/net80211/ieee80211_adhoc.c
diff --git a/freebsd/net80211/ieee80211_adhoc.h b/freebsd/sys/net80211/ieee80211_adhoc.h
similarity index 100%
rename from freebsd/net80211/ieee80211_adhoc.h
rename to freebsd/sys/net80211/ieee80211_adhoc.h
diff --git a/freebsd/net80211/ieee80211_ageq.c b/freebsd/sys/net80211/ieee80211_ageq.c
similarity index 100%
rename from freebsd/net80211/ieee80211_ageq.c
rename to freebsd/sys/net80211/ieee80211_ageq.c
diff --git a/freebsd/net80211/ieee80211_ageq.h b/freebsd/sys/net80211/ieee80211_ageq.h
similarity index 100%
rename from freebsd/net80211/ieee80211_ageq.h
rename to freebsd/sys/net80211/ieee80211_ageq.h
diff --git a/freebsd/net80211/ieee80211_amrr.c b/freebsd/sys/net80211/ieee80211_amrr.c
similarity index 100%
rename from freebsd/net80211/ieee80211_amrr.c
rename to freebsd/sys/net80211/ieee80211_amrr.c
diff --git a/freebsd/net80211/ieee80211_amrr.h b/freebsd/sys/net80211/ieee80211_amrr.h
similarity index 100%
rename from freebsd/net80211/ieee80211_amrr.h
rename to freebsd/sys/net80211/ieee80211_amrr.h
diff --git a/freebsd/net80211/ieee80211_crypto.c b/freebsd/sys/net80211/ieee80211_crypto.c
similarity index 100%
rename from freebsd/net80211/ieee80211_crypto.c
rename to freebsd/sys/net80211/ieee80211_crypto.c
diff --git a/freebsd/net80211/ieee80211_crypto.h b/freebsd/sys/net80211/ieee80211_crypto.h
similarity index 100%
rename from freebsd/net80211/ieee80211_crypto.h
rename to freebsd/sys/net80211/ieee80211_crypto.h
diff --git a/freebsd/net80211/ieee80211_crypto_ccmp.c b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c
similarity index 100%
rename from freebsd/net80211/ieee80211_crypto_ccmp.c
rename to freebsd/sys/net80211/ieee80211_crypto_ccmp.c
diff --git a/freebsd/net80211/ieee80211_crypto_none.c b/freebsd/sys/net80211/ieee80211_crypto_none.c
similarity index 100%
rename from freebsd/net80211/ieee80211_crypto_none.c
rename to freebsd/sys/net80211/ieee80211_crypto_none.c
diff --git a/freebsd/net80211/ieee80211_crypto_tkip.c b/freebsd/sys/net80211/ieee80211_crypto_tkip.c
similarity index 100%
rename from freebsd/net80211/ieee80211_crypto_tkip.c
rename to freebsd/sys/net80211/ieee80211_crypto_tkip.c
diff --git a/freebsd/net80211/ieee80211_crypto_wep.c b/freebsd/sys/net80211/ieee80211_crypto_wep.c
similarity index 100%
rename from freebsd/net80211/ieee80211_crypto_wep.c
rename to freebsd/sys/net80211/ieee80211_crypto_wep.c
diff --git a/freebsd/net80211/ieee80211_ddb.c b/freebsd/sys/net80211/ieee80211_ddb.c
similarity index 100%
rename from freebsd/net80211/ieee80211_ddb.c
rename to freebsd/sys/net80211/ieee80211_ddb.c
diff --git a/freebsd/net80211/ieee80211_dfs.c b/freebsd/sys/net80211/ieee80211_dfs.c
similarity index 100%
rename from freebsd/net80211/ieee80211_dfs.c
rename to freebsd/sys/net80211/ieee80211_dfs.c
diff --git a/freebsd/net80211/ieee80211_dfs.h b/freebsd/sys/net80211/ieee80211_dfs.h
similarity index 100%
rename from freebsd/net80211/ieee80211_dfs.h
rename to freebsd/sys/net80211/ieee80211_dfs.h
diff --git a/freebsd/net80211/ieee80211_freebsd.c b/freebsd/sys/net80211/ieee80211_freebsd.c
similarity index 100%
rename from freebsd/net80211/ieee80211_freebsd.c
rename to freebsd/sys/net80211/ieee80211_freebsd.c
diff --git a/freebsd/net80211/ieee80211_freebsd.h b/freebsd/sys/net80211/ieee80211_freebsd.h
similarity index 100%
rename from freebsd/net80211/ieee80211_freebsd.h
rename to freebsd/sys/net80211/ieee80211_freebsd.h
diff --git a/freebsd/net80211/ieee80211_hostap.c b/freebsd/sys/net80211/ieee80211_hostap.c
similarity index 100%
rename from freebsd/net80211/ieee80211_hostap.c
rename to freebsd/sys/net80211/ieee80211_hostap.c
diff --git a/freebsd/net80211/ieee80211_hostap.h b/freebsd/sys/net80211/ieee80211_hostap.h
similarity index 100%
rename from freebsd/net80211/ieee80211_hostap.h
rename to freebsd/sys/net80211/ieee80211_hostap.h
diff --git a/freebsd/net80211/ieee80211_ht.c b/freebsd/sys/net80211/ieee80211_ht.c
similarity index 100%
rename from freebsd/net80211/ieee80211_ht.c
rename to freebsd/sys/net80211/ieee80211_ht.c
diff --git a/freebsd/net80211/ieee80211_ht.h b/freebsd/sys/net80211/ieee80211_ht.h
similarity index 100%
rename from freebsd/net80211/ieee80211_ht.h
rename to freebsd/sys/net80211/ieee80211_ht.h
diff --git a/freebsd/net80211/ieee80211_hwmp.c b/freebsd/sys/net80211/ieee80211_hwmp.c
similarity index 100%
rename from freebsd/net80211/ieee80211_hwmp.c
rename to freebsd/sys/net80211/ieee80211_hwmp.c
diff --git a/freebsd/net80211/ieee80211_input.c b/freebsd/sys/net80211/ieee80211_input.c
similarity index 100%
rename from freebsd/net80211/ieee80211_input.c
rename to freebsd/sys/net80211/ieee80211_input.c
diff --git a/freebsd/net80211/ieee80211_input.h b/freebsd/sys/net80211/ieee80211_input.h
similarity index 100%
rename from freebsd/net80211/ieee80211_input.h
rename to freebsd/sys/net80211/ieee80211_input.h
diff --git a/freebsd/net80211/ieee80211_ioctl.c b/freebsd/sys/net80211/ieee80211_ioctl.c
similarity index 100%
rename from freebsd/net80211/ieee80211_ioctl.c
rename to freebsd/sys/net80211/ieee80211_ioctl.c
diff --git a/freebsd/net80211/ieee80211_ioctl.h b/freebsd/sys/net80211/ieee80211_ioctl.h
similarity index 100%
rename from freebsd/net80211/ieee80211_ioctl.h
rename to freebsd/sys/net80211/ieee80211_ioctl.h
diff --git a/freebsd/net80211/ieee80211_mesh.c b/freebsd/sys/net80211/ieee80211_mesh.c
similarity index 100%
rename from freebsd/net80211/ieee80211_mesh.c
rename to freebsd/sys/net80211/ieee80211_mesh.c
diff --git a/freebsd/net80211/ieee80211_mesh.h b/freebsd/sys/net80211/ieee80211_mesh.h
similarity index 100%
rename from freebsd/net80211/ieee80211_mesh.h
rename to freebsd/sys/net80211/ieee80211_mesh.h
diff --git a/freebsd/net80211/ieee80211_monitor.c b/freebsd/sys/net80211/ieee80211_monitor.c
similarity index 100%
rename from freebsd/net80211/ieee80211_monitor.c
rename to freebsd/sys/net80211/ieee80211_monitor.c
diff --git a/freebsd/net80211/ieee80211_monitor.h b/freebsd/sys/net80211/ieee80211_monitor.h
similarity index 100%
rename from freebsd/net80211/ieee80211_monitor.h
rename to freebsd/sys/net80211/ieee80211_monitor.h
diff --git a/freebsd/net80211/ieee80211_node.c b/freebsd/sys/net80211/ieee80211_node.c
similarity index 100%
rename from freebsd/net80211/ieee80211_node.c
rename to freebsd/sys/net80211/ieee80211_node.c
diff --git a/freebsd/net80211/ieee80211_node.h b/freebsd/sys/net80211/ieee80211_node.h
similarity index 100%
rename from freebsd/net80211/ieee80211_node.h
rename to freebsd/sys/net80211/ieee80211_node.h
diff --git a/freebsd/net80211/ieee80211_output.c b/freebsd/sys/net80211/ieee80211_output.c
similarity index 100%
rename from freebsd/net80211/ieee80211_output.c
rename to freebsd/sys/net80211/ieee80211_output.c
diff --git a/freebsd/net80211/ieee80211_phy.c b/freebsd/sys/net80211/ieee80211_phy.c
similarity index 100%
rename from freebsd/net80211/ieee80211_phy.c
rename to freebsd/sys/net80211/ieee80211_phy.c
diff --git a/freebsd/net80211/ieee80211_phy.h b/freebsd/sys/net80211/ieee80211_phy.h
similarity index 100%
rename from freebsd/net80211/ieee80211_phy.h
rename to freebsd/sys/net80211/ieee80211_phy.h
diff --git a/freebsd/net80211/ieee80211_power.c b/freebsd/sys/net80211/ieee80211_power.c
similarity index 100%
rename from freebsd/net80211/ieee80211_power.c
rename to freebsd/sys/net80211/ieee80211_power.c
diff --git a/freebsd/net80211/ieee80211_power.h b/freebsd/sys/net80211/ieee80211_power.h
similarity index 100%
rename from freebsd/net80211/ieee80211_power.h
rename to freebsd/sys/net80211/ieee80211_power.h
diff --git a/freebsd/net80211/ieee80211_proto.c b/freebsd/sys/net80211/ieee80211_proto.c
similarity index 100%
rename from freebsd/net80211/ieee80211_proto.c
rename to freebsd/sys/net80211/ieee80211_proto.c
diff --git a/freebsd/net80211/ieee80211_proto.h b/freebsd/sys/net80211/ieee80211_proto.h
similarity index 100%
rename from freebsd/net80211/ieee80211_proto.h
rename to freebsd/sys/net80211/ieee80211_proto.h
diff --git a/freebsd/net80211/ieee80211_radiotap.c b/freebsd/sys/net80211/ieee80211_radiotap.c
similarity index 100%
rename from freebsd/net80211/ieee80211_radiotap.c
rename to freebsd/sys/net80211/ieee80211_radiotap.c
diff --git a/freebsd/net80211/ieee80211_radiotap.h b/freebsd/sys/net80211/ieee80211_radiotap.h
similarity index 100%
rename from freebsd/net80211/ieee80211_radiotap.h
rename to freebsd/sys/net80211/ieee80211_radiotap.h
diff --git a/freebsd/net80211/ieee80211_ratectl.c b/freebsd/sys/net80211/ieee80211_ratectl.c
similarity index 100%
rename from freebsd/net80211/ieee80211_ratectl.c
rename to freebsd/sys/net80211/ieee80211_ratectl.c
diff --git a/freebsd/net80211/ieee80211_ratectl.h b/freebsd/sys/net80211/ieee80211_ratectl.h
similarity index 100%
rename from freebsd/net80211/ieee80211_ratectl.h
rename to freebsd/sys/net80211/ieee80211_ratectl.h
diff --git a/freebsd/net80211/ieee80211_ratectl_none.c b/freebsd/sys/net80211/ieee80211_ratectl_none.c
similarity index 100%
rename from freebsd/net80211/ieee80211_ratectl_none.c
rename to freebsd/sys/net80211/ieee80211_ratectl_none.c
diff --git a/freebsd/net80211/ieee80211_regdomain.c b/freebsd/sys/net80211/ieee80211_regdomain.c
similarity index 100%
rename from freebsd/net80211/ieee80211_regdomain.c
rename to freebsd/sys/net80211/ieee80211_regdomain.c
diff --git a/freebsd/net80211/ieee80211_regdomain.h b/freebsd/sys/net80211/ieee80211_regdomain.h
similarity index 100%
rename from freebsd/net80211/ieee80211_regdomain.h
rename to freebsd/sys/net80211/ieee80211_regdomain.h
diff --git a/freebsd/net80211/ieee80211_rssadapt.c b/freebsd/sys/net80211/ieee80211_rssadapt.c
similarity index 100%
rename from freebsd/net80211/ieee80211_rssadapt.c
rename to freebsd/sys/net80211/ieee80211_rssadapt.c
diff --git a/freebsd/net80211/ieee80211_rssadapt.h b/freebsd/sys/net80211/ieee80211_rssadapt.h
similarity index 100%
rename from freebsd/net80211/ieee80211_rssadapt.h
rename to freebsd/sys/net80211/ieee80211_rssadapt.h
diff --git a/freebsd/net80211/ieee80211_scan.c b/freebsd/sys/net80211/ieee80211_scan.c
similarity index 100%
rename from freebsd/net80211/ieee80211_scan.c
rename to freebsd/sys/net80211/ieee80211_scan.c
diff --git a/freebsd/net80211/ieee80211_scan.h b/freebsd/sys/net80211/ieee80211_scan.h
similarity index 100%
rename from freebsd/net80211/ieee80211_scan.h
rename to freebsd/sys/net80211/ieee80211_scan.h
diff --git a/freebsd/net80211/ieee80211_scan_sta.c b/freebsd/sys/net80211/ieee80211_scan_sta.c
similarity index 100%
rename from freebsd/net80211/ieee80211_scan_sta.c
rename to freebsd/sys/net80211/ieee80211_scan_sta.c
diff --git a/freebsd/net80211/ieee80211_sta.c b/freebsd/sys/net80211/ieee80211_sta.c
similarity index 100%
rename from freebsd/net80211/ieee80211_sta.c
rename to freebsd/sys/net80211/ieee80211_sta.c
diff --git a/freebsd/net80211/ieee80211_sta.h b/freebsd/sys/net80211/ieee80211_sta.h
similarity index 100%
rename from freebsd/net80211/ieee80211_sta.h
rename to freebsd/sys/net80211/ieee80211_sta.h
diff --git a/freebsd/net80211/ieee80211_superg.c b/freebsd/sys/net80211/ieee80211_superg.c
similarity index 100%
rename from freebsd/net80211/ieee80211_superg.c
rename to freebsd/sys/net80211/ieee80211_superg.c
diff --git a/freebsd/net80211/ieee80211_superg.h b/freebsd/sys/net80211/ieee80211_superg.h
similarity index 100%
rename from freebsd/net80211/ieee80211_superg.h
rename to freebsd/sys/net80211/ieee80211_superg.h
diff --git a/freebsd/net80211/ieee80211_tdma.c b/freebsd/sys/net80211/ieee80211_tdma.c
similarity index 100%
rename from freebsd/net80211/ieee80211_tdma.c
rename to freebsd/sys/net80211/ieee80211_tdma.c
diff --git a/freebsd/net80211/ieee80211_tdma.h b/freebsd/sys/net80211/ieee80211_tdma.h
similarity index 100%
rename from freebsd/net80211/ieee80211_tdma.h
rename to freebsd/sys/net80211/ieee80211_tdma.h
diff --git a/freebsd/net80211/ieee80211_var.h b/freebsd/sys/net80211/ieee80211_var.h
similarity index 100%
rename from freebsd/net80211/ieee80211_var.h
rename to freebsd/sys/net80211/ieee80211_var.h
diff --git a/freebsd/net80211/ieee80211_wds.c b/freebsd/sys/net80211/ieee80211_wds.c
similarity index 100%
rename from freebsd/net80211/ieee80211_wds.c
rename to freebsd/sys/net80211/ieee80211_wds.c
diff --git a/freebsd/net80211/ieee80211_wds.h b/freebsd/sys/net80211/ieee80211_wds.h
similarity index 100%
rename from freebsd/net80211/ieee80211_wds.h
rename to freebsd/sys/net80211/ieee80211_wds.h
diff --git a/freebsd/net80211/ieee80211_xauth.c b/freebsd/sys/net80211/ieee80211_xauth.c
similarity index 100%
rename from freebsd/net80211/ieee80211_xauth.c
rename to freebsd/sys/net80211/ieee80211_xauth.c
diff --git a/freebsd/netatalk/aarp.c b/freebsd/sys/netatalk/aarp.c
similarity index 100%
rename from freebsd/netatalk/aarp.c
rename to freebsd/sys/netatalk/aarp.c
diff --git a/freebsd/netatalk/aarp.h b/freebsd/sys/netatalk/aarp.h
similarity index 100%
rename from freebsd/netatalk/aarp.h
rename to freebsd/sys/netatalk/aarp.h
diff --git a/freebsd-userspace/include/netatalk/at.h b/freebsd/sys/netatalk/at.h
similarity index 100%
rename from freebsd-userspace/include/netatalk/at.h
rename to freebsd/sys/netatalk/at.h
diff --git a/freebsd/netatalk/at_control.c b/freebsd/sys/netatalk/at_control.c
similarity index 100%
rename from freebsd/netatalk/at_control.c
rename to freebsd/sys/netatalk/at_control.c
diff --git a/freebsd/netatalk/at_extern.h b/freebsd/sys/netatalk/at_extern.h
similarity index 100%
rename from freebsd/netatalk/at_extern.h
rename to freebsd/sys/netatalk/at_extern.h
diff --git a/freebsd/netatalk/at_proto.c b/freebsd/sys/netatalk/at_proto.c
similarity index 100%
rename from freebsd/netatalk/at_proto.c
rename to freebsd/sys/netatalk/at_proto.c
diff --git a/freebsd/netatalk/at_rmx.c b/freebsd/sys/netatalk/at_rmx.c
similarity index 100%
rename from freebsd/netatalk/at_rmx.c
rename to freebsd/sys/netatalk/at_rmx.c
diff --git a/freebsd/netatalk/at_var.h b/freebsd/sys/netatalk/at_var.h
similarity index 100%
rename from freebsd/netatalk/at_var.h
rename to freebsd/sys/netatalk/at_var.h
diff --git a/freebsd/netatalk/ddp.h b/freebsd/sys/netatalk/ddp.h
similarity index 100%
rename from freebsd/netatalk/ddp.h
rename to freebsd/sys/netatalk/ddp.h
diff --git a/freebsd/netatalk/ddp_input.c b/freebsd/sys/netatalk/ddp_input.c
similarity index 100%
rename from freebsd/netatalk/ddp_input.c
rename to freebsd/sys/netatalk/ddp_input.c
diff --git a/freebsd/netatalk/ddp_output.c b/freebsd/sys/netatalk/ddp_output.c
similarity index 100%
rename from freebsd/netatalk/ddp_output.c
rename to freebsd/sys/netatalk/ddp_output.c
diff --git a/freebsd/netatalk/ddp_pcb.c b/freebsd/sys/netatalk/ddp_pcb.c
similarity index 100%
rename from freebsd/netatalk/ddp_pcb.c
rename to freebsd/sys/netatalk/ddp_pcb.c
diff --git a/freebsd/netatalk/ddp_pcb.h b/freebsd/sys/netatalk/ddp_pcb.h
similarity index 100%
rename from freebsd/netatalk/ddp_pcb.h
rename to freebsd/sys/netatalk/ddp_pcb.h
diff --git a/freebsd/netatalk/ddp_usrreq.c b/freebsd/sys/netatalk/ddp_usrreq.c
similarity index 100%
rename from freebsd/netatalk/ddp_usrreq.c
rename to freebsd/sys/netatalk/ddp_usrreq.c
diff --git a/freebsd/netatalk/ddp_var.h b/freebsd/sys/netatalk/ddp_var.h
similarity index 100%
rename from freebsd/netatalk/ddp_var.h
rename to freebsd/sys/netatalk/ddp_var.h
diff --git a/freebsd/netatalk/endian.h b/freebsd/sys/netatalk/endian.h
similarity index 100%
rename from freebsd/netatalk/endian.h
rename to freebsd/sys/netatalk/endian.h
diff --git a/freebsd/netatalk/phase2.h b/freebsd/sys/netatalk/phase2.h
similarity index 100%
rename from freebsd/netatalk/phase2.h
rename to freebsd/sys/netatalk/phase2.h
diff --git a/freebsd/netinet/accf_data.c b/freebsd/sys/netinet/accf_data.c
similarity index 100%
rename from freebsd/netinet/accf_data.c
rename to freebsd/sys/netinet/accf_data.c
diff --git a/freebsd/netinet/accf_dns.c b/freebsd/sys/netinet/accf_dns.c
similarity index 100%
rename from freebsd/netinet/accf_dns.c
rename to freebsd/sys/netinet/accf_dns.c
diff --git a/freebsd/netinet/accf_http.c b/freebsd/sys/netinet/accf_http.c
similarity index 100%
rename from freebsd/netinet/accf_http.c
rename to freebsd/sys/netinet/accf_http.c
diff --git a/freebsd-userspace/include/netinet/icmp6.h b/freebsd/sys/netinet/icmp6.h
similarity index 100%
rename from freebsd-userspace/include/netinet/icmp6.h
rename to freebsd/sys/netinet/icmp6.h
diff --git a/freebsd/netinet/icmp_var.h b/freebsd/sys/netinet/icmp_var.h
similarity index 100%
rename from freebsd/netinet/icmp_var.h
rename to freebsd/sys/netinet/icmp_var.h
diff --git a/freebsd/netinet/if_atm.c b/freebsd/sys/netinet/if_atm.c
similarity index 100%
rename from freebsd/netinet/if_atm.c
rename to freebsd/sys/netinet/if_atm.c
diff --git a/freebsd/netinet/if_atm.h b/freebsd/sys/netinet/if_atm.h
similarity index 100%
rename from freebsd/netinet/if_atm.h
rename to freebsd/sys/netinet/if_atm.h
diff --git a/freebsd/netinet/if_ether.c b/freebsd/sys/netinet/if_ether.c
similarity index 100%
rename from freebsd/netinet/if_ether.c
rename to freebsd/sys/netinet/if_ether.c
diff --git a/freebsd-userspace/include/netinet/if_ether.h b/freebsd/sys/netinet/if_ether.h
similarity index 100%
rename from freebsd-userspace/include/netinet/if_ether.h
rename to freebsd/sys/netinet/if_ether.h
diff --git a/freebsd/netinet/igmp.c b/freebsd/sys/netinet/igmp.c
similarity index 100%
rename from freebsd/netinet/igmp.c
rename to freebsd/sys/netinet/igmp.c
diff --git a/freebsd-userspace/include/netinet/igmp.h b/freebsd/sys/netinet/igmp.h
similarity index 100%
rename from freebsd-userspace/include/netinet/igmp.h
rename to freebsd/sys/netinet/igmp.h
diff --git a/freebsd/netinet/igmp_var.h b/freebsd/sys/netinet/igmp_var.h
similarity index 100%
rename from freebsd/netinet/igmp_var.h
rename to freebsd/sys/netinet/igmp_var.h
diff --git a/freebsd/netinet/in.c b/freebsd/sys/netinet/in.c
similarity index 100%
rename from freebsd/netinet/in.c
rename to freebsd/sys/netinet/in.c
diff --git a/freebsd-userspace/include/netinet/in.h b/freebsd/sys/netinet/in.h
similarity index 100%
rename from freebsd-userspace/include/netinet/in.h
rename to freebsd/sys/netinet/in.h
diff --git a/freebsd/netinet/in_gif.c b/freebsd/sys/netinet/in_gif.c
similarity index 100%
rename from freebsd/netinet/in_gif.c
rename to freebsd/sys/netinet/in_gif.c
diff --git a/freebsd/netinet/in_gif.h b/freebsd/sys/netinet/in_gif.h
similarity index 100%
rename from freebsd/netinet/in_gif.h
rename to freebsd/sys/netinet/in_gif.h
diff --git a/freebsd/netinet/in_mcast.c b/freebsd/sys/netinet/in_mcast.c
similarity index 100%
rename from freebsd/netinet/in_mcast.c
rename to freebsd/sys/netinet/in_mcast.c
diff --git a/freebsd/netinet/in_pcb.c b/freebsd/sys/netinet/in_pcb.c
similarity index 100%
rename from freebsd/netinet/in_pcb.c
rename to freebsd/sys/netinet/in_pcb.c
diff --git a/freebsd/netinet/in_pcb.h b/freebsd/sys/netinet/in_pcb.h
similarity index 100%
rename from freebsd/netinet/in_pcb.h
rename to freebsd/sys/netinet/in_pcb.h
diff --git a/freebsd/netinet/in_proto.c b/freebsd/sys/netinet/in_proto.c
similarity index 100%
rename from freebsd/netinet/in_proto.c
rename to freebsd/sys/netinet/in_proto.c
diff --git a/freebsd/netinet/in_rmx.c b/freebsd/sys/netinet/in_rmx.c
similarity index 100%
rename from freebsd/netinet/in_rmx.c
rename to freebsd/sys/netinet/in_rmx.c
diff --git a/freebsd-userspace/include/netinet/in_systm.h b/freebsd/sys/netinet/in_systm.h
similarity index 100%
rename from freebsd-userspace/include/netinet/in_systm.h
rename to freebsd/sys/netinet/in_systm.h
diff --git a/freebsd/netinet/in_var.h b/freebsd/sys/netinet/in_var.h
similarity index 100%
rename from freebsd/netinet/in_var.h
rename to freebsd/sys/netinet/in_var.h
diff --git a/freebsd-userspace/include/netinet/ip.h b/freebsd/sys/netinet/ip.h
similarity index 100%
rename from freebsd-userspace/include/netinet/ip.h
rename to freebsd/sys/netinet/ip.h
diff --git a/freebsd-userspace/include/netinet/ip6.h b/freebsd/sys/netinet/ip6.h
similarity index 100%
rename from freebsd-userspace/include/netinet/ip6.h
rename to freebsd/sys/netinet/ip6.h
diff --git a/freebsd/netinet/ip_carp.c b/freebsd/sys/netinet/ip_carp.c
similarity index 100%
rename from freebsd/netinet/ip_carp.c
rename to freebsd/sys/netinet/ip_carp.c
diff --git a/freebsd/netinet/ip_carp.h b/freebsd/sys/netinet/ip_carp.h
similarity index 100%
rename from freebsd/netinet/ip_carp.h
rename to freebsd/sys/netinet/ip_carp.h
diff --git a/freebsd/netinet/ip_divert.c b/freebsd/sys/netinet/ip_divert.c
similarity index 100%
rename from freebsd/netinet/ip_divert.c
rename to freebsd/sys/netinet/ip_divert.c
diff --git a/freebsd/netinet/ip_divert.h b/freebsd/sys/netinet/ip_divert.h
similarity index 100%
rename from freebsd/netinet/ip_divert.h
rename to freebsd/sys/netinet/ip_divert.h
diff --git a/freebsd/netinet/ip_dummynet.h b/freebsd/sys/netinet/ip_dummynet.h
similarity index 100%
rename from freebsd/netinet/ip_dummynet.h
rename to freebsd/sys/netinet/ip_dummynet.h
diff --git a/freebsd/netinet/ip_ecn.c b/freebsd/sys/netinet/ip_ecn.c
similarity index 100%
rename from freebsd/netinet/ip_ecn.c
rename to freebsd/sys/netinet/ip_ecn.c
diff --git a/freebsd/netinet/ip_ecn.h b/freebsd/sys/netinet/ip_ecn.h
similarity index 100%
rename from freebsd/netinet/ip_ecn.h
rename to freebsd/sys/netinet/ip_ecn.h
diff --git a/freebsd/netinet/ip_encap.c b/freebsd/sys/netinet/ip_encap.c
similarity index 100%
rename from freebsd/netinet/ip_encap.c
rename to freebsd/sys/netinet/ip_encap.c
diff --git a/freebsd/netinet/ip_encap.h b/freebsd/sys/netinet/ip_encap.h
similarity index 100%
rename from freebsd/netinet/ip_encap.h
rename to freebsd/sys/netinet/ip_encap.h
diff --git a/freebsd/netinet/ip_fastfwd.c b/freebsd/sys/netinet/ip_fastfwd.c
similarity index 100%
rename from freebsd/netinet/ip_fastfwd.c
rename to freebsd/sys/netinet/ip_fastfwd.c
diff --git a/freebsd/netinet/ip_fw.h b/freebsd/sys/netinet/ip_fw.h
similarity index 100%
rename from freebsd/netinet/ip_fw.h
rename to freebsd/sys/netinet/ip_fw.h
diff --git a/freebsd/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c
similarity index 100%
rename from freebsd/netinet/ip_gre.c
rename to freebsd/sys/netinet/ip_gre.c
diff --git a/freebsd/netinet/ip_gre.h b/freebsd/sys/netinet/ip_gre.h
similarity index 100%
rename from freebsd/netinet/ip_gre.h
rename to freebsd/sys/netinet/ip_gre.h
diff --git a/freebsd/netinet/ip_icmp.c b/freebsd/sys/netinet/ip_icmp.c
similarity index 100%
rename from freebsd/netinet/ip_icmp.c
rename to freebsd/sys/netinet/ip_icmp.c
diff --git a/freebsd-userspace/include/netinet/ip_icmp.h b/freebsd/sys/netinet/ip_icmp.h
similarity index 100%
rename from freebsd-userspace/include/netinet/ip_icmp.h
rename to freebsd/sys/netinet/ip_icmp.h
diff --git a/freebsd/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c
similarity index 100%
rename from freebsd/netinet/ip_id.c
rename to freebsd/sys/netinet/ip_id.c
diff --git a/freebsd/netinet/ip_input.c b/freebsd/sys/netinet/ip_input.c
similarity index 100%
rename from freebsd/netinet/ip_input.c
rename to freebsd/sys/netinet/ip_input.c
diff --git a/freebsd/netinet/ip_ipsec.c b/freebsd/sys/netinet/ip_ipsec.c
similarity index 100%
rename from freebsd/netinet/ip_ipsec.c
rename to freebsd/sys/netinet/ip_ipsec.c
diff --git a/freebsd/netinet/ip_ipsec.h b/freebsd/sys/netinet/ip_ipsec.h
similarity index 100%
rename from freebsd/netinet/ip_ipsec.h
rename to freebsd/sys/netinet/ip_ipsec.h
diff --git a/freebsd/netinet/ip_mroute.c b/freebsd/sys/netinet/ip_mroute.c
similarity index 100%
rename from freebsd/netinet/ip_mroute.c
rename to freebsd/sys/netinet/ip_mroute.c
diff --git a/freebsd/netinet/ip_mroute.h b/freebsd/sys/netinet/ip_mroute.h
similarity index 100%
rename from freebsd/netinet/ip_mroute.h
rename to freebsd/sys/netinet/ip_mroute.h
diff --git a/freebsd/netinet/ip_options.c b/freebsd/sys/netinet/ip_options.c
similarity index 100%
rename from freebsd/netinet/ip_options.c
rename to freebsd/sys/netinet/ip_options.c
diff --git a/freebsd/netinet/ip_options.h b/freebsd/sys/netinet/ip_options.h
similarity index 100%
rename from freebsd/netinet/ip_options.h
rename to freebsd/sys/netinet/ip_options.h
diff --git a/freebsd/netinet/ip_output.c b/freebsd/sys/netinet/ip_output.c
similarity index 100%
rename from freebsd/netinet/ip_output.c
rename to freebsd/sys/netinet/ip_output.c
diff --git a/freebsd/netinet/ip_var.h b/freebsd/sys/netinet/ip_var.h
similarity index 100%
rename from freebsd/netinet/ip_var.h
rename to freebsd/sys/netinet/ip_var.h
diff --git a/freebsd/netinet/ipfw/dn_heap.c b/freebsd/sys/netinet/ipfw/dn_heap.c
similarity index 100%
rename from freebsd/netinet/ipfw/dn_heap.c
rename to freebsd/sys/netinet/ipfw/dn_heap.c
diff --git a/freebsd/netinet/ipfw/dn_heap.h b/freebsd/sys/netinet/ipfw/dn_heap.h
similarity index 100%
rename from freebsd/netinet/ipfw/dn_heap.h
rename to freebsd/sys/netinet/ipfw/dn_heap.h
diff --git a/freebsd/netinet/ipfw/dn_sched.h b/freebsd/sys/netinet/ipfw/dn_sched.h
similarity index 100%
rename from freebsd/netinet/ipfw/dn_sched.h
rename to freebsd/sys/netinet/ipfw/dn_sched.h
diff --git a/freebsd/netinet/ipfw/dn_sched_fifo.c b/freebsd/sys/netinet/ipfw/dn_sched_fifo.c
similarity index 100%
rename from freebsd/netinet/ipfw/dn_sched_fifo.c
rename to freebsd/sys/netinet/ipfw/dn_sched_fifo.c
diff --git a/freebsd/netinet/ipfw/dn_sched_prio.c b/freebsd/sys/netinet/ipfw/dn_sched_prio.c
similarity index 100%
rename from freebsd/netinet/ipfw/dn_sched_prio.c
rename to freebsd/sys/netinet/ipfw/dn_sched_prio.c
diff --git a/freebsd/netinet/ipfw/dn_sched_qfq.c b/freebsd/sys/netinet/ipfw/dn_sched_qfq.c
similarity index 100%
rename from freebsd/netinet/ipfw/dn_sched_qfq.c
rename to freebsd/sys/netinet/ipfw/dn_sched_qfq.c
diff --git a/freebsd/netinet/ipfw/dn_sched_rr.c b/freebsd/sys/netinet/ipfw/dn_sched_rr.c
similarity index 100%
rename from freebsd/netinet/ipfw/dn_sched_rr.c
rename to freebsd/sys/netinet/ipfw/dn_sched_rr.c
diff --git a/freebsd/netinet/ipfw/dn_sched_wf2q.c b/freebsd/sys/netinet/ipfw/dn_sched_wf2q.c
similarity index 100%
rename from freebsd/netinet/ipfw/dn_sched_wf2q.c
rename to freebsd/sys/netinet/ipfw/dn_sched_wf2q.c
diff --git a/freebsd/netinet/ipfw/ip_dn_glue.c b/freebsd/sys/netinet/ipfw/ip_dn_glue.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_dn_glue.c
rename to freebsd/sys/netinet/ipfw/ip_dn_glue.c
diff --git a/freebsd/netinet/ipfw/ip_dn_io.c b/freebsd/sys/netinet/ipfw/ip_dn_io.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_dn_io.c
rename to freebsd/sys/netinet/ipfw/ip_dn_io.c
diff --git a/freebsd/netinet/ipfw/ip_dn_private.h b/freebsd/sys/netinet/ipfw/ip_dn_private.h
similarity index 100%
rename from freebsd/netinet/ipfw/ip_dn_private.h
rename to freebsd/sys/netinet/ipfw/ip_dn_private.h
diff --git a/freebsd/netinet/ipfw/ip_dummynet.c b/freebsd/sys/netinet/ipfw/ip_dummynet.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_dummynet.c
rename to freebsd/sys/netinet/ipfw/ip_dummynet.c
diff --git a/freebsd/netinet/ipfw/ip_fw2.c b/freebsd/sys/netinet/ipfw/ip_fw2.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw2.c
rename to freebsd/sys/netinet/ipfw/ip_fw2.c
diff --git a/freebsd/netinet/ipfw/ip_fw_log.c b/freebsd/sys/netinet/ipfw/ip_fw_log.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw_log.c
rename to freebsd/sys/netinet/ipfw/ip_fw_log.c
diff --git a/freebsd/netinet/ipfw/ip_fw_nat.c b/freebsd/sys/netinet/ipfw/ip_fw_nat.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw_nat.c
rename to freebsd/sys/netinet/ipfw/ip_fw_nat.c
diff --git a/freebsd/netinet/ipfw/ip_fw_pfil.c b/freebsd/sys/netinet/ipfw/ip_fw_pfil.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw_pfil.c
rename to freebsd/sys/netinet/ipfw/ip_fw_pfil.c
diff --git a/freebsd/netinet/ipfw/ip_fw_private.h b/freebsd/sys/netinet/ipfw/ip_fw_private.h
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw_private.h
rename to freebsd/sys/netinet/ipfw/ip_fw_private.h
diff --git a/freebsd/netinet/ipfw/ip_fw_sockopt.c b/freebsd/sys/netinet/ipfw/ip_fw_sockopt.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw_sockopt.c
rename to freebsd/sys/netinet/ipfw/ip_fw_sockopt.c
diff --git a/freebsd/netinet/ipfw/ip_fw_table.c b/freebsd/sys/netinet/ipfw/ip_fw_table.c
similarity index 100%
rename from freebsd/netinet/ipfw/ip_fw_table.c
rename to freebsd/sys/netinet/ipfw/ip_fw_table.c
diff --git a/freebsd/netinet/libalias/alias.c b/freebsd/sys/netinet/libalias/alias.c
similarity index 100%
rename from freebsd/netinet/libalias/alias.c
rename to freebsd/sys/netinet/libalias/alias.c
diff --git a/freebsd/netinet/libalias/alias.h b/freebsd/sys/netinet/libalias/alias.h
similarity index 100%
rename from freebsd/netinet/libalias/alias.h
rename to freebsd/sys/netinet/libalias/alias.h
diff --git a/freebsd/netinet/libalias/alias_cuseeme.c b/freebsd/sys/netinet/libalias/alias_cuseeme.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_cuseeme.c
rename to freebsd/sys/netinet/libalias/alias_cuseeme.c
diff --git a/freebsd/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_db.c
rename to freebsd/sys/netinet/libalias/alias_db.c
diff --git a/freebsd/netinet/libalias/alias_dummy.c b/freebsd/sys/netinet/libalias/alias_dummy.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_dummy.c
rename to freebsd/sys/netinet/libalias/alias_dummy.c
diff --git a/freebsd/netinet/libalias/alias_ftp.c b/freebsd/sys/netinet/libalias/alias_ftp.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_ftp.c
rename to freebsd/sys/netinet/libalias/alias_ftp.c
diff --git a/freebsd/netinet/libalias/alias_irc.c b/freebsd/sys/netinet/libalias/alias_irc.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_irc.c
rename to freebsd/sys/netinet/libalias/alias_irc.c
diff --git a/freebsd/netinet/libalias/alias_local.h b/freebsd/sys/netinet/libalias/alias_local.h
similarity index 100%
rename from freebsd/netinet/libalias/alias_local.h
rename to freebsd/sys/netinet/libalias/alias_local.h
diff --git a/freebsd/netinet/libalias/alias_mod.c b/freebsd/sys/netinet/libalias/alias_mod.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_mod.c
rename to freebsd/sys/netinet/libalias/alias_mod.c
diff --git a/freebsd/netinet/libalias/alias_mod.h b/freebsd/sys/netinet/libalias/alias_mod.h
similarity index 100%
rename from freebsd/netinet/libalias/alias_mod.h
rename to freebsd/sys/netinet/libalias/alias_mod.h
diff --git a/freebsd/netinet/libalias/alias_nbt.c b/freebsd/sys/netinet/libalias/alias_nbt.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_nbt.c
rename to freebsd/sys/netinet/libalias/alias_nbt.c
diff --git a/freebsd/netinet/libalias/alias_pptp.c b/freebsd/sys/netinet/libalias/alias_pptp.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_pptp.c
rename to freebsd/sys/netinet/libalias/alias_pptp.c
diff --git a/freebsd/netinet/libalias/alias_proxy.c b/freebsd/sys/netinet/libalias/alias_proxy.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_proxy.c
rename to freebsd/sys/netinet/libalias/alias_proxy.c
diff --git a/freebsd/netinet/libalias/alias_sctp.c b/freebsd/sys/netinet/libalias/alias_sctp.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_sctp.c
rename to freebsd/sys/netinet/libalias/alias_sctp.c
diff --git a/freebsd/netinet/libalias/alias_sctp.h b/freebsd/sys/netinet/libalias/alias_sctp.h
similarity index 100%
rename from freebsd/netinet/libalias/alias_sctp.h
rename to freebsd/sys/netinet/libalias/alias_sctp.h
diff --git a/freebsd/netinet/libalias/alias_skinny.c b/freebsd/sys/netinet/libalias/alias_skinny.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_skinny.c
rename to freebsd/sys/netinet/libalias/alias_skinny.c
diff --git a/freebsd/netinet/libalias/alias_smedia.c b/freebsd/sys/netinet/libalias/alias_smedia.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_smedia.c
rename to freebsd/sys/netinet/libalias/alias_smedia.c
diff --git a/freebsd/netinet/libalias/alias_util.c b/freebsd/sys/netinet/libalias/alias_util.c
similarity index 100%
rename from freebsd/netinet/libalias/alias_util.c
rename to freebsd/sys/netinet/libalias/alias_util.c
diff --git a/freebsd/netinet/pim.h b/freebsd/sys/netinet/pim.h
similarity index 100%
rename from freebsd/netinet/pim.h
rename to freebsd/sys/netinet/pim.h
diff --git a/freebsd/netinet/pim_var.h b/freebsd/sys/netinet/pim_var.h
similarity index 100%
rename from freebsd/netinet/pim_var.h
rename to freebsd/sys/netinet/pim_var.h
diff --git a/freebsd/netinet/raw_ip.c b/freebsd/sys/netinet/raw_ip.c
similarity index 100%
rename from freebsd/netinet/raw_ip.c
rename to freebsd/sys/netinet/raw_ip.c
diff --git a/freebsd/netinet/sctp.h b/freebsd/sys/netinet/sctp.h
similarity index 100%
rename from freebsd/netinet/sctp.h
rename to freebsd/sys/netinet/sctp.h
diff --git a/freebsd/netinet/sctp_asconf.c b/freebsd/sys/netinet/sctp_asconf.c
similarity index 100%
rename from freebsd/netinet/sctp_asconf.c
rename to freebsd/sys/netinet/sctp_asconf.c
diff --git a/freebsd/netinet/sctp_asconf.h b/freebsd/sys/netinet/sctp_asconf.h
similarity index 100%
rename from freebsd/netinet/sctp_asconf.h
rename to freebsd/sys/netinet/sctp_asconf.h
diff --git a/freebsd/netinet/sctp_auth.c b/freebsd/sys/netinet/sctp_auth.c
similarity index 100%
rename from freebsd/netinet/sctp_auth.c
rename to freebsd/sys/netinet/sctp_auth.c
diff --git a/freebsd/netinet/sctp_auth.h b/freebsd/sys/netinet/sctp_auth.h
similarity index 100%
rename from freebsd/netinet/sctp_auth.h
rename to freebsd/sys/netinet/sctp_auth.h
diff --git a/freebsd/netinet/sctp_bsd_addr.c b/freebsd/sys/netinet/sctp_bsd_addr.c
similarity index 100%
rename from freebsd/netinet/sctp_bsd_addr.c
rename to freebsd/sys/netinet/sctp_bsd_addr.c
diff --git a/freebsd/netinet/sctp_bsd_addr.h b/freebsd/sys/netinet/sctp_bsd_addr.h
similarity index 100%
rename from freebsd/netinet/sctp_bsd_addr.h
rename to freebsd/sys/netinet/sctp_bsd_addr.h
diff --git a/freebsd/netinet/sctp_cc_functions.c b/freebsd/sys/netinet/sctp_cc_functions.c
similarity index 100%
rename from freebsd/netinet/sctp_cc_functions.c
rename to freebsd/sys/netinet/sctp_cc_functions.c
diff --git a/freebsd/netinet/sctp_cc_functions.h b/freebsd/sys/netinet/sctp_cc_functions.h
similarity index 100%
rename from freebsd/netinet/sctp_cc_functions.h
rename to freebsd/sys/netinet/sctp_cc_functions.h
diff --git a/freebsd/netinet/sctp_constants.h b/freebsd/sys/netinet/sctp_constants.h
similarity index 100%
rename from freebsd/netinet/sctp_constants.h
rename to freebsd/sys/netinet/sctp_constants.h
diff --git a/freebsd/netinet/sctp_crc32.c b/freebsd/sys/netinet/sctp_crc32.c
similarity index 100%
rename from freebsd/netinet/sctp_crc32.c
rename to freebsd/sys/netinet/sctp_crc32.c
diff --git a/freebsd/netinet/sctp_crc32.h b/freebsd/sys/netinet/sctp_crc32.h
similarity index 100%
rename from freebsd/netinet/sctp_crc32.h
rename to freebsd/sys/netinet/sctp_crc32.h
diff --git a/freebsd/netinet/sctp_header.h b/freebsd/sys/netinet/sctp_header.h
similarity index 100%
rename from freebsd/netinet/sctp_header.h
rename to freebsd/sys/netinet/sctp_header.h
diff --git a/freebsd/netinet/sctp_indata.c b/freebsd/sys/netinet/sctp_indata.c
similarity index 100%
rename from freebsd/netinet/sctp_indata.c
rename to freebsd/sys/netinet/sctp_indata.c
diff --git a/freebsd/netinet/sctp_indata.h b/freebsd/sys/netinet/sctp_indata.h
similarity index 100%
rename from freebsd/netinet/sctp_indata.h
rename to freebsd/sys/netinet/sctp_indata.h
diff --git a/freebsd/netinet/sctp_input.c b/freebsd/sys/netinet/sctp_input.c
similarity index 100%
rename from freebsd/netinet/sctp_input.c
rename to freebsd/sys/netinet/sctp_input.c
diff --git a/freebsd/netinet/sctp_input.h b/freebsd/sys/netinet/sctp_input.h
similarity index 100%
rename from freebsd/netinet/sctp_input.h
rename to freebsd/sys/netinet/sctp_input.h
diff --git a/freebsd/netinet/sctp_lock_bsd.h b/freebsd/sys/netinet/sctp_lock_bsd.h
similarity index 100%
rename from freebsd/netinet/sctp_lock_bsd.h
rename to freebsd/sys/netinet/sctp_lock_bsd.h
diff --git a/freebsd/netinet/sctp_os.h b/freebsd/sys/netinet/sctp_os.h
similarity index 100%
rename from freebsd/netinet/sctp_os.h
rename to freebsd/sys/netinet/sctp_os.h
diff --git a/freebsd/netinet/sctp_os_bsd.h b/freebsd/sys/netinet/sctp_os_bsd.h
similarity index 100%
rename from freebsd/netinet/sctp_os_bsd.h
rename to freebsd/sys/netinet/sctp_os_bsd.h
diff --git a/freebsd/netinet/sctp_output.c b/freebsd/sys/netinet/sctp_output.c
similarity index 100%
rename from freebsd/netinet/sctp_output.c
rename to freebsd/sys/netinet/sctp_output.c
diff --git a/freebsd/netinet/sctp_output.h b/freebsd/sys/netinet/sctp_output.h
similarity index 100%
rename from freebsd/netinet/sctp_output.h
rename to freebsd/sys/netinet/sctp_output.h
diff --git a/freebsd/netinet/sctp_pcb.c b/freebsd/sys/netinet/sctp_pcb.c
similarity index 100%
rename from freebsd/netinet/sctp_pcb.c
rename to freebsd/sys/netinet/sctp_pcb.c
diff --git a/freebsd/netinet/sctp_pcb.h b/freebsd/sys/netinet/sctp_pcb.h
similarity index 100%
rename from freebsd/netinet/sctp_pcb.h
rename to freebsd/sys/netinet/sctp_pcb.h
diff --git a/freebsd/netinet/sctp_peeloff.c b/freebsd/sys/netinet/sctp_peeloff.c
similarity index 100%
rename from freebsd/netinet/sctp_peeloff.c
rename to freebsd/sys/netinet/sctp_peeloff.c
diff --git a/freebsd/netinet/sctp_peeloff.h b/freebsd/sys/netinet/sctp_peeloff.h
similarity index 100%
rename from freebsd/netinet/sctp_peeloff.h
rename to freebsd/sys/netinet/sctp_peeloff.h
diff --git a/freebsd/netinet/sctp_structs.h b/freebsd/sys/netinet/sctp_structs.h
similarity index 100%
rename from freebsd/netinet/sctp_structs.h
rename to freebsd/sys/netinet/sctp_structs.h
diff --git a/freebsd/netinet/sctp_sysctl.c b/freebsd/sys/netinet/sctp_sysctl.c
similarity index 100%
rename from freebsd/netinet/sctp_sysctl.c
rename to freebsd/sys/netinet/sctp_sysctl.c
diff --git a/freebsd/netinet/sctp_sysctl.h b/freebsd/sys/netinet/sctp_sysctl.h
similarity index 100%
rename from freebsd/netinet/sctp_sysctl.h
rename to freebsd/sys/netinet/sctp_sysctl.h
diff --git a/freebsd/netinet/sctp_timer.c b/freebsd/sys/netinet/sctp_timer.c
similarity index 100%
rename from freebsd/netinet/sctp_timer.c
rename to freebsd/sys/netinet/sctp_timer.c
diff --git a/freebsd/netinet/sctp_timer.h b/freebsd/sys/netinet/sctp_timer.h
similarity index 100%
rename from freebsd/netinet/sctp_timer.h
rename to freebsd/sys/netinet/sctp_timer.h
diff --git a/freebsd/netinet/sctp_uio.h b/freebsd/sys/netinet/sctp_uio.h
similarity index 100%
rename from freebsd/netinet/sctp_uio.h
rename to freebsd/sys/netinet/sctp_uio.h
diff --git a/freebsd/netinet/sctp_usrreq.c b/freebsd/sys/netinet/sctp_usrreq.c
similarity index 100%
rename from freebsd/netinet/sctp_usrreq.c
rename to freebsd/sys/netinet/sctp_usrreq.c
diff --git a/freebsd/netinet/sctp_var.h b/freebsd/sys/netinet/sctp_var.h
similarity index 100%
rename from freebsd/netinet/sctp_var.h
rename to freebsd/sys/netinet/sctp_var.h
diff --git a/freebsd/netinet/sctputil.c b/freebsd/sys/netinet/sctputil.c
similarity index 100%
rename from freebsd/netinet/sctputil.c
rename to freebsd/sys/netinet/sctputil.c
diff --git a/freebsd/netinet/sctputil.h b/freebsd/sys/netinet/sctputil.h
similarity index 100%
rename from freebsd/netinet/sctputil.h
rename to freebsd/sys/netinet/sctputil.h
diff --git a/freebsd-userspace/include/netinet/tcp.h b/freebsd/sys/netinet/tcp.h
similarity index 100%
rename from freebsd-userspace/include/netinet/tcp.h
rename to freebsd/sys/netinet/tcp.h
diff --git a/freebsd/netinet/tcp_debug.c b/freebsd/sys/netinet/tcp_debug.c
similarity index 100%
rename from freebsd/netinet/tcp_debug.c
rename to freebsd/sys/netinet/tcp_debug.c
diff --git a/freebsd/netinet/tcp_debug.h b/freebsd/sys/netinet/tcp_debug.h
similarity index 100%
rename from freebsd/netinet/tcp_debug.h
rename to freebsd/sys/netinet/tcp_debug.h
diff --git a/freebsd/netinet/tcp_fsm.h b/freebsd/sys/netinet/tcp_fsm.h
similarity index 100%
rename from freebsd/netinet/tcp_fsm.h
rename to freebsd/sys/netinet/tcp_fsm.h
diff --git a/freebsd/netinet/tcp_hostcache.c b/freebsd/sys/netinet/tcp_hostcache.c
similarity index 100%
rename from freebsd/netinet/tcp_hostcache.c
rename to freebsd/sys/netinet/tcp_hostcache.c
diff --git a/freebsd/netinet/tcp_hostcache.h b/freebsd/sys/netinet/tcp_hostcache.h
similarity index 100%
rename from freebsd/netinet/tcp_hostcache.h
rename to freebsd/sys/netinet/tcp_hostcache.h
diff --git a/freebsd/netinet/tcp_input.c b/freebsd/sys/netinet/tcp_input.c
similarity index 100%
rename from freebsd/netinet/tcp_input.c
rename to freebsd/sys/netinet/tcp_input.c
diff --git a/freebsd/netinet/tcp_lro.c b/freebsd/sys/netinet/tcp_lro.c
similarity index 100%
rename from freebsd/netinet/tcp_lro.c
rename to freebsd/sys/netinet/tcp_lro.c
diff --git a/freebsd/netinet/tcp_lro.h b/freebsd/sys/netinet/tcp_lro.h
similarity index 100%
rename from freebsd/netinet/tcp_lro.h
rename to freebsd/sys/netinet/tcp_lro.h
diff --git a/freebsd/netinet/tcp_offload.c b/freebsd/sys/netinet/tcp_offload.c
similarity index 100%
rename from freebsd/netinet/tcp_offload.c
rename to freebsd/sys/netinet/tcp_offload.c
diff --git a/freebsd/netinet/tcp_offload.h b/freebsd/sys/netinet/tcp_offload.h
similarity index 100%
rename from freebsd/netinet/tcp_offload.h
rename to freebsd/sys/netinet/tcp_offload.h
diff --git a/freebsd/netinet/tcp_output.c b/freebsd/sys/netinet/tcp_output.c
similarity index 100%
rename from freebsd/netinet/tcp_output.c
rename to freebsd/sys/netinet/tcp_output.c
diff --git a/freebsd/netinet/tcp_reass.c b/freebsd/sys/netinet/tcp_reass.c
similarity index 100%
rename from freebsd/netinet/tcp_reass.c
rename to freebsd/sys/netinet/tcp_reass.c
diff --git a/freebsd/netinet/tcp_sack.c b/freebsd/sys/netinet/tcp_sack.c
similarity index 100%
rename from freebsd/netinet/tcp_sack.c
rename to freebsd/sys/netinet/tcp_sack.c
diff --git a/freebsd/netinet/tcp_seq.h b/freebsd/sys/netinet/tcp_seq.h
similarity index 100%
rename from freebsd/netinet/tcp_seq.h
rename to freebsd/sys/netinet/tcp_seq.h
diff --git a/freebsd/netinet/tcp_subr.c b/freebsd/sys/netinet/tcp_subr.c
similarity index 100%
rename from freebsd/netinet/tcp_subr.c
rename to freebsd/sys/netinet/tcp_subr.c
diff --git a/freebsd/netinet/tcp_syncache.c b/freebsd/sys/netinet/tcp_syncache.c
similarity index 100%
rename from freebsd/netinet/tcp_syncache.c
rename to freebsd/sys/netinet/tcp_syncache.c
diff --git a/freebsd/netinet/tcp_syncache.h b/freebsd/sys/netinet/tcp_syncache.h
similarity index 100%
rename from freebsd/netinet/tcp_syncache.h
rename to freebsd/sys/netinet/tcp_syncache.h
diff --git a/freebsd/netinet/tcp_timer.c b/freebsd/sys/netinet/tcp_timer.c
similarity index 100%
rename from freebsd/netinet/tcp_timer.c
rename to freebsd/sys/netinet/tcp_timer.c
diff --git a/freebsd/netinet/tcp_timer.h b/freebsd/sys/netinet/tcp_timer.h
similarity index 100%
rename from freebsd/netinet/tcp_timer.h
rename to freebsd/sys/netinet/tcp_timer.h
diff --git a/freebsd/netinet/tcp_timewait.c b/freebsd/sys/netinet/tcp_timewait.c
similarity index 100%
rename from freebsd/netinet/tcp_timewait.c
rename to freebsd/sys/netinet/tcp_timewait.c
diff --git a/freebsd/netinet/tcp_usrreq.c b/freebsd/sys/netinet/tcp_usrreq.c
similarity index 100%
rename from freebsd/netinet/tcp_usrreq.c
rename to freebsd/sys/netinet/tcp_usrreq.c
diff --git a/freebsd/netinet/tcp_var.h b/freebsd/sys/netinet/tcp_var.h
similarity index 100%
rename from freebsd/netinet/tcp_var.h
rename to freebsd/sys/netinet/tcp_var.h
diff --git a/freebsd/netinet/tcpip.h b/freebsd/sys/netinet/tcpip.h
similarity index 100%
rename from freebsd/netinet/tcpip.h
rename to freebsd/sys/netinet/tcpip.h
diff --git a/freebsd/netinet/toedev.h b/freebsd/sys/netinet/toedev.h
similarity index 100%
rename from freebsd/netinet/toedev.h
rename to freebsd/sys/netinet/toedev.h
diff --git a/freebsd-userspace/include/netinet/udp.h b/freebsd/sys/netinet/udp.h
similarity index 100%
rename from freebsd-userspace/include/netinet/udp.h
rename to freebsd/sys/netinet/udp.h
diff --git a/freebsd/netinet/udp_usrreq.c b/freebsd/sys/netinet/udp_usrreq.c
similarity index 100%
rename from freebsd/netinet/udp_usrreq.c
rename to freebsd/sys/netinet/udp_usrreq.c
diff --git a/freebsd/netinet/udp_var.h b/freebsd/sys/netinet/udp_var.h
similarity index 100%
rename from freebsd/netinet/udp_var.h
rename to freebsd/sys/netinet/udp_var.h
diff --git a/freebsd/netinet6/dest6.c b/freebsd/sys/netinet6/dest6.c
similarity index 100%
rename from freebsd/netinet6/dest6.c
rename to freebsd/sys/netinet6/dest6.c
diff --git a/freebsd/netinet6/frag6.c b/freebsd/sys/netinet6/frag6.c
similarity index 100%
rename from freebsd/netinet6/frag6.c
rename to freebsd/sys/netinet6/frag6.c
diff --git a/freebsd/netinet6/icmp6.c b/freebsd/sys/netinet6/icmp6.c
similarity index 100%
rename from freebsd/netinet6/icmp6.c
rename to freebsd/sys/netinet6/icmp6.c
diff --git a/freebsd/netinet6/icmp6.h b/freebsd/sys/netinet6/icmp6.h
similarity index 100%
rename from freebsd/netinet6/icmp6.h
rename to freebsd/sys/netinet6/icmp6.h
diff --git a/freebsd/netinet6/in6.c b/freebsd/sys/netinet6/in6.c
similarity index 100%
rename from freebsd/netinet6/in6.c
rename to freebsd/sys/netinet6/in6.c
diff --git a/freebsd/netinet6/in6.h b/freebsd/sys/netinet6/in6.h
similarity index 100%
rename from freebsd/netinet6/in6.h
rename to freebsd/sys/netinet6/in6.h
diff --git a/freebsd/netinet6/in6_cksum.c b/freebsd/sys/netinet6/in6_cksum.c
similarity index 100%
rename from freebsd/netinet6/in6_cksum.c
rename to freebsd/sys/netinet6/in6_cksum.c
diff --git a/freebsd/netinet6/in6_gif.c b/freebsd/sys/netinet6/in6_gif.c
similarity index 100%
rename from freebsd/netinet6/in6_gif.c
rename to freebsd/sys/netinet6/in6_gif.c
diff --git a/freebsd/netinet6/in6_gif.h b/freebsd/sys/netinet6/in6_gif.h
similarity index 100%
rename from freebsd/netinet6/in6_gif.h
rename to freebsd/sys/netinet6/in6_gif.h
diff --git a/freebsd/netinet6/in6_ifattach.c b/freebsd/sys/netinet6/in6_ifattach.c
similarity index 100%
rename from freebsd/netinet6/in6_ifattach.c
rename to freebsd/sys/netinet6/in6_ifattach.c
diff --git a/freebsd/netinet6/in6_ifattach.h b/freebsd/sys/netinet6/in6_ifattach.h
similarity index 100%
rename from freebsd/netinet6/in6_ifattach.h
rename to freebsd/sys/netinet6/in6_ifattach.h
diff --git a/freebsd/netinet6/in6_mcast.c b/freebsd/sys/netinet6/in6_mcast.c
similarity index 100%
rename from freebsd/netinet6/in6_mcast.c
rename to freebsd/sys/netinet6/in6_mcast.c
diff --git a/freebsd/netinet6/in6_pcb.c b/freebsd/sys/netinet6/in6_pcb.c
similarity index 100%
rename from freebsd/netinet6/in6_pcb.c
rename to freebsd/sys/netinet6/in6_pcb.c
diff --git a/freebsd/netinet6/in6_pcb.h b/freebsd/sys/netinet6/in6_pcb.h
similarity index 100%
rename from freebsd/netinet6/in6_pcb.h
rename to freebsd/sys/netinet6/in6_pcb.h
diff --git a/freebsd/netinet6/in6_proto.c b/freebsd/sys/netinet6/in6_proto.c
similarity index 100%
rename from freebsd/netinet6/in6_proto.c
rename to freebsd/sys/netinet6/in6_proto.c
diff --git a/freebsd/netinet6/in6_rmx.c b/freebsd/sys/netinet6/in6_rmx.c
similarity index 100%
rename from freebsd/netinet6/in6_rmx.c
rename to freebsd/sys/netinet6/in6_rmx.c
diff --git a/freebsd/netinet6/in6_src.c b/freebsd/sys/netinet6/in6_src.c
similarity index 100%
rename from freebsd/netinet6/in6_src.c
rename to freebsd/sys/netinet6/in6_src.c
diff --git a/freebsd/netinet6/in6_var.h b/freebsd/sys/netinet6/in6_var.h
similarity index 100%
rename from freebsd/netinet6/in6_var.h
rename to freebsd/sys/netinet6/in6_var.h
diff --git a/freebsd/netinet6/ip6.h b/freebsd/sys/netinet6/ip6.h
similarity index 100%
rename from freebsd/netinet6/ip6.h
rename to freebsd/sys/netinet6/ip6.h
diff --git a/freebsd/netinet6/ip6_ecn.h b/freebsd/sys/netinet6/ip6_ecn.h
similarity index 100%
rename from freebsd/netinet6/ip6_ecn.h
rename to freebsd/sys/netinet6/ip6_ecn.h
diff --git a/freebsd/netinet6/ip6_forward.c b/freebsd/sys/netinet6/ip6_forward.c
similarity index 100%
rename from freebsd/netinet6/ip6_forward.c
rename to freebsd/sys/netinet6/ip6_forward.c
diff --git a/freebsd/netinet6/ip6_id.c b/freebsd/sys/netinet6/ip6_id.c
similarity index 100%
rename from freebsd/netinet6/ip6_id.c
rename to freebsd/sys/netinet6/ip6_id.c
diff --git a/freebsd/netinet6/ip6_input.c b/freebsd/sys/netinet6/ip6_input.c
similarity index 100%
rename from freebsd/netinet6/ip6_input.c
rename to freebsd/sys/netinet6/ip6_input.c
diff --git a/freebsd/netinet6/ip6_ipsec.c b/freebsd/sys/netinet6/ip6_ipsec.c
similarity index 100%
rename from freebsd/netinet6/ip6_ipsec.c
rename to freebsd/sys/netinet6/ip6_ipsec.c
diff --git a/freebsd/netinet6/ip6_ipsec.h b/freebsd/sys/netinet6/ip6_ipsec.h
similarity index 100%
rename from freebsd/netinet6/ip6_ipsec.h
rename to freebsd/sys/netinet6/ip6_ipsec.h
diff --git a/freebsd/netinet6/ip6_mroute.c b/freebsd/sys/netinet6/ip6_mroute.c
similarity index 100%
rename from freebsd/netinet6/ip6_mroute.c
rename to freebsd/sys/netinet6/ip6_mroute.c
diff --git a/freebsd/netinet6/ip6_mroute.h b/freebsd/sys/netinet6/ip6_mroute.h
similarity index 100%
rename from freebsd/netinet6/ip6_mroute.h
rename to freebsd/sys/netinet6/ip6_mroute.h
diff --git a/freebsd/netinet6/ip6_output.c b/freebsd/sys/netinet6/ip6_output.c
similarity index 100%
rename from freebsd/netinet6/ip6_output.c
rename to freebsd/sys/netinet6/ip6_output.c
diff --git a/freebsd/netinet6/ip6_var.h b/freebsd/sys/netinet6/ip6_var.h
similarity index 100%
rename from freebsd/netinet6/ip6_var.h
rename to freebsd/sys/netinet6/ip6_var.h
diff --git a/freebsd/netinet6/ip6protosw.h b/freebsd/sys/netinet6/ip6protosw.h
similarity index 100%
rename from freebsd/netinet6/ip6protosw.h
rename to freebsd/sys/netinet6/ip6protosw.h
diff --git a/freebsd/netinet6/mld6.c b/freebsd/sys/netinet6/mld6.c
similarity index 100%
rename from freebsd/netinet6/mld6.c
rename to freebsd/sys/netinet6/mld6.c
diff --git a/freebsd/netinet6/mld6.h b/freebsd/sys/netinet6/mld6.h
similarity index 100%
rename from freebsd/netinet6/mld6.h
rename to freebsd/sys/netinet6/mld6.h
diff --git a/freebsd/netinet6/mld6_var.h b/freebsd/sys/netinet6/mld6_var.h
similarity index 100%
rename from freebsd/netinet6/mld6_var.h
rename to freebsd/sys/netinet6/mld6_var.h
diff --git a/freebsd/netinet6/nd6.c b/freebsd/sys/netinet6/nd6.c
similarity index 100%
rename from freebsd/netinet6/nd6.c
rename to freebsd/sys/netinet6/nd6.c
diff --git a/freebsd/netinet6/nd6.h b/freebsd/sys/netinet6/nd6.h
similarity index 100%
rename from freebsd/netinet6/nd6.h
rename to freebsd/sys/netinet6/nd6.h
diff --git a/freebsd/netinet6/nd6_nbr.c b/freebsd/sys/netinet6/nd6_nbr.c
similarity index 100%
rename from freebsd/netinet6/nd6_nbr.c
rename to freebsd/sys/netinet6/nd6_nbr.c
diff --git a/freebsd/netinet6/nd6_rtr.c b/freebsd/sys/netinet6/nd6_rtr.c
similarity index 100%
rename from freebsd/netinet6/nd6_rtr.c
rename to freebsd/sys/netinet6/nd6_rtr.c
diff --git a/freebsd/netinet6/pim6.h b/freebsd/sys/netinet6/pim6.h
similarity index 100%
rename from freebsd/netinet6/pim6.h
rename to freebsd/sys/netinet6/pim6.h
diff --git a/freebsd/netinet6/pim6_var.h b/freebsd/sys/netinet6/pim6_var.h
similarity index 100%
rename from freebsd/netinet6/pim6_var.h
rename to freebsd/sys/netinet6/pim6_var.h
diff --git a/freebsd/netinet6/raw_ip6.c b/freebsd/sys/netinet6/raw_ip6.c
similarity index 100%
rename from freebsd/netinet6/raw_ip6.c
rename to freebsd/sys/netinet6/raw_ip6.c
diff --git a/freebsd/netinet6/raw_ip6.h b/freebsd/sys/netinet6/raw_ip6.h
similarity index 100%
rename from freebsd/netinet6/raw_ip6.h
rename to freebsd/sys/netinet6/raw_ip6.h
diff --git a/freebsd/netinet6/route6.c b/freebsd/sys/netinet6/route6.c
similarity index 100%
rename from freebsd/netinet6/route6.c
rename to freebsd/sys/netinet6/route6.c
diff --git a/freebsd/netinet6/scope6.c b/freebsd/sys/netinet6/scope6.c
similarity index 100%
rename from freebsd/netinet6/scope6.c
rename to freebsd/sys/netinet6/scope6.c
diff --git a/freebsd/netinet6/scope6_var.h b/freebsd/sys/netinet6/scope6_var.h
similarity index 100%
rename from freebsd/netinet6/scope6_var.h
rename to freebsd/sys/netinet6/scope6_var.h
diff --git a/freebsd/netinet6/sctp6_usrreq.c b/freebsd/sys/netinet6/sctp6_usrreq.c
similarity index 100%
rename from freebsd/netinet6/sctp6_usrreq.c
rename to freebsd/sys/netinet6/sctp6_usrreq.c
diff --git a/freebsd/netinet6/sctp6_var.h b/freebsd/sys/netinet6/sctp6_var.h
similarity index 100%
rename from freebsd/netinet6/sctp6_var.h
rename to freebsd/sys/netinet6/sctp6_var.h
diff --git a/freebsd/netinet6/tcp6_var.h b/freebsd/sys/netinet6/tcp6_var.h
similarity index 100%
rename from freebsd/netinet6/tcp6_var.h
rename to freebsd/sys/netinet6/tcp6_var.h
diff --git a/freebsd/netinet6/udp6_usrreq.c b/freebsd/sys/netinet6/udp6_usrreq.c
similarity index 100%
rename from freebsd/netinet6/udp6_usrreq.c
rename to freebsd/sys/netinet6/udp6_usrreq.c
diff --git a/freebsd/netinet6/udp6_var.h b/freebsd/sys/netinet6/udp6_var.h
similarity index 100%
rename from freebsd/netinet6/udp6_var.h
rename to freebsd/sys/netinet6/udp6_var.h
diff --git a/freebsd/netipsec/ah.h b/freebsd/sys/netipsec/ah.h
similarity index 100%
rename from freebsd/netipsec/ah.h
rename to freebsd/sys/netipsec/ah.h
diff --git a/freebsd/netipsec/ah_var.h b/freebsd/sys/netipsec/ah_var.h
similarity index 100%
rename from freebsd/netipsec/ah_var.h
rename to freebsd/sys/netipsec/ah_var.h
diff --git a/freebsd/netipsec/esp.h b/freebsd/sys/netipsec/esp.h
similarity index 100%
rename from freebsd/netipsec/esp.h
rename to freebsd/sys/netipsec/esp.h
diff --git a/freebsd/netipsec/esp_var.h b/freebsd/sys/netipsec/esp_var.h
similarity index 100%
rename from freebsd/netipsec/esp_var.h
rename to freebsd/sys/netipsec/esp_var.h
diff --git a/freebsd/netipsec/ipcomp.h b/freebsd/sys/netipsec/ipcomp.h
similarity index 100%
rename from freebsd/netipsec/ipcomp.h
rename to freebsd/sys/netipsec/ipcomp.h
diff --git a/freebsd/netipsec/ipcomp_var.h b/freebsd/sys/netipsec/ipcomp_var.h
similarity index 100%
rename from freebsd/netipsec/ipcomp_var.h
rename to freebsd/sys/netipsec/ipcomp_var.h
diff --git a/freebsd/netipsec/ipip_var.h b/freebsd/sys/netipsec/ipip_var.h
similarity index 100%
rename from freebsd/netipsec/ipip_var.h
rename to freebsd/sys/netipsec/ipip_var.h
diff --git a/freebsd/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c
similarity index 100%
rename from freebsd/netipsec/ipsec.c
rename to freebsd/sys/netipsec/ipsec.c
diff --git a/freebsd/netipsec/ipsec.h b/freebsd/sys/netipsec/ipsec.h
similarity index 100%
rename from freebsd/netipsec/ipsec.h
rename to freebsd/sys/netipsec/ipsec.h
diff --git a/freebsd/netipsec/ipsec6.h b/freebsd/sys/netipsec/ipsec6.h
similarity index 100%
rename from freebsd/netipsec/ipsec6.h
rename to freebsd/sys/netipsec/ipsec6.h
diff --git a/freebsd/netipsec/ipsec_input.c b/freebsd/sys/netipsec/ipsec_input.c
similarity index 100%
rename from freebsd/netipsec/ipsec_input.c
rename to freebsd/sys/netipsec/ipsec_input.c
diff --git a/freebsd/netipsec/ipsec_mbuf.c b/freebsd/sys/netipsec/ipsec_mbuf.c
similarity index 100%
rename from freebsd/netipsec/ipsec_mbuf.c
rename to freebsd/sys/netipsec/ipsec_mbuf.c
diff --git a/freebsd/netipsec/ipsec_output.c b/freebsd/sys/netipsec/ipsec_output.c
similarity index 100%
rename from freebsd/netipsec/ipsec_output.c
rename to freebsd/sys/netipsec/ipsec_output.c
diff --git a/freebsd/netipsec/key.c b/freebsd/sys/netipsec/key.c
similarity index 100%
rename from freebsd/netipsec/key.c
rename to freebsd/sys/netipsec/key.c
diff --git a/freebsd/netipsec/key.h b/freebsd/sys/netipsec/key.h
similarity index 100%
rename from freebsd/netipsec/key.h
rename to freebsd/sys/netipsec/key.h
diff --git a/freebsd/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c
similarity index 100%
rename from freebsd/netipsec/key_debug.c
rename to freebsd/sys/netipsec/key_debug.c
diff --git a/freebsd/netipsec/key_debug.h b/freebsd/sys/netipsec/key_debug.h
similarity index 100%
rename from freebsd/netipsec/key_debug.h
rename to freebsd/sys/netipsec/key_debug.h
diff --git a/freebsd/netipsec/key_var.h b/freebsd/sys/netipsec/key_var.h
similarity index 100%
rename from freebsd/netipsec/key_var.h
rename to freebsd/sys/netipsec/key_var.h
diff --git a/freebsd/netipsec/keydb.h b/freebsd/sys/netipsec/keydb.h
similarity index 100%
rename from freebsd/netipsec/keydb.h
rename to freebsd/sys/netipsec/keydb.h
diff --git a/freebsd/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c
similarity index 100%
rename from freebsd/netipsec/keysock.c
rename to freebsd/sys/netipsec/keysock.c
diff --git a/freebsd/netipsec/keysock.h b/freebsd/sys/netipsec/keysock.h
similarity index 100%
rename from freebsd/netipsec/keysock.h
rename to freebsd/sys/netipsec/keysock.h
diff --git a/freebsd/netipsec/xform.h b/freebsd/sys/netipsec/xform.h
similarity index 100%
rename from freebsd/netipsec/xform.h
rename to freebsd/sys/netipsec/xform.h
diff --git a/freebsd/netipsec/xform_ah.c b/freebsd/sys/netipsec/xform_ah.c
similarity index 100%
rename from freebsd/netipsec/xform_ah.c
rename to freebsd/sys/netipsec/xform_ah.c
diff --git a/freebsd/netipsec/xform_esp.c b/freebsd/sys/netipsec/xform_esp.c
similarity index 100%
rename from freebsd/netipsec/xform_esp.c
rename to freebsd/sys/netipsec/xform_esp.c
diff --git a/freebsd/netipsec/xform_ipcomp.c b/freebsd/sys/netipsec/xform_ipcomp.c
similarity index 100%
rename from freebsd/netipsec/xform_ipcomp.c
rename to freebsd/sys/netipsec/xform_ipcomp.c
diff --git a/freebsd/netipsec/xform_ipip.c b/freebsd/sys/netipsec/xform_ipip.c
similarity index 100%
rename from freebsd/netipsec/xform_ipip.c
rename to freebsd/sys/netipsec/xform_ipip.c
diff --git a/freebsd/netipsec/xform_tcp.c b/freebsd/sys/netipsec/xform_tcp.c
similarity index 100%
rename from freebsd/netipsec/xform_tcp.c
rename to freebsd/sys/netipsec/xform_tcp.c
diff --git a/freebsd/opencrypto/cast.c b/freebsd/sys/opencrypto/cast.c
similarity index 100%
rename from freebsd/opencrypto/cast.c
rename to freebsd/sys/opencrypto/cast.c
diff --git a/freebsd/opencrypto/cast.h b/freebsd/sys/opencrypto/cast.h
similarity index 100%
rename from freebsd/opencrypto/cast.h
rename to freebsd/sys/opencrypto/cast.h
diff --git a/freebsd/opencrypto/castsb.h b/freebsd/sys/opencrypto/castsb.h
similarity index 100%
rename from freebsd/opencrypto/castsb.h
rename to freebsd/sys/opencrypto/castsb.h
diff --git a/freebsd/opencrypto/criov.c b/freebsd/sys/opencrypto/criov.c
similarity index 100%
rename from freebsd/opencrypto/criov.c
rename to freebsd/sys/opencrypto/criov.c
diff --git a/freebsd/opencrypto/crypto.c b/freebsd/sys/opencrypto/crypto.c
similarity index 100%
rename from freebsd/opencrypto/crypto.c
rename to freebsd/sys/opencrypto/crypto.c
diff --git a/freebsd/opencrypto/cryptodev.c b/freebsd/sys/opencrypto/cryptodev.c
similarity index 100%
rename from freebsd/opencrypto/cryptodev.c
rename to freebsd/sys/opencrypto/cryptodev.c
diff --git a/freebsd/opencrypto/cryptodev.h b/freebsd/sys/opencrypto/cryptodev.h
similarity index 100%
rename from freebsd/opencrypto/cryptodev.h
rename to freebsd/sys/opencrypto/cryptodev.h
diff --git a/freebsd/opencrypto/cryptosoft.c b/freebsd/sys/opencrypto/cryptosoft.c
similarity index 100%
rename from freebsd/opencrypto/cryptosoft.c
rename to freebsd/sys/opencrypto/cryptosoft.c
diff --git a/freebsd/opencrypto/cryptosoft.h b/freebsd/sys/opencrypto/cryptosoft.h
similarity index 100%
rename from freebsd/opencrypto/cryptosoft.h
rename to freebsd/sys/opencrypto/cryptosoft.h
diff --git a/freebsd/opencrypto/deflate.c b/freebsd/sys/opencrypto/deflate.c
similarity index 100%
rename from freebsd/opencrypto/deflate.c
rename to freebsd/sys/opencrypto/deflate.c
diff --git a/freebsd/opencrypto/deflate.h b/freebsd/sys/opencrypto/deflate.h
similarity index 100%
rename from freebsd/opencrypto/deflate.h
rename to freebsd/sys/opencrypto/deflate.h
diff --git a/freebsd/opencrypto/rmd160.c b/freebsd/sys/opencrypto/rmd160.c
similarity index 100%
rename from freebsd/opencrypto/rmd160.c
rename to freebsd/sys/opencrypto/rmd160.c
diff --git a/freebsd/opencrypto/rmd160.h b/freebsd/sys/opencrypto/rmd160.h
similarity index 100%
rename from freebsd/opencrypto/rmd160.h
rename to freebsd/sys/opencrypto/rmd160.h
diff --git a/freebsd/opencrypto/skipjack.c b/freebsd/sys/opencrypto/skipjack.c
similarity index 100%
rename from freebsd/opencrypto/skipjack.c
rename to freebsd/sys/opencrypto/skipjack.c
diff --git a/freebsd/opencrypto/skipjack.h b/freebsd/sys/opencrypto/skipjack.h
similarity index 100%
rename from freebsd/opencrypto/skipjack.h
rename to freebsd/sys/opencrypto/skipjack.h
diff --git a/freebsd/opencrypto/xform.c b/freebsd/sys/opencrypto/xform.c
similarity index 100%
rename from freebsd/opencrypto/xform.c
rename to freebsd/sys/opencrypto/xform.c
diff --git a/freebsd/opencrypto/xform.h b/freebsd/sys/opencrypto/xform.h
similarity index 100%
rename from freebsd/opencrypto/xform.h
rename to freebsd/sys/opencrypto/xform.h
diff --git a/freebsd/pci/if_rlreg.h b/freebsd/sys/pci/if_rlreg.h
similarity index 100%
rename from freebsd/pci/if_rlreg.h
rename to freebsd/sys/pci/if_rlreg.h
diff --git a/freebsd/powerpc/include/freebsd/machine/cpufunc.h b/freebsd/sys/powerpc/include/machine/cpufunc.h
similarity index 100%
rename from freebsd/powerpc/include/freebsd/machine/cpufunc.h
rename to freebsd/sys/powerpc/include/machine/cpufunc.h
diff --git a/freebsd/powerpc/include/freebsd/machine/psl.h b/freebsd/sys/powerpc/include/machine/psl.h
similarity index 100%
rename from freebsd/powerpc/include/freebsd/machine/psl.h
rename to freebsd/sys/powerpc/include/machine/psl.h
diff --git a/freebsd/powerpc/include/freebsd/machine/spr.h b/freebsd/sys/powerpc/include/machine/spr.h
similarity index 100%
rename from freebsd/powerpc/include/freebsd/machine/spr.h
rename to freebsd/sys/powerpc/include/machine/spr.h
diff --git a/freebsd/powerpc/powerpc/in_cksum.c b/freebsd/sys/powerpc/powerpc/in_cksum.c
similarity index 100%
rename from freebsd/powerpc/powerpc/in_cksum.c
rename to freebsd/sys/powerpc/powerpc/in_cksum.c
diff --git a/freebsd-userspace/sys/rpc/types.h b/freebsd/sys/rpc/types.h
similarity index 100%
rename from freebsd-userspace/sys/rpc/types.h
rename to freebsd/sys/rpc/types.h
diff --git a/freebsd/security/mac/mac_framework.h b/freebsd/sys/security/mac/mac_framework.h
similarity index 100%
rename from freebsd/security/mac/mac_framework.h
rename to freebsd/sys/security/mac/mac_framework.h
diff --git a/freebsd/sparc64/include/freebsd/machine/asi.h b/freebsd/sys/sparc64/include/machine/asi.h
similarity index 100%
rename from freebsd/sparc64/include/freebsd/machine/asi.h
rename to freebsd/sys/sparc64/include/machine/asi.h
diff --git a/freebsd/sparc64/include/freebsd/machine/cpufunc.h b/freebsd/sys/sparc64/include/machine/cpufunc.h
similarity index 100%
rename from freebsd/sparc64/include/freebsd/machine/cpufunc.h
rename to freebsd/sys/sparc64/include/machine/cpufunc.h
diff --git a/freebsd/sparc64/include/freebsd/machine/pstate.h b/freebsd/sys/sparc64/include/machine/pstate.h
similarity index 100%
rename from freebsd/sparc64/include/freebsd/machine/pstate.h
rename to freebsd/sys/sparc64/include/machine/pstate.h
diff --git a/freebsd/sparc64/sparc64/in_cksum.c b/freebsd/sys/sparc64/sparc64/in_cksum.c
similarity index 100%
rename from freebsd/sparc64/sparc64/in_cksum.c
rename to freebsd/sys/sparc64/sparc64/in_cksum.c
diff --git a/freebsd/sys/_bus_dma.h b/freebsd/sys/sys/_bus_dma.h
similarity index 100%
rename from freebsd/sys/_bus_dma.h
rename to freebsd/sys/sys/_bus_dma.h
diff --git a/freebsd/sys/_lock.h b/freebsd/sys/sys/_lock.h
similarity index 100%
rename from freebsd/sys/_lock.h
rename to freebsd/sys/sys/_lock.h
diff --git a/freebsd/sys/_lockmgr.h b/freebsd/sys/sys/_lockmgr.h
similarity index 100%
rename from freebsd/sys/_lockmgr.h
rename to freebsd/sys/sys/_lockmgr.h
diff --git a/freebsd/sys/_mutex.h b/freebsd/sys/sys/_mutex.h
similarity index 100%
rename from freebsd/sys/_mutex.h
rename to freebsd/sys/sys/_mutex.h
diff --git a/freebsd-userspace/sys/sys/_null.h b/freebsd/sys/sys/_null.h
similarity index 100%
rename from freebsd-userspace/sys/sys/_null.h
rename to freebsd/sys/sys/_null.h
diff --git a/freebsd/sys/_rmlock.h b/freebsd/sys/sys/_rmlock.h
similarity index 100%
rename from freebsd/sys/_rmlock.h
rename to freebsd/sys/sys/_rmlock.h
diff --git a/freebsd/sys/_rwlock.h b/freebsd/sys/sys/_rwlock.h
similarity index 100%
rename from freebsd/sys/_rwlock.h
rename to freebsd/sys/sys/_rwlock.h
diff --git a/freebsd/sys/_semaphore.h b/freebsd/sys/sys/_semaphore.h
similarity index 100%
rename from freebsd/sys/_semaphore.h
rename to freebsd/sys/sys/_semaphore.h
diff --git a/freebsd/sys/_sigset.h b/freebsd/sys/sys/_sigset.h
similarity index 100%
rename from freebsd/sys/_sigset.h
rename to freebsd/sys/sys/_sigset.h
diff --git a/freebsd/sys/_sx.h b/freebsd/sys/sys/_sx.h
similarity index 100%
rename from freebsd/sys/_sx.h
rename to freebsd/sys/sys/_sx.h
diff --git a/freebsd/sys/_task.h b/freebsd/sys/sys/_task.h
similarity index 100%
rename from freebsd/sys/_task.h
rename to freebsd/sys/sys/_task.h
diff --git a/freebsd/sys/_timeval.h b/freebsd/sys/sys/_timeval.h
similarity index 100%
rename from freebsd/sys/_timeval.h
rename to freebsd/sys/sys/_timeval.h
diff --git a/freebsd/sys/acl.h b/freebsd/sys/sys/acl.h
similarity index 100%
rename from freebsd/sys/acl.h
rename to freebsd/sys/sys/acl.h
diff --git a/freebsd/sys/aio.h b/freebsd/sys/sys/aio.h
similarity index 100%
rename from freebsd/sys/aio.h
rename to freebsd/sys/sys/aio.h
diff --git a/freebsd/sys/ata.h b/freebsd/sys/sys/ata.h
similarity index 100%
rename from freebsd/sys/ata.h
rename to freebsd/sys/sys/ata.h
diff --git a/freebsd/sys/bitstring.h b/freebsd/sys/sys/bitstring.h
similarity index 100%
rename from freebsd/sys/bitstring.h
rename to freebsd/sys/sys/bitstring.h
diff --git a/freebsd/sys/buf.h b/freebsd/sys/sys/buf.h
similarity index 100%
rename from freebsd/sys/buf.h
rename to freebsd/sys/sys/buf.h
diff --git a/freebsd/sys/buf_ring.h b/freebsd/sys/sys/buf_ring.h
similarity index 100%
rename from freebsd/sys/buf_ring.h
rename to freebsd/sys/sys/buf_ring.h
diff --git a/freebsd/sys/bufobj.h b/freebsd/sys/sys/bufobj.h
similarity index 100%
rename from freebsd/sys/bufobj.h
rename to freebsd/sys/sys/bufobj.h
diff --git a/freebsd/sys/bus.h b/freebsd/sys/sys/bus.h
similarity index 100%
rename from freebsd/sys/bus.h
rename to freebsd/sys/sys/bus.h
diff --git a/freebsd/sys/bus_dma.h b/freebsd/sys/sys/bus_dma.h
similarity index 100%
rename from freebsd/sys/bus_dma.h
rename to freebsd/sys/sys/bus_dma.h
diff --git a/freebsd/sys/callout.h b/freebsd/sys/sys/callout.h
similarity index 100%
rename from freebsd/sys/callout.h
rename to freebsd/sys/sys/callout.h
diff --git a/freebsd/sys/condvar.h b/freebsd/sys/sys/condvar.h
similarity index 100%
rename from freebsd/sys/condvar.h
rename to freebsd/sys/sys/condvar.h
diff --git a/freebsd/sys/conf.h b/freebsd/sys/sys/conf.h
similarity index 100%
rename from freebsd/sys/conf.h
rename to freebsd/sys/sys/conf.h
diff --git a/freebsd/sys/cpu.h b/freebsd/sys/sys/cpu.h
similarity index 100%
rename from freebsd/sys/cpu.h
rename to freebsd/sys/sys/cpu.h
diff --git a/freebsd/sys/ctype.h b/freebsd/sys/sys/ctype.h
similarity index 100%
rename from freebsd/sys/ctype.h
rename to freebsd/sys/sys/ctype.h
diff --git a/freebsd/sys/domain.h b/freebsd/sys/sys/domain.h
similarity index 100%
rename from freebsd/sys/domain.h
rename to freebsd/sys/sys/domain.h
diff --git a/freebsd/sys/endian.h b/freebsd/sys/sys/endian.h
similarity index 100%
rename from freebsd/sys/endian.h
rename to freebsd/sys/sys/endian.h
diff --git a/freebsd/sys/event.h b/freebsd/sys/sys/event.h
similarity index 100%
rename from freebsd/sys/event.h
rename to freebsd/sys/sys/event.h
diff --git a/freebsd/sys/eventhandler.h b/freebsd/sys/sys/eventhandler.h
similarity index 100%
rename from freebsd/sys/eventhandler.h
rename to freebsd/sys/sys/eventhandler.h
diff --git a/freebsd/sys/eventvar.h b/freebsd/sys/sys/eventvar.h
similarity index 100%
rename from freebsd/sys/eventvar.h
rename to freebsd/sys/sys/eventvar.h
diff --git a/freebsd/sys/fcntl.h b/freebsd/sys/sys/fcntl.h
similarity index 100%
rename from freebsd/sys/fcntl.h
rename to freebsd/sys/sys/fcntl.h
diff --git a/freebsd/sys/file.h b/freebsd/sys/sys/file.h
similarity index 100%
rename from freebsd/sys/file.h
rename to freebsd/sys/sys/file.h
diff --git a/freebsd/sys/filedesc.h b/freebsd/sys/sys/filedesc.h
similarity index 100%
rename from freebsd/sys/filedesc.h
rename to freebsd/sys/sys/filedesc.h
diff --git a/freebsd/sys/filio.h b/freebsd/sys/sys/filio.h
similarity index 100%
rename from freebsd/sys/filio.h
rename to freebsd/sys/sys/filio.h
diff --git a/freebsd/sys/fnv_hash.h b/freebsd/sys/sys/fnv_hash.h
similarity index 100%
rename from freebsd/sys/fnv_hash.h
rename to freebsd/sys/sys/fnv_hash.h
diff --git a/freebsd/sys/hash.h b/freebsd/sys/sys/hash.h
similarity index 100%
rename from freebsd/sys/hash.h
rename to freebsd/sys/sys/hash.h
diff --git a/freebsd/sys/interrupt.h b/freebsd/sys/sys/interrupt.h
similarity index 100%
rename from freebsd/sys/interrupt.h
rename to freebsd/sys/sys/interrupt.h
diff --git a/freebsd/sys/jail.h b/freebsd/sys/sys/jail.h
similarity index 100%
rename from freebsd/sys/jail.h
rename to freebsd/sys/sys/jail.h
diff --git a/freebsd/sys/kenv.h b/freebsd/sys/sys/kenv.h
similarity index 100%
rename from freebsd/sys/kenv.h
rename to freebsd/sys/sys/kenv.h
diff --git a/freebsd/sys/kernel.h b/freebsd/sys/sys/kernel.h
similarity index 100%
rename from freebsd/sys/kernel.h
rename to freebsd/sys/sys/kernel.h
diff --git a/freebsd/sys/kobj.h b/freebsd/sys/sys/kobj.h
similarity index 100%
rename from freebsd/sys/kobj.h
rename to freebsd/sys/sys/kobj.h
diff --git a/freebsd/sys/kthread.h b/freebsd/sys/sys/kthread.h
similarity index 100%
rename from freebsd/sys/kthread.h
rename to freebsd/sys/sys/kthread.h
diff --git a/freebsd/sys/ktr.h b/freebsd/sys/sys/ktr.h
similarity index 100%
rename from freebsd/sys/ktr.h
rename to freebsd/sys/sys/ktr.h
diff --git a/freebsd/sys/libkern.h b/freebsd/sys/sys/libkern.h
similarity index 100%
rename from freebsd/sys/libkern.h
rename to freebsd/sys/sys/libkern.h
diff --git a/rtemsbsd/freebsd/sys/limits.h b/freebsd/sys/sys/limits.h
similarity index 100%
rename from rtemsbsd/freebsd/sys/limits.h
rename to freebsd/sys/sys/limits.h
diff --git a/freebsd/sys/linker.h b/freebsd/sys/sys/linker.h
similarity index 100%
rename from freebsd/sys/linker.h
rename to freebsd/sys/sys/linker.h
diff --git a/freebsd/sys/linker_set.h b/freebsd/sys/sys/linker_set.h
similarity index 100%
rename from freebsd/sys/linker_set.h
rename to freebsd/sys/sys/linker_set.h
diff --git a/freebsd/sys/lock_profile.h b/freebsd/sys/sys/lock_profile.h
similarity index 100%
rename from freebsd/sys/lock_profile.h
rename to freebsd/sys/sys/lock_profile.h
diff --git a/freebsd/sys/lockmgr.h b/freebsd/sys/sys/lockmgr.h
similarity index 100%
rename from freebsd/sys/lockmgr.h
rename to freebsd/sys/sys/lockmgr.h
diff --git a/freebsd/sys/lockstat.h b/freebsd/sys/sys/lockstat.h
similarity index 100%
rename from freebsd/sys/lockstat.h
rename to freebsd/sys/sys/lockstat.h
diff --git a/freebsd/sys/mac.h b/freebsd/sys/sys/mac.h
similarity index 100%
rename from freebsd/sys/mac.h
rename to freebsd/sys/sys/mac.h
diff --git a/freebsd/sys/malloc.h b/freebsd/sys/sys/malloc.h
similarity index 100%
rename from freebsd/sys/malloc.h
rename to freebsd/sys/sys/malloc.h
diff --git a/freebsd/sys/mbuf.h b/freebsd/sys/sys/mbuf.h
similarity index 100%
rename from freebsd/sys/mbuf.h
rename to freebsd/sys/sys/mbuf.h
diff --git a/freebsd/sys/md5.h b/freebsd/sys/sys/md5.h
similarity index 100%
rename from freebsd/sys/md5.h
rename to freebsd/sys/sys/md5.h
diff --git a/freebsd-userspace/include/sys/mman.h b/freebsd/sys/sys/mman.h
similarity index 100%
rename from freebsd-userspace/include/sys/mman.h
rename to freebsd/sys/sys/mman.h
diff --git a/freebsd/sys/module.h b/freebsd/sys/sys/module.h
similarity index 100%
rename from freebsd/sys/module.h
rename to freebsd/sys/sys/module.h
diff --git a/freebsd/sys/mount.h b/freebsd/sys/sys/mount.h
similarity index 100%
rename from freebsd/sys/mount.h
rename to freebsd/sys/sys/mount.h
diff --git a/freebsd/sys/mqueue.h b/freebsd/sys/sys/mqueue.h
similarity index 100%
rename from freebsd/sys/mqueue.h
rename to freebsd/sys/sys/mqueue.h
diff --git a/freebsd/sys/mutex.h b/freebsd/sys/sys/mutex.h
similarity index 100%
rename from freebsd/sys/mutex.h
rename to freebsd/sys/sys/mutex.h
diff --git a/freebsd-userspace/sys/sys/nlist_aout.h b/freebsd/sys/sys/nlist_aout.h
similarity index 100%
rename from freebsd-userspace/sys/sys/nlist_aout.h
rename to freebsd/sys/sys/nlist_aout.h
diff --git a/freebsd/sys/osd.h b/freebsd/sys/sys/osd.h
similarity index 100%
rename from freebsd/sys/osd.h
rename to freebsd/sys/sys/osd.h
diff --git a/freebsd/sys/pciio.h b/freebsd/sys/sys/pciio.h
similarity index 100%
rename from freebsd/sys/pciio.h
rename to freebsd/sys/sys/pciio.h
diff --git a/freebsd/sys/pcpu.h b/freebsd/sys/sys/pcpu.h
similarity index 100%
rename from freebsd/sys/pcpu.h
rename to freebsd/sys/sys/pcpu.h
diff --git a/freebsd/sys/poll.h b/freebsd/sys/sys/poll.h
similarity index 100%
rename from freebsd/sys/poll.h
rename to freebsd/sys/sys/poll.h
diff --git a/freebsd/sys/priority.h b/freebsd/sys/sys/priority.h
similarity index 100%
rename from freebsd/sys/priority.h
rename to freebsd/sys/sys/priority.h
diff --git a/freebsd/sys/priv.h b/freebsd/sys/sys/priv.h
similarity index 100%
rename from freebsd/sys/priv.h
rename to freebsd/sys/sys/priv.h
diff --git a/freebsd/sys/proc.h b/freebsd/sys/sys/proc.h
similarity index 100%
rename from freebsd/sys/proc.h
rename to freebsd/sys/sys/proc.h
diff --git a/freebsd/sys/protosw.h b/freebsd/sys/sys/protosw.h
similarity index 100%
rename from freebsd/sys/protosw.h
rename to freebsd/sys/sys/protosw.h
diff --git a/freebsd/sys/queue.h b/freebsd/sys/sys/queue.h
similarity index 100%
rename from freebsd/sys/queue.h
rename to freebsd/sys/sys/queue.h
diff --git a/freebsd/sys/random.h b/freebsd/sys/sys/random.h
similarity index 100%
rename from freebsd/sys/random.h
rename to freebsd/sys/sys/random.h
diff --git a/freebsd/sys/reboot.h b/freebsd/sys/sys/reboot.h
similarity index 100%
rename from freebsd/sys/reboot.h
rename to freebsd/sys/sys/reboot.h
diff --git a/freebsd/sys/refcount.h b/freebsd/sys/sys/refcount.h
similarity index 100%
rename from freebsd/sys/refcount.h
rename to freebsd/sys/sys/refcount.h
diff --git a/freebsd/sys/resourcevar.h b/freebsd/sys/sys/resourcevar.h
similarity index 100%
rename from freebsd/sys/resourcevar.h
rename to freebsd/sys/sys/resourcevar.h
diff --git a/freebsd/sys/rman.h b/freebsd/sys/sys/rman.h
similarity index 100%
rename from freebsd/sys/rman.h
rename to freebsd/sys/sys/rman.h
diff --git a/freebsd/sys/rmlock.h b/freebsd/sys/sys/rmlock.h
similarity index 100%
rename from freebsd/sys/rmlock.h
rename to freebsd/sys/sys/rmlock.h
diff --git a/freebsd/sys/rtprio.h b/freebsd/sys/sys/rtprio.h
similarity index 100%
rename from freebsd/sys/rtprio.h
rename to freebsd/sys/sys/rtprio.h
diff --git a/freebsd/sys/runq.h b/freebsd/sys/sys/runq.h
similarity index 100%
rename from freebsd/sys/runq.h
rename to freebsd/sys/sys/runq.h
diff --git a/freebsd/sys/rwlock.h b/freebsd/sys/sys/rwlock.h
similarity index 100%
rename from freebsd/sys/rwlock.h
rename to freebsd/sys/sys/rwlock.h
diff --git a/freebsd/sys/sbuf.h b/freebsd/sys/sys/sbuf.h
similarity index 100%
rename from freebsd/sys/sbuf.h
rename to freebsd/sys/sys/sbuf.h
diff --git a/freebsd/sys/sdt.h b/freebsd/sys/sys/sdt.h
similarity index 100%
rename from freebsd/sys/sdt.h
rename to freebsd/sys/sys/sdt.h
diff --git a/freebsd-userspace/include/sys/select.h b/freebsd/sys/sys/select.h
similarity index 100%
rename from freebsd-userspace/include/sys/select.h
rename to freebsd/sys/sys/select.h
diff --git a/freebsd/sys/selinfo.h b/freebsd/sys/sys/selinfo.h
similarity index 100%
rename from freebsd/sys/selinfo.h
rename to freebsd/sys/sys/selinfo.h
diff --git a/freebsd/sys/sf_buf.h b/freebsd/sys/sys/sf_buf.h
similarity index 100%
rename from freebsd/sys/sf_buf.h
rename to freebsd/sys/sys/sf_buf.h
diff --git a/freebsd/sys/sigio.h b/freebsd/sys/sys/sigio.h
similarity index 100%
rename from freebsd/sys/sigio.h
rename to freebsd/sys/sys/sigio.h
diff --git a/freebsd/sys/smp.h b/freebsd/sys/sys/smp.h
similarity index 100%
rename from freebsd/sys/smp.h
rename to freebsd/sys/sys/smp.h
diff --git a/freebsd/sys/sockbuf.h b/freebsd/sys/sys/sockbuf.h
similarity index 100%
rename from freebsd/sys/sockbuf.h
rename to freebsd/sys/sys/sockbuf.h
diff --git a/freebsd-userspace/include/sys/socket.h b/freebsd/sys/sys/socket.h
similarity index 100%
rename from freebsd-userspace/include/sys/socket.h
rename to freebsd/sys/sys/socket.h
diff --git a/freebsd-userspace/include/sys/socketvar.h b/freebsd/sys/sys/socketvar.h
similarity index 100%
rename from freebsd-userspace/include/sys/socketvar.h
rename to freebsd/sys/sys/socketvar.h
diff --git a/freebsd/sys/sockio.h b/freebsd/sys/sys/sockio.h
similarity index 100%
rename from freebsd/sys/sockio.h
rename to freebsd/sys/sys/sockio.h
diff --git a/freebsd/sys/sockopt.h b/freebsd/sys/sys/sockopt.h
similarity index 100%
rename from freebsd/sys/sockopt.h
rename to freebsd/sys/sys/sockopt.h
diff --git a/freebsd/sys/sockstate.h b/freebsd/sys/sys/sockstate.h
similarity index 100%
rename from freebsd/sys/sockstate.h
rename to freebsd/sys/sys/sockstate.h
diff --git a/freebsd/sys/stddef.h b/freebsd/sys/sys/stddef.h
similarity index 100%
rename from freebsd/sys/stddef.h
rename to freebsd/sys/sys/stddef.h
diff --git a/freebsd/sys/stdint.h b/freebsd/sys/sys/stdint.h
similarity index 100%
rename from freebsd/sys/stdint.h
rename to freebsd/sys/sys/stdint.h
diff --git a/freebsd/sys/sx.h b/freebsd/sys/sys/sx.h
similarity index 100%
rename from freebsd/sys/sx.h
rename to freebsd/sys/sys/sx.h
diff --git a/freebsd-userspace/include/sys/sysctl.h b/freebsd/sys/sys/sysctl.h
similarity index 100%
rename from freebsd-userspace/include/sys/sysctl.h
rename to freebsd/sys/sys/sysctl.h
diff --git a/freebsd-userspace/rtems/include/sys/syslog.h b/freebsd/sys/sys/syslog.h
similarity index 100%
rename from freebsd-userspace/rtems/include/sys/syslog.h
rename to freebsd/sys/sys/syslog.h
diff --git a/freebsd/sys/systm.h b/freebsd/sys/sys/systm.h
similarity index 100%
rename from freebsd/sys/systm.h
rename to freebsd/sys/sys/systm.h
diff --git a/freebsd/sys/taskqueue.h b/freebsd/sys/sys/taskqueue.h
similarity index 100%
rename from freebsd/sys/taskqueue.h
rename to freebsd/sys/sys/taskqueue.h
diff --git a/freebsd/sys/timepps.h b/freebsd/sys/sys/timepps.h
similarity index 100%
rename from freebsd/sys/timepps.h
rename to freebsd/sys/sys/timepps.h
diff --git a/freebsd/sys/timetc.h b/freebsd/sys/sys/timetc.h
similarity index 100%
rename from freebsd/sys/timetc.h
rename to freebsd/sys/sys/timetc.h
diff --git a/freebsd/sys/timex.h b/freebsd/sys/sys/timex.h
similarity index 100%
rename from freebsd/sys/timex.h
rename to freebsd/sys/sys/timex.h
diff --git a/freebsd/sys/tree.h b/freebsd/sys/sys/tree.h
similarity index 100%
rename from freebsd/sys/tree.h
rename to freebsd/sys/sys/tree.h
diff --git a/freebsd/sys/tty.h b/freebsd/sys/sys/tty.h
similarity index 100%
rename from freebsd/sys/tty.h
rename to freebsd/sys/sys/tty.h
diff --git a/freebsd/sys/ttycom.h b/freebsd/sys/sys/ttycom.h
similarity index 100%
rename from freebsd/sys/ttycom.h
rename to freebsd/sys/sys/ttycom.h
diff --git a/freebsd/sys/ttydevsw.h b/freebsd/sys/sys/ttydevsw.h
similarity index 100%
rename from freebsd/sys/ttydevsw.h
rename to freebsd/sys/sys/ttydevsw.h
diff --git a/freebsd/sys/ttydisc.h b/freebsd/sys/sys/ttydisc.h
similarity index 100%
rename from freebsd/sys/ttydisc.h
rename to freebsd/sys/sys/ttydisc.h
diff --git a/freebsd/sys/ttyhook.h b/freebsd/sys/sys/ttyhook.h
similarity index 100%
rename from freebsd/sys/ttyhook.h
rename to freebsd/sys/sys/ttyhook.h
diff --git a/freebsd/sys/ttyqueue.h b/freebsd/sys/sys/ttyqueue.h
similarity index 100%
rename from freebsd/sys/ttyqueue.h
rename to freebsd/sys/sys/ttyqueue.h
diff --git a/freebsd/sys/ucred.h b/freebsd/sys/sys/ucred.h
similarity index 100%
rename from freebsd/sys/ucred.h
rename to freebsd/sys/sys/ucred.h
diff --git a/freebsd-userspace/sys/sys/un.h b/freebsd/sys/sys/un.h
similarity index 100%
rename from freebsd-userspace/sys/sys/un.h
rename to freebsd/sys/sys/un.h
diff --git a/freebsd/sys/user.h b/freebsd/sys/sys/user.h
similarity index 100%
rename from freebsd/sys/user.h
rename to freebsd/sys/sys/user.h
diff --git a/freebsd/sys/vmmeter.h b/freebsd/sys/sys/vmmeter.h
similarity index 100%
rename from freebsd/sys/vmmeter.h
rename to freebsd/sys/sys/vmmeter.h
diff --git a/freebsd/vm/uma.h b/freebsd/sys/vm/uma.h
similarity index 100%
rename from freebsd/vm/uma.h
rename to freebsd/sys/vm/uma.h
diff --git a/freebsd/vm/uma_core.c b/freebsd/sys/vm/uma_core.c
similarity index 100%
rename from freebsd/vm/uma_core.c
rename to freebsd/sys/vm/uma_core.c
diff --git a/freebsd/vm/uma_dbg.h b/freebsd/sys/vm/uma_dbg.h
similarity index 100%
rename from freebsd/vm/uma_dbg.h
rename to freebsd/sys/vm/uma_dbg.h
diff --git a/freebsd/vm/uma_int.h b/freebsd/sys/vm/uma_int.h
similarity index 100%
rename from freebsd/vm/uma_int.h
rename to freebsd/sys/vm/uma_int.h
diff --git a/freebsd/vm/vm.h b/freebsd/sys/vm/vm.h
similarity index 100%
rename from freebsd/vm/vm.h
rename to freebsd/sys/vm/vm.h
diff --git a/freebsd-userspace/commands/usr.bin/netstat/atalk.c b/freebsd/usr.bin/netstat/atalk.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/atalk.c
rename to freebsd/usr.bin/netstat/atalk.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/bpf.c b/freebsd/usr.bin/netstat/bpf.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/bpf.c
rename to freebsd/usr.bin/netstat/bpf.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/if.c b/freebsd/usr.bin/netstat/if.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/if.c
rename to freebsd/usr.bin/netstat/if.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/inet.c b/freebsd/usr.bin/netstat/inet.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/inet.c
rename to freebsd/usr.bin/netstat/inet.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/inet6.c b/freebsd/usr.bin/netstat/inet6.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/inet6.c
rename to freebsd/usr.bin/netstat/inet6.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/ipsec.c b/freebsd/usr.bin/netstat/ipsec.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/ipsec.c
rename to freebsd/usr.bin/netstat/ipsec.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/main.c b/freebsd/usr.bin/netstat/main.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/main.c
rename to freebsd/usr.bin/netstat/main.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/mbuf.c b/freebsd/usr.bin/netstat/mbuf.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/mbuf.c
rename to freebsd/usr.bin/netstat/mbuf.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/mroute.c b/freebsd/usr.bin/netstat/mroute.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/mroute.c
rename to freebsd/usr.bin/netstat/mroute.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/mroute6.c b/freebsd/usr.bin/netstat/mroute6.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/mroute6.c
rename to freebsd/usr.bin/netstat/mroute6.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/netstat.h b/freebsd/usr.bin/netstat/netstat.h
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/netstat.h
rename to freebsd/usr.bin/netstat/netstat.h
diff --git a/freebsd-userspace/commands/usr.bin/netstat/pfkey.c b/freebsd/usr.bin/netstat/pfkey.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/pfkey.c
rename to freebsd/usr.bin/netstat/pfkey.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/netstat_route.c b/freebsd/usr.bin/netstat/route.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/netstat_route.c
rename to freebsd/usr.bin/netstat/route.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/sctp.c b/freebsd/usr.bin/netstat/sctp.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/sctp.c
rename to freebsd/usr.bin/netstat/sctp.c
diff --git a/freebsd-userspace/commands/usr.bin/netstat/unix.c b/freebsd/usr.bin/netstat/unix.c
similarity index 100%
rename from freebsd-userspace/commands/usr.bin/netstat/unix.c
rename to freebsd/usr.bin/netstat/unix.c
diff --git a/freebsd/cam/cam_queue.h b/rtemsbsd/include/cam/cam_queue.h
similarity index 100%
rename from freebsd/cam/cam_queue.h
rename to rtemsbsd/include/cam/cam_queue.h
diff --git a/freebsd/ddb/db_sym.h b/rtemsbsd/include/ddb/db_sym.h
similarity index 100%
rename from freebsd/ddb/db_sym.h
rename to rtemsbsd/include/ddb/db_sym.h
diff --git a/freebsd/ddb/ddb.h b/rtemsbsd/include/ddb/ddb.h
similarity index 100%
rename from freebsd/ddb/ddb.h
rename to rtemsbsd/include/ddb/ddb.h
diff --git a/freebsd/geom/geom_disk.h b/rtemsbsd/include/geom/geom_disk.h
similarity index 100%
rename from freebsd/geom/geom_disk.h
rename to rtemsbsd/include/geom/geom_disk.h
diff --git a/rtemsbsd/freebsd/local/pmap.h b/rtemsbsd/include/local/pmap.h
similarity index 100%
rename from rtemsbsd/freebsd/local/pmap.h
rename to rtemsbsd/include/local/pmap.h
diff --git a/rtemsbsd/freebsd/machine/_bus.h b/rtemsbsd/include/machine/_bus.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/_bus.h
rename to rtemsbsd/include/machine/_bus.h
diff --git a/rtemsbsd/freebsd/machine/_limits.h b/rtemsbsd/include/machine/_limits.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/_limits.h
rename to rtemsbsd/include/machine/_limits.h
diff --git a/rtemsbsd/freebsd/machine/atomic.h b/rtemsbsd/include/machine/atomic.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/atomic.h
rename to rtemsbsd/include/machine/atomic.h
diff --git a/rtemsbsd/freebsd/machine/bus.h b/rtemsbsd/include/machine/bus.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/bus.h
rename to rtemsbsd/include/machine/bus.h
diff --git a/rtemsbsd/freebsd/machine/bus_dma.h b/rtemsbsd/include/machine/bus_dma.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/bus_dma.h
rename to rtemsbsd/include/machine/bus_dma.h
diff --git a/rtemsbsd/freebsd/machine/bus_space-i386.h b/rtemsbsd/include/machine/bus_space-i386.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/bus_space-i386.h
rename to rtemsbsd/include/machine/bus_space-i386.h
diff --git a/rtemsbsd/freebsd/machine/bus_space-simple_memory.h b/rtemsbsd/include/machine/bus_space-simple_memory.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/bus_space-simple_memory.h
rename to rtemsbsd/include/machine/bus_space-simple_memory.h
diff --git a/rtemsbsd/freebsd/machine/clock.h b/rtemsbsd/include/machine/clock.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/clock.h
rename to rtemsbsd/include/machine/clock.h
diff --git a/rtemsbsd/freebsd/machine/cpu.h b/rtemsbsd/include/machine/cpu.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/cpu.h
rename to rtemsbsd/include/machine/cpu.h
diff --git a/rtemsbsd/avr/include/freebsd/machine/cpufunc.h b/rtemsbsd/include/machine/cpufunc.h
similarity index 100%
rename from rtemsbsd/avr/include/freebsd/machine/cpufunc.h
rename to rtemsbsd/include/machine/cpufunc.h
diff --git a/freebsd/machine/elf.h b/rtemsbsd/include/machine/elf.h
similarity index 100%
rename from freebsd/machine/elf.h
rename to rtemsbsd/include/machine/elf.h
diff --git a/rtemsbsd/freebsd/machine/mutex.h b/rtemsbsd/include/machine/mutex.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/mutex.h
rename to rtemsbsd/include/machine/mutex.h
diff --git a/freebsd/machine/pcb.h b/rtemsbsd/include/machine/pcb.h
similarity index 100%
rename from freebsd/machine/pcb.h
rename to rtemsbsd/include/machine/pcb.h
diff --git a/rtemsbsd/freebsd/machine/pcpu.h b/rtemsbsd/include/machine/pcpu.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/pcpu.h
rename to rtemsbsd/include/machine/pcpu.h
diff --git a/rtemsbsd/freebsd/machine/proc.h b/rtemsbsd/include/machine/proc.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/proc.h
rename to rtemsbsd/include/machine/proc.h
diff --git a/freebsd/machine/resource.h b/rtemsbsd/include/machine/resource.h
similarity index 100%
rename from freebsd/machine/resource.h
rename to rtemsbsd/include/machine/resource.h
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-bus-dma.h b/rtemsbsd/include/machine/rtems-bsd-bus-dma.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-bus-dma.h
rename to rtemsbsd/include/machine/rtems-bsd-bus-dma.h
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-cache.h b/rtemsbsd/include/machine/rtems-bsd-cache.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-cache.h
rename to rtemsbsd/include/machine/rtems-bsd-cache.h
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-config.h.in
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-config.h.in
rename to rtemsbsd/include/machine/rtems-bsd-config.h.in
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-devicet.h b/rtemsbsd/include/machine/rtems-bsd-devicet.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-devicet.h
rename to rtemsbsd/include/machine/rtems-bsd-devicet.h
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-symbols.h b/rtemsbsd/include/machine/rtems-bsd-symbols.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-symbols.h
rename to rtemsbsd/include/machine/rtems-bsd-symbols.h
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h b/rtemsbsd/include/machine/rtems-bsd-sysinit.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
rename to rtemsbsd/include/machine/rtems-bsd-sysinit.h
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-taskqueue.h b/rtemsbsd/include/machine/rtems-bsd-taskqueue.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/rtems-bsd-taskqueue.h
rename to rtemsbsd/include/machine/rtems-bsd-taskqueue.h
diff --git a/rtemsbsd/freebsd/machine/runq.h b/rtemsbsd/include/machine/runq.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/runq.h
rename to rtemsbsd/include/machine/runq.h
diff --git a/rtemsbsd/freebsd/machine/signal.h b/rtemsbsd/include/machine/signal.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/signal.h
rename to rtemsbsd/include/machine/signal.h
diff --git a/freebsd/machine/smp.h b/rtemsbsd/include/machine/smp.h
similarity index 100%
rename from freebsd/machine/smp.h
rename to rtemsbsd/include/machine/smp.h
diff --git a/rtemsbsd/freebsd/machine/stdarg.h b/rtemsbsd/include/machine/stdarg.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/stdarg.h
rename to rtemsbsd/include/machine/stdarg.h
diff --git a/rtemsbsd/freebsd/machine/ucontext.h b/rtemsbsd/include/machine/ucontext.h
similarity index 100%
rename from rtemsbsd/freebsd/machine/ucontext.h
rename to rtemsbsd/include/machine/ucontext.h
diff --git a/freebsd/machine/vm.h b/rtemsbsd/include/machine/vm.h
similarity index 100%
rename from freebsd/machine/vm.h
rename to rtemsbsd/include/machine/vm.h
diff --git a/freebsd/netgraph/ng_ipfw.h b/rtemsbsd/include/netgraph/ng_ipfw.h
similarity index 100%
rename from freebsd/netgraph/ng_ipfw.h
rename to rtemsbsd/include/netgraph/ng_ipfw.h
diff --git a/freebsd-userspace/include/poll.h b/rtemsbsd/include/poll.h
similarity index 100%
rename from freebsd-userspace/include/poll.h
rename to rtemsbsd/include/poll.h
diff --git a/rtemsbsd/freebsd/bsd.h b/rtemsbsd/include/rtems/bsd/bsd.h
similarity index 100%
rename from rtemsbsd/freebsd/bsd.h
rename to rtemsbsd/include/rtems/bsd/bsd.h
diff --git a/freebsd/local/bus_if.h b/rtemsbsd/include/rtems/bsd/local/bus_if.h
similarity index 100%
rename from freebsd/local/bus_if.h
rename to rtemsbsd/include/rtems/bsd/local/bus_if.h
diff --git a/freebsd/local/cryptodev_if.h b/rtemsbsd/include/rtems/bsd/local/cryptodev_if.h
similarity index 100%
rename from freebsd/local/cryptodev_if.h
rename to rtemsbsd/include/rtems/bsd/local/cryptodev_if.h
diff --git a/freebsd/local/device_if.h b/rtemsbsd/include/rtems/bsd/local/device_if.h
similarity index 100%
rename from freebsd/local/device_if.h
rename to rtemsbsd/include/rtems/bsd/local/device_if.h
diff --git a/freebsd/local/linker_if.h b/rtemsbsd/include/rtems/bsd/local/linker_if.h
similarity index 100%
rename from freebsd/local/linker_if.h
rename to rtemsbsd/include/rtems/bsd/local/linker_if.h
diff --git a/freebsd/local/miibus_if.h b/rtemsbsd/include/rtems/bsd/local/miibus_if.h
similarity index 100%
rename from freebsd/local/miibus_if.h
rename to rtemsbsd/include/rtems/bsd/local/miibus_if.h
diff --git a/freebsd/local/miidevs.h b/rtemsbsd/include/rtems/bsd/local/miidevs.h
similarity index 100%
rename from freebsd/local/miidevs.h
rename to rtemsbsd/include/rtems/bsd/local/miidevs.h
diff --git a/freebsd/local/opt_altq.h b/rtemsbsd/include/rtems/bsd/local/opt_altq.h
similarity index 100%
rename from freebsd/local/opt_altq.h
rename to rtemsbsd/include/rtems/bsd/local/opt_altq.h
diff --git a/freebsd/local/opt_atalk.h b/rtemsbsd/include/rtems/bsd/local/opt_atalk.h
similarity index 100%
rename from freebsd/local/opt_atalk.h
rename to rtemsbsd/include/rtems/bsd/local/opt_atalk.h
diff --git a/freebsd/local/opt_bce.h b/rtemsbsd/include/rtems/bsd/local/opt_bce.h
similarity index 100%
rename from freebsd/local/opt_bce.h
rename to rtemsbsd/include/rtems/bsd/local/opt_bce.h
diff --git a/freebsd/local/opt_bootp.h b/rtemsbsd/include/rtems/bsd/local/opt_bootp.h
similarity index 100%
rename from freebsd/local/opt_bootp.h
rename to rtemsbsd/include/rtems/bsd/local/opt_bootp.h
diff --git a/freebsd/local/opt_bpf.h b/rtemsbsd/include/rtems/bsd/local/opt_bpf.h
similarity index 100%
rename from freebsd/local/opt_bpf.h
rename to rtemsbsd/include/rtems/bsd/local/opt_bpf.h
diff --git a/freebsd/local/opt_bus.h b/rtemsbsd/include/rtems/bsd/local/opt_bus.h
similarity index 100%
rename from freebsd/local/opt_bus.h
rename to rtemsbsd/include/rtems/bsd/local/opt_bus.h
diff --git a/freebsd/local/opt_cam.h b/rtemsbsd/include/rtems/bsd/local/opt_cam.h
similarity index 100%
rename from freebsd/local/opt_cam.h
rename to rtemsbsd/include/rtems/bsd/local/opt_cam.h
diff --git a/freebsd/local/opt_carp.h b/rtemsbsd/include/rtems/bsd/local/opt_carp.h
similarity index 100%
rename from freebsd/local/opt_carp.h
rename to rtemsbsd/include/rtems/bsd/local/opt_carp.h
diff --git a/freebsd/local/opt_compat.h b/rtemsbsd/include/rtems/bsd/local/opt_compat.h
similarity index 100%
rename from freebsd/local/opt_compat.h
rename to rtemsbsd/include/rtems/bsd/local/opt_compat.h
diff --git a/freebsd/local/opt_config.h b/rtemsbsd/include/rtems/bsd/local/opt_config.h
similarity index 100%
rename from freebsd/local/opt_config.h
rename to rtemsbsd/include/rtems/bsd/local/opt_config.h
diff --git a/freebsd/local/opt_cpu.h b/rtemsbsd/include/rtems/bsd/local/opt_cpu.h
similarity index 100%
rename from freebsd/local/opt_cpu.h
rename to rtemsbsd/include/rtems/bsd/local/opt_cpu.h
diff --git a/freebsd/local/opt_ddb.h b/rtemsbsd/include/rtems/bsd/local/opt_ddb.h
similarity index 100%
rename from freebsd/local/opt_ddb.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ddb.h
diff --git a/freebsd/local/opt_device_polling.h b/rtemsbsd/include/rtems/bsd/local/opt_device_polling.h
similarity index 100%
rename from freebsd/local/opt_device_polling.h
rename to rtemsbsd/include/rtems/bsd/local/opt_device_polling.h
diff --git a/freebsd/local/opt_ef.h b/rtemsbsd/include/rtems/bsd/local/opt_ef.h
similarity index 100%
rename from freebsd/local/opt_ef.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ef.h
diff --git a/freebsd/local/opt_enc.h b/rtemsbsd/include/rtems/bsd/local/opt_enc.h
similarity index 100%
rename from freebsd/local/opt_enc.h
rename to rtemsbsd/include/rtems/bsd/local/opt_enc.h
diff --git a/freebsd/local/opt_hwpmc_hooks.h b/rtemsbsd/include/rtems/bsd/local/opt_hwpmc_hooks.h
similarity index 100%
rename from freebsd/local/opt_hwpmc_hooks.h
rename to rtemsbsd/include/rtems/bsd/local/opt_hwpmc_hooks.h
diff --git a/freebsd/local/opt_inet.h b/rtemsbsd/include/rtems/bsd/local/opt_inet.h
similarity index 100%
rename from freebsd/local/opt_inet.h
rename to rtemsbsd/include/rtems/bsd/local/opt_inet.h
diff --git a/freebsd/local/opt_inet6.h b/rtemsbsd/include/rtems/bsd/local/opt_inet6.h
similarity index 100%
rename from freebsd/local/opt_inet6.h
rename to rtemsbsd/include/rtems/bsd/local/opt_inet6.h
diff --git a/freebsd/local/opt_init_path.h b/rtemsbsd/include/rtems/bsd/local/opt_init_path.h
similarity index 100%
rename from freebsd/local/opt_init_path.h
rename to rtemsbsd/include/rtems/bsd/local/opt_init_path.h
diff --git a/freebsd/local/opt_ipdivert.h b/rtemsbsd/include/rtems/bsd/local/opt_ipdivert.h
similarity index 100%
rename from freebsd/local/opt_ipdivert.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ipdivert.h
diff --git a/freebsd/local/opt_ipdn.h b/rtemsbsd/include/rtems/bsd/local/opt_ipdn.h
similarity index 100%
rename from freebsd/local/opt_ipdn.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ipdn.h
diff --git a/freebsd/local/opt_ipfw.h b/rtemsbsd/include/rtems/bsd/local/opt_ipfw.h
similarity index 100%
rename from freebsd/local/opt_ipfw.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ipfw.h
diff --git a/freebsd/local/opt_ipsec.h b/rtemsbsd/include/rtems/bsd/local/opt_ipsec.h
similarity index 100%
rename from freebsd/local/opt_ipsec.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ipsec.h
diff --git a/freebsd/local/opt_ipstealth.h b/rtemsbsd/include/rtems/bsd/local/opt_ipstealth.h
similarity index 100%
rename from freebsd/local/opt_ipstealth.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ipstealth.h
diff --git a/freebsd/local/opt_ipx.h b/rtemsbsd/include/rtems/bsd/local/opt_ipx.h
similarity index 100%
rename from freebsd/local/opt_ipx.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ipx.h
diff --git a/freebsd/local/opt_kdb.h b/rtemsbsd/include/rtems/bsd/local/opt_kdb.h
similarity index 100%
rename from freebsd/local/opt_kdb.h
rename to rtemsbsd/include/rtems/bsd/local/opt_kdb.h
diff --git a/freebsd/local/opt_kdtrace.h b/rtemsbsd/include/rtems/bsd/local/opt_kdtrace.h
similarity index 100%
rename from freebsd/local/opt_kdtrace.h
rename to rtemsbsd/include/rtems/bsd/local/opt_kdtrace.h
diff --git a/freebsd/local/opt_ktrace.h b/rtemsbsd/include/rtems/bsd/local/opt_ktrace.h
similarity index 100%
rename from freebsd/local/opt_ktrace.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ktrace.h
diff --git a/freebsd/local/opt_mbuf_profiling.h b/rtemsbsd/include/rtems/bsd/local/opt_mbuf_profiling.h
similarity index 100%
rename from freebsd/local/opt_mbuf_profiling.h
rename to rtemsbsd/include/rtems/bsd/local/opt_mbuf_profiling.h
diff --git a/freebsd/local/opt_mbuf_stress_test.h b/rtemsbsd/include/rtems/bsd/local/opt_mbuf_stress_test.h
similarity index 100%
rename from freebsd/local/opt_mbuf_stress_test.h
rename to rtemsbsd/include/rtems/bsd/local/opt_mbuf_stress_test.h
diff --git a/freebsd/local/opt_mpath.h b/rtemsbsd/include/rtems/bsd/local/opt_mpath.h
similarity index 100%
rename from freebsd/local/opt_mpath.h
rename to rtemsbsd/include/rtems/bsd/local/opt_mpath.h
diff --git a/freebsd/local/opt_mrouting.h b/rtemsbsd/include/rtems/bsd/local/opt_mrouting.h
similarity index 100%
rename from freebsd/local/opt_mrouting.h
rename to rtemsbsd/include/rtems/bsd/local/opt_mrouting.h
diff --git a/freebsd/local/opt_natm.h b/rtemsbsd/include/rtems/bsd/local/opt_natm.h
similarity index 100%
rename from freebsd/local/opt_natm.h
rename to rtemsbsd/include/rtems/bsd/local/opt_natm.h
diff --git a/freebsd/local/opt_netgraph.h b/rtemsbsd/include/rtems/bsd/local/opt_netgraph.h
similarity index 100%
rename from freebsd/local/opt_netgraph.h
rename to rtemsbsd/include/rtems/bsd/local/opt_netgraph.h
diff --git a/freebsd/local/opt_ntp.h b/rtemsbsd/include/rtems/bsd/local/opt_ntp.h
similarity index 100%
rename from freebsd/local/opt_ntp.h
rename to rtemsbsd/include/rtems/bsd/local/opt_ntp.h
diff --git a/freebsd/local/opt_param.h b/rtemsbsd/include/rtems/bsd/local/opt_param.h
similarity index 100%
rename from freebsd/local/opt_param.h
rename to rtemsbsd/include/rtems/bsd/local/opt_param.h
diff --git a/freebsd/local/opt_pf.h b/rtemsbsd/include/rtems/bsd/local/opt_pf.h
similarity index 100%
rename from freebsd/local/opt_pf.h
rename to rtemsbsd/include/rtems/bsd/local/opt_pf.h
diff --git a/freebsd/local/opt_posix.h b/rtemsbsd/include/rtems/bsd/local/opt_posix.h
similarity index 100%
rename from freebsd/local/opt_posix.h
rename to rtemsbsd/include/rtems/bsd/local/opt_posix.h
diff --git a/freebsd/local/opt_printf.h b/rtemsbsd/include/rtems/bsd/local/opt_printf.h
similarity index 100%
rename from freebsd/local/opt_printf.h
rename to rtemsbsd/include/rtems/bsd/local/opt_printf.h
diff --git a/freebsd/local/opt_route.h b/rtemsbsd/include/rtems/bsd/local/opt_route.h
similarity index 100%
rename from freebsd/local/opt_route.h
rename to rtemsbsd/include/rtems/bsd/local/opt_route.h
diff --git a/freebsd/local/opt_scsi.h b/rtemsbsd/include/rtems/bsd/local/opt_scsi.h
similarity index 100%
rename from freebsd/local/opt_scsi.h
rename to rtemsbsd/include/rtems/bsd/local/opt_scsi.h
diff --git a/freebsd/local/opt_sctp.h b/rtemsbsd/include/rtems/bsd/local/opt_sctp.h
similarity index 100%
rename from freebsd/local/opt_sctp.h
rename to rtemsbsd/include/rtems/bsd/local/opt_sctp.h
diff --git a/freebsd/local/opt_tcpdebug.h b/rtemsbsd/include/rtems/bsd/local/opt_tcpdebug.h
similarity index 100%
rename from freebsd/local/opt_tcpdebug.h
rename to rtemsbsd/include/rtems/bsd/local/opt_tcpdebug.h
diff --git a/freebsd/local/opt_tdma.h b/rtemsbsd/include/rtems/bsd/local/opt_tdma.h
similarity index 100%
rename from freebsd/local/opt_tdma.h
rename to rtemsbsd/include/rtems/bsd/local/opt_tdma.h
diff --git a/freebsd/local/opt_usb.h b/rtemsbsd/include/rtems/bsd/local/opt_usb.h
similarity index 100%
rename from freebsd/local/opt_usb.h
rename to rtemsbsd/include/rtems/bsd/local/opt_usb.h
diff --git a/freebsd/local/opt_vlan.h b/rtemsbsd/include/rtems/bsd/local/opt_vlan.h
similarity index 100%
rename from freebsd/local/opt_vlan.h
rename to rtemsbsd/include/rtems/bsd/local/opt_vlan.h
diff --git a/freebsd/local/opt_wlan.h b/rtemsbsd/include/rtems/bsd/local/opt_wlan.h
similarity index 100%
rename from freebsd/local/opt_wlan.h
rename to rtemsbsd/include/rtems/bsd/local/opt_wlan.h
diff --git a/freebsd/local/opt_zero.h b/rtemsbsd/include/rtems/bsd/local/opt_zero.h
similarity index 100%
rename from freebsd/local/opt_zero.h
rename to rtemsbsd/include/rtems/bsd/local/opt_zero.h
diff --git a/freebsd/local/pci_if.h b/rtemsbsd/include/rtems/bsd/local/pci_if.h
similarity index 100%
rename from freebsd/local/pci_if.h
rename to rtemsbsd/include/rtems/bsd/local/pci_if.h
diff --git a/freebsd/local/pcib_if.h b/rtemsbsd/include/rtems/bsd/local/pcib_if.h
similarity index 100%
rename from freebsd/local/pcib_if.h
rename to rtemsbsd/include/rtems/bsd/local/pcib_if.h
diff --git a/freebsd/local/usb_if.h b/rtemsbsd/include/rtems/bsd/local/usb_if.h
similarity index 100%
rename from freebsd/local/usb_if.h
rename to rtemsbsd/include/rtems/bsd/local/usb_if.h
diff --git a/freebsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
similarity index 100%
rename from freebsd/local/usbdevs.h
rename to rtemsbsd/include/rtems/bsd/local/usbdevs.h
diff --git a/freebsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
similarity index 100%
rename from freebsd/local/usbdevs_data.h
rename to rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
diff --git a/freebsd/local/vnode_if.h b/rtemsbsd/include/rtems/bsd/local/vnode_if.h
similarity index 100%
rename from freebsd/local/vnode_if.h
rename to rtemsbsd/include/rtems/bsd/local/vnode_if.h
diff --git a/freebsd/local/vnode_if_newproto.h b/rtemsbsd/include/rtems/bsd/local/vnode_if_newproto.h
similarity index 100%
rename from freebsd/local/vnode_if_newproto.h
rename to rtemsbsd/include/rtems/bsd/local/vnode_if_newproto.h
diff --git a/freebsd/local/vnode_if_typedef.h b/rtemsbsd/include/rtems/bsd/local/vnode_if_typedef.h
similarity index 100%
rename from freebsd/local/vnode_if_typedef.h
rename to rtemsbsd/include/rtems/bsd/local/vnode_if_typedef.h
diff --git a/freebsd/sys/_types.h b/rtemsbsd/include/rtems/bsd/sys/_types.h
similarity index 100%
rename from freebsd/sys/_types.h
rename to rtemsbsd/include/rtems/bsd/sys/_types.h
diff --git a/freebsd/sys/errno.h b/rtemsbsd/include/rtems/bsd/sys/errno.h
similarity index 100%
rename from freebsd/sys/errno.h
rename to rtemsbsd/include/rtems/bsd/sys/errno.h
diff --git a/freebsd/sys/lock.h b/rtemsbsd/include/rtems/bsd/sys/lock.h
similarity index 100%
rename from freebsd/sys/lock.h
rename to rtemsbsd/include/rtems/bsd/sys/lock.h
diff --git a/freebsd/sys/param.h b/rtemsbsd/include/rtems/bsd/sys/param.h
similarity index 100%
rename from freebsd/sys/param.h
rename to rtemsbsd/include/rtems/bsd/sys/param.h
diff --git a/freebsd/sys/resource.h b/rtemsbsd/include/rtems/bsd/sys/resource.h
similarity index 100%
rename from freebsd/sys/resource.h
rename to rtemsbsd/include/rtems/bsd/sys/resource.h
diff --git a/freebsd/sys/time.h b/rtemsbsd/include/rtems/bsd/sys/time.h
similarity index 100%
rename from freebsd/sys/time.h
rename to rtemsbsd/include/rtems/bsd/sys/time.h
diff --git a/rtemsbsd/freebsd/sys/timespec.h b/rtemsbsd/include/rtems/bsd/sys/timespec.h
similarity index 100%
rename from rtemsbsd/freebsd/sys/timespec.h
rename to rtemsbsd/include/rtems/bsd/sys/timespec.h
diff --git a/freebsd/sys/types.h b/rtemsbsd/include/rtems/bsd/sys/types.h
similarity index 100%
rename from freebsd/sys/types.h
rename to rtemsbsd/include/rtems/bsd/sys/types.h
diff --git a/freebsd/sys/unistd.h b/rtemsbsd/include/rtems/bsd/sys/unistd.h
similarity index 100%
rename from freebsd/sys/unistd.h
rename to rtemsbsd/include/rtems/bsd/sys/unistd.h
diff --git a/freebsd-userspace/rtems/include/rtems/netcmds-config.h b/rtemsbsd/include/rtems/netcmds-config.h
similarity index 100%
rename from freebsd-userspace/rtems/include/rtems/netcmds-config.h
rename to rtemsbsd/include/rtems/netcmds-config.h
diff --git a/freebsd-userspace/rtems/include/rtems/rtems_bsdnet.h b/rtemsbsd/include/rtems/rtems_bsdnet.h
similarity index 100%
rename from freebsd-userspace/rtems/include/rtems/rtems_bsdnet.h
rename to rtemsbsd/include/rtems/rtems_bsdnet.h
diff --git a/freebsd/security/audit/audit.h b/rtemsbsd/include/security/audit/audit.h
similarity index 100%
rename from freebsd/security/audit/audit.h
rename to rtemsbsd/include/security/audit/audit.h
diff --git a/freebsd-userspace/local/sys/_pthreadtypes.h b/rtemsbsd/include/sys/_pthreadtypes.h
similarity index 100%
rename from freebsd-userspace/local/sys/_pthreadtypes.h
rename to rtemsbsd/include/sys/_pthreadtypes.h
diff --git a/freebsd/sys/bio.h b/rtemsbsd/include/sys/bio.h
similarity index 100%
rename from freebsd/sys/bio.h
rename to rtemsbsd/include/sys/bio.h
diff --git a/freebsd/sys/copyright.h b/rtemsbsd/include/sys/copyright.h
similarity index 100%
rename from freebsd/sys/copyright.h
rename to rtemsbsd/include/sys/copyright.h
diff --git a/freebsd/sys/cpuset.h b/rtemsbsd/include/sys/cpuset.h
similarity index 100%
rename from freebsd/sys/cpuset.h
rename to rtemsbsd/include/sys/cpuset.h
diff --git a/freebsd/sys/exec.h b/rtemsbsd/include/sys/exec.h
similarity index 100%
rename from freebsd/sys/exec.h
rename to rtemsbsd/include/sys/exec.h
diff --git a/freebsd/sys/fail.h b/rtemsbsd/include/sys/fail.h
similarity index 100%
rename from freebsd/sys/fail.h
rename to rtemsbsd/include/sys/fail.h
diff --git a/freebsd/sys/namei.h b/rtemsbsd/include/sys/namei.h
similarity index 100%
rename from freebsd/sys/namei.h
rename to rtemsbsd/include/sys/namei.h
diff --git a/rtemsbsd/freebsd/sys/signalvar.h b/rtemsbsd/include/sys/signalvar.h
similarity index 100%
rename from rtemsbsd/freebsd/sys/signalvar.h
rename to rtemsbsd/include/sys/signalvar.h
diff --git a/freebsd/sys/sleepqueue.h b/rtemsbsd/include/sys/sleepqueue.h
similarity index 100%
rename from freebsd/sys/sleepqueue.h
rename to rtemsbsd/include/sys/sleepqueue.h
diff --git a/freebsd/sys/syscallsubr.h b/rtemsbsd/include/sys/syscallsubr.h
similarity index 100%
rename from freebsd/sys/syscallsubr.h
rename to rtemsbsd/include/sys/syscallsubr.h
diff --git a/freebsd/sys/sysent.h b/rtemsbsd/include/sys/sysent.h
similarity index 100%
rename from freebsd/sys/sysent.h
rename to rtemsbsd/include/sys/sysent.h
diff --git a/freebsd/sys/sysproto.h b/rtemsbsd/include/sys/sysproto.h
similarity index 100%
rename from freebsd/sys/sysproto.h
rename to rtemsbsd/include/sys/sysproto.h
diff --git a/freebsd/sys/ucontext.h b/rtemsbsd/include/sys/ucontext.h
similarity index 100%
rename from freebsd/sys/ucontext.h
rename to rtemsbsd/include/sys/ucontext.h
diff --git a/freebsd/sys/vnode.h b/rtemsbsd/include/sys/vnode.h
similarity index 100%
rename from freebsd/sys/vnode.h
rename to rtemsbsd/include/sys/vnode.h
diff --git a/freebsd-userspace/local/syslog.h b/rtemsbsd/include/syslog.h
similarity index 100%
rename from freebsd-userspace/local/syslog.h
rename to rtemsbsd/include/syslog.h
diff --git a/freebsd/vm/pmap.h b/rtemsbsd/include/vm/pmap.h
similarity index 100%
rename from freebsd/vm/pmap.h
rename to rtemsbsd/include/vm/pmap.h
diff --git a/freebsd/vm/vm_map.h b/rtemsbsd/include/vm/vm_map.h
similarity index 100%
rename from freebsd/vm/vm_map.h
rename to rtemsbsd/include/vm/vm_map.h
diff --git a/freebsd/vm/vm_param.h b/rtemsbsd/include/vm/vm_param.h
similarity index 100%
rename from freebsd/vm/vm_param.h
rename to rtemsbsd/include/vm/vm_param.h
diff --git a/freebsd/local/bus_if.c b/rtemsbsd/local/bus_if.c
similarity index 100%
rename from freebsd/local/bus_if.c
rename to rtemsbsd/local/bus_if.c
diff --git a/freebsd/local/cryptodev_if.c b/rtemsbsd/local/cryptodev_if.c
similarity index 100%
rename from freebsd/local/cryptodev_if.c
rename to rtemsbsd/local/cryptodev_if.c
diff --git a/freebsd/local/device_if.c b/rtemsbsd/local/device_if.c
similarity index 100%
rename from freebsd/local/device_if.c
rename to rtemsbsd/local/device_if.c
diff --git a/freebsd/local/miibus_if.c b/rtemsbsd/local/miibus_if.c
similarity index 100%
rename from freebsd/local/miibus_if.c
rename to rtemsbsd/local/miibus_if.c
diff --git a/freebsd/local/pci_if.c b/rtemsbsd/local/pci_if.c
similarity index 100%
rename from freebsd/local/pci_if.c
rename to rtemsbsd/local/pci_if.c
diff --git a/freebsd/local/pcib_if.c b/rtemsbsd/local/pcib_if.c
similarity index 100%
rename from freebsd/local/pcib_if.c
rename to rtemsbsd/local/pcib_if.c
diff --git a/freebsd/local/usb_if.c b/rtemsbsd/local/usb_if.c
similarity index 100%
rename from freebsd/local/usb_if.c
rename to rtemsbsd/local/usb_if.c
diff --git a/freebsd-userspace/rtems/generate_kvm_symbols b/rtemsbsd/rtems/generate_kvm_symbols
similarity index 100%
rename from freebsd-userspace/rtems/generate_kvm_symbols
rename to rtemsbsd/rtems/generate_kvm_symbols
diff --git a/freebsd-userspace/rtems/ipsec_get_policylen.c b/rtemsbsd/rtems/ipsec_get_policylen.c
similarity index 100%
rename from freebsd-userspace/rtems/ipsec_get_policylen.c
rename to rtemsbsd/rtems/ipsec_get_policylen.c
diff --git a/freebsd-userspace/rtems/kvm_private.h b/rtemsbsd/rtems/kvm_private.h
similarity index 100%
rename from freebsd-userspace/rtems/kvm_private.h
rename to rtemsbsd/rtems/kvm_private.h
diff --git a/rtemsbsd/src/rtems-bsd-assert.c b/rtemsbsd/rtems/rtems-bsd-assert.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-assert.c
rename to rtemsbsd/rtems/rtems-bsd-assert.c
diff --git a/rtemsbsd/src/rtems-bsd-autoconf.c b/rtemsbsd/rtems/rtems-bsd-autoconf.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-autoconf.c
rename to rtemsbsd/rtems/rtems-bsd-autoconf.c
diff --git a/rtemsbsd/src/rtems-bsd-bus-dma-mbuf.c b/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-bus-dma-mbuf.c
rename to rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
diff --git a/rtemsbsd/src/rtems-bsd-bus-dma.c b/rtemsbsd/rtems/rtems-bsd-bus-dma.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-bus-dma.c
rename to rtemsbsd/rtems/rtems-bsd-bus-dma.c
diff --git a/rtemsbsd/src/rtems-bsd-cam.c b/rtemsbsd/rtems/rtems-bsd-cam.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-cam.c
rename to rtemsbsd/rtems/rtems-bsd-cam.c
diff --git a/rtemsbsd/src/rtems-bsd-condvar.c b/rtemsbsd/rtems/rtems-bsd-condvar.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-condvar.c
rename to rtemsbsd/rtems/rtems-bsd-condvar.c
diff --git a/rtemsbsd/src/rtems-bsd-conf.c b/rtemsbsd/rtems/rtems-bsd-conf.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-conf.c
rename to rtemsbsd/rtems/rtems-bsd-conf.c
diff --git a/rtemsbsd/src/rtems-bsd-copyinout.c b/rtemsbsd/rtems/rtems-bsd-copyinout.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-copyinout.c
rename to rtemsbsd/rtems/rtems-bsd-copyinout.c
diff --git a/rtemsbsd/src/rtems-bsd-delay.c b/rtemsbsd/rtems/rtems-bsd-delay.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-delay.c
rename to rtemsbsd/rtems/rtems-bsd-delay.c
diff --git a/rtemsbsd/src/rtems-bsd-descrip.c b/rtemsbsd/rtems/rtems-bsd-descrip.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-descrip.c
rename to rtemsbsd/rtems/rtems-bsd-descrip.c
diff --git a/rtemsbsd/src/rtems-bsd-generic.c b/rtemsbsd/rtems/rtems-bsd-generic.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-generic.c
rename to rtemsbsd/rtems/rtems-bsd-generic.c
diff --git a/rtemsbsd/src/rtems-bsd-init-with-irq.c b/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-init-with-irq.c
rename to rtemsbsd/rtems/rtems-bsd-init-with-irq.c
diff --git a/rtemsbsd/src/rtems-bsd-init.c b/rtemsbsd/rtems/rtems-bsd-init.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-init.c
rename to rtemsbsd/rtems/rtems-bsd-init.c
diff --git a/rtemsbsd/src/rtems-bsd-jail.c b/rtemsbsd/rtems/rtems-bsd-jail.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-jail.c
rename to rtemsbsd/rtems/rtems-bsd-jail.c
diff --git a/rtemsbsd/src/rtems-bsd-lock.c b/rtemsbsd/rtems/rtems-bsd-lock.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-lock.c
rename to rtemsbsd/rtems/rtems-bsd-lock.c
diff --git a/rtemsbsd/src/rtems-bsd-log.c b/rtemsbsd/rtems/rtems-bsd-log.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-log.c
rename to rtemsbsd/rtems/rtems-bsd-log.c
diff --git a/rtemsbsd/src/rtems-bsd-malloc.c b/rtemsbsd/rtems/rtems-bsd-malloc.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-malloc.c
rename to rtemsbsd/rtems/rtems-bsd-malloc.c
diff --git a/rtemsbsd/src/rtems-bsd-mutex.c b/rtemsbsd/rtems/rtems-bsd-mutex.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-mutex.c
rename to rtemsbsd/rtems/rtems-bsd-mutex.c
diff --git a/rtemsbsd/src/rtems-bsd-newproc.c b/rtemsbsd/rtems/rtems-bsd-newproc.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-newproc.c
rename to rtemsbsd/rtems/rtems-bsd-newproc.c
diff --git a/rtemsbsd/src/rtems-bsd-nexus.c b/rtemsbsd/rtems/rtems-bsd-nexus.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-nexus.c
rename to rtemsbsd/rtems/rtems-bsd-nexus.c
diff --git a/rtemsbsd/src/rtems-bsd-page.c b/rtemsbsd/rtems/rtems-bsd-page.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-page.c
rename to rtemsbsd/rtems/rtems-bsd-page.c
diff --git a/rtemsbsd/src/rtems-bsd-panic.c b/rtemsbsd/rtems/rtems-bsd-panic.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-panic.c
rename to rtemsbsd/rtems/rtems-bsd-panic.c
diff --git a/rtemsbsd/src/rtems-bsd-pci_cfgreg.c b/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-pci_cfgreg.c
rename to rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
diff --git a/rtemsbsd/src/rtems-bsd-rwlock.c b/rtemsbsd/rtems/rtems-bsd-rwlock.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-rwlock.c
rename to rtemsbsd/rtems/rtems-bsd-rwlock.c
diff --git a/rtemsbsd/src/rtems-bsd-shell.c b/rtemsbsd/rtems/rtems-bsd-shell.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-shell.c
rename to rtemsbsd/rtems/rtems-bsd-shell.c
diff --git a/rtemsbsd/src/rtems-bsd-signal.c b/rtemsbsd/rtems/rtems-bsd-signal.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-signal.c
rename to rtemsbsd/rtems/rtems-bsd-signal.c
diff --git a/rtemsbsd/src/rtems-bsd-smp.c b/rtemsbsd/rtems/rtems-bsd-smp.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-smp.c
rename to rtemsbsd/rtems/rtems-bsd-smp.c
diff --git a/rtemsbsd/src/rtems-bsd-subr_param.c b/rtemsbsd/rtems/rtems-bsd-subr_param.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-subr_param.c
rename to rtemsbsd/rtems/rtems-bsd-subr_param.c
diff --git a/rtemsbsd/src/rtems-bsd-support.c b/rtemsbsd/rtems/rtems-bsd-support.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-support.c
rename to rtemsbsd/rtems/rtems-bsd-support.c
diff --git a/rtemsbsd/src/rtems-bsd-sx.c b/rtemsbsd/rtems/rtems-bsd-sx.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-sx.c
rename to rtemsbsd/rtems/rtems-bsd-sx.c
diff --git a/rtemsbsd/src/rtems-bsd-synch.c b/rtemsbsd/rtems/rtems-bsd-synch.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-synch.c
rename to rtemsbsd/rtems/rtems-bsd-synch.c
diff --git a/rtemsbsd/src/rtems-bsd-syscalls.c b/rtemsbsd/rtems/rtems-bsd-syscalls.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-syscalls.c
rename to rtemsbsd/rtems/rtems-bsd-syscalls.c
diff --git a/rtemsbsd/src/rtems-bsd-sysctl.c b/rtemsbsd/rtems/rtems-bsd-sysctl.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-sysctl.c
rename to rtemsbsd/rtems/rtems-bsd-sysctl.c
diff --git a/rtemsbsd/src/rtems-bsd-sysctlbyname.c b/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-sysctlbyname.c
rename to rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
diff --git a/rtemsbsd/src/rtems-bsd-sysctlnametomib.c b/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-sysctlnametomib.c
rename to rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
diff --git a/rtemsbsd/src/rtems-bsd-taskqueue.c b/rtemsbsd/rtems/rtems-bsd-taskqueue.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-taskqueue.c
rename to rtemsbsd/rtems/rtems-bsd-taskqueue.c
diff --git a/rtemsbsd/src/rtems-bsd-thread.c b/rtemsbsd/rtems/rtems-bsd-thread.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-thread.c
rename to rtemsbsd/rtems/rtems-bsd-thread.c
diff --git a/rtemsbsd/src/rtems-bsd-thread0-ucred.c b/rtemsbsd/rtems/rtems-bsd-thread0-ucred.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-thread0-ucred.c
rename to rtemsbsd/rtems/rtems-bsd-thread0-ucred.c
diff --git a/rtemsbsd/src/rtems-bsd-timesupport.c b/rtemsbsd/rtems/rtems-bsd-timesupport.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-timesupport.c
rename to rtemsbsd/rtems/rtems-bsd-timesupport.c
diff --git a/rtemsbsd/src/rtems-bsd-vm_glue.c b/rtemsbsd/rtems/rtems-bsd-vm_glue.c
similarity index 100%
rename from rtemsbsd/src/rtems-bsd-vm_glue.c
rename to rtemsbsd/rtems/rtems-bsd-vm_glue.c
diff --git a/freebsd-userspace/rtems/rtems-getprogname.c b/rtemsbsd/rtems/rtems-getprogname.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-getprogname.c
rename to rtemsbsd/rtems/rtems-getprogname.c
diff --git a/freebsd-userspace/rtems/rtems-kvm.c b/rtemsbsd/rtems/rtems-kvm.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-kvm.c
rename to rtemsbsd/rtems/rtems-kvm.c
diff --git a/freebsd-userspace/rtems/rtems-net-setup.c b/rtemsbsd/rtems/rtems-net-setup.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-net-setup.c
rename to rtemsbsd/rtems/rtems-net-setup.c
diff --git a/freebsd-userspace/rtems/rtems-shell.c b/rtemsbsd/rtems/rtems-shell.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-shell.c
rename to rtemsbsd/rtems/rtems-shell.c
diff --git a/freebsd-userspace/rtems/rtems-syslog-initialize.c b/rtemsbsd/rtems/rtems-syslog-initialize.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-syslog-initialize.c
rename to rtemsbsd/rtems/rtems-syslog-initialize.c
diff --git a/freebsd-userspace/rtems/rtems-syspoll.c b/rtemsbsd/rtems/rtems-syspoll.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-syspoll.c
rename to rtemsbsd/rtems/rtems-syspoll.c
diff --git a/freebsd-userspace/rtems/rtems-uthread_kevent.c b/rtemsbsd/rtems/rtems-uthread_kevent.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-uthread_kevent.c
rename to rtemsbsd/rtems/rtems-uthread_kevent.c
diff --git a/freebsd-userspace/rtems/rtems-uthread_kqueue.c b/rtemsbsd/rtems/rtems-uthread_kqueue.c
similarity index 100%
rename from freebsd-userspace/rtems/rtems-uthread_kqueue.c
rename to rtemsbsd/rtems/rtems-uthread_kqueue.c
diff --git a/freebsd-userspace/rtems/syslog.c b/rtemsbsd/rtems/syslog.c
similarity index 100%
rename from freebsd-userspace/rtems/syslog.c
rename to rtemsbsd/rtems/syslog.c
diff --git a/rtemsbsd/dev/usb/controller/ehci_mpc83xx.c b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
similarity index 100%
rename from rtemsbsd/dev/usb/controller/ehci_mpc83xx.c
rename to rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
diff --git a/rtemsbsd/dev/usb/controller/ohci_lpc24xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
similarity index 100%
rename from rtemsbsd/dev/usb/controller/ohci_lpc24xx.c
rename to rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
diff --git a/rtemsbsd/dev/usb/controller/ohci_lpc32xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
similarity index 100%
rename from rtemsbsd/dev/usb/controller/ohci_lpc32xx.c
rename to rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
diff --git a/testsuite/init01/nic-sysinit.h b/testsuite/include/rtems/bsd/test/nic-sysinit.h
similarity index 100%
rename from testsuite/init01/nic-sysinit.h
rename to testsuite/include/rtems/bsd/test/nic-sysinit.h




More information about the vc mailing list