diff --git a/TactilityKernel/Include/tactility/timer.h b/TactilityKernel/Include/tactility/concurrent/timer.h
similarity index 100%
rename from TactilityKernel/Include/tactility/timer.h
rename to TactilityKernel/Include/tactility/concurrent/timer.h
diff --git a/TactilityKernel/Source/timer.c b/TactilityKernel/Source/concurrent/timer.c
similarity index 100%
rename from TactilityKernel/Source/timer.c
rename to TactilityKernel/Source/concurrent/timer.c
diff --git a/Tests/TactilityKernel/ThreadTest.cpp b/Tests/TactilityKernel/ThreadTest.cpp
index a89b0c13..1bc4e9f0 100644
--- a/Tests/TactilityKernel/ThreadTest.cpp
+++ b/Tests/TactilityKernel/ThreadTest.cpp
@@ -1,6 +1,6 @@
 #include "doctest.h"
-#include "tactility/delay.h"
 
+#include <tactility/delay.h>
 #include <tactility/concurrent/thread.h>
 
 TEST_CASE("when a thread is started then its callback should be called") {
diff --git a/Tests/TactilityKernel/TimerTest.cpp b/Tests/TactilityKernel/TimerTest.cpp
index bb68b022..c2d4e8c9 100644
--- a/Tests/TactilityKernel/TimerTest.cpp
+++ b/Tests/TactilityKernel/TimerTest.cpp
@@ -1,9 +1,10 @@
 #include "doctest.h"
 
-#include "tactility/timer.h"
-#include "tactility/delay.h"
 #include <atomic>
 
+#include <tactility/concurrent/timer.h>
+#include <tactility/delay.h>
+
 TEST_CASE("timer_alloc and timer_free should handle allocation and deallocation") {
     auto callback = [](void* context) {};
     struct Timer* timer = timer_alloc(TIMER_TYPE_ONCE, 10, callback, nullptr);