diff --git a/kernel/include/init/acpi.h b/kernel/include/acpi/acpi.h
similarity index 100%
rename from kernel/include/init/acpi.h
rename to kernel/include/acpi/acpi.h
diff --git a/kernel/include/init/apic.h b/kernel/include/acpi/madt.h
similarity index 99%
rename from kernel/include/init/apic.h
rename to kernel/include/acpi/madt.h
index fe23166..b31b6b1 100644
--- a/kernel/include/init/apic.h
+++ b/kernel/include/acpi/madt.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "init/acpi.h"
+#include "acpi/acpi.h"
 #include "memory/pointer.h"
 #include "util/number.h"
 
diff --git a/kernel/include/apic/timer.h b/kernel/include/apic/timer.h
new file mode 100644
index 0000000..73510b1
--- /dev/null
+++ b/kernel/include/apic/timer.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "acpi/madt.h"
+
+namespace apic {
+
+struct lapic_timer_calibration_t {};
+
+lapic_timer_calibration_t calibrateTimer(const acpi::Madt& madt);
+
+} // namespace apic
diff --git a/kernel/src/init/init.cpp b/kernel/src/init/init.cpp
index f88396e..2ff7571 100644
--- a/kernel/src/init/init.cpp
+++ b/kernel/src/init/init.cpp
@@ -1,6 +1,6 @@
 #include "init/init.h"
-#include "init/acpi.h"
-#include "init/apic.h"
+#include "acpi/acpi.h"
+#include "acpi/madt.h"
 #include "init/multiboot2.h"
 #include "init/print.h"
 #include "memory/allocator.h"