diff --git a/sys/contrib/dev/acpica/CHANGES.txt b/CHANGES.txt
similarity index 100%
rename from sys/contrib/dev/acpica/CHANGES.txt
rename to CHANGES.txt
diff --git a/sys/contrib/dev/acpica/acapps.h b/acapps.h
similarity index 100%
rename from sys/contrib/dev/acpica/acapps.h
rename to acapps.h
diff --git a/sys/contrib/dev/acpica/acconfig.h b/acconfig.h
similarity index 100%
rename from sys/contrib/dev/acpica/acconfig.h
rename to acconfig.h
diff --git a/sys/contrib/dev/acpica/acdebug.h b/acdebug.h
similarity index 100%
rename from sys/contrib/dev/acpica/acdebug.h
rename to acdebug.h
diff --git a/sys/contrib/dev/acpica/acdisasm.h b/acdisasm.h
similarity index 100%
rename from sys/contrib/dev/acpica/acdisasm.h
rename to acdisasm.h
diff --git a/sys/contrib/dev/acpica/acdispat.h b/acdispat.h
similarity index 100%
rename from sys/contrib/dev/acpica/acdispat.h
rename to acdispat.h
diff --git a/sys/contrib/dev/acpica/acefi.h b/acefi.h
similarity index 100%
rename from sys/contrib/dev/acpica/acefi.h
rename to acefi.h
diff --git a/sys/contrib/dev/acpica/acenv.h b/acenv.h
similarity index 100%
rename from sys/contrib/dev/acpica/acenv.h
rename to acenv.h
diff --git a/sys/contrib/dev/acpica/acevents.h b/acevents.h
similarity index 100%
rename from sys/contrib/dev/acpica/acevents.h
rename to acevents.h
diff --git a/sys/contrib/dev/acpica/acexcep.h b/acexcep.h
similarity index 100%
rename from sys/contrib/dev/acpica/acexcep.h
rename to acexcep.h
diff --git a/sys/contrib/dev/acpica/acfreebsd.h b/acfreebsd.h
similarity index 100%
rename from sys/contrib/dev/acpica/acfreebsd.h
rename to acfreebsd.h
diff --git a/sys/contrib/dev/acpica/acgcc.h b/acgcc.h
similarity index 100%
rename from sys/contrib/dev/acpica/acgcc.h
rename to acgcc.h
diff --git a/sys/contrib/dev/acpica/acglobal.h b/acglobal.h
similarity index 100%
rename from sys/contrib/dev/acpica/acglobal.h
rename to acglobal.h
diff --git a/sys/contrib/dev/acpica/achware.h b/achware.h
similarity index 100%
rename from sys/contrib/dev/acpica/achware.h
rename to achware.h
diff --git a/sys/contrib/dev/acpica/acinterp.h b/acinterp.h
similarity index 100%
rename from sys/contrib/dev/acpica/acinterp.h
rename to acinterp.h
diff --git a/sys/contrib/dev/acpica/aclocal.h b/aclocal.h
similarity index 100%
rename from sys/contrib/dev/acpica/aclocal.h
rename to aclocal.h
diff --git a/sys/contrib/dev/acpica/acmacros.h b/acmacros.h
similarity index 100%
rename from sys/contrib/dev/acpica/acmacros.h
rename to acmacros.h
diff --git a/sys/contrib/dev/acpica/acnames.h b/acnames.h
similarity index 100%
rename from sys/contrib/dev/acpica/acnames.h
rename to acnames.h
diff --git a/sys/contrib/dev/acpica/acnamesp.h b/acnamesp.h
similarity index 100%
rename from sys/contrib/dev/acpica/acnamesp.h
rename to acnamesp.h
diff --git a/sys/contrib/dev/acpica/acobject.h b/acobject.h
similarity index 100%
rename from sys/contrib/dev/acpica/acobject.h
rename to acobject.h
diff --git a/sys/contrib/dev/acpica/acopcode.h b/acopcode.h
similarity index 100%
rename from sys/contrib/dev/acpica/acopcode.h
rename to acopcode.h
diff --git a/sys/contrib/dev/acpica/acoutput.h b/acoutput.h
similarity index 100%
rename from sys/contrib/dev/acpica/acoutput.h
rename to acoutput.h
diff --git a/sys/contrib/dev/acpica/acparser.h b/acparser.h
similarity index 100%
rename from sys/contrib/dev/acpica/acparser.h
rename to acparser.h
diff --git a/sys/contrib/dev/acpica/acpi.h b/acpi.h
similarity index 100%
rename from sys/contrib/dev/acpica/acpi.h
rename to acpi.h
diff --git a/sys/contrib/dev/acpica/acpiosxf.h b/acpiosxf.h
similarity index 100%
rename from sys/contrib/dev/acpica/acpiosxf.h
rename to acpiosxf.h
diff --git a/sys/contrib/dev/acpica/acpixf.h b/acpixf.h
similarity index 100%
rename from sys/contrib/dev/acpica/acpixf.h
rename to acpixf.h
diff --git a/sys/contrib/dev/acpica/acresrc.h b/acresrc.h
similarity index 100%
rename from sys/contrib/dev/acpica/acresrc.h
rename to acresrc.h
diff --git a/sys/contrib/dev/acpica/acstruct.h b/acstruct.h
similarity index 100%
rename from sys/contrib/dev/acpica/acstruct.h
rename to acstruct.h
diff --git a/sys/contrib/dev/acpica/actables.h b/actables.h
similarity index 100%
rename from sys/contrib/dev/acpica/actables.h
rename to actables.h
diff --git a/sys/contrib/dev/acpica/actbl.h b/actbl.h
similarity index 100%
rename from sys/contrib/dev/acpica/actbl.h
rename to actbl.h
diff --git a/sys/contrib/dev/acpica/actbl1.h b/actbl1.h
similarity index 100%
rename from sys/contrib/dev/acpica/actbl1.h
rename to actbl1.h
diff --git a/sys/contrib/dev/acpica/actbl2.h b/actbl2.h
similarity index 100%
rename from sys/contrib/dev/acpica/actbl2.h
rename to actbl2.h
diff --git a/sys/contrib/dev/acpica/actypes.h b/actypes.h
similarity index 100%
rename from sys/contrib/dev/acpica/actypes.h
rename to actypes.h
diff --git a/sys/contrib/dev/acpica/acutils.h b/acutils.h
similarity index 100%
rename from sys/contrib/dev/acpica/acutils.h
rename to acutils.h
diff --git a/sys/contrib/dev/acpica/aecommon.h b/aecommon.h
similarity index 100%
rename from sys/contrib/dev/acpica/aecommon.h
rename to aecommon.h
diff --git a/sys/contrib/dev/acpica/amlcode.h b/amlcode.h
similarity index 100%
rename from sys/contrib/dev/acpica/amlcode.h
rename to amlcode.h
diff --git a/sys/contrib/dev/acpica/amlresrc.h b/amlresrc.h
similarity index 100%
rename from sys/contrib/dev/acpica/amlresrc.h
rename to amlresrc.h
diff --git a/sys/contrib/dev/acpica/common/adfile.c b/common/adfile.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/adfile.c
rename to common/adfile.c
diff --git a/sys/contrib/dev/acpica/common/adisasm.c b/common/adisasm.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/adisasm.c
rename to common/adisasm.c
diff --git a/sys/contrib/dev/acpica/common/adwalk.c b/common/adwalk.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/adwalk.c
rename to common/adwalk.c
diff --git a/sys/contrib/dev/acpica/common/dmrestag.c b/common/dmrestag.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/dmrestag.c
rename to common/dmrestag.c
diff --git a/sys/contrib/dev/acpica/common/dmtable.c b/common/dmtable.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/dmtable.c
rename to common/dmtable.c
diff --git a/sys/contrib/dev/acpica/common/dmtbdump.c b/common/dmtbdump.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/dmtbdump.c
rename to common/dmtbdump.c
diff --git a/sys/contrib/dev/acpica/common/dmtbinfo.c b/common/dmtbinfo.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/dmtbinfo.c
rename to common/dmtbinfo.c
diff --git a/sys/contrib/dev/acpica/common/getopt.c b/common/getopt.c
similarity index 100%
rename from sys/contrib/dev/acpica/common/getopt.c
rename to common/getopt.c
diff --git a/sys/contrib/dev/acpica/compiler/aslanalyze.c b/compiler/aslanalyze.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslanalyze.c
rename to compiler/aslanalyze.c
diff --git a/sys/contrib/dev/acpica/compiler/aslcodegen.c b/compiler/aslcodegen.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslcodegen.c
rename to compiler/aslcodegen.c
diff --git a/sys/contrib/dev/acpica/compiler/aslcompile.c b/compiler/aslcompile.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslcompile.c
rename to compiler/aslcompile.c
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.h b/compiler/aslcompiler.h
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslcompiler.h
rename to compiler/aslcompiler.h
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.l b/compiler/aslcompiler.l
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslcompiler.l
rename to compiler/aslcompiler.l
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.y b/compiler/aslcompiler.y
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslcompiler.y
rename to compiler/aslcompiler.y
diff --git a/sys/contrib/dev/acpica/compiler/asldefine.h b/compiler/asldefine.h
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asldefine.h
rename to compiler/asldefine.h
diff --git a/sys/contrib/dev/acpica/compiler/aslerror.c b/compiler/aslerror.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslerror.c
rename to compiler/aslerror.c
diff --git a/sys/contrib/dev/acpica/compiler/aslfiles.c b/compiler/aslfiles.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslfiles.c
rename to compiler/aslfiles.c
diff --git a/sys/contrib/dev/acpica/compiler/aslfold.c b/compiler/aslfold.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslfold.c
rename to compiler/aslfold.c
diff --git a/sys/contrib/dev/acpica/compiler/aslglobal.h b/compiler/aslglobal.h
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslglobal.h
rename to compiler/aslglobal.h
diff --git a/sys/contrib/dev/acpica/compiler/asllength.c b/compiler/asllength.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asllength.c
rename to compiler/asllength.c
diff --git a/sys/contrib/dev/acpica/compiler/asllisting.c b/compiler/asllisting.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asllisting.c
rename to compiler/asllisting.c
diff --git a/sys/contrib/dev/acpica/compiler/aslload.c b/compiler/aslload.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslload.c
rename to compiler/aslload.c
diff --git a/sys/contrib/dev/acpica/compiler/asllookup.c b/compiler/asllookup.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asllookup.c
rename to compiler/asllookup.c
diff --git a/sys/contrib/dev/acpica/compiler/aslmain.c b/compiler/aslmain.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslmain.c
rename to compiler/aslmain.c
diff --git a/sys/contrib/dev/acpica/compiler/aslmap.c b/compiler/aslmap.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslmap.c
rename to compiler/aslmap.c
diff --git a/sys/contrib/dev/acpica/compiler/aslopcodes.c b/compiler/aslopcodes.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslopcodes.c
rename to compiler/aslopcodes.c
diff --git a/sys/contrib/dev/acpica/compiler/asloperands.c b/compiler/asloperands.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asloperands.c
rename to compiler/asloperands.c
diff --git a/sys/contrib/dev/acpica/compiler/aslopt.c b/compiler/aslopt.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslopt.c
rename to compiler/aslopt.c
diff --git a/sys/contrib/dev/acpica/compiler/aslresource.c b/compiler/aslresource.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslresource.c
rename to compiler/aslresource.c
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype1.c b/compiler/aslrestype1.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslrestype1.c
rename to compiler/aslrestype1.c
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2.c b/compiler/aslrestype2.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslrestype2.c
rename to compiler/aslrestype2.c
diff --git a/sys/contrib/dev/acpica/compiler/aslstubs.c b/compiler/aslstubs.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslstubs.c
rename to compiler/aslstubs.c
diff --git a/sys/contrib/dev/acpica/compiler/asltransform.c b/compiler/asltransform.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asltransform.c
rename to compiler/asltransform.c
diff --git a/sys/contrib/dev/acpica/compiler/asltree.c b/compiler/asltree.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asltree.c
rename to compiler/asltree.c
diff --git a/sys/contrib/dev/acpica/compiler/asltypes.h b/compiler/asltypes.h
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/asltypes.h
rename to compiler/asltypes.h
diff --git a/sys/contrib/dev/acpica/compiler/aslutils.c b/compiler/aslutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/compiler/aslutils.c
rename to compiler/aslutils.c
diff --git a/sys/contrib/dev/acpica/dbcmds.c b/dbcmds.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbcmds.c
rename to dbcmds.c
diff --git a/sys/contrib/dev/acpica/dbdisply.c b/dbdisply.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbdisply.c
rename to dbdisply.c
diff --git a/sys/contrib/dev/acpica/dbexec.c b/dbexec.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbexec.c
rename to dbexec.c
diff --git a/sys/contrib/dev/acpica/dbfileio.c b/dbfileio.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbfileio.c
rename to dbfileio.c
diff --git a/sys/contrib/dev/acpica/dbhistry.c b/dbhistry.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbhistry.c
rename to dbhistry.c
diff --git a/sys/contrib/dev/acpica/dbinput.c b/dbinput.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbinput.c
rename to dbinput.c
diff --git a/sys/contrib/dev/acpica/dbstats.c b/dbstats.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbstats.c
rename to dbstats.c
diff --git a/sys/contrib/dev/acpica/dbutils.c b/dbutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbutils.c
rename to dbutils.c
diff --git a/sys/contrib/dev/acpica/dbxface.c b/dbxface.c
similarity index 100%
rename from sys/contrib/dev/acpica/dbxface.c
rename to dbxface.c
diff --git a/sys/contrib/dev/acpica/dmbuffer.c b/dmbuffer.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmbuffer.c
rename to dmbuffer.c
diff --git a/sys/contrib/dev/acpica/dmnames.c b/dmnames.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmnames.c
rename to dmnames.c
diff --git a/sys/contrib/dev/acpica/dmobject.c b/dmobject.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmobject.c
rename to dmobject.c
diff --git a/sys/contrib/dev/acpica/dmopcode.c b/dmopcode.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmopcode.c
rename to dmopcode.c
diff --git a/sys/contrib/dev/acpica/dmresrc.c b/dmresrc.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmresrc.c
rename to dmresrc.c
diff --git a/sys/contrib/dev/acpica/dmresrcl.c b/dmresrcl.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmresrcl.c
rename to dmresrcl.c
diff --git a/sys/contrib/dev/acpica/dmresrcs.c b/dmresrcs.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmresrcs.c
rename to dmresrcs.c
diff --git a/sys/contrib/dev/acpica/dmutils.c b/dmutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmutils.c
rename to dmutils.c
diff --git a/sys/contrib/dev/acpica/dmwalk.c b/dmwalk.c
similarity index 100%
rename from sys/contrib/dev/acpica/dmwalk.c
rename to dmwalk.c
diff --git a/sys/contrib/dev/acpica/dsfield.c b/dsfield.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsfield.c
rename to dsfield.c
diff --git a/sys/contrib/dev/acpica/dsinit.c b/dsinit.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsinit.c
rename to dsinit.c
diff --git a/sys/contrib/dev/acpica/dsmethod.c b/dsmethod.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsmethod.c
rename to dsmethod.c
diff --git a/sys/contrib/dev/acpica/dsmthdat.c b/dsmthdat.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsmthdat.c
rename to dsmthdat.c
diff --git a/sys/contrib/dev/acpica/dsobject.c b/dsobject.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsobject.c
rename to dsobject.c
diff --git a/sys/contrib/dev/acpica/dsopcode.c b/dsopcode.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsopcode.c
rename to dsopcode.c
diff --git a/sys/contrib/dev/acpica/dsutils.c b/dsutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/dsutils.c
rename to dsutils.c
diff --git a/sys/contrib/dev/acpica/dswexec.c b/dswexec.c
similarity index 100%
rename from sys/contrib/dev/acpica/dswexec.c
rename to dswexec.c
diff --git a/sys/contrib/dev/acpica/dswload.c b/dswload.c
similarity index 100%
rename from sys/contrib/dev/acpica/dswload.c
rename to dswload.c
diff --git a/sys/contrib/dev/acpica/dswscope.c b/dswscope.c
similarity index 100%
rename from sys/contrib/dev/acpica/dswscope.c
rename to dswscope.c
diff --git a/sys/contrib/dev/acpica/dswstate.c b/dswstate.c
similarity index 100%
rename from sys/contrib/dev/acpica/dswstate.c
rename to dswstate.c
diff --git a/sys/contrib/dev/acpica/evevent.c b/evevent.c
similarity index 100%
rename from sys/contrib/dev/acpica/evevent.c
rename to evevent.c
diff --git a/sys/contrib/dev/acpica/evgpe.c b/evgpe.c
similarity index 100%
rename from sys/contrib/dev/acpica/evgpe.c
rename to evgpe.c
diff --git a/sys/contrib/dev/acpica/evgpeblk.c b/evgpeblk.c
similarity index 100%
rename from sys/contrib/dev/acpica/evgpeblk.c
rename to evgpeblk.c
diff --git a/sys/contrib/dev/acpica/evmisc.c b/evmisc.c
similarity index 100%
rename from sys/contrib/dev/acpica/evmisc.c
rename to evmisc.c
diff --git a/sys/contrib/dev/acpica/evregion.c b/evregion.c
similarity index 100%
rename from sys/contrib/dev/acpica/evregion.c
rename to evregion.c
diff --git a/sys/contrib/dev/acpica/evrgnini.c b/evrgnini.c
similarity index 100%
rename from sys/contrib/dev/acpica/evrgnini.c
rename to evrgnini.c
diff --git a/sys/contrib/dev/acpica/evsci.c b/evsci.c
similarity index 100%
rename from sys/contrib/dev/acpica/evsci.c
rename to evsci.c
diff --git a/sys/contrib/dev/acpica/evxface.c b/evxface.c
similarity index 100%
rename from sys/contrib/dev/acpica/evxface.c
rename to evxface.c
diff --git a/sys/contrib/dev/acpica/evxfevnt.c b/evxfevnt.c
similarity index 100%
rename from sys/contrib/dev/acpica/evxfevnt.c
rename to evxfevnt.c
diff --git a/sys/contrib/dev/acpica/evxfregn.c b/evxfregn.c
similarity index 100%
rename from sys/contrib/dev/acpica/evxfregn.c
rename to evxfregn.c
diff --git a/sys/contrib/dev/acpica/exconfig.c b/exconfig.c
similarity index 100%
rename from sys/contrib/dev/acpica/exconfig.c
rename to exconfig.c
diff --git a/sys/contrib/dev/acpica/exconvrt.c b/exconvrt.c
similarity index 100%
rename from sys/contrib/dev/acpica/exconvrt.c
rename to exconvrt.c
diff --git a/sys/contrib/dev/acpica/excreate.c b/excreate.c
similarity index 100%
rename from sys/contrib/dev/acpica/excreate.c
rename to excreate.c
diff --git a/sys/contrib/dev/acpica/exdump.c b/exdump.c
similarity index 100%
rename from sys/contrib/dev/acpica/exdump.c
rename to exdump.c
diff --git a/sys/contrib/dev/acpica/exfield.c b/exfield.c
similarity index 100%
rename from sys/contrib/dev/acpica/exfield.c
rename to exfield.c
diff --git a/sys/contrib/dev/acpica/exfldio.c b/exfldio.c
similarity index 100%
rename from sys/contrib/dev/acpica/exfldio.c
rename to exfldio.c
diff --git a/sys/contrib/dev/acpica/exmisc.c b/exmisc.c
similarity index 100%
rename from sys/contrib/dev/acpica/exmisc.c
rename to exmisc.c
diff --git a/sys/contrib/dev/acpica/exmutex.c b/exmutex.c
similarity index 100%
rename from sys/contrib/dev/acpica/exmutex.c
rename to exmutex.c
diff --git a/sys/contrib/dev/acpica/exnames.c b/exnames.c
similarity index 100%
rename from sys/contrib/dev/acpica/exnames.c
rename to exnames.c
diff --git a/sys/contrib/dev/acpica/exoparg1.c b/exoparg1.c
similarity index 100%
rename from sys/contrib/dev/acpica/exoparg1.c
rename to exoparg1.c
diff --git a/sys/contrib/dev/acpica/exoparg2.c b/exoparg2.c
similarity index 100%
rename from sys/contrib/dev/acpica/exoparg2.c
rename to exoparg2.c
diff --git a/sys/contrib/dev/acpica/exoparg3.c b/exoparg3.c
similarity index 100%
rename from sys/contrib/dev/acpica/exoparg3.c
rename to exoparg3.c
diff --git a/sys/contrib/dev/acpica/exoparg6.c b/exoparg6.c
similarity index 100%
rename from sys/contrib/dev/acpica/exoparg6.c
rename to exoparg6.c
diff --git a/sys/contrib/dev/acpica/exprep.c b/exprep.c
similarity index 100%
rename from sys/contrib/dev/acpica/exprep.c
rename to exprep.c
diff --git a/sys/contrib/dev/acpica/exregion.c b/exregion.c
similarity index 100%
rename from sys/contrib/dev/acpica/exregion.c
rename to exregion.c
diff --git a/sys/contrib/dev/acpica/exresnte.c b/exresnte.c
similarity index 100%
rename from sys/contrib/dev/acpica/exresnte.c
rename to exresnte.c
diff --git a/sys/contrib/dev/acpica/exresolv.c b/exresolv.c
similarity index 100%
rename from sys/contrib/dev/acpica/exresolv.c
rename to exresolv.c
diff --git a/sys/contrib/dev/acpica/exresop.c b/exresop.c
similarity index 100%
rename from sys/contrib/dev/acpica/exresop.c
rename to exresop.c
diff --git a/sys/contrib/dev/acpica/exstore.c b/exstore.c
similarity index 100%
rename from sys/contrib/dev/acpica/exstore.c
rename to exstore.c
diff --git a/sys/contrib/dev/acpica/exstoren.c b/exstoren.c
similarity index 100%
rename from sys/contrib/dev/acpica/exstoren.c
rename to exstoren.c
diff --git a/sys/contrib/dev/acpica/exstorob.c b/exstorob.c
similarity index 100%
rename from sys/contrib/dev/acpica/exstorob.c
rename to exstorob.c
diff --git a/sys/contrib/dev/acpica/exsystem.c b/exsystem.c
similarity index 100%
rename from sys/contrib/dev/acpica/exsystem.c
rename to exsystem.c
diff --git a/sys/contrib/dev/acpica/exutils.c b/exutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/exutils.c
rename to exutils.c
diff --git a/sys/contrib/dev/acpica/hwacpi.c b/hwacpi.c
similarity index 100%
rename from sys/contrib/dev/acpica/hwacpi.c
rename to hwacpi.c
diff --git a/sys/contrib/dev/acpica/hwgpe.c b/hwgpe.c
similarity index 100%
rename from sys/contrib/dev/acpica/hwgpe.c
rename to hwgpe.c
diff --git a/sys/contrib/dev/acpica/hwregs.c b/hwregs.c
similarity index 100%
rename from sys/contrib/dev/acpica/hwregs.c
rename to hwregs.c
diff --git a/sys/contrib/dev/acpica/hwsleep.c b/hwsleep.c
similarity index 100%
rename from sys/contrib/dev/acpica/hwsleep.c
rename to hwsleep.c
diff --git a/sys/contrib/dev/acpica/hwtimer.c b/hwtimer.c
similarity index 100%
rename from sys/contrib/dev/acpica/hwtimer.c
rename to hwtimer.c
diff --git a/sys/contrib/dev/acpica/nsaccess.c b/nsaccess.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsaccess.c
rename to nsaccess.c
diff --git a/sys/contrib/dev/acpica/nsalloc.c b/nsalloc.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsalloc.c
rename to nsalloc.c
diff --git a/sys/contrib/dev/acpica/nsdump.c b/nsdump.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsdump.c
rename to nsdump.c
diff --git a/sys/contrib/dev/acpica/nsdumpdv.c b/nsdumpdv.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsdumpdv.c
rename to nsdumpdv.c
diff --git a/sys/contrib/dev/acpica/nseval.c b/nseval.c
similarity index 100%
rename from sys/contrib/dev/acpica/nseval.c
rename to nseval.c
diff --git a/sys/contrib/dev/acpica/nsinit.c b/nsinit.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsinit.c
rename to nsinit.c
diff --git a/sys/contrib/dev/acpica/nsload.c b/nsload.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsload.c
rename to nsload.c
diff --git a/sys/contrib/dev/acpica/nsnames.c b/nsnames.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsnames.c
rename to nsnames.c
diff --git a/sys/contrib/dev/acpica/nsobject.c b/nsobject.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsobject.c
rename to nsobject.c
diff --git a/sys/contrib/dev/acpica/nsparse.c b/nsparse.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsparse.c
rename to nsparse.c
diff --git a/sys/contrib/dev/acpica/nssearch.c b/nssearch.c
similarity index 100%
rename from sys/contrib/dev/acpica/nssearch.c
rename to nssearch.c
diff --git a/sys/contrib/dev/acpica/nsutils.c b/nsutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsutils.c
rename to nsutils.c
diff --git a/sys/contrib/dev/acpica/nswalk.c b/nswalk.c
similarity index 100%
rename from sys/contrib/dev/acpica/nswalk.c
rename to nswalk.c
diff --git a/sys/contrib/dev/acpica/nsxfeval.c b/nsxfeval.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsxfeval.c
rename to nsxfeval.c
diff --git a/sys/contrib/dev/acpica/nsxfname.c b/nsxfname.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsxfname.c
rename to nsxfname.c
diff --git a/sys/contrib/dev/acpica/nsxfobj.c b/nsxfobj.c
similarity index 100%
rename from sys/contrib/dev/acpica/nsxfobj.c
rename to nsxfobj.c
diff --git a/sys/contrib/dev/acpica/osunixxf.c b/osunixxf.c
similarity index 100%
rename from sys/contrib/dev/acpica/osunixxf.c
rename to osunixxf.c
diff --git a/sys/contrib/dev/acpica/psargs.c b/psargs.c
similarity index 100%
rename from sys/contrib/dev/acpica/psargs.c
rename to psargs.c
diff --git a/sys/contrib/dev/acpica/psloop.c b/psloop.c
similarity index 100%
rename from sys/contrib/dev/acpica/psloop.c
rename to psloop.c
diff --git a/sys/contrib/dev/acpica/psopcode.c b/psopcode.c
similarity index 100%
rename from sys/contrib/dev/acpica/psopcode.c
rename to psopcode.c
diff --git a/sys/contrib/dev/acpica/psparse.c b/psparse.c
similarity index 100%
rename from sys/contrib/dev/acpica/psparse.c
rename to psparse.c
diff --git a/sys/contrib/dev/acpica/psscope.c b/psscope.c
similarity index 100%
rename from sys/contrib/dev/acpica/psscope.c
rename to psscope.c
diff --git a/sys/contrib/dev/acpica/pstree.c b/pstree.c
similarity index 100%
rename from sys/contrib/dev/acpica/pstree.c
rename to pstree.c
diff --git a/sys/contrib/dev/acpica/psutils.c b/psutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/psutils.c
rename to psutils.c
diff --git a/sys/contrib/dev/acpica/pswalk.c b/pswalk.c
similarity index 100%
rename from sys/contrib/dev/acpica/pswalk.c
rename to pswalk.c
diff --git a/sys/contrib/dev/acpica/psxface.c b/psxface.c
similarity index 100%
rename from sys/contrib/dev/acpica/psxface.c
rename to psxface.c
diff --git a/sys/contrib/dev/acpica/rsaddr.c b/rsaddr.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsaddr.c
rename to rsaddr.c
diff --git a/sys/contrib/dev/acpica/rscalc.c b/rscalc.c
similarity index 100%
rename from sys/contrib/dev/acpica/rscalc.c
rename to rscalc.c
diff --git a/sys/contrib/dev/acpica/rscreate.c b/rscreate.c
similarity index 100%
rename from sys/contrib/dev/acpica/rscreate.c
rename to rscreate.c
diff --git a/sys/contrib/dev/acpica/rsdump.c b/rsdump.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsdump.c
rename to rsdump.c
diff --git a/sys/contrib/dev/acpica/rsinfo.c b/rsinfo.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsinfo.c
rename to rsinfo.c
diff --git a/sys/contrib/dev/acpica/rsio.c b/rsio.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsio.c
rename to rsio.c
diff --git a/sys/contrib/dev/acpica/rsirq.c b/rsirq.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsirq.c
rename to rsirq.c
diff --git a/sys/contrib/dev/acpica/rslist.c b/rslist.c
similarity index 100%
rename from sys/contrib/dev/acpica/rslist.c
rename to rslist.c
diff --git a/sys/contrib/dev/acpica/rsmemory.c b/rsmemory.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsmemory.c
rename to rsmemory.c
diff --git a/sys/contrib/dev/acpica/rsmisc.c b/rsmisc.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsmisc.c
rename to rsmisc.c
diff --git a/sys/contrib/dev/acpica/rsutils.c b/rsutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsutils.c
rename to rsutils.c
diff --git a/sys/contrib/dev/acpica/rsxface.c b/rsxface.c
similarity index 100%
rename from sys/contrib/dev/acpica/rsxface.c
rename to rsxface.c
diff --git a/sys/contrib/dev/acpica/tbfadt.c b/tbfadt.c
similarity index 100%
rename from sys/contrib/dev/acpica/tbfadt.c
rename to tbfadt.c
diff --git a/sys/contrib/dev/acpica/tbfind.c b/tbfind.c
similarity index 100%
rename from sys/contrib/dev/acpica/tbfind.c
rename to tbfind.c
diff --git a/sys/contrib/dev/acpica/tbinstal.c b/tbinstal.c
similarity index 100%
rename from sys/contrib/dev/acpica/tbinstal.c
rename to tbinstal.c
diff --git a/sys/contrib/dev/acpica/tbutils.c b/tbutils.c
similarity index 100%
rename from sys/contrib/dev/acpica/tbutils.c
rename to tbutils.c
diff --git a/sys/contrib/dev/acpica/tbxface.c b/tbxface.c
similarity index 100%
rename from sys/contrib/dev/acpica/tbxface.c
rename to tbxface.c
diff --git a/sys/contrib/dev/acpica/tbxfroot.c b/tbxfroot.c
similarity index 100%
rename from sys/contrib/dev/acpica/tbxfroot.c
rename to tbxfroot.c
diff --git a/sys/contrib/dev/acpica/utalloc.c b/utalloc.c
similarity index 100%
rename from sys/contrib/dev/acpica/utalloc.c
rename to utalloc.c
diff --git a/sys/contrib/dev/acpica/utcache.c b/utcache.c
similarity index 100%
rename from sys/contrib/dev/acpica/utcache.c
rename to utcache.c
diff --git a/sys/contrib/dev/acpica/utclib.c b/utclib.c
similarity index 100%
rename from sys/contrib/dev/acpica/utclib.c
rename to utclib.c
diff --git a/sys/contrib/dev/acpica/utcopy.c b/utcopy.c
similarity index 100%
rename from sys/contrib/dev/acpica/utcopy.c
rename to utcopy.c
diff --git a/sys/contrib/dev/acpica/utdebug.c b/utdebug.c
similarity index 100%
rename from sys/contrib/dev/acpica/utdebug.c
rename to utdebug.c
diff --git a/sys/contrib/dev/acpica/utdelete.c b/utdelete.c
similarity index 100%
rename from sys/contrib/dev/acpica/utdelete.c
rename to utdelete.c
diff --git a/sys/contrib/dev/acpica/uteval.c b/uteval.c
similarity index 100%
rename from sys/contrib/dev/acpica/uteval.c
rename to uteval.c
diff --git a/sys/contrib/dev/acpica/utglobal.c b/utglobal.c
similarity index 100%
rename from sys/contrib/dev/acpica/utglobal.c
rename to utglobal.c
diff --git a/sys/contrib/dev/acpica/utinit.c b/utinit.c
similarity index 100%
rename from sys/contrib/dev/acpica/utinit.c
rename to utinit.c
diff --git a/sys/contrib/dev/acpica/utmath.c b/utmath.c
similarity index 100%
rename from sys/contrib/dev/acpica/utmath.c
rename to utmath.c
diff --git a/sys/contrib/dev/acpica/utmisc.c b/utmisc.c
similarity index 100%
rename from sys/contrib/dev/acpica/utmisc.c
rename to utmisc.c
diff --git a/sys/contrib/dev/acpica/utmutex.c b/utmutex.c
similarity index 100%
rename from sys/contrib/dev/acpica/utmutex.c
rename to utmutex.c
diff --git a/sys/contrib/dev/acpica/utobject.c b/utobject.c
similarity index 100%
rename from sys/contrib/dev/acpica/utobject.c
rename to utobject.c
diff --git a/sys/contrib/dev/acpica/utresrc.c b/utresrc.c
similarity index 100%
rename from sys/contrib/dev/acpica/utresrc.c
rename to utresrc.c
diff --git a/sys/contrib/dev/acpica/utstate.c b/utstate.c
similarity index 100%
rename from sys/contrib/dev/acpica/utstate.c
rename to utstate.c
diff --git a/sys/contrib/dev/acpica/uttrack.c b/uttrack.c
similarity index 100%
rename from sys/contrib/dev/acpica/uttrack.c
rename to uttrack.c
diff --git a/sys/contrib/dev/acpica/utxface.c b/utxface.c
similarity index 100%
rename from sys/contrib/dev/acpica/utxface.c
rename to utxface.c