diff --git a/Source/charon/daemon.c b/Source/charon/daemon.c
index 277d8c6c6..d856a5dec 100644
--- a/Source/charon/daemon.c
+++ b/Source/charon/daemon.c
@@ -29,10 +29,10 @@
 
 #include <types.h>
 #include <ike_sa_manager.h>
-#include <sender.h>
-#include <receiver.h>
-#include <scheduler.h>
-#include <thread_pool.h>
+#include <threads/sender.h>
+#include <threads/receiver.h>
+#include <threads/scheduler.h>
+#include <threads/thread_pool.h>
 #include <network/socket.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c
index 6a0cf0a7e..f90a66075 100644
--- a/Source/charon/testcases/receiver_test.c
+++ b/Source/charon/testcases/receiver_test.c
@@ -26,7 +26,7 @@
 #include "receiver_test.h"
 
 #include <globals.h>
-#include <receiver.h>
+#include <threads/receiver.h>
 #include <network/packet.h>
 #include <network/socket.h>
 #include <queues/send_queue.h>
diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c
index aeb73b2eb..390d3be02 100644
--- a/Source/charon/testcases/scheduler_test.c
+++ b/Source/charon/testcases/scheduler_test.c
@@ -26,7 +26,7 @@
 #include "scheduler_test.h"
 
 #include <globals.h>
-#include <scheduler.h>
+#include <threads/scheduler.h>
 #include <queues/event_queue.h>
 #include <queues/job_queue.h>
 #include <queues/jobs/incoming_packet_job.h>
diff --git a/Source/charon/testcases/sender_test.c b/Source/charon/testcases/sender_test.c
index a4ed41b0d..3ce30cabd 100644
--- a/Source/charon/testcases/sender_test.c
+++ b/Source/charon/testcases/sender_test.c
@@ -25,7 +25,7 @@
 #include "sender_test.h"
 
 #include <globals.h>
-#include <sender.h>
+#include <threads/sender.h>
 #include <network/packet.h>
 #include <network/socket.h>
 #include <queues/send_queue.h>
diff --git a/Source/charon/testcases/thread_pool_test.c b/Source/charon/testcases/thread_pool_test.c
index dec0cf81c..ad3200ccd 100644
--- a/Source/charon/testcases/thread_pool_test.c
+++ b/Source/charon/testcases/thread_pool_test.c
@@ -24,7 +24,7 @@
 
 #include "thread_pool_test.h"
 
-#include <thread_pool.h>
+#include <threads/thread_pool.h>
 
 /*
  * Description in header file
diff --git a/Source/charon/receiver.c b/Source/charon/threads/receiver.c
similarity index 100%
rename from Source/charon/receiver.c
rename to Source/charon/threads/receiver.c
diff --git a/Source/charon/receiver.h b/Source/charon/threads/receiver.h
similarity index 100%
rename from Source/charon/receiver.h
rename to Source/charon/threads/receiver.h
diff --git a/Source/charon/scheduler.c b/Source/charon/threads/scheduler.c
similarity index 100%
rename from Source/charon/scheduler.c
rename to Source/charon/threads/scheduler.c
diff --git a/Source/charon/scheduler.h b/Source/charon/threads/scheduler.h
similarity index 100%
rename from Source/charon/scheduler.h
rename to Source/charon/threads/scheduler.h
diff --git a/Source/charon/sender.c b/Source/charon/threads/sender.c
similarity index 100%
rename from Source/charon/sender.c
rename to Source/charon/threads/sender.c
diff --git a/Source/charon/sender.h b/Source/charon/threads/sender.h
similarity index 100%
rename from Source/charon/sender.h
rename to Source/charon/threads/sender.h
diff --git a/Source/charon/thread_pool.c b/Source/charon/threads/thread_pool.c
similarity index 100%
rename from Source/charon/thread_pool.c
rename to Source/charon/threads/thread_pool.c
diff --git a/Source/charon/thread_pool.h b/Source/charon/threads/thread_pool.h
similarity index 100%
rename from Source/charon/thread_pool.h
rename to Source/charon/threads/thread_pool.h