diff --git a/src/add-ons/kernel/bus_managers/acpi/Jamfile b/src/add-ons/kernel/bus_managers/acpi/Jamfile
index f1a82e530a..eec7fd91f0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/Jamfile
+++ b/src/add-ons/kernel/bus_managers/acpi/Jamfile
@@ -1,8 +1,8 @@
 SubDir HAIKU_TOP src add-ons kernel bus_managers acpi ;
 
 UsePrivateKernelHeaders ;
-SubDirHdrs [ FDirName $(SUBDIR) include ] ;
-SubDirHdrs [ FDirName $(SUBDIR) include platform ] ;
+SubDirHdrs [ FDirName $(SUBDIR) acpica include ] ;
+SubDirHdrs [ FDirName $(SUBDIR) acpica include platform ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) pci ] ;
 SubDirCcFlags -fno-pic -D_KERNEL_MODE ;
 
@@ -181,16 +181,16 @@ StaticLibrary libacpi_ca.a :
 	$(utilities_src)
 	;
 
-SEARCH on [ FGristFiles $(common_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi common ] ;
-SEARCH on [ FGristFiles $(dispatcher_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi dispatcher ] ;
-SEARCH on [ FGristFiles $(events_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi events ] ;
-SEARCH on [ FGristFiles $(executer_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi executer ] ;
-SEARCH on [ FGristFiles $(hardware_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi hardware ] ;
-SEARCH on [ FGristFiles $(namespace_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi namespace ] ;
-SEARCH on [ FGristFiles $(parser_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi parser ] ;
-SEARCH on [ FGristFiles $(resources_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi resources ] ;
-SEARCH on [ FGristFiles $(tables_src) ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi tables ] ;
-SEARCH on [ FGristFiles $(utilities_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi utilities ] ;
+SEARCH on [ FGristFiles $(common_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica common ] ;
+SEARCH on [ FGristFiles $(dispatcher_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components dispatcher ] ;
+SEARCH on [ FGristFiles $(events_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components events ] ;
+SEARCH on [ FGristFiles $(executer_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components executer ] ;
+SEARCH on [ FGristFiles $(hardware_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components hardware ] ;
+SEARCH on [ FGristFiles $(namespace_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components namespace ] ;
+SEARCH on [ FGristFiles $(parser_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components parser ] ;
+SEARCH on [ FGristFiles $(resources_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components resources ] ;
+SEARCH on [ FGristFiles $(tables_src) ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components tables ] ;
+SEARCH on [ FGristFiles $(utilities_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components utilities ] ;
 
 KernelAddon acpi :
 	oshaiku.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/adfile.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adfile.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/adfile.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/adfile.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/adisasm.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adisasm.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/adisasm.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/adisasm.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/adwalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adwalk.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/adwalk.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/adwalk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmextern.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmextern.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/dmextern.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/dmextern.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmrestag.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmrestag.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/dmrestag.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/dmrestag.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmtable.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtable.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/dmtable.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtable.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmtbdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbdump.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/dmtbdump.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmtbinfo.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbinfo.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/dmtbinfo.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbinfo.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/getopt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/getopt.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/common/getopt.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/common/getopt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsargs.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsargs.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsargs.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsargs.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dscontrol.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dscontrol.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dscontrol.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dscontrol.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsfield.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsfield.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsfield.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsfield.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsinit.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsinit.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmethod.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmethod.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmethod.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmethod.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmthdat.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmthdat.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmthdat.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmthdat.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsobject.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsobject.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsobject.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsobject.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsopcode.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsopcode.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsopcode.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsopcode.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsutils.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dsutils.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswexec.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswexec.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dswexec.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswexec.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload2.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload2.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload2.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload2.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswscope.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswscope.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dswscope.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswscope.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswstate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswstate.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/dispatcher/dswstate.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswstate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evevent.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evevent.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evevent.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evevent.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evglock.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evglock.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evglock.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evglock.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpe.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpe.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evgpe.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpe.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpeblk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeblk.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evgpeblk.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeblk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpeinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeinit.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evgpeinit.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpeutil.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeutil.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evgpeutil.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeutil.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evmisc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evmisc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evregion.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evregion.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evregion.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evregion.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evrgnini.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evrgnini.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evrgnini.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evrgnini.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evsci.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evsci.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evsci.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evsci.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxface.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evxface.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxfevnt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfevnt.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evxfevnt.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfevnt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxfgpe.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfgpe.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evxfgpe.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfgpe.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxfregn.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfregn.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/events/evxfregn.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfregn.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exconfig.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconfig.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exconfig.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconfig.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exconvrt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconvrt.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exconvrt.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconvrt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/excreate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/excreate.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/excreate.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/excreate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exdebug.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdebug.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exdebug.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdebug.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdump.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exdump.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exfield.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfield.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exfield.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfield.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exfldio.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfldio.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exfldio.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfldio.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmisc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exmisc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exmutex.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmutex.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exmutex.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmutex.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exnames.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exnames.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exnames.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exnames.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg1.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg1.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exoparg1.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg1.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg2.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg2.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exoparg2.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg2.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg3.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg3.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exoparg3.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg3.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg6.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg6.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exoparg6.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg6.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exprep.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exprep.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exprep.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exprep.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exregion.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exregion.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exregion.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exregion.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exresnte.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresnte.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exresnte.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresnte.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exresolv.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresolv.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exresolv.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresolv.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exresop.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresop.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exresop.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresop.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exstore.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstore.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exstore.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstore.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exstoren.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstoren.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exstoren.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstoren.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exstorob.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstorob.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exstorob.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstorob.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exsystem.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exsystem.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exsystem.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exsystem.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exutils.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/executer/exutils.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwacpi.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwacpi.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwacpi.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwacpi.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwgpe.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwgpe.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwgpe.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwgpe.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwpci.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwpci.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwpci.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwpci.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwregs.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwregs.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwregs.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwregs.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwsleep.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwsleep.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwsleep.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwsleep.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwtimer.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwtimer.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwtimer.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwtimer.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwvalid.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwvalid.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwvalid.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwvalid.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwxface.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/hardware/hwxface.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsaccess.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsaccess.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsaccess.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsaccess.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsalloc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsalloc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsalloc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsalloc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdump.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsdump.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsdumpdv.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdumpdv.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsdumpdv.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdumpdv.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nseval.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nseval.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nseval.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nseval.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsinit.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsinit.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsload.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsload.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsload.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsload.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsnames.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsnames.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsnames.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsnames.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsobject.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsobject.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsobject.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsobject.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsparse.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsparse.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsparse.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsparse.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nspredef.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nspredef.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nspredef.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nspredef.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair2.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair2.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair2.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair2.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nssearch.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nssearch.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nssearch.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nssearch.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsutils.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsutils.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nswalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nswalk.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nswalk.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nswalk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfeval.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfeval.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsxfeval.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfeval.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfname.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfname.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsxfname.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfname.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfobj.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfobj.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/namespace/nsxfobj.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfobj.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psargs.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psargs.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psargs.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psargs.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psloop.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psloop.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psloop.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psloop.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psopcode.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psopcode.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psopcode.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psopcode.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psparse.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psparse.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psparse.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psparse.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psscope.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psscope.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psscope.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psscope.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/pstree.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pstree.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/pstree.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pstree.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psutils.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psutils.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/pswalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/pswalk.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psxface.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/parser/psxface.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsaddr.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsaddr.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsaddr.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsaddr.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rscalc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscalc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rscalc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscalc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rscreate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscreate.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rscreate.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscreate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsdump.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsdump.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsinfo.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsinfo.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsinfo.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsinfo.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsio.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsio.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsio.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsio.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsirq.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsirq.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsirq.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsirq.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rslist.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rslist.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rslist.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rslist.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsmemory.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmemory.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsmemory.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmemory.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmisc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsmisc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsutils.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsutils.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsxface.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/resources/rsxface.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbfadt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfadt.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/tables/tbfadt.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfadt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbfind.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfind.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/tables/tbfind.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfind.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbinstal.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbinstal.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/tables/tbinstal.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbinstal.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbutils.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/tables/tbutils.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxface.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/tables/tbxface.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbxfroot.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxfroot.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/tables/tbxfroot.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxfroot.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utalloc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utalloc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utalloc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utalloc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utcache.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcache.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utcache.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcache.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utclib.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utclib.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utclib.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utclib.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utcopy.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcopy.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utcopy.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcopy.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utdebug.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdebug.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utdebug.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdebug.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utdecode.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdecode.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utdecode.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdecode.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utdelete.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdelete.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utdelete.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdelete.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/uteval.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uteval.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/uteval.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uteval.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utglobal.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utglobal.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utglobal.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utglobal.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utids.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utids.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utids.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utids.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utinit.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utinit.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utlock.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utlock.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utlock.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utlock.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utmath.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmath.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utmath.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmath.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmisc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utmisc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utmutex.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmutex.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utmutex.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmutex.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utobject.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utobject.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utobject.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utobject.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utosi.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utosi.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utosi.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utosi.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utresrc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utresrc.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utresrc.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utresrc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utstate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utstate.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utstate.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utstate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/uttrack.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uttrack.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/uttrack.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uttrack.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxface.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utxface.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utxferror.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxferror.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/utilities/utxferror.c
rename to src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxferror.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acapps.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acapps.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acapps.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acapps.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/accommon.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/accommon.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/accommon.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/accommon.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acconfig.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acconfig.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acconfig.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acconfig.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acdebug.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdebug.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acdebug.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acdebug.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acdisasm.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdisasm.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acdisasm.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acdisasm.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acdispat.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdispat.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acdispat.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acdispat.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acevents.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acevents.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acevents.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acevents.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acexcep.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acexcep.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acexcep.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acexcep.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acglobal.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acglobal.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acglobal.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acglobal.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/achware.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/achware.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/achware.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/achware.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acinterp.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acinterp.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acinterp.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acinterp.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/aclocal.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/aclocal.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/aclocal.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/aclocal.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acmacros.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acmacros.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acmacros.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acmacros.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acnames.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acnames.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acnames.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acnames.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acnamesp.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acnamesp.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acnamesp.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acnamesp.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acobject.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acobject.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acobject.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acobject.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acopcode.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acopcode.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acopcode.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acopcode.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acoutput.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acoutput.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acoutput.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acoutput.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acparser.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acparser.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acparser.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acparser.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpi.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpi.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acpi.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acpi.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpiosxf.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpiosxf.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acpiosxf.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acpiosxf.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpixf.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpixf.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acpixf.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acpixf.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpredef.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpredef.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acpredef.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acpredef.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acresrc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acresrc.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acresrc.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acresrc.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acrestyp.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acrestyp.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acrestyp.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acrestyp.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acstruct.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acstruct.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acstruct.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acstruct.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actables.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actables.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/actables.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/actables.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actbl.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/actbl.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actbl1.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl1.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/actbl1.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl1.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actbl2.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl2.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/actbl2.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl2.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actypes.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/actypes.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acutils.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acutils.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/acutils.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/acutils.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/amlcode.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/amlcode.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/amlcode.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/amlcode.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/amlresrc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/amlresrc.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/amlresrc.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/amlresrc.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acefi.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acefi.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/platform/acefi.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acefi.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acenv.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acenv.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/platform/acenv.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acenv.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acgcc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acgcc.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/platform/acgcc.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acgcc.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/achaiku.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/achaiku.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acintel.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acintel.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/platform/acintel.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acintel.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acmsvc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acmsvc.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/include/platform/acmsvc.h
rename to src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acmsvc.h
diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index ecb9706398..cc43a7da0a 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -3,8 +3,8 @@ SubDir HAIKU_TOP src system kernel arch x86 ;
 SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) system kernel ] ;
 	# for syscall_numbers.h
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers ps2 ;
-SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi include ;
-SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi include platform ;
+SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica include ;
+SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica include platform ;
 SubDirHdrs $(SUBDIR) timers ;
 
 UsePrivateKernelHeaders ;