diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index f9022a69dc7..5a0879f4c1a 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 PROJECT(Drivers)
 
+add_subdirectory(acpi)
 add_subdirectory(base)
 add_subdirectory(battery)
 add_subdirectory(bluetooth)
diff --git a/drivers/acpi/CMakeLists.txt b/drivers/acpi/CMakeLists.txt
new file mode 100644
index 00000000000..1f630a0770c
--- /dev/null
+++ b/drivers/acpi/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(cmbatt)
diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/acpi/cmbatt/CMakeLists.txt
similarity index 100%
rename from drivers/bus/acpi/cmbatt/CMakeLists.txt
rename to drivers/acpi/cmbatt/CMakeLists.txt
diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/acpi/cmbatt/cmbatt.c
similarity index 100%
rename from drivers/bus/acpi/cmbatt/cmbatt.c
rename to drivers/acpi/cmbatt/cmbatt.c
diff --git a/drivers/bus/acpi/cmbatt/cmbatt.h b/drivers/acpi/cmbatt/cmbatt.h
similarity index 100%
rename from drivers/bus/acpi/cmbatt/cmbatt.h
rename to drivers/acpi/cmbatt/cmbatt.h
diff --git a/drivers/bus/acpi/cmbatt/cmbatt.rc b/drivers/acpi/cmbatt/cmbatt.rc
similarity index 100%
rename from drivers/bus/acpi/cmbatt/cmbatt.rc
rename to drivers/acpi/cmbatt/cmbatt.rc
diff --git a/drivers/bus/acpi/cmbatt/cmbpnp.c b/drivers/acpi/cmbatt/cmbpnp.c
similarity index 100%
rename from drivers/bus/acpi/cmbatt/cmbpnp.c
rename to drivers/acpi/cmbatt/cmbpnp.c
diff --git a/drivers/bus/acpi/cmbatt/cmbwmi.c b/drivers/acpi/cmbatt/cmbwmi.c
similarity index 100%
rename from drivers/bus/acpi/cmbatt/cmbwmi.c
rename to drivers/acpi/cmbatt/cmbwmi.c
diff --git a/drivers/bus/acpi/cmbatt/cmexec.c b/drivers/acpi/cmbatt/cmexec.c
similarity index 100%
rename from drivers/bus/acpi/cmbatt/cmexec.c
rename to drivers/acpi/cmbatt/cmexec.c
diff --git a/drivers/bus/acpi/cmbatt/guid.c b/drivers/acpi/cmbatt/guid.c
similarity index 100%
rename from drivers/bus/acpi/cmbatt/guid.c
rename to drivers/acpi/cmbatt/guid.c
diff --git a/drivers/battery/CMakeLists.txt b/drivers/battery/CMakeLists.txt
index 1a3ce814291..2f949902ebc 100644
--- a/drivers/battery/CMakeLists.txt
+++ b/drivers/battery/CMakeLists.txt
@@ -1,2 +1,3 @@
 
 add_subdirectory(battc)
+add_subdirectory(compbatt)
diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/battery/compbatt/CMakeLists.txt
similarity index 100%
rename from drivers/bus/acpi/compbatt/CMakeLists.txt
rename to drivers/battery/compbatt/CMakeLists.txt
diff --git a/drivers/bus/acpi/compbatt/compbatt.c b/drivers/battery/compbatt/compbatt.c
similarity index 100%
rename from drivers/bus/acpi/compbatt/compbatt.c
rename to drivers/battery/compbatt/compbatt.c
diff --git a/drivers/bus/acpi/compbatt/compbatt.h b/drivers/battery/compbatt/compbatt.h
similarity index 100%
rename from drivers/bus/acpi/compbatt/compbatt.h
rename to drivers/battery/compbatt/compbatt.h
diff --git a/drivers/bus/acpi/compbatt/compbatt.rc b/drivers/battery/compbatt/compbatt.rc
similarity index 100%
rename from drivers/bus/acpi/compbatt/compbatt.rc
rename to drivers/battery/compbatt/compbatt.rc
diff --git a/drivers/bus/acpi/compbatt/compmisc.c b/drivers/battery/compbatt/compmisc.c
similarity index 100%
rename from drivers/bus/acpi/compbatt/compmisc.c
rename to drivers/battery/compbatt/compmisc.c
diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/battery/compbatt/comppnp.c
similarity index 100%
rename from drivers/bus/acpi/compbatt/comppnp.c
rename to drivers/battery/compbatt/comppnp.c
diff --git a/drivers/bus/acpi/compbatt/guid.c b/drivers/battery/compbatt/guid.c
similarity index 100%
rename from drivers/bus/acpi/compbatt/guid.c
rename to drivers/battery/compbatt/guid.c
diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt
index 3535cf5604c..f56afd97228 100644
--- a/drivers/bus/acpi/CMakeLists.txt
+++ b/drivers/bus/acpi/CMakeLists.txt
@@ -209,6 +209,3 @@ add_importlibs(acpi ntoskrnl hal)
 add_pch(acpi precomp.h ACPI_SOURCE)
 add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all)
 add_driver_inf(acpi acpi.inf)
-
-add_subdirectory(cmbatt)
-add_subdirectory(compbatt)