diff --git a/CHANGES.txt b/changes.txt
similarity index 100%
rename from CHANGES.txt
rename to changes.txt
diff --git a/dbcmds.c b/debugger/dbcmds.c
similarity index 100%
rename from dbcmds.c
rename to debugger/dbcmds.c
diff --git a/dbdisply.c b/debugger/dbdisply.c
similarity index 100%
rename from dbdisply.c
rename to debugger/dbdisply.c
diff --git a/dbexec.c b/debugger/dbexec.c
similarity index 100%
rename from dbexec.c
rename to debugger/dbexec.c
diff --git a/dbfileio.c b/debugger/dbfileio.c
similarity index 100%
rename from dbfileio.c
rename to debugger/dbfileio.c
diff --git a/dbhistry.c b/debugger/dbhistry.c
similarity index 100%
rename from dbhistry.c
rename to debugger/dbhistry.c
diff --git a/dbinput.c b/debugger/dbinput.c
similarity index 100%
rename from dbinput.c
rename to debugger/dbinput.c
diff --git a/dbstats.c b/debugger/dbstats.c
similarity index 100%
rename from dbstats.c
rename to debugger/dbstats.c
diff --git a/dbutils.c b/debugger/dbutils.c
similarity index 100%
rename from dbutils.c
rename to debugger/dbutils.c
diff --git a/dbxface.c b/debugger/dbxface.c
similarity index 100%
rename from dbxface.c
rename to debugger/dbxface.c
diff --git a/dmbuffer.c b/disassembler/dmbuffer.c
similarity index 100%
rename from dmbuffer.c
rename to disassembler/dmbuffer.c
diff --git a/dmnames.c b/disassembler/dmnames.c
similarity index 100%
rename from dmnames.c
rename to disassembler/dmnames.c
diff --git a/dmobject.c b/disassembler/dmobject.c
similarity index 100%
rename from dmobject.c
rename to disassembler/dmobject.c
diff --git a/dmopcode.c b/disassembler/dmopcode.c
similarity index 100%
rename from dmopcode.c
rename to disassembler/dmopcode.c
diff --git a/dmresrc.c b/disassembler/dmresrc.c
similarity index 100%
rename from dmresrc.c
rename to disassembler/dmresrc.c
diff --git a/dmresrcl.c b/disassembler/dmresrcl.c
similarity index 100%
rename from dmresrcl.c
rename to disassembler/dmresrcl.c
diff --git a/dmresrcs.c b/disassembler/dmresrcs.c
similarity index 100%
rename from dmresrcs.c
rename to disassembler/dmresrcs.c
diff --git a/dmutils.c b/disassembler/dmutils.c
similarity index 100%
rename from dmutils.c
rename to disassembler/dmutils.c
diff --git a/dmwalk.c b/disassembler/dmwalk.c
similarity index 100%
rename from dmwalk.c
rename to disassembler/dmwalk.c
diff --git a/evevent.c b/events/evevent.c
similarity index 100%
rename from evevent.c
rename to events/evevent.c
diff --git a/evgpe.c b/events/evgpe.c
similarity index 100%
rename from evgpe.c
rename to events/evgpe.c
diff --git a/evgpeblk.c b/events/evgpeblk.c
similarity index 100%
rename from evgpeblk.c
rename to events/evgpeblk.c
diff --git a/evmisc.c b/events/evmisc.c
similarity index 100%
rename from evmisc.c
rename to events/evmisc.c
diff --git a/evregion.c b/events/evregion.c
similarity index 100%
rename from evregion.c
rename to events/evregion.c
diff --git a/evrgnini.c b/events/evrgnini.c
similarity index 100%
rename from evrgnini.c
rename to events/evrgnini.c
diff --git a/evsci.c b/events/evsci.c
similarity index 100%
rename from evsci.c
rename to events/evsci.c
diff --git a/evxface.c b/events/evxface.c
similarity index 100%
rename from evxface.c
rename to events/evxface.c
diff --git a/evxfevnt.c b/events/evxfevnt.c
similarity index 100%
rename from evxfevnt.c
rename to events/evxfevnt.c
diff --git a/evxfregn.c b/events/evxfregn.c
similarity index 100%
rename from evxfregn.c
rename to events/evxfregn.c
diff --git a/hwacpi.c b/hardware/hwacpi.c
similarity index 100%
rename from hwacpi.c
rename to hardware/hwacpi.c
diff --git a/hwgpe.c b/hardware/hwgpe.c
similarity index 100%
rename from hwgpe.c
rename to hardware/hwgpe.c
diff --git a/hwregs.c b/hardware/hwregs.c
similarity index 100%
rename from hwregs.c
rename to hardware/hwregs.c
diff --git a/hwsleep.c b/hardware/hwsleep.c
similarity index 100%
rename from hwsleep.c
rename to hardware/hwsleep.c
diff --git a/hwtimer.c b/hardware/hwtimer.c
similarity index 100%
rename from hwtimer.c
rename to hardware/hwtimer.c
diff --git a/acapps.h b/include/acapps.h
similarity index 100%
rename from acapps.h
rename to include/acapps.h
diff --git a/acconfig.h b/include/acconfig.h
similarity index 100%
rename from acconfig.h
rename to include/acconfig.h
diff --git a/acdebug.h b/include/acdebug.h
similarity index 100%
rename from acdebug.h
rename to include/acdebug.h
diff --git a/acdisasm.h b/include/acdisasm.h
similarity index 100%
rename from acdisasm.h
rename to include/acdisasm.h
diff --git a/acdispat.h b/include/acdispat.h
similarity index 100%
rename from acdispat.h
rename to include/acdispat.h
diff --git a/acevents.h b/include/acevents.h
similarity index 100%
rename from acevents.h
rename to include/acevents.h
diff --git a/acexcep.h b/include/acexcep.h
similarity index 100%
rename from acexcep.h
rename to include/acexcep.h
diff --git a/acglobal.h b/include/acglobal.h
similarity index 100%
rename from acglobal.h
rename to include/acglobal.h
diff --git a/achware.h b/include/achware.h
similarity index 100%
rename from achware.h
rename to include/achware.h
diff --git a/acinterp.h b/include/acinterp.h
similarity index 100%
rename from acinterp.h
rename to include/acinterp.h
diff --git a/aclocal.h b/include/aclocal.h
similarity index 100%
rename from aclocal.h
rename to include/aclocal.h
diff --git a/acmacros.h b/include/acmacros.h
similarity index 100%
rename from acmacros.h
rename to include/acmacros.h
diff --git a/acnames.h b/include/acnames.h
similarity index 100%
rename from acnames.h
rename to include/acnames.h
diff --git a/acnamesp.h b/include/acnamesp.h
similarity index 100%
rename from acnamesp.h
rename to include/acnamesp.h
diff --git a/acobject.h b/include/acobject.h
similarity index 100%
rename from acobject.h
rename to include/acobject.h
diff --git a/acopcode.h b/include/acopcode.h
similarity index 100%
rename from acopcode.h
rename to include/acopcode.h
diff --git a/acoutput.h b/include/acoutput.h
similarity index 100%
rename from acoutput.h
rename to include/acoutput.h
diff --git a/acparser.h b/include/acparser.h
similarity index 100%
rename from acparser.h
rename to include/acparser.h
diff --git a/acpi.h b/include/acpi.h
similarity index 100%
rename from acpi.h
rename to include/acpi.h
diff --git a/acpiosxf.h b/include/acpiosxf.h
similarity index 100%
rename from acpiosxf.h
rename to include/acpiosxf.h
diff --git a/acpixf.h b/include/acpixf.h
similarity index 100%
rename from acpixf.h
rename to include/acpixf.h
diff --git a/acresrc.h b/include/acresrc.h
similarity index 100%
rename from acresrc.h
rename to include/acresrc.h
diff --git a/acstruct.h b/include/acstruct.h
similarity index 100%
rename from acstruct.h
rename to include/acstruct.h
diff --git a/actables.h b/include/actables.h
similarity index 100%
rename from actables.h
rename to include/actables.h
diff --git a/actbl.h b/include/actbl.h
similarity index 100%
rename from actbl.h
rename to include/actbl.h
diff --git a/actbl1.h b/include/actbl1.h
similarity index 100%
rename from actbl1.h
rename to include/actbl1.h
diff --git a/actbl2.h b/include/actbl2.h
similarity index 100%
rename from actbl2.h
rename to include/actbl2.h
diff --git a/actypes.h b/include/actypes.h
similarity index 100%
rename from actypes.h
rename to include/actypes.h
diff --git a/acutils.h b/include/acutils.h
similarity index 100%
rename from acutils.h
rename to include/acutils.h
diff --git a/amlcode.h b/include/amlcode.h
similarity index 100%
rename from amlcode.h
rename to include/amlcode.h
diff --git a/amlresrc.h b/include/amlresrc.h
similarity index 100%
rename from amlresrc.h
rename to include/amlresrc.h
diff --git a/acefi.h b/include/platform/acefi.h
similarity index 100%
rename from acefi.h
rename to include/platform/acefi.h
diff --git a/acenv.h b/include/platform/acenv.h
similarity index 100%
rename from acenv.h
rename to include/platform/acenv.h
diff --git a/acfreebsd.h b/include/platform/acfreebsd.h
similarity index 100%
rename from acfreebsd.h
rename to include/platform/acfreebsd.h
diff --git a/acgcc.h b/include/platform/acgcc.h
similarity index 100%
rename from acgcc.h
rename to include/platform/acgcc.h
diff --git a/dsfield.c b/interpreter/dispatcher/dsfield.c
similarity index 100%
rename from dsfield.c
rename to interpreter/dispatcher/dsfield.c
diff --git a/dsinit.c b/interpreter/dispatcher/dsinit.c
similarity index 100%
rename from dsinit.c
rename to interpreter/dispatcher/dsinit.c
diff --git a/dsmethod.c b/interpreter/dispatcher/dsmethod.c
similarity index 100%
rename from dsmethod.c
rename to interpreter/dispatcher/dsmethod.c
diff --git a/dsmthdat.c b/interpreter/dispatcher/dsmthdat.c
similarity index 100%
rename from dsmthdat.c
rename to interpreter/dispatcher/dsmthdat.c
diff --git a/dsobject.c b/interpreter/dispatcher/dsobject.c
similarity index 100%
rename from dsobject.c
rename to interpreter/dispatcher/dsobject.c
diff --git a/dsopcode.c b/interpreter/dispatcher/dsopcode.c
similarity index 100%
rename from dsopcode.c
rename to interpreter/dispatcher/dsopcode.c
diff --git a/dsutils.c b/interpreter/dispatcher/dsutils.c
similarity index 100%
rename from dsutils.c
rename to interpreter/dispatcher/dsutils.c
diff --git a/dswexec.c b/interpreter/dispatcher/dswexec.c
similarity index 100%
rename from dswexec.c
rename to interpreter/dispatcher/dswexec.c
diff --git a/dswload.c b/interpreter/dispatcher/dswload.c
similarity index 100%
rename from dswload.c
rename to interpreter/dispatcher/dswload.c
diff --git a/dswscope.c b/interpreter/dispatcher/dswscope.c
similarity index 100%
rename from dswscope.c
rename to interpreter/dispatcher/dswscope.c
diff --git a/dswstate.c b/interpreter/dispatcher/dswstate.c
similarity index 100%
rename from dswstate.c
rename to interpreter/dispatcher/dswstate.c
diff --git a/exconfig.c b/interpreter/executer/exconfig.c
similarity index 100%
rename from exconfig.c
rename to interpreter/executer/exconfig.c
diff --git a/exconvrt.c b/interpreter/executer/exconvrt.c
similarity index 100%
rename from exconvrt.c
rename to interpreter/executer/exconvrt.c
diff --git a/excreate.c b/interpreter/executer/excreate.c
similarity index 100%
rename from excreate.c
rename to interpreter/executer/excreate.c
diff --git a/exdump.c b/interpreter/executer/exdump.c
similarity index 100%
rename from exdump.c
rename to interpreter/executer/exdump.c
diff --git a/exfield.c b/interpreter/executer/exfield.c
similarity index 100%
rename from exfield.c
rename to interpreter/executer/exfield.c
diff --git a/exfldio.c b/interpreter/executer/exfldio.c
similarity index 100%
rename from exfldio.c
rename to interpreter/executer/exfldio.c
diff --git a/exmisc.c b/interpreter/executer/exmisc.c
similarity index 100%
rename from exmisc.c
rename to interpreter/executer/exmisc.c
diff --git a/exmutex.c b/interpreter/executer/exmutex.c
similarity index 100%
rename from exmutex.c
rename to interpreter/executer/exmutex.c
diff --git a/exnames.c b/interpreter/executer/exnames.c
similarity index 100%
rename from exnames.c
rename to interpreter/executer/exnames.c
diff --git a/exoparg1.c b/interpreter/executer/exoparg1.c
similarity index 100%
rename from exoparg1.c
rename to interpreter/executer/exoparg1.c
diff --git a/exoparg2.c b/interpreter/executer/exoparg2.c
similarity index 100%
rename from exoparg2.c
rename to interpreter/executer/exoparg2.c
diff --git a/exoparg3.c b/interpreter/executer/exoparg3.c
similarity index 100%
rename from exoparg3.c
rename to interpreter/executer/exoparg3.c
diff --git a/exoparg6.c b/interpreter/executer/exoparg6.c
similarity index 100%
rename from exoparg6.c
rename to interpreter/executer/exoparg6.c
diff --git a/exprep.c b/interpreter/executer/exprep.c
similarity index 100%
rename from exprep.c
rename to interpreter/executer/exprep.c
diff --git a/exregion.c b/interpreter/executer/exregion.c
similarity index 100%
rename from exregion.c
rename to interpreter/executer/exregion.c
diff --git a/exresnte.c b/interpreter/executer/exresnte.c
similarity index 100%
rename from exresnte.c
rename to interpreter/executer/exresnte.c
diff --git a/exresolv.c b/interpreter/executer/exresolv.c
similarity index 100%
rename from exresolv.c
rename to interpreter/executer/exresolv.c
diff --git a/exresop.c b/interpreter/executer/exresop.c
similarity index 100%
rename from exresop.c
rename to interpreter/executer/exresop.c
diff --git a/exstore.c b/interpreter/executer/exstore.c
similarity index 100%
rename from exstore.c
rename to interpreter/executer/exstore.c
diff --git a/exstoren.c b/interpreter/executer/exstoren.c
similarity index 100%
rename from exstoren.c
rename to interpreter/executer/exstoren.c
diff --git a/exstorob.c b/interpreter/executer/exstorob.c
similarity index 100%
rename from exstorob.c
rename to interpreter/executer/exstorob.c
diff --git a/exsystem.c b/interpreter/executer/exsystem.c
similarity index 100%
rename from exsystem.c
rename to interpreter/executer/exsystem.c
diff --git a/exutils.c b/interpreter/executer/exutils.c
similarity index 100%
rename from exutils.c
rename to interpreter/executer/exutils.c
diff --git a/psargs.c b/interpreter/parser/psargs.c
similarity index 100%
rename from psargs.c
rename to interpreter/parser/psargs.c
diff --git a/psloop.c b/interpreter/parser/psloop.c
similarity index 100%
rename from psloop.c
rename to interpreter/parser/psloop.c
diff --git a/psopcode.c b/interpreter/parser/psopcode.c
similarity index 100%
rename from psopcode.c
rename to interpreter/parser/psopcode.c
diff --git a/psparse.c b/interpreter/parser/psparse.c
similarity index 100%
rename from psparse.c
rename to interpreter/parser/psparse.c
diff --git a/psscope.c b/interpreter/parser/psscope.c
similarity index 100%
rename from psscope.c
rename to interpreter/parser/psscope.c
diff --git a/pstree.c b/interpreter/parser/pstree.c
similarity index 100%
rename from pstree.c
rename to interpreter/parser/pstree.c
diff --git a/psutils.c b/interpreter/parser/psutils.c
similarity index 100%
rename from psutils.c
rename to interpreter/parser/psutils.c
diff --git a/pswalk.c b/interpreter/parser/pswalk.c
similarity index 100%
rename from pswalk.c
rename to interpreter/parser/pswalk.c
diff --git a/psxface.c b/interpreter/parser/psxface.c
similarity index 100%
rename from psxface.c
rename to interpreter/parser/psxface.c
diff --git a/nsaccess.c b/namespace/nsaccess.c
similarity index 100%
rename from nsaccess.c
rename to namespace/nsaccess.c
diff --git a/nsalloc.c b/namespace/nsalloc.c
similarity index 100%
rename from nsalloc.c
rename to namespace/nsalloc.c
diff --git a/nsdump.c b/namespace/nsdump.c
similarity index 100%
rename from nsdump.c
rename to namespace/nsdump.c
diff --git a/nsdumpdv.c b/namespace/nsdumpdv.c
similarity index 100%
rename from nsdumpdv.c
rename to namespace/nsdumpdv.c
diff --git a/nseval.c b/namespace/nseval.c
similarity index 100%
rename from nseval.c
rename to namespace/nseval.c
diff --git a/nsinit.c b/namespace/nsinit.c
similarity index 100%
rename from nsinit.c
rename to namespace/nsinit.c
diff --git a/nsload.c b/namespace/nsload.c
similarity index 100%
rename from nsload.c
rename to namespace/nsload.c
diff --git a/nsnames.c b/namespace/nsnames.c
similarity index 100%
rename from nsnames.c
rename to namespace/nsnames.c
diff --git a/nsobject.c b/namespace/nsobject.c
similarity index 100%
rename from nsobject.c
rename to namespace/nsobject.c
diff --git a/nsparse.c b/namespace/nsparse.c
similarity index 100%
rename from nsparse.c
rename to namespace/nsparse.c
diff --git a/nssearch.c b/namespace/nssearch.c
similarity index 100%
rename from nssearch.c
rename to namespace/nssearch.c
diff --git a/nsutils.c b/namespace/nsutils.c
similarity index 100%
rename from nsutils.c
rename to namespace/nsutils.c
diff --git a/nswalk.c b/namespace/nswalk.c
similarity index 100%
rename from nswalk.c
rename to namespace/nswalk.c
diff --git a/nsxfeval.c b/namespace/nsxfeval.c
similarity index 100%
rename from nsxfeval.c
rename to namespace/nsxfeval.c
diff --git a/nsxfname.c b/namespace/nsxfname.c
similarity index 100%
rename from nsxfname.c
rename to namespace/nsxfname.c
diff --git a/nsxfobj.c b/namespace/nsxfobj.c
similarity index 100%
rename from nsxfobj.c
rename to namespace/nsxfobj.c
diff --git a/rsaddr.c b/resources/rsaddr.c
similarity index 100%
rename from rsaddr.c
rename to resources/rsaddr.c
diff --git a/rscalc.c b/resources/rscalc.c
similarity index 100%
rename from rscalc.c
rename to resources/rscalc.c
diff --git a/rscreate.c b/resources/rscreate.c
similarity index 100%
rename from rscreate.c
rename to resources/rscreate.c
diff --git a/rsdump.c b/resources/rsdump.c
similarity index 100%
rename from rsdump.c
rename to resources/rsdump.c
diff --git a/rsinfo.c b/resources/rsinfo.c
similarity index 100%
rename from rsinfo.c
rename to resources/rsinfo.c
diff --git a/rsio.c b/resources/rsio.c
similarity index 100%
rename from rsio.c
rename to resources/rsio.c
diff --git a/rsirq.c b/resources/rsirq.c
similarity index 100%
rename from rsirq.c
rename to resources/rsirq.c
diff --git a/rslist.c b/resources/rslist.c
similarity index 100%
rename from rslist.c
rename to resources/rslist.c
diff --git a/rsmemory.c b/resources/rsmemory.c
similarity index 100%
rename from rsmemory.c
rename to resources/rsmemory.c
diff --git a/rsmisc.c b/resources/rsmisc.c
similarity index 100%
rename from rsmisc.c
rename to resources/rsmisc.c
diff --git a/rsutils.c b/resources/rsutils.c
similarity index 100%
rename from rsutils.c
rename to resources/rsutils.c
diff --git a/rsxface.c b/resources/rsxface.c
similarity index 100%
rename from rsxface.c
rename to resources/rsxface.c
diff --git a/tbfadt.c b/tables/tbfadt.c
similarity index 100%
rename from tbfadt.c
rename to tables/tbfadt.c
diff --git a/tbfind.c b/tables/tbfind.c
similarity index 100%
rename from tbfind.c
rename to tables/tbfind.c
diff --git a/tbinstal.c b/tables/tbinstal.c
similarity index 100%
rename from tbinstal.c
rename to tables/tbinstal.c
diff --git a/tbutils.c b/tables/tbutils.c
similarity index 100%
rename from tbutils.c
rename to tables/tbutils.c
diff --git a/tbxface.c b/tables/tbxface.c
similarity index 100%
rename from tbxface.c
rename to tables/tbxface.c
diff --git a/tbxfroot.c b/tables/tbxfroot.c
similarity index 100%
rename from tbxfroot.c
rename to tables/tbxfroot.c
diff --git a/aecommon.h b/tools/acpiexec/aecommon.h
similarity index 100%
rename from aecommon.h
rename to tools/acpiexec/aecommon.h
diff --git a/utalloc.c b/utilities/utalloc.c
similarity index 100%
rename from utalloc.c
rename to utilities/utalloc.c
diff --git a/utcache.c b/utilities/utcache.c
similarity index 100%
rename from utcache.c
rename to utilities/utcache.c
diff --git a/utclib.c b/utilities/utclib.c
similarity index 100%
rename from utclib.c
rename to utilities/utclib.c
diff --git a/utcopy.c b/utilities/utcopy.c
similarity index 100%
rename from utcopy.c
rename to utilities/utcopy.c
diff --git a/utdebug.c b/utilities/utdebug.c
similarity index 100%
rename from utdebug.c
rename to utilities/utdebug.c
diff --git a/utdelete.c b/utilities/utdelete.c
similarity index 100%
rename from utdelete.c
rename to utilities/utdelete.c
diff --git a/uteval.c b/utilities/uteval.c
similarity index 100%
rename from uteval.c
rename to utilities/uteval.c
diff --git a/utglobal.c b/utilities/utglobal.c
similarity index 100%
rename from utglobal.c
rename to utilities/utglobal.c
diff --git a/utinit.c b/utilities/utinit.c
similarity index 100%
rename from utinit.c
rename to utilities/utinit.c
diff --git a/utmath.c b/utilities/utmath.c
similarity index 100%
rename from utmath.c
rename to utilities/utmath.c
diff --git a/utmisc.c b/utilities/utmisc.c
similarity index 100%
rename from utmisc.c
rename to utilities/utmisc.c
diff --git a/utmutex.c b/utilities/utmutex.c
similarity index 100%
rename from utmutex.c
rename to utilities/utmutex.c
diff --git a/utobject.c b/utilities/utobject.c
similarity index 100%
rename from utobject.c
rename to utilities/utobject.c
diff --git a/utresrc.c b/utilities/utresrc.c
similarity index 100%
rename from utresrc.c
rename to utilities/utresrc.c
diff --git a/utstate.c b/utilities/utstate.c
similarity index 100%
rename from utstate.c
rename to utilities/utstate.c
diff --git a/uttrack.c b/utilities/uttrack.c
similarity index 100%
rename from uttrack.c
rename to utilities/uttrack.c
diff --git a/utxface.c b/utilities/utxface.c
similarity index 100%
rename from utxface.c
rename to utilities/utxface.c