diff --git a/Source/charon/queues/event_queue.h b/Source/charon/queues/event_queue.h
index fe823145d..49f6d718f 100644
--- a/Source/charon/queues/event_queue.h
+++ b/Source/charon/queues/event_queue.h
@@ -26,7 +26,7 @@
 #include <sys/time.h>
 
 #include <types.h>
-#include <jobs/job.h>
+#include <queues/jobs/job.h>
 
 /**
  * @brief Event-Queue used to store timed events.
diff --git a/Source/charon/queues/job_queue.h b/Source/charon/queues/job_queue.h
index f5030ac32..3fde9ccce 100644
--- a/Source/charon/queues/job_queue.h
+++ b/Source/charon/queues/job_queue.h
@@ -24,7 +24,7 @@
 #define JOB_QUEUE_H_
 
 #include <types.h>
-#include <jobs/job.h>
+#include <queues/jobs/job.h>
 
 /**
  * @brief Job-Queue
diff --git a/Source/charon/jobs/delete_ike_sa_job.c b/Source/charon/queues/jobs/delete_ike_sa_job.c
similarity index 100%
rename from Source/charon/jobs/delete_ike_sa_job.c
rename to Source/charon/queues/jobs/delete_ike_sa_job.c
diff --git a/Source/charon/jobs/delete_ike_sa_job.h b/Source/charon/queues/jobs/delete_ike_sa_job.h
similarity index 98%
rename from Source/charon/jobs/delete_ike_sa_job.h
rename to Source/charon/queues/jobs/delete_ike_sa_job.h
index 37dcbc83c..dd6ad8835 100644
--- a/Source/charon/jobs/delete_ike_sa_job.h
+++ b/Source/charon/queues/jobs/delete_ike_sa_job.h
@@ -25,7 +25,7 @@
 
 #include <types.h>
 #include <ike_sa_id.h>
-#include <jobs/job.h>
+#include <queues/jobs/job.h>
 
 
 /**
diff --git a/Source/charon/jobs/incoming_packet_job.c b/Source/charon/queues/jobs/incoming_packet_job.c
similarity index 100%
rename from Source/charon/jobs/incoming_packet_job.c
rename to Source/charon/queues/jobs/incoming_packet_job.c
diff --git a/Source/charon/jobs/incoming_packet_job.h b/Source/charon/queues/jobs/incoming_packet_job.h
similarity index 98%
rename from Source/charon/jobs/incoming_packet_job.h
rename to Source/charon/queues/jobs/incoming_packet_job.h
index 9deab6d80..5e5cb34b5 100644
--- a/Source/charon/jobs/incoming_packet_job.h
+++ b/Source/charon/queues/jobs/incoming_packet_job.h
@@ -23,9 +23,9 @@
 #ifndef INCOMING_PACKET_JOB_H_
 #define INCOMING_PACKET_JOB_H_
 
-#include <jobs/job.h>
 #include <types.h>
 #include <packet.h>
+#include <queues/jobs/job.h>
 
 /**
  * Object representing an INCOMING_PACKET Job
diff --git a/Source/charon/jobs/initiate_ike_sa_job.c b/Source/charon/queues/jobs/initiate_ike_sa_job.c
similarity index 100%
rename from Source/charon/jobs/initiate_ike_sa_job.c
rename to Source/charon/queues/jobs/initiate_ike_sa_job.c
diff --git a/Source/charon/jobs/initiate_ike_sa_job.h b/Source/charon/queues/jobs/initiate_ike_sa_job.h
similarity index 98%
rename from Source/charon/jobs/initiate_ike_sa_job.h
rename to Source/charon/queues/jobs/initiate_ike_sa_job.h
index 39a6b5971..4ffb732cd 100644
--- a/Source/charon/jobs/initiate_ike_sa_job.h
+++ b/Source/charon/queues/jobs/initiate_ike_sa_job.h
@@ -24,7 +24,7 @@
 #define INITIATE_IKE_SA_JOB_H_
 
 #include <types.h>
-#include <jobs/job.h>
+#include <queues/jobs/job.h>
 
 /**
  * Object representing an INITIATE_IKE_SA Job
diff --git a/Source/charon/jobs/job.c b/Source/charon/queues/jobs/job.c
similarity index 100%
rename from Source/charon/jobs/job.c
rename to Source/charon/queues/jobs/job.c
diff --git a/Source/charon/jobs/job.h b/Source/charon/queues/jobs/job.h
similarity index 100%
rename from Source/charon/jobs/job.h
rename to Source/charon/queues/jobs/job.h
diff --git a/Source/charon/receiver.c b/Source/charon/receiver.c
index 75ce071dd..3f77eb5e8 100644
--- a/Source/charon/receiver.c
+++ b/Source/charon/receiver.c
@@ -28,8 +28,8 @@
 #include <socket.h>
 #include <packet.h>
 #include <globals.h>
-#include <jobs/job.h>
 #include <queues/job_queue.h>
+#include <queues/jobs/job.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>