diff --git a/sys/contrib/dev/ath/COPYRIGHT b/COPYRIGHT
similarity index 100%
rename from sys/contrib/dev/ath/COPYRIGHT
rename to COPYRIGHT
diff --git a/sys/contrib/dev/ath/README b/README
similarity index 100%
rename from sys/contrib/dev/ath/README
rename to README
diff --git a/sys/contrib/dev/ath/ah.h b/ah.h
similarity index 100%
rename from sys/contrib/dev/ath/ah.h
rename to ah.h
diff --git a/sys/contrib/dev/ath/ah_desc.h b/ah_desc.h
similarity index 100%
rename from sys/contrib/dev/ath/ah_desc.h
rename to ah_desc.h
diff --git a/sys/contrib/dev/ath/ah_devid.h b/ah_devid.h
similarity index 100%
rename from sys/contrib/dev/ath/ah_devid.h
rename to ah_devid.h
diff --git a/sys/contrib/dev/ath/ah_soc.h b/ah_soc.h
similarity index 100%
rename from sys/contrib/dev/ath/ah_soc.h
rename to ah_soc.h
diff --git a/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu b/freebsd/i386-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu
rename to freebsd/i386-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/freebsd/opt_ah.h b/freebsd/opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/freebsd/opt_ah.h
rename to freebsd/opt_ah.h
diff --git a/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu b/public/alpha-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/alpha-elf.hal.o.uu
rename to public/alpha-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/alpha-elf.inc b/public/alpha-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/alpha-elf.inc
rename to public/alpha-elf.inc
diff --git a/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h b/public/alpha-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/alpha-elf.opt_ah.h
rename to public/alpha-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/ap30.hal.o.uu b/public/ap30.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/ap30.hal.o.uu
rename to public/ap30.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/ap30.inc b/public/ap30.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/ap30.inc
rename to public/ap30.inc
diff --git a/sys/contrib/dev/ath/public/ap30.opt_ah.h b/public/ap30.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/ap30.opt_ah.h
rename to public/ap30.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/ap43.hal.o.uu b/public/ap43.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/ap43.hal.o.uu
rename to public/ap43.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/ap43.inc b/public/ap43.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/ap43.inc
rename to public/ap43.inc
diff --git a/sys/contrib/dev/ath/public/ap43.opt_ah.h b/public/ap43.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/ap43.opt_ah.h
rename to public/ap43.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/ap51.hal.o.uu b/public/ap51.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/ap51.hal.o.uu
rename to public/ap51.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/ap51.inc b/public/ap51.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/ap51.inc
rename to public/ap51.inc
diff --git a/sys/contrib/dev/ath/public/ap51.opt_ah.h b/public/ap51.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/ap51.opt_ah.h
rename to public/ap51.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/ap61.hal.o.uu b/public/ap61.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/ap61.hal.o.uu
rename to public/ap61.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/ap61.inc b/public/ap61.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/ap61.inc
rename to public/ap61.inc
diff --git a/sys/contrib/dev/ath/public/ap61.opt_ah.h b/public/ap61.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/ap61.opt_ah.h
rename to public/ap61.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu b/public/arm9-le-thumb-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu
rename to public/arm9-le-thumb-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc b/public/arm9-le-thumb-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc
rename to public/arm9-le-thumb-elf.inc
diff --git a/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h b/public/arm9-le-thumb-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h
rename to public/arm9-le-thumb-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu b/public/armv4-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu
rename to public/armv4-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/armv4-be-elf.inc b/public/armv4-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/armv4-be-elf.inc
rename to public/armv4-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h b/public/armv4-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h
rename to public/armv4-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu b/public/armv4-le-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu
rename to public/armv4-le-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/armv4-le-elf.inc b/public/armv4-le-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/armv4-le-elf.inc
rename to public/armv4-le-elf.inc
diff --git a/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h b/public/armv4-le-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h
rename to public/armv4-le-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/i386-elf.hal.o.uu b/public/i386-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/i386-elf.hal.o.uu
rename to public/i386-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/i386-elf.inc b/public/i386-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/i386-elf.inc
rename to public/i386-elf.inc
diff --git a/sys/contrib/dev/ath/public/i386-elf.opt_ah.h b/public/i386-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/i386-elf.opt_ah.h
rename to public/i386-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu b/public/mips-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu
rename to public/mips-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/mips-be-elf.inc b/public/mips-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/mips-be-elf.inc
rename to public/mips-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h b/public/mips-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h
rename to public/mips-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu b/public/mips-le-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu
rename to public/mips-le-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/mips-le-elf.inc b/public/mips-le-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/mips-le-elf.inc
rename to public/mips-le-elf.inc
diff --git a/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h b/public/mips-le-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h
rename to public/mips-le-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu b/public/mips1-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu
rename to public/mips1-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/mips1-be-elf.inc b/public/mips1-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/mips1-be-elf.inc
rename to public/mips1-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h b/public/mips1-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h
rename to public/mips1-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu b/public/mips1-le-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu
rename to public/mips1-le-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/mips1-le-elf.inc b/public/mips1-le-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/mips1-le-elf.inc
rename to public/mips1-le-elf.inc
diff --git a/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h b/public/mips1-le-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h
rename to public/mips1-le-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu b/public/mipsisa32-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu
rename to public/mipsisa32-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc b/public/mipsisa32-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/mipsisa32-be-elf.inc
rename to public/mipsisa32-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h b/public/mipsisa32-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h
rename to public/mipsisa32-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu b/public/mipsisa32-le-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu
rename to public/mipsisa32-le-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc b/public/mipsisa32-le-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/mipsisa32-le-elf.inc
rename to public/mipsisa32-le-elf.inc
diff --git a/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h b/public/mipsisa32-le-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h
rename to public/mipsisa32-le-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu b/public/powerpc-be-eabi.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu
rename to public/powerpc-be-eabi.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/powerpc-be-eabi.inc b/public/powerpc-be-eabi.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-be-eabi.inc
rename to public/powerpc-be-eabi.inc
diff --git a/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h b/public/powerpc-be-eabi.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h
rename to public/powerpc-be-eabi.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu b/public/powerpc-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu
rename to public/powerpc-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/powerpc-be-elf.inc b/public/powerpc-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-be-elf.inc
rename to public/powerpc-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h b/public/powerpc-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h
rename to public/powerpc-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu b/public/powerpc-le-eabi.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu
rename to public/powerpc-le-eabi.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/powerpc-le-eabi.inc b/public/powerpc-le-eabi.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-le-eabi.inc
rename to public/powerpc-le-eabi.inc
diff --git a/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h b/public/powerpc-le-eabi.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h
rename to public/powerpc-le-eabi.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu b/public/sh4-le-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu
rename to public/sh4-le-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/sh4-le-elf.inc b/public/sh4-le-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/sh4-le-elf.inc
rename to public/sh4-le-elf.inc
diff --git a/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h b/public/sh4-le-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h
rename to public/sh4-le-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu b/public/sparc-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu
rename to public/sparc-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/sparc-be-elf.inc b/public/sparc-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/sparc-be-elf.inc
rename to public/sparc-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h b/public/sparc-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h
rename to public/sparc-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu b/public/sparc64-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu
rename to public/sparc64-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/sparc64-be-elf.inc b/public/sparc64-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/sparc64-be-elf.inc
rename to public/sparc64-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h b/public/sparc64-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h
rename to public/sparc64-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/wackelf.c b/public/wackelf.c
similarity index 100%
rename from sys/contrib/dev/ath/public/wackelf.c
rename to public/wackelf.c
diff --git a/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu b/public/x86_64-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu
rename to public/x86_64-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/x86_64-elf.inc b/public/x86_64-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/x86_64-elf.inc
rename to public/x86_64-elf.inc
diff --git a/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h b/public/x86_64-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h
rename to public/x86_64-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu b/public/xscale-be-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu
rename to public/xscale-be-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/xscale-be-elf.inc b/public/xscale-be-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/xscale-be-elf.inc
rename to public/xscale-be-elf.inc
diff --git a/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h b/public/xscale-be-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h
rename to public/xscale-be-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu b/public/xscale-le-elf.hal.o.uu
similarity index 100%
rename from sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu
rename to public/xscale-le-elf.hal.o.uu
diff --git a/sys/contrib/dev/ath/public/xscale-le-elf.inc b/public/xscale-le-elf.inc
similarity index 100%
rename from sys/contrib/dev/ath/public/xscale-le-elf.inc
rename to public/xscale-le-elf.inc
diff --git a/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h b/public/xscale-le-elf.opt_ah.h
similarity index 100%
rename from sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h
rename to public/xscale-le-elf.opt_ah.h
diff --git a/sys/contrib/dev/ath/version.h b/version.h
similarity index 100%
rename from sys/contrib/dev/ath/version.h
rename to version.h