98 files changed, 128 insertions, 135 deletions

diff --git a/src/libcharon/sa/authenticators/authenticator.c b/src/libcharon/sa/authenticator.c
index 73029b9e1..d7a4b3eef 100644
--- a/src/libcharon/sa/authenticators/authenticator.c
+++ b/src/libcharon/sa/authenticator.c
@@ -18,12 +18,12 @@
 
 #include "authenticator.h"
 
-#include <sa/authenticators/pubkey_authenticator.h>
-#include <sa/authenticators/psk_authenticator.h>
-#include <sa/authenticators/eap_authenticator.h>
-#include <sa/authenticators/psk_v1_authenticator.h>
-#include <sa/authenticators/pubkey_v1_authenticator.h>
-#include <sa/authenticators/hybrid_authenticator.h>
+#include <sa/ikev2/authenticators/pubkey_authenticator.h>
+#include <sa/ikev2/authenticators/psk_authenticator.h>
+#include <sa/ikev2/authenticators/eap_authenticator.h>
+#include <sa/ikev1/authenticators/psk_v1_authenticator.h>
+#include <sa/ikev1/authenticators/pubkey_v1_authenticator.h>
+#include <sa/ikev1/authenticators/hybrid_authenticator.h>
 #include <encoding/payloads/auth_payload.h>
 
 
diff --git a/src/libcharon/sa/authenticators/authenticator.h b/src/libcharon/sa/authenticator.h
index 3af939160..3af939160 100644
--- a/src/libcharon/sa/authenticators/authenticator.h
+++ b/src/libcharon/sa/authenticator.h
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 331b001bf..0ee4324bf 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -28,30 +28,30 @@
 #include <daemon.h>
 #include <utils/linked_list.h>
 #include <utils/lexparser.h>
-#include <sa/tasks/ike_init.h>
-#include <sa/tasks/ike_natd.h>
-#include <sa/tasks/ike_mobike.h>
-#include <sa/tasks/ike_auth.h>
-#include <sa/tasks/ike_auth_lifetime.h>
-#include <sa/tasks/ike_config.h>
-#include <sa/tasks/ike_cert_pre.h>
-#include <sa/tasks/ike_cert_post.h>
-#include <sa/tasks/ike_rekey.h>
-#include <sa/tasks/ike_reauth.h>
-#include <sa/tasks/ike_delete.h>
-#include <sa/tasks/ike_dpd.h>
-#include <sa/tasks/ike_vendor.h>
-#include <sa/tasks/child_create.h>
-#include <sa/tasks/child_delete.h>
-#include <sa/tasks/child_rekey.h>
-#include <sa/tasks/main_mode.h>
-#include <sa/tasks/isakmp_cert_pre.h>
-#include <sa/tasks/isakmp_cert_post.h>
-#include <sa/tasks/isakmp_natd.h>
-#include <sa/tasks/quick_mode.h>
-#include <sa/tasks/quick_delete.h>
-#include <sa/tasks/isakmp_vendor.h>
-#include <sa/tasks/isakmp_delete.h>
+#include <sa/ikev2/tasks/ike_init.h>
+#include <sa/ikev2/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_mobike.h>
+#include <sa/ikev2/tasks/ike_auth.h>
+#include <sa/ikev2/tasks/ike_auth_lifetime.h>
+#include <sa/ikev2/tasks/ike_config.h>
+#include <sa/ikev2/tasks/ike_cert_pre.h>
+#include <sa/ikev2/tasks/ike_cert_post.h>
+#include <sa/ikev2/tasks/ike_rekey.h>
+#include <sa/ikev2/tasks/ike_reauth.h>
+#include <sa/ikev2/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_dpd.h>
+#include <sa/ikev2/tasks/ike_vendor.h>
+#include <sa/ikev2/tasks/child_create.h>
+#include <sa/ikev2/tasks/child_delete.h>
+#include <sa/ikev2/tasks/child_rekey.h>
+#include <sa/ikev1/tasks/main_mode.h>
+#include <sa/ikev1/tasks/isakmp_cert_pre.h>
+#include <sa/ikev1/tasks/isakmp_cert_post.h>
+#include <sa/ikev1/tasks/isakmp_natd.h>
+#include <sa/ikev1/tasks/quick_mode.h>
+#include <sa/ikev1/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/isakmp_vendor.h>
+#include <sa/ikev1/tasks/isakmp_delete.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 #include <processing/jobs/send_dpd_job.h>
@@ -59,7 +59,7 @@
 #include <processing/jobs/rekey_ike_sa_job.h>
 
 #ifdef ME
-#include <sa/tasks/ike_me.h>
+#include <sa/ikev2/tasks/ike_me.h>
 #include <processing/jobs/initiate_mediation_job.h>
 #endif
 
diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index cbb16ca4a..e50356451 100644
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -37,7 +37,7 @@ typedef struct ike_sa_t ike_sa_t;
 #include <encoding/payloads/configuration_attribute.h>
 #include <sa/ike_sa_id.h>
 #include <sa/child_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <sa/task_manager.h>
 #include <sa/keymat.h>
 #include <config/peer_cfg.h>
diff --git a/src/libcharon/sa/authenticators/hybrid_authenticator.c b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.c
index f1bc1ecc2..f1bc1ecc2 100644
--- a/src/libcharon/sa/authenticators/hybrid_authenticator.c
+++ b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.c
diff --git a/src/libcharon/sa/authenticators/hybrid_authenticator.h b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
index 37057470b..6a0bb1e59 100644
--- a/src/libcharon/sa/authenticators/hybrid_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct hybrid_authenticator_t hybrid_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using IKEv1 hybrid authentication.
diff --git a/src/libcharon/sa/authenticators/psk_v1_authenticator.c b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
index 11fd8118d..ce794a286 100644
--- a/src/libcharon/sa/authenticators/psk_v1_authenticator.c
+++ b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
@@ -16,7 +16,7 @@
 #include "psk_v1_authenticator.h"
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/hash_payload.h>
 
 typedef struct private_psk_v1_authenticator_t private_psk_v1_authenticator_t;
diff --git a/src/libcharon/sa/authenticators/psk_v1_authenticator.h b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
index e01d49c95..194b96456 100644
--- a/src/libcharon/sa/authenticators/psk_v1_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct psk_v1_authenticator_t psk_v1_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using pre-shared keys for IKEv1.
diff --git a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.c b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
index 7da1953af..56fcf2c9d 100644
--- a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.c
+++ b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
@@ -16,7 +16,7 @@
 #include "pubkey_v1_authenticator.h"
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/hash_payload.h>
 
 typedef struct private_pubkey_v1_authenticator_t private_pubkey_v1_authenticator_t;
diff --git a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.h b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
index e71a81f18..bafc3a2b2 100644
--- a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct pubkey_v1_authenticator_t pubkey_v1_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using public keys for IKEv1.
diff --git a/src/libcharon/sa/authenticators/xauth/xauth_manager.c b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.c
index 432c9c0ab..432c9c0ab 100644
--- a/src/libcharon/sa/authenticators/xauth/xauth_manager.c
+++ b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.c
diff --git a/src/libcharon/sa/authenticators/xauth/xauth_manager.h b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h
index 7f07cc22a..e7e84d06b 100644
--- a/src/libcharon/sa/authenticators/xauth/xauth_manager.h
+++ b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h
@@ -21,7 +21,7 @@
 #ifndef XAUTH_MANAGER_H_
 #define XAUTH_MANAGER_H_
 
-#include <sa/authenticators/xauth/xauth_method.h>
+#include <sa/ikev1/authenticators/xauth/xauth_method.h>
 
 typedef struct xauth_manager_t xauth_manager_t;
 
diff --git a/src/libcharon/sa/authenticators/xauth/xauth_method.c b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.c
index 838822d1e..838822d1e 100644
--- a/src/libcharon/sa/authenticators/xauth/xauth_method.c
+++ b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.c
diff --git a/src/libcharon/sa/authenticators/xauth/xauth_method.h b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.h
index 9f6067dbf..9f6067dbf 100644
--- a/src/libcharon/sa/authenticators/xauth/xauth_method.h
+++ b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.h
diff --git a/src/libcharon/sa/keymat_v1.c b/src/libcharon/sa/ikev1/keymat_v1.c
index 100c9526a..100c9526a 100644
--- a/src/libcharon/sa/keymat_v1.c
+++ b/src/libcharon/sa/ikev1/keymat_v1.c
diff --git a/src/libcharon/sa/keymat_v1.h b/src/libcharon/sa/ikev1/keymat_v1.h
index 875ad9d30..bb1022b5e 100644
--- a/src/libcharon/sa/keymat_v1.h
+++ b/src/libcharon/sa/ikev1/keymat_v1.h
@@ -22,6 +22,7 @@
 #define KEYMAT_V1_H_
 
 #include <sa/keymat.h>
+#include <sa/authenticator.h>
 
 typedef struct keymat_v1_t keymat_v1_t;
 
diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index dea4dcb87..8e4aa7496 100644
--- a/src/libcharon/sa/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -19,15 +19,15 @@
 #include <math.h>
 
 #include <daemon.h>
-#include <sa/tasks/main_mode.h>
-#include <sa/tasks/quick_mode.h>
-#include <sa/tasks/xauth.h>
-#include <sa/tasks/mode_config.h>
-#include <sa/tasks/informational.h>
-#include <sa/tasks/isakmp_natd.h>
-#include <sa/tasks/isakmp_vendor.h>
-#include <sa/tasks/isakmp_cert_pre.h>
-#include <sa/tasks/isakmp_cert_post.h>
+#include <sa/ikev1/tasks/main_mode.h>
+#include <sa/ikev1/tasks/quick_mode.h>
+#include <sa/ikev1/tasks/xauth.h>
+#include <sa/ikev1/tasks/mode_config.h>
+#include <sa/ikev1/tasks/informational.h>
+#include <sa/ikev1/tasks/isakmp_natd.h>
+#include <sa/ikev1/tasks/isakmp_vendor.h>
+#include <sa/ikev1/tasks/isakmp_cert_pre.h>
+#include <sa/ikev1/tasks/isakmp_cert_post.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 
diff --git a/src/libcharon/sa/task_manager_v1.h b/src/libcharon/sa/ikev1/task_manager_v1.h
index 99cd35e32..99cd35e32 100644
--- a/src/libcharon/sa/task_manager_v1.h
+++ b/src/libcharon/sa/ikev1/task_manager_v1.h
diff --git a/src/libcharon/sa/tasks/informational.c b/src/libcharon/sa/ikev1/tasks/informational.c
index 5b2ceca84..9de5c2e71 100644
--- a/src/libcharon/sa/tasks/informational.c
+++ b/src/libcharon/sa/ikev1/tasks/informational.c
@@ -16,8 +16,8 @@
 #include "informational.h"
 
 #include <daemon.h>
-#include <sa/tasks/isakmp_delete.h>
-#include <sa/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/isakmp_delete.h>
+#include <sa/ikev1/tasks/quick_delete.h>
 #include <encoding/payloads/delete_payload.h>
 
 typedef struct private_informational_t private_informational_t;
diff --git a/src/libcharon/sa/tasks/informational.h b/src/libcharon/sa/ikev1/tasks/informational.h
index 2aec7abd8..f1543dc58 100644
--- a/src/libcharon/sa/tasks/informational.h
+++ b/src/libcharon/sa/ikev1/tasks/informational.h
@@ -25,7 +25,7 @@ typedef struct informational_t informational_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <encoding/payloads/notify_payload.h>
 
 /**
diff --git a/src/libcharon/sa/tasks/isakmp_cert_post.c b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.c
index 30e1c6d84..30e1c6d84 100644
--- a/src/libcharon/sa/tasks/isakmp_cert_post.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.c
diff --git a/src/libcharon/sa/tasks/isakmp_cert_post.h b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
index 6720c54e0..2e38df89f 100644
--- a/src/libcharon/sa/tasks/isakmp_cert_post.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
@@ -25,7 +25,7 @@ typedef struct isakmp_cert_post_t isakmp_cert_post_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * ISAKMP_CERT_POST, IKEv1 certificate processing after authentication.
diff --git a/src/libcharon/sa/tasks/isakmp_cert_pre.c b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.c
index db25bf3a3..db25bf3a3 100644
--- a/src/libcharon/sa/tasks/isakmp_cert_pre.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.c
diff --git a/src/libcharon/sa/tasks/isakmp_cert_pre.h b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
index c6dc98ac5..908cff020 100644
--- a/src/libcharon/sa/tasks/isakmp_cert_pre.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
@@ -25,7 +25,7 @@ typedef struct isakmp_cert_pre_t isakmp_cert_pre_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * ISAKMP_CERT_PRE task, IKEv1 certificate processing before authentication.
diff --git a/src/libcharon/sa/tasks/isakmp_delete.c b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
index 0640d13b1..0640d13b1 100644
--- a/src/libcharon/sa/tasks/isakmp_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
diff --git a/src/libcharon/sa/tasks/isakmp_delete.h b/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
index 49e49fab9..3b7b40c11 100644
--- a/src/libcharon/sa/tasks/isakmp_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
@@ -25,7 +25,7 @@ typedef struct isakmp_delete_t isakmp_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ISAKMP_DELETE, delete an IKEv1 IKE_SA.
diff --git a/src/libcharon/sa/tasks/isakmp_natd.c b/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
index b956ff66f..88ee327ba 100644
--- a/src/libcharon/sa/tasks/isakmp_natd.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
@@ -21,7 +21,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <config/peer_cfg.h>
 #include <crypto/hashers/hasher.h>
 #include <encoding/payloads/hash_payload.h>
diff --git a/src/libcharon/sa/tasks/isakmp_natd.h b/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
index 3d5df7e5a..b83b07805 100644
--- a/src/libcharon/sa/tasks/isakmp_natd.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
@@ -25,7 +25,7 @@ typedef struct isakmp_natd_t isakmp_natd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ISAKMP_NATD, detects NAT situation in IKEv1 Phase 1.
diff --git a/src/libcharon/sa/tasks/isakmp_vendor.c b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
index a1d64863c..a1d64863c 100644
--- a/src/libcharon/sa/tasks/isakmp_vendor.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
diff --git a/src/libcharon/sa/tasks/isakmp_vendor.h b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
index e6ceb2e6d..b81d79034 100644
--- a/src/libcharon/sa/tasks/isakmp_vendor.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
@@ -25,7 +25,7 @@ typedef struct isakmp_vendor_t isakmp_vendor_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Vendor ID processing task for IKEv1.
diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
index 08bb29124..7f263260c 100644
--- a/src/libcharon/sa/tasks/main_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
@@ -21,17 +21,17 @@
 #include <string.h>
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <crypto/diffie_hellman.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/hash_payload.h>
-#include <sa/tasks/xauth.h>
-#include <sa/tasks/mode_config.h>
-#include <sa/tasks/informational.h>
-#include <sa/tasks/isakmp_delete.h>
+#include <sa/ikev1/tasks/xauth.h>
+#include <sa/ikev1/tasks/mode_config.h>
+#include <sa/ikev1/tasks/informational.h>
+#include <sa/ikev1/tasks/isakmp_delete.h>
 
 typedef struct private_main_mode_t private_main_mode_t;
 
diff --git a/src/libcharon/sa/tasks/main_mode.h b/src/libcharon/sa/ikev1/tasks/main_mode.h
index 9ff253096..d266b6e63 100644
--- a/src/libcharon/sa/tasks/main_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.h
@@ -25,7 +25,7 @@ typedef struct main_mode_t main_mode_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * IKEv1 main mode, establishes a mainmode including authentication.
diff --git a/src/libcharon/sa/tasks/mode_config.c b/src/libcharon/sa/ikev1/tasks/mode_config.c
index e99d07428..e99d07428 100644
--- a/src/libcharon/sa/tasks/mode_config.c
+++ b/src/libcharon/sa/ikev1/tasks/mode_config.c
diff --git a/src/libcharon/sa/tasks/mode_config.h b/src/libcharon/sa/ikev1/tasks/mode_config.h
index 34b744d10..026545eba 100644
--- a/src/libcharon/sa/tasks/mode_config.h
+++ b/src/libcharon/sa/ikev1/tasks/mode_config.h
@@ -25,7 +25,7 @@ typedef struct mode_config_t mode_config_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_MODE_COFNIG, IKEv1 configuration attribute exchange.
diff --git a/src/libcharon/sa/tasks/quick_delete.c b/src/libcharon/sa/ikev1/tasks/quick_delete.c
index a5f27c5e0..a5f27c5e0 100644
--- a/src/libcharon/sa/tasks/quick_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.c
diff --git a/src/libcharon/sa/tasks/quick_delete.h b/src/libcharon/sa/ikev1/tasks/quick_delete.h
index 80aae8273..1cdf07c48 100644
--- a/src/libcharon/sa/tasks/quick_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.h
@@ -25,7 +25,7 @@ typedef struct quick_delete_t quick_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <sa/child_sa.h>
 
 /**
diff --git a/src/libcharon/sa/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 9d9b5e958..9e71642af 100644
--- a/src/libcharon/sa/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -18,14 +18,14 @@
 #include <string.h>
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/payload.h>
-#include <sa/tasks/informational.h>
-#include <sa/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/informational.h>
+#include <sa/ikev1/tasks/quick_delete.h>
 
 typedef struct private_quick_mode_t private_quick_mode_t;
 
diff --git a/src/libcharon/sa/tasks/quick_mode.h b/src/libcharon/sa/ikev1/tasks/quick_mode.h
index e50c1a97e..82790c768 100644
--- a/src/libcharon/sa/tasks/quick_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.h
@@ -25,7 +25,7 @@ typedef struct quick_mode_t quick_mode_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * IKEv1 quick mode, establishes a CHILD_SA in IKEv1.
diff --git a/src/libcharon/sa/tasks/xauth.c b/src/libcharon/sa/ikev1/tasks/xauth.c
index b4d690094..b4d690094 100644
--- a/src/libcharon/sa/tasks/xauth.c
+++ b/src/libcharon/sa/ikev1/tasks/xauth.c
diff --git a/src/libcharon/sa/tasks/xauth.h b/src/libcharon/sa/ikev1/tasks/xauth.h
index 6633f9e55..c1528ccbe 100644
--- a/src/libcharon/sa/tasks/xauth.h
+++ b/src/libcharon/sa/ikev1/tasks/xauth.h
@@ -25,7 +25,7 @@ typedef struct xauth_t xauth_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_XAUTH, additional authentication after main/aggressive mode.
diff --git a/src/libcharon/sa/authenticators/eap/eap_manager.c b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c
index bc2c4a617..d38754e01 100644
--- a/src/libcharon/sa/authenticators/eap/eap_manager.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c
@@ -159,4 +159,3 @@ eap_manager_t *eap_manager_create()
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/authenticators/eap/eap_manager.h b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h
index 0333fb6da..6b8754634 100644
--- a/src/libcharon/sa/authenticators/eap/eap_manager.h
+++ b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h
@@ -21,7 +21,7 @@
 #ifndef EAP_MANAGER_H_
 #define EAP_MANAGER_H_
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 typedef struct eap_manager_t eap_manager_t;
 
diff --git a/src/libcharon/sa/authenticators/eap/eap_method.c b/src/libcharon/sa/ikev2/authenticators/eap/eap_method.c
index a05e8c59a..a05e8c59a 100644
--- a/src/libcharon/sa/authenticators/eap/eap_method.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap/eap_method.c
diff --git a/src/libcharon/sa/authenticators/eap/eap_method.h b/src/libcharon/sa/ikev2/authenticators/eap/eap_method.h
index 6242a5a6e..6242a5a6e 100644
--- a/src/libcharon/sa/authenticators/eap/eap_method.h
+++ b/src/libcharon/sa/ikev2/authenticators/eap/eap_method.h
diff --git a/src/libcharon/sa/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index d36d544e8..462436d80 100644
--- a/src/libcharon/sa/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -16,8 +16,8 @@
 #include "eap_authenticator.h"
 
 #include <daemon.h>
-#include <sa/keymat_v2.h>
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/keymat_v2.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/eap_payload.h>
 
@@ -707,4 +707,3 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa,
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/authenticators/eap_authenticator.h b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
index 726411a18..15d7cb88d 100644
--- a/src/libcharon/sa/authenticators/eap_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_authenticator_t eap_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using EAP authentication.
diff --git a/src/libcharon/sa/authenticators/psk_authenticator.c b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
index 26c722530..2d3434cdf 100644
--- a/src/libcharon/sa/authenticators/psk_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
@@ -18,7 +18,7 @@
 
 #include <daemon.h>
 #include <encoding/payloads/auth_payload.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 
 typedef struct private_psk_authenticator_t private_psk_authenticator_t;
 
@@ -202,4 +202,3 @@ psk_authenticator_t *psk_authenticator_create_verifier(ike_sa_t *ike_sa,
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/authenticators/psk_authenticator.h b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
index 8cf1a0f98..ffd06f1bc 100644
--- a/src/libcharon/sa/authenticators/psk_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct psk_authenticator_t psk_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using pre-shared keys.
diff --git a/src/libcharon/sa/authenticators/pubkey_authenticator.c b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
index df5b06ae6..179be3977 100644
--- a/src/libcharon/sa/authenticators/pubkey_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
@@ -19,7 +19,7 @@
 
 #include <daemon.h>
 #include <encoding/payloads/auth_payload.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 
 typedef struct private_pubkey_authenticator_t private_pubkey_authenticator_t;
 
diff --git a/src/libcharon/sa/authenticators/pubkey_authenticator.h b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
index 4c3937ecc..bf95d6efd 100644
--- a/src/libcharon/sa/authenticators/pubkey_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
@@ -24,7 +24,7 @@
 
 typedef struct pubkey_authenticator_t pubkey_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using public key authenitcation.
diff --git a/src/libcharon/sa/connect_manager.c b/src/libcharon/sa/ikev2/connect_manager.c
index 31947aa7b..31947aa7b 100644
--- a/src/libcharon/sa/connect_manager.c
+++ b/src/libcharon/sa/ikev2/connect_manager.c
diff --git a/src/libcharon/sa/connect_manager.h b/src/libcharon/sa/ikev2/connect_manager.h
index 8fa8ff697..8fa8ff697 100644
--- a/src/libcharon/sa/connect_manager.h
+++ b/src/libcharon/sa/ikev2/connect_manager.h
diff --git a/src/libcharon/sa/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
index aacff0a99..aacff0a99 100644
--- a/src/libcharon/sa/keymat_v2.c
+++ b/src/libcharon/sa/ikev2/keymat_v2.c
diff --git a/src/libcharon/sa/keymat_v2.h b/src/libcharon/sa/ikev2/keymat_v2.h
index b33e71344..b33e71344 100644
--- a/src/libcharon/sa/keymat_v2.h
+++ b/src/libcharon/sa/ikev2/keymat_v2.h
diff --git a/src/libcharon/sa/mediation_manager.c b/src/libcharon/sa/ikev2/mediation_manager.c
index 60eeb5d4b..60eeb5d4b 100644
--- a/src/libcharon/sa/mediation_manager.c
+++ b/src/libcharon/sa/ikev2/mediation_manager.c
diff --git a/src/libcharon/sa/mediation_manager.h b/src/libcharon/sa/ikev2/mediation_manager.h
index 31a16f69c..31a16f69c 100644
--- a/src/libcharon/sa/mediation_manager.h
+++ b/src/libcharon/sa/ikev2/mediation_manager.h
diff --git a/src/libcharon/sa/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 57b485ac5..cce9551d5 100644
--- a/src/libcharon/sa/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -19,28 +19,28 @@
 #include <math.h>
 
 #include <daemon.h>
-#include <sa/tasks/ike_init.h>
-#include <sa/tasks/ike_natd.h>
-#include <sa/tasks/ike_mobike.h>
-#include <sa/tasks/ike_auth.h>
-#include <sa/tasks/ike_auth_lifetime.h>
-#include <sa/tasks/ike_cert_pre.h>
-#include <sa/tasks/ike_cert_post.h>
-#include <sa/tasks/ike_rekey.h>
-#include <sa/tasks/ike_delete.h>
-#include <sa/tasks/ike_config.h>
-#include <sa/tasks/ike_dpd.h>
-#include <sa/tasks/ike_vendor.h>
-#include <sa/tasks/child_create.h>
-#include <sa/tasks/child_rekey.h>
-#include <sa/tasks/child_delete.h>
+#include <sa/ikev2/tasks/ike_init.h>
+#include <sa/ikev2/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_mobike.h>
+#include <sa/ikev2/tasks/ike_auth.h>
+#include <sa/ikev2/tasks/ike_auth_lifetime.h>
+#include <sa/ikev2/tasks/ike_cert_pre.h>
+#include <sa/ikev2/tasks/ike_cert_post.h>
+#include <sa/ikev2/tasks/ike_rekey.h>
+#include <sa/ikev2/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_config.h>
+#include <sa/ikev2/tasks/ike_dpd.h>
+#include <sa/ikev2/tasks/ike_vendor.h>
+#include <sa/ikev2/tasks/child_create.h>
+#include <sa/ikev2/tasks/child_rekey.h>
+#include <sa/ikev2/tasks/child_delete.h>
 #include <encoding/payloads/delete_payload.h>
 #include <encoding/payloads/unknown_payload.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 
 #ifdef ME
-#include <sa/tasks/ike_me.h>
+#include <sa/ikev2/tasks/ike_me.h>
 #endif
 
 typedef struct exchange_t exchange_t;
diff --git a/src/libcharon/sa/task_manager_v2.h b/src/libcharon/sa/ikev2/task_manager_v2.h
index 3e55c983b..3e55c983b 100644
--- a/src/libcharon/sa/task_manager_v2.h
+++ b/src/libcharon/sa/ikev2/task_manager_v2.h
diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index 79d082138..023334bd4 100644
--- a/src/libcharon/sa/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -18,7 +18,7 @@
 #include "child_create.h"
 
 #include <daemon.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <crypto/diffie_hellman.h>
 #include <credentials/certificates/x509.h>
 #include <encoding/payloads/sa_payload.h>
diff --git a/src/libcharon/sa/tasks/child_create.h b/src/libcharon/sa/ikev2/tasks/child_create.h
index fdec3bbb9..938b84398 100644
--- a/src/libcharon/sa/tasks/child_create.h
+++ b/src/libcharon/sa/ikev2/tasks/child_create.h
@@ -25,7 +25,7 @@ typedef struct child_create_t child_create_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <config/child_cfg.h>
 
 /**
diff --git a/src/libcharon/sa/tasks/child_delete.c b/src/libcharon/sa/ikev2/tasks/child_delete.c
index c5151abf1..c5151abf1 100644
--- a/src/libcharon/sa/tasks/child_delete.c
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.c
diff --git a/src/libcharon/sa/tasks/child_delete.h b/src/libcharon/sa/ikev2/tasks/child_delete.h
index 365807c68..34d399ce3 100644
--- a/src/libcharon/sa/tasks/child_delete.h
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.h
@@ -25,7 +25,7 @@ typedef struct child_delete_t child_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <sa/child_sa.h>
 
 /**
diff --git a/src/libcharon/sa/tasks/child_rekey.c b/src/libcharon/sa/ikev2/tasks/child_rekey.c
index fa916c4e5..50a8aad95 100644
--- a/src/libcharon/sa/tasks/child_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.c
@@ -18,8 +18,8 @@
 
 #include <daemon.h>
 #include <encoding/payloads/notify_payload.h>
-#include <sa/tasks/child_create.h>
-#include <sa/tasks/child_delete.h>
+#include <sa/ikev2/tasks/child_create.h>
+#include <sa/ikev2/tasks/child_delete.h>
 #include <processing/jobs/rekey_child_sa_job.h>
 #include <processing/jobs/rekey_ike_sa_job.h>
 
diff --git a/src/libcharon/sa/tasks/child_rekey.h b/src/libcharon/sa/ikev2/tasks/child_rekey.h
index 3ba417611..78314b0f9 100644
--- a/src/libcharon/sa/tasks/child_rekey.h
+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.h
@@ -26,7 +26,7 @@ typedef struct child_rekey_t child_rekey_t;
 #include <library.h>
 #include <sa/ike_sa.h>
 #include <sa/child_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_CHILD_REKEY, rekey an established CHILD_SA.
diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/ikev2/tasks/ike_auth.c
index f9cf5c613..183ca3440 100644
--- a/src/libcharon/sa/tasks/ike_auth.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.c
@@ -23,7 +23,7 @@
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/eap_payload.h>
 #include <encoding/payloads/nonce_payload.h>
-#include <sa/authenticators/eap_authenticator.h>
+#include <sa/ikev2/authenticators/eap_authenticator.h>
 
 typedef struct private_ike_auth_t private_ike_auth_t;
 
@@ -1096,4 +1096,3 @@ ike_auth_t *ike_auth_create(ike_sa_t *ike_sa, bool initiator)
 	}
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_auth.h b/src/libcharon/sa/ikev2/tasks/ike_auth.h
index c6c0100b0..cf507f8e6 100644
--- a/src/libcharon/sa/tasks/ike_auth.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.h
@@ -25,7 +25,7 @@ typedef struct ike_auth_t ike_auth_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_auth, authenticates an IKE_SA using authenticators.
diff --git a/src/libcharon/sa/tasks/ike_auth_lifetime.c b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c
index 31e3bffca..a7d162e68 100644
--- a/src/libcharon/sa/tasks/ike_auth_lifetime.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c
@@ -170,4 +170,3 @@ ike_auth_lifetime_t *ike_auth_lifetime_create(ike_sa_t *ike_sa, bool initiator)
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_auth_lifetime.h b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
index 9052f4274..5259beb2a 100644
--- a/src/libcharon/sa/tasks/ike_auth_lifetime.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
@@ -25,7 +25,7 @@ typedef struct ike_auth_lifetime_t ike_auth_lifetime_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_AUTH_LIFETIME, implements RFC4478.
diff --git a/src/libcharon/sa/tasks/ike_cert_post.c b/src/libcharon/sa/ikev2/tasks/ike_cert_post.c
index bedf323ff..10bb4d19b 100644
--- a/src/libcharon/sa/tasks/ike_cert_post.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_post.c
@@ -254,4 +254,3 @@ ike_cert_post_t *ike_cert_post_create(ike_sa_t *ike_sa, bool initiator)
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_cert_post.h b/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
index b3881a01a..61d4c2d82 100644
--- a/src/libcharon/sa/tasks/ike_cert_post.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
@@ -25,7 +25,7 @@ typedef struct ike_cert_post_t ike_cert_post_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_cert_post, certificate processing after authentication.
diff --git a/src/libcharon/sa/tasks/ike_cert_pre.c b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c
index 0de2efd38..0de2efd38 100644
--- a/src/libcharon/sa/tasks/ike_cert_pre.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c
diff --git a/src/libcharon/sa/tasks/ike_cert_pre.h b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
index 4b2d0d470..7de1f3271 100644
--- a/src/libcharon/sa/tasks/ike_cert_pre.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
@@ -25,7 +25,7 @@ typedef struct ike_cert_pre_t ike_cert_pre_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_cert_post, certificate processing before authentication.
diff --git a/src/libcharon/sa/tasks/ike_config.c b/src/libcharon/sa/ikev2/tasks/ike_config.c
index 332af465b..da530a007 100644
--- a/src/libcharon/sa/tasks/ike_config.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.c
@@ -443,4 +443,3 @@ ike_config_t *ike_config_create(ike_sa_t *ike_sa, bool initiator)
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_config.h b/src/libcharon/sa/ikev2/tasks/ike_config.h
index d343761c1..239e35c43 100644
--- a/src/libcharon/sa/tasks/ike_config.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.h
@@ -25,7 +25,7 @@ typedef struct ike_config_t ike_config_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_CONFIG, sets up a virtual IP and other
diff --git a/src/libcharon/sa/tasks/ike_delete.c b/src/libcharon/sa/ikev2/tasks/ike_delete.c
index 29ac87258..29ac87258 100644
--- a/src/libcharon/sa/tasks/ike_delete.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_delete.c
diff --git a/src/libcharon/sa/tasks/ike_delete.h b/src/libcharon/sa/ikev2/tasks/ike_delete.h
index 82782f393..039e068e6 100644
--- a/src/libcharon/sa/tasks/ike_delete.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_delete.h
@@ -25,7 +25,7 @@ typedef struct ike_delete_t ike_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_delete, delete an IKE_SA.
diff --git a/src/libcharon/sa/tasks/ike_dpd.c b/src/libcharon/sa/ikev2/tasks/ike_dpd.c
index 28ccc2efe..28ccc2efe 100644
--- a/src/libcharon/sa/tasks/ike_dpd.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_dpd.c
diff --git a/src/libcharon/sa/tasks/ike_dpd.h b/src/libcharon/sa/ikev2/tasks/ike_dpd.h
index a9f68c31c..586557232 100644
--- a/src/libcharon/sa/tasks/ike_dpd.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_dpd.h
@@ -25,7 +25,7 @@ typedef struct ike_dpd_t ike_dpd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_dpd, detects dead peers.
diff --git a/src/libcharon/sa/tasks/ike_init.c b/src/libcharon/sa/ikev2/tasks/ike_init.c
index 3b0c4e8f8..ceae484d0 100644
--- a/src/libcharon/sa/tasks/ike_init.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_init.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <daemon.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <crypto/diffie_hellman.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/ke_payload.h>
diff --git a/src/libcharon/sa/tasks/ike_init.h b/src/libcharon/sa/ikev2/tasks/ike_init.h
index 6855ac839..aa3cfa8a9 100644
--- a/src/libcharon/sa/tasks/ike_init.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_init.h
@@ -25,7 +25,7 @@ typedef struct ike_init_t ike_init_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_INIT, creates an IKE_SA without authentication.
diff --git a/src/libcharon/sa/tasks/ike_me.c b/src/libcharon/sa/ikev2/tasks/ike_me.c
index 333c13635..333c13635 100644
--- a/src/libcharon/sa/tasks/ike_me.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_me.c
diff --git a/src/libcharon/sa/tasks/ike_me.h b/src/libcharon/sa/ikev2/tasks/ike_me.h
index 74dd1dedf..a7fe0c588 100644
--- a/src/libcharon/sa/tasks/ike_me.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_me.h
@@ -25,7 +25,7 @@ typedef struct ike_me_t ike_me_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_ME, detects and handles IKE-ME extensions.
diff --git a/src/libcharon/sa/tasks/ike_mobike.c b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
index 6719bddd6..c533506bb 100644
--- a/src/libcharon/sa/tasks/ike_mobike.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
@@ -19,7 +19,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
-#include <sa/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_natd.h>
 #include <encoding/payloads/notify_payload.h>
 
 #define COOKIE2_SIZE 16
@@ -649,4 +649,3 @@ ike_mobike_t *ike_mobike_create(ike_sa_t *ike_sa, bool initiator)
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_mobike.h b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
index 16611939e..04cd33f51 100644
--- a/src/libcharon/sa/tasks/ike_mobike.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
@@ -25,7 +25,7 @@ typedef struct ike_mobike_t ike_mobike_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <network/packet.h>
 
 /**
diff --git a/src/libcharon/sa/tasks/ike_natd.c b/src/libcharon/sa/ikev2/tasks/ike_natd.c
index 3de0ab1b4..3de0ab1b4 100644
--- a/src/libcharon/sa/tasks/ike_natd.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_natd.c
diff --git a/src/libcharon/sa/tasks/ike_natd.h b/src/libcharon/sa/ikev2/tasks/ike_natd.h
index 68114af42..33ebfcae7 100644
--- a/src/libcharon/sa/tasks/ike_natd.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_natd.h
@@ -25,7 +25,7 @@ typedef struct ike_natd_t ike_natd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_natd, detects NAT situation in IKE_SA_INIT exchange.
diff --git a/src/libcharon/sa/tasks/ike_reauth.c b/src/libcharon/sa/ikev2/tasks/ike_reauth.c
index 38c7a4272..d9f3fe8de 100644
--- a/src/libcharon/sa/tasks/ike_reauth.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_reauth.c
@@ -16,7 +16,7 @@
 #include "ike_reauth.h"
 
 #include <daemon.h>
-#include <sa/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_delete.h>
 
 
 typedef struct private_ike_reauth_t private_ike_reauth_t;
@@ -190,4 +190,3 @@ ike_reauth_t *ike_reauth_create(ike_sa_t *ike_sa)
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_reauth.h b/src/libcharon/sa/ikev2/tasks/ike_reauth.h
index 5e97b719c..52c507ede 100644
--- a/src/libcharon/sa/tasks/ike_reauth.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_reauth.h
@@ -25,7 +25,7 @@ typedef struct ike_reauth_t ike_reauth_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_reauth, reestablishes an IKE_SA.
diff --git a/src/libcharon/sa/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
index a0d346040..2cfcdc1fc 100644
--- a/src/libcharon/sa/tasks/ike_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
@@ -18,8 +18,8 @@
 
 #include <daemon.h>
 #include <encoding/payloads/notify_payload.h>
-#include <sa/tasks/ike_init.h>
-#include <sa/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_init.h>
+#include <sa/ikev2/tasks/ike_delete.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 #include <processing/jobs/rekey_ike_sa_job.h>
 
diff --git a/src/libcharon/sa/tasks/ike_rekey.h b/src/libcharon/sa/ikev2/tasks/ike_rekey.h
index 6a9d59b0e..20fcd80ed 100644
--- a/src/libcharon/sa/tasks/ike_rekey.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.h
@@ -25,7 +25,7 @@ typedef struct ike_rekey_t ike_rekey_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_REKEY, rekey an established IKE_SA.
diff --git a/src/libcharon/sa/tasks/ike_vendor.c b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
index 7b3cc6e91..b2b965a57 100644
--- a/src/libcharon/sa/tasks/ike_vendor.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
@@ -139,4 +139,3 @@ ike_vendor_t *ike_vendor_create(ike_sa_t *ike_sa, bool initiator)
 
 	return &this->public;
 }
-
diff --git a/src/libcharon/sa/tasks/ike_vendor.h b/src/libcharon/sa/ikev2/tasks/ike_vendor.h
index 6c353c447..54aad9541 100644
--- a/src/libcharon/sa/tasks/ike_vendor.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.h
@@ -25,7 +25,7 @@ typedef struct ike_vendor_t ike_vendor_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Vendor ID processing task.
diff --git a/src/libcharon/sa/keymat.c b/src/libcharon/sa/keymat.c
index f132822b7..bcf131fd0 100644
--- a/src/libcharon/sa/keymat.c
+++ b/src/libcharon/sa/keymat.c
@@ -14,8 +14,9 @@
  */
 
 #include "keymat.h"
-#include "keymat_v1.h"
-#include "keymat_v2.h"
+
+#include <sa/ikev1/keymat_v1.h>
+#include <sa/ikev2/keymat_v2.h>
 
 /**
  * See header
diff --git a/src/libcharon/sa/keymat.h b/src/libcharon/sa/keymat.h
index 5395c3776..4a551a8f5 100644
--- a/src/libcharon/sa/keymat.h
+++ b/src/libcharon/sa/keymat.h
@@ -28,7 +28,7 @@ typedef struct keymat_t keymat_t;
 #include <crypto/prfs/prf.h>
 #include <crypto/aead.h>
 #include <config/proposal.h>
-#include <config/peer_cfg.h> /* for ike_version_t */
+#include <config/peer_cfg.h>
 #include <sa/ike_sa_id.h>
 
 /**
diff --git a/src/libcharon/sa/tasks/task.c b/src/libcharon/sa/task.c
index ce61c4088..ce61c4088 100644
--- a/src/libcharon/sa/tasks/task.c
+++ b/src/libcharon/sa/task.c
diff --git a/src/libcharon/sa/tasks/task.h b/src/libcharon/sa/task.h
index 0afdf4351..0afdf4351 100644
--- a/src/libcharon/sa/tasks/task.h
+++ b/src/libcharon/sa/task.h
diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 3538087bc..70f732fab 100644
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager.c
@@ -14,8 +14,9 @@
  */
 
 #include "task_manager.h"
-#include "task_manager_v1.h"
-#include "task_manager_v2.h"
+
+#include <sa/ikev1/task_manager_v1.h>
+#include <sa/ikev2/task_manager_v2.h>
 
 /**
  * See header
diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index 42a04fb64..47b39a68a 100644
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -29,7 +29,7 @@ typedef enum task_queue_t task_queue_t;
 #include <library.h>
 #include <encoding/message.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * First retransmit timeout in seconds.