From: Martin Willi <martin@revosec.ch>
Date: Mon, 19 Dec 2011 12:10:29 +0000 (+0100)
Subject: Separated libcharon/sa directory with ikev1 and ikev2 subfolders
X-Git-Tag: 5.0.0~338^2~9^2~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15a682f4c23d0b8340b31077698e6f6d924c2861;p=thirdparty%2Fstrongswan.git

Separated libcharon/sa directory with ikev1 and ikev2 subfolders
---

diff --git a/src/conftest/hooks/pretend_auth.c b/src/conftest/hooks/pretend_auth.c
index 10b13c6ac4..3a7bb4f6b9 100644
--- a/src/conftest/hooks/pretend_auth.c
+++ b/src/conftest/hooks/pretend_auth.c
@@ -15,7 +15,7 @@
 
 #include "hook.h"
 
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/cert_payload.h>
 #include <encoding/payloads/auth_payload.h>
diff --git a/src/conftest/hooks/rebuild_auth.c b/src/conftest/hooks/rebuild_auth.c
index cf9b113cc8..1197eb2dc1 100644
--- a/src/conftest/hooks/rebuild_auth.c
+++ b/src/conftest/hooks/rebuild_auth.c
@@ -15,7 +15,7 @@
 
 #include "hook.h"
 
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <encoding/generator.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/auth_payload.h>
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 95bec0966d..474b205212 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -57,55 +57,57 @@ processing/jobs/start_action_job.c processing/jobs/start_action_job.h \
 processing/jobs/roam_job.c processing/jobs/roam_job.h \
 processing/jobs/update_sa_job.c processing/jobs/update_sa_job.h \
 processing/jobs/inactivity_job.c processing/jobs/inactivity_job.h \
-sa/authenticators/authenticator.c sa/authenticators/authenticator.h \
-sa/authenticators/eap_authenticator.c sa/authenticators/eap_authenticator.h \
-sa/authenticators/eap/eap_method.c sa/authenticators/eap/eap_method.h \
-sa/authenticators/eap/eap_manager.c sa/authenticators/eap/eap_manager.h \
-sa/authenticators/psk_authenticator.c sa/authenticators/psk_authenticator.h \
-sa/authenticators/pubkey_authenticator.c sa/authenticators/pubkey_authenticator.h \
-sa/authenticators/psk_v1_authenticator.c sa/authenticators/psk_v1_authenticator.h \
-sa/authenticators/pubkey_v1_authenticator.c sa/authenticators/pubkey_v1_authenticator.h \
-sa/authenticators/hybrid_authenticator.c sa/authenticators/hybrid_authenticator.h \
-sa/authenticators/xauth/xauth_method.c sa/authenticators/xauth/xauth_method.h \
-sa/authenticators/xauth/xauth_manager.c sa/authenticators/xauth/xauth_manager.h \
+sa/authenticator.c sa/authenticator.h \
 sa/child_sa.c sa/child_sa.h \
 sa/ike_sa.c sa/ike_sa.h \
 sa/ike_sa_id.c sa/ike_sa_id.h \
+sa/keymat.h sa/keymat.c \
 sa/ike_sa_manager.c sa/ike_sa_manager.h \
-sa/task_manager.h sa/task_manager.c sa/task_manager_v2.c sa/task_manager_v2.h \
-sa/task_manager_v1.c sa/task_manager_v1.h \
-sa/keymat.h sa/keymat.c sa/keymat_v2.c sa/keymat_v2.h \
-sa/keymat_v1.c sa/keymat_v1.h \
+sa/task_manager.h sa/task_manager.c \
 sa/shunt_manager.c sa/shunt_manager.h \
 sa/trap_manager.c sa/trap_manager.h \
-sa/tasks/child_create.c sa/tasks/child_create.h \
-sa/tasks/child_delete.c sa/tasks/child_delete.h \
-sa/tasks/child_rekey.c sa/tasks/child_rekey.h \
-sa/tasks/ike_auth.c sa/tasks/ike_auth.h \
-sa/tasks/ike_cert_pre.c sa/tasks/ike_cert_pre.h \
-sa/tasks/ike_cert_post.c sa/tasks/ike_cert_post.h \
-sa/tasks/ike_config.c sa/tasks/ike_config.h \
-sa/tasks/ike_delete.c sa/tasks/ike_delete.h \
-sa/tasks/ike_dpd.c sa/tasks/ike_dpd.h \
-sa/tasks/ike_init.c sa/tasks/ike_init.h \
-sa/tasks/ike_natd.c sa/tasks/ike_natd.h \
-sa/tasks/ike_mobike.c sa/tasks/ike_mobike.h \
-sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
-sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
-sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
-sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
-sa/tasks/main_mode.c sa/tasks/main_mode.h \
-sa/tasks/informational.c sa/tasks/informational.h \
-sa/tasks/isakmp_cert_pre.c sa/tasks/isakmp_cert_pre.h \
-sa/tasks/isakmp_cert_post.c sa/tasks/isakmp_cert_post.h \
-sa/tasks/isakmp_natd.c sa/tasks/isakmp_natd.h \
-sa/tasks/isakmp_vendor.c sa/tasks/isakmp_vendor.h \
-sa/tasks/isakmp_delete.c sa/tasks/isakmp_delete.h \
-sa/tasks/xauth.c sa/tasks/xauth.h \
-sa/tasks/quick_mode.c sa/tasks/quick_mode.h \
-sa/tasks/quick_delete.c sa/tasks/quick_delete.h \
-sa/tasks/mode_config.c sa/tasks/mode_config.h \
-sa/tasks/task.c sa/tasks/task.h
+sa/task.c sa/task.h \
+sa/ikev2/keymat_v2.c sa/ikev2/keymat_v2.h \
+sa/ikev2/task_manager_v2.c sa/ikev2/task_manager_v2.h \
+sa/ikev2/authenticators/eap_authenticator.c sa/ikev2/authenticators/eap_authenticator.h \
+sa/ikev2/authenticators/eap/eap_method.c sa/ikev2/authenticators/eap/eap_method.h \
+sa/ikev2/authenticators/eap/eap_manager.c sa/ikev2/authenticators/eap/eap_manager.h \
+sa/ikev2/authenticators/psk_authenticator.c sa/ikev2/authenticators/psk_authenticator.h \
+sa/ikev2/authenticators/pubkey_authenticator.c sa/ikev2/authenticators/pubkey_authenticator.h \
+sa/ikev2/tasks/child_create.c sa/ikev2/tasks/child_create.h \
+sa/ikev2/tasks/child_delete.c sa/ikev2/tasks/child_delete.h \
+sa/ikev2/tasks/child_rekey.c sa/ikev2/tasks/child_rekey.h \
+sa/ikev2/tasks/ike_auth.c sa/ikev2/tasks/ike_auth.h \
+sa/ikev2/tasks/ike_cert_pre.c sa/ikev2/tasks/ike_cert_pre.h \
+sa/ikev2/tasks/ike_cert_post.c sa/ikev2/tasks/ike_cert_post.h \
+sa/ikev2/tasks/ike_config.c sa/ikev2/tasks/ike_config.h \
+sa/ikev2/tasks/ike_delete.c sa/ikev2/tasks/ike_delete.h \
+sa/ikev2/tasks/ike_dpd.c sa/ikev2/tasks/ike_dpd.h \
+sa/ikev2/tasks/ike_init.c sa/ikev2/tasks/ike_init.h \
+sa/ikev2/tasks/ike_natd.c sa/ikev2/tasks/ike_natd.h \
+sa/ikev2/tasks/ike_mobike.c sa/ikev2/tasks/ike_mobike.h \
+sa/ikev2/tasks/ike_rekey.c sa/ikev2/tasks/ike_rekey.h \
+sa/ikev2/tasks/ike_reauth.c sa/ikev2/tasks/ike_reauth.h \
+sa/ikev2/tasks/ike_auth_lifetime.c sa/ikev2/tasks/ike_auth_lifetime.h \
+sa/ikev2/tasks/ike_vendor.c sa/ikev2/tasks/ike_vendor.h \
+sa/ikev1/keymat_v1.c sa/ikev1/keymat_v1.h \
+sa/ikev1/task_manager_v1.c sa/ikev1/task_manager_v1.h \
+sa/ikev1/authenticators/psk_v1_authenticator.c sa/ikev1/authenticators/psk_v1_authenticator.h \
+sa/ikev1/authenticators/pubkey_v1_authenticator.c sa/ikev1/authenticators/pubkey_v1_authenticator.h \
+sa/ikev1/authenticators/hybrid_authenticator.c sa/ikev1/authenticators/hybrid_authenticator.h \
+sa/ikev1/authenticators/xauth/xauth_method.c sa/ikev1/authenticators/xauth/xauth_method.h \
+sa/ikev1/authenticators/xauth/xauth_manager.c sa/ikev1/authenticators/xauth/xauth_manager.h \
+sa/ikev1/tasks/main_mode.c sa/ikev1/tasks/main_mode.h \
+sa/ikev1/tasks/informational.c sa/ikev1/tasks/informational.h \
+sa/ikev1/tasks/isakmp_cert_pre.c sa/ikev1/tasks/isakmp_cert_pre.h \
+sa/ikev1/tasks/isakmp_cert_post.c sa/ikev1/tasks/isakmp_cert_post.h \
+sa/ikev1/tasks/isakmp_natd.c sa/ikev1/tasks/isakmp_natd.h \
+sa/ikev1/tasks/isakmp_vendor.c sa/ikev1/tasks/isakmp_vendor.h \
+sa/ikev1/tasks/isakmp_delete.c sa/ikev1/tasks/isakmp_delete.h \
+sa/ikev1/tasks/xauth.c sa/ikev1/tasks/xauth.h \
+sa/ikev1/tasks/quick_mode.c sa/ikev1/tasks/quick_mode.h \
+sa/ikev1/tasks/quick_delete.c sa/ikev1/tasks/quick_delete.h \
+sa/ikev1/tasks/mode_config.c sa/ikev1/tasks/mode_config.h
 
 
 daemon.lo :		$(top_builddir)/config.status
@@ -132,9 +134,9 @@ if USE_ME
   libcharon_la_SOURCES += encoding/payloads/endpoint_notify.c encoding/payloads/endpoint_notify.h \
     processing/jobs/initiate_mediation_job.c processing/jobs/initiate_mediation_job.h \
     processing/jobs/mediation_job.c processing/jobs/mediation_job.h \
-    sa/connect_manager.c sa/connect_manager.h \
-    sa/mediation_manager.c sa/mediation_manager.h \
-    sa/tasks/ike_me.c sa/tasks/ike_me.h
+    sa/ikev2/connect_manager.c sa/ikev2/connect_manager.h \
+    sa/ikev2/mediation_manager.c sa/ikev2/mediation_manager.h \
+    sa/ikev2/tasks/ike_me.c sa/ikev2/tasks/ike_me.h
 endif
 
 if USE_LIBCAP
diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index f1915614a2..dcbe6aa9e1 100644
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -35,8 +35,6 @@ typedef struct peer_cfg_t peer_cfg_t;
 #include <config/proposal.h>
 #include <config/ike_cfg.h>
 #include <config/child_cfg.h>
-#include <sa/authenticators/authenticator.h>
-#include <sa/authenticators/eap/eap_method.h>
 #include <credentials/auth_cfg.h>
 
 /**
diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index a887eab79f..785ad23bf8 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -148,12 +148,12 @@ typedef struct daemon_t daemon_t;
 #include <sa/trap_manager.h>
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
-#include <sa/authenticators/eap/eap_manager.h>
-#include <sa/authenticators/xauth/xauth_manager.h>
+#include <sa/ikev2/authenticators/eap/eap_manager.h>
+#include <sa/ikev1/authenticators/xauth/xauth_manager.h>
 
 #ifdef ME
-#include <sa/connect_manager.h>
-#include <sa/mediation_manager.h>
+#include <sa/ikev2/connect_manager.h>
+#include <sa/ikev2/mediation_manager.h>
 #endif /* ME */
 
 /**
diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 708e3fb973..cf2a66efa1 100644
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -24,7 +24,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/generator.h>
 #include <encoding/parser.h>
 #include <encoding/payloads/encodings.h>
diff --git a/src/libcharon/encoding/payloads/auth_payload.h b/src/libcharon/encoding/payloads/auth_payload.h
index 521fe1d196..b922d12c85 100644
--- a/src/libcharon/encoding/payloads/auth_payload.h
+++ b/src/libcharon/encoding/payloads/auth_payload.h
@@ -26,7 +26,7 @@ typedef struct auth_payload_t auth_payload_t;
 
 #include <library.h>
 #include <encoding/payloads/payload.h>
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Class representing an IKEv2 AUTH payload.
diff --git a/src/libcharon/encoding/payloads/eap_payload.c b/src/libcharon/encoding/payloads/eap_payload.c
index 9982f05a16..1b9a5c8028 100644
--- a/src/libcharon/encoding/payloads/eap_payload.c
+++ b/src/libcharon/encoding/payloads/eap_payload.c
@@ -19,6 +19,7 @@
 #include "eap_payload.h"
 
 #include <daemon.h>
+#include <eap/eap.h>
 
 typedef struct private_eap_payload_t private_eap_payload_t;
 
diff --git a/src/libcharon/encoding/payloads/eap_payload.h b/src/libcharon/encoding/payloads/eap_payload.h
index e63db7d880..52bc7ac5ea 100644
--- a/src/libcharon/encoding/payloads/eap_payload.h
+++ b/src/libcharon/encoding/payloads/eap_payload.h
@@ -25,8 +25,8 @@
 typedef struct eap_payload_t eap_payload_t;
 
 #include <library.h>
+#include <eap/eap.h>
 #include <encoding/payloads/payload.h>
-#include <sa/authenticators/eap/eap_method.h>
 
 /**
  * Class representing an IKEv2 EAP payload.
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h
index 03b26e1275..aefdf2f277 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.h
+++ b/src/libcharon/encoding/payloads/proposal_substructure.h
@@ -30,7 +30,7 @@ typedef struct proposal_substructure_t proposal_substructure_t;
 #include <config/proposal.h>
 #include <utils/linked_list.h>
 #include <kernel/kernel_ipsec.h>
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Class representing an IKEv1/IKEv2 proposal substructure.
diff --git a/src/libcharon/encoding/payloads/sa_payload.h b/src/libcharon/encoding/payloads/sa_payload.h
index dfba477498..6dfbd51805 100644
--- a/src/libcharon/encoding/payloads/sa_payload.h
+++ b/src/libcharon/encoding/payloads/sa_payload.h
@@ -29,7 +29,7 @@ typedef struct sa_payload_t sa_payload_t;
 #include <encoding/payloads/proposal_substructure.h>
 #include <utils/linked_list.h>
 #include <kernel/kernel_ipsec.h>
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Class representing an IKEv1 or IKEv2 SA Payload.
diff --git a/src/libcharon/plugins/eap_aka/eap_aka_peer.h b/src/libcharon/plugins/eap_aka/eap_aka_peer.h
index 974ba27210..4fc1821c44 100644
--- a/src/libcharon/plugins/eap_aka/eap_aka_peer.h
+++ b/src/libcharon/plugins/eap_aka/eap_aka_peer.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_aka_peer_t eap_aka_peer_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * EAP-AKA peer implementation.
diff --git a/src/libcharon/plugins/eap_aka/eap_aka_server.h b/src/libcharon/plugins/eap_aka/eap_aka_server.h
index 5ab1c4dfd9..4819021d2e 100644
--- a/src/libcharon/plugins/eap_aka/eap_aka_server.h
+++ b/src/libcharon/plugins/eap_aka/eap_aka_server.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_aka_server_t eap_aka_server_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * EAP-AKA server implementation.
diff --git a/src/libcharon/plugins/eap_gtc/eap_gtc.h b/src/libcharon/plugins/eap_gtc/eap_gtc.h
index 2eb8482f86..0ce46b3031 100644
--- a/src/libcharon/plugins/eap_gtc/eap_gtc.h
+++ b/src/libcharon/plugins/eap_gtc/eap_gtc.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_gtc_t eap_gtc_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of the eap_method_t interface using EAP-GTC.
diff --git a/src/libcharon/plugins/eap_identity/eap_identity.h b/src/libcharon/plugins/eap_identity/eap_identity.h
index 9a7f285749..811b19b5b2 100644
--- a/src/libcharon/plugins/eap_identity/eap_identity.h
+++ b/src/libcharon/plugins/eap_identity/eap_identity.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_identity_t eap_identity_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of the eap_method_t interface using EAP Identity.
diff --git a/src/libcharon/plugins/eap_md5/eap_md5.h b/src/libcharon/plugins/eap_md5/eap_md5.h
index c6687149a9..302abc4e68 100644
--- a/src/libcharon/plugins/eap_md5/eap_md5.h
+++ b/src/libcharon/plugins/eap_md5/eap_md5.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_md5_t eap_md5_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of the eap_method_t interface using EAP-MD5 (CHAP).
diff --git a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h
index 34cc1141ed..44050d0da2 100644
--- a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h
+++ b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_mschapv2_t eap_mschapv2_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of the eap_method_t interface using EAP-MS-CHAPv2.
diff --git a/src/libcharon/plugins/eap_peap/eap_peap.h b/src/libcharon/plugins/eap_peap/eap_peap.h
index f47bad561c..7bf7b1d70f 100644
--- a/src/libcharon/plugins/eap_peap/eap_peap.h
+++ b/src/libcharon/plugins/eap_peap/eap_peap.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_peap_t eap_peap_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of eap_method_t using EAP-PEAP.
diff --git a/src/libcharon/plugins/eap_peap/eap_peap_peer.h b/src/libcharon/plugins/eap_peap/eap_peap_peer.h
index a875442093..61586b16ca 100644
--- a/src/libcharon/plugins/eap_peap/eap_peap_peer.h
+++ b/src/libcharon/plugins/eap_peap/eap_peap_peer.h
@@ -26,7 +26,7 @@ typedef struct eap_peap_peer_t eap_peap_peer_t;
 #include "tls_application.h"
 
 #include <library.h>
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * TLS application data handler as peer.
diff --git a/src/libcharon/plugins/eap_peap/eap_peap_server.h b/src/libcharon/plugins/eap_peap/eap_peap_server.h
index 93141d62b0..cc03d4ba9e 100644
--- a/src/libcharon/plugins/eap_peap/eap_peap_server.h
+++ b/src/libcharon/plugins/eap_peap/eap_peap_server.h
@@ -26,7 +26,7 @@ typedef struct eap_peap_server_t eap_peap_server_t;
 #include "tls_application.h"
 
 #include <library.h>
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * TLS application data handler as server.
diff --git a/src/libcharon/plugins/eap_radius/eap_radius.h b/src/libcharon/plugins/eap_radius/eap_radius.h
index e98cb06e30..9cfdbb95dc 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius.h
+++ b/src/libcharon/plugins/eap_radius/eap_radius.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_radius_t eap_radius_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of the eap_method_t interface using a RADIUS server.
diff --git a/src/libcharon/plugins/eap_sim/eap_sim_peer.h b/src/libcharon/plugins/eap_sim/eap_sim_peer.h
index ba72ce4841..c32cb3120a 100644
--- a/src/libcharon/plugins/eap_sim/eap_sim_peer.h
+++ b/src/libcharon/plugins/eap_sim/eap_sim_peer.h
@@ -21,7 +21,7 @@
 #ifndef EAP_SIM_PEER_H_
 #define EAP_SIM_PEER_H_
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 typedef struct eap_sim_peer_t eap_sim_peer_t;
 
diff --git a/src/libcharon/plugins/eap_sim/eap_sim_server.h b/src/libcharon/plugins/eap_sim/eap_sim_server.h
index c0ed64ff21..a4a0eea634 100644
--- a/src/libcharon/plugins/eap_sim/eap_sim_server.h
+++ b/src/libcharon/plugins/eap_sim/eap_sim_server.h
@@ -21,7 +21,7 @@
 #ifndef EAP_SIM_SERVER_H_
 #define EAP_SIM_SERVER_H_
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 typedef struct eap_sim_server_t eap_sim_server_t;
 
diff --git a/src/libcharon/plugins/eap_tls/eap_tls.h b/src/libcharon/plugins/eap_tls/eap_tls.h
index 7e080230a1..4227c9db3e 100644
--- a/src/libcharon/plugins/eap_tls/eap_tls.h
+++ b/src/libcharon/plugins/eap_tls/eap_tls.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_tls_t eap_tls_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of eap_method_t using EAP-TLS.
diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc.h b/src/libcharon/plugins/eap_tnc/eap_tnc.h
index 7e166fb605..1c7e1b6fad 100644
--- a/src/libcharon/plugins/eap_tnc/eap_tnc.h
+++ b/src/libcharon/plugins/eap_tnc/eap_tnc.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_tnc_t eap_tnc_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of the eap_method_t interface using EAP-TNC.
diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls.h b/src/libcharon/plugins/eap_ttls/eap_ttls.h
index 6e3bf2cebe..ca2b824773 100644
--- a/src/libcharon/plugins/eap_ttls/eap_ttls.h
+++ b/src/libcharon/plugins/eap_ttls/eap_ttls.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_ttls_t eap_ttls_t;
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 /**
  * Implementation of eap_method_t using EAP-TTLS.
diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
index d2feb7774a..aa10c7d3d5 100644
--- a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
+++ b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
@@ -19,7 +19,7 @@
 #include <debug.h>
 #include <daemon.h>
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 typedef struct private_eap_ttls_peer_t private_eap_ttls_peer_t;
 
diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c
index 3c46993b73..2a2aee12f7 100644
--- a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c
+++ b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c
@@ -19,7 +19,7 @@
 #include <debug.h>
 #include <daemon.h>
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 typedef struct private_eap_ttls_server_t private_eap_ttls_server_t;
 
diff --git a/src/libcharon/plugins/xauth_generic/xauth_generic.h b/src/libcharon/plugins/xauth_generic/xauth_generic.h
index dfb759b82d..04e3d47bb6 100644
--- a/src/libcharon/plugins/xauth_generic/xauth_generic.h
+++ b/src/libcharon/plugins/xauth_generic/xauth_generic.h
@@ -23,7 +23,7 @@
 
 typedef struct xauth_generic_t xauth_generic_t;
 
-#include <sa/authenticators/xauth/xauth_method.h>
+#include <sa/ikev1/authenticators/xauth/xauth_method.h>
 
 /**
  * Implementation of the xauth_method_t interface using cleartext secrets
diff --git a/src/libcharon/sa/authenticators/authenticator.c b/src/libcharon/sa/authenticator.c
similarity index 92%
rename from src/libcharon/sa/authenticators/authenticator.c
rename to src/libcharon/sa/authenticator.c
index 73029b9e14..d7a4b3eef1 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
similarity index 100%
rename from src/libcharon/sa/authenticators/authenticator.h
rename to src/libcharon/sa/authenticator.h
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 331b001bf6..0ee4324bf7 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 cbb16ca4ad..e503564517 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
similarity index 100%
rename from src/libcharon/sa/authenticators/hybrid_authenticator.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/authenticators/hybrid_authenticator.h
rename to src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
index 37057470bd..6a0bb1e59f 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
similarity index 99%
rename from src/libcharon/sa/authenticators/psk_v1_authenticator.c
rename to src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
index 11fd8118d1..ce794a286b 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
similarity index 97%
rename from src/libcharon/sa/authenticators/psk_v1_authenticator.h
rename to src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
index e01d49c956..194b964569 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
similarity index 99%
rename from src/libcharon/sa/authenticators/pubkey_v1_authenticator.c
rename to src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
index 7da1953afb..56fcf2c9df 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
similarity index 97%
rename from src/libcharon/sa/authenticators/pubkey_v1_authenticator.h
rename to src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
index e71a81f18e..bafc3a2b2e 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
similarity index 100%
rename from src/libcharon/sa/authenticators/xauth/xauth_manager.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/authenticators/xauth/xauth_manager.h
rename to src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h
index 7f07cc22a1..e7e84d06bd 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
similarity index 100%
rename from src/libcharon/sa/authenticators/xauth/xauth_method.c
rename to 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
similarity index 100%
rename from src/libcharon/sa/authenticators/xauth/xauth_method.h
rename to 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
similarity index 100%
rename from src/libcharon/sa/keymat_v1.c
rename to src/libcharon/sa/ikev1/keymat_v1.c
diff --git a/src/libcharon/sa/keymat_v1.h b/src/libcharon/sa/ikev1/keymat_v1.h
similarity index 99%
rename from src/libcharon/sa/keymat_v1.h
rename to src/libcharon/sa/ikev1/keymat_v1.h
index 875ad9d301..bb1022b5e4 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
similarity index 98%
rename from src/libcharon/sa/task_manager_v1.c
rename to src/libcharon/sa/ikev1/task_manager_v1.c
index dea4dcb87d..8e4aa74966 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
similarity index 100%
rename from src/libcharon/sa/task_manager_v1.h
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/informational.c
rename to src/libcharon/sa/ikev1/tasks/informational.c
index 5b2ceca845..9de5c2e71e 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
similarity index 98%
rename from src/libcharon/sa/tasks/informational.h
rename to src/libcharon/sa/ikev1/tasks/informational.h
index 2aec7abd8d..f1543dc58b 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
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_cert_post.c
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/isakmp_cert_post.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
index 6720c54e00..2e38df89ff 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
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_cert_pre.c
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/isakmp_cert_pre.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
index c6dc98ac5e..908cff020b 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
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_delete.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/tasks/isakmp_delete.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_delete.h
index 49e49fab94..3b7b40c116 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
similarity index 99%
rename from src/libcharon/sa/tasks/isakmp_natd.c
rename to src/libcharon/sa/ikev1/tasks/isakmp_natd.c
index b956ff66fc..88ee327bad 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
similarity index 97%
rename from src/libcharon/sa/tasks/isakmp_natd.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_natd.h
index 3d5df7e5a5..b83b078056 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
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_vendor.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/tasks/isakmp_vendor.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
index e6ceb2e6d9..b81d79034c 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
similarity index 99%
rename from src/libcharon/sa/tasks/main_mode.c
rename to src/libcharon/sa/ikev1/tasks/main_mode.c
index 08bb29124a..7f263260c7 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
similarity index 97%
rename from src/libcharon/sa/tasks/main_mode.h
rename to src/libcharon/sa/ikev1/tasks/main_mode.h
index 9ff253096e..d266b6e636 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
similarity index 100%
rename from src/libcharon/sa/tasks/mode_config.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/tasks/mode_config.h
rename to src/libcharon/sa/ikev1/tasks/mode_config.h
index 34b744d100..026545eba1 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
similarity index 100%
rename from src/libcharon/sa/tasks/quick_delete.c
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/quick_delete.h
rename to src/libcharon/sa/ikev1/tasks/quick_delete.h
index 80aae82739..1cdf07c488 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
similarity index 99%
rename from src/libcharon/sa/tasks/quick_mode.c
rename to src/libcharon/sa/ikev1/tasks/quick_mode.c
index 9d9b5e9583..9e71642af2 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
similarity index 98%
rename from src/libcharon/sa/tasks/quick_mode.h
rename to src/libcharon/sa/ikev1/tasks/quick_mode.h
index e50c1a97ee..82790c7683 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
similarity index 100%
rename from src/libcharon/sa/tasks/xauth.c
rename to src/libcharon/sa/ikev1/tasks/xauth.c
diff --git a/src/libcharon/sa/tasks/xauth.h b/src/libcharon/sa/ikev1/tasks/xauth.h
similarity index 97%
rename from src/libcharon/sa/tasks/xauth.h
rename to src/libcharon/sa/ikev1/tasks/xauth.h
index 6633f9e557..c1528ccbe0 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
similarity index 99%
rename from src/libcharon/sa/authenticators/eap/eap_manager.c
rename to src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c
index bc2c4a6170..d38754e013 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
similarity index 98%
rename from src/libcharon/sa/authenticators/eap/eap_manager.h
rename to src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h
index 0333fb6daa..6b87546343 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
similarity index 100%
rename from src/libcharon/sa/authenticators/eap/eap_method.c
rename to 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
similarity index 100%
rename from src/libcharon/sa/authenticators/eap/eap_method.h
rename to 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
similarity index 99%
rename from src/libcharon/sa/authenticators/eap_authenticator.c
rename to src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index d36d544e87..462436d805 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
similarity index 98%
rename from src/libcharon/sa/authenticators/eap_authenticator.h
rename to src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
index 726411a180..15d7cb88d0 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
similarity index 99%
rename from src/libcharon/sa/authenticators/psk_authenticator.c
rename to src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
index 26c722530a..2d3434cdf1 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
similarity index 97%
rename from src/libcharon/sa/authenticators/psk_authenticator.h
rename to src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
index 8cf1a0f98e..ffd06f1bc6 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
similarity index 99%
rename from src/libcharon/sa/authenticators/pubkey_authenticator.c
rename to src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
index df5b06ae6e..179be39777 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
similarity index 97%
rename from src/libcharon/sa/authenticators/pubkey_authenticator.h
rename to src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
index 4c3937ecc1..bf95d6efd5 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
similarity index 100%
rename from src/libcharon/sa/connect_manager.c
rename to src/libcharon/sa/ikev2/connect_manager.c
diff --git a/src/libcharon/sa/connect_manager.h b/src/libcharon/sa/ikev2/connect_manager.h
similarity index 100%
rename from src/libcharon/sa/connect_manager.h
rename to src/libcharon/sa/ikev2/connect_manager.h
diff --git a/src/libcharon/sa/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
similarity index 100%
rename from src/libcharon/sa/keymat_v2.c
rename to src/libcharon/sa/ikev2/keymat_v2.c
diff --git a/src/libcharon/sa/keymat_v2.h b/src/libcharon/sa/ikev2/keymat_v2.h
similarity index 100%
rename from src/libcharon/sa/keymat_v2.h
rename to src/libcharon/sa/ikev2/keymat_v2.h
diff --git a/src/libcharon/sa/mediation_manager.c b/src/libcharon/sa/ikev2/mediation_manager.c
similarity index 100%
rename from src/libcharon/sa/mediation_manager.c
rename to src/libcharon/sa/ikev2/mediation_manager.c
diff --git a/src/libcharon/sa/mediation_manager.h b/src/libcharon/sa/ikev2/mediation_manager.h
similarity index 100%
rename from src/libcharon/sa/mediation_manager.h
rename to 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
similarity index 98%
rename from src/libcharon/sa/task_manager_v2.c
rename to src/libcharon/sa/ikev2/task_manager_v2.c
index 57b485ac50..cce9551d5d 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
similarity index 100%
rename from src/libcharon/sa/task_manager_v2.h
rename to 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
similarity index 99%
rename from src/libcharon/sa/tasks/child_create.c
rename to src/libcharon/sa/ikev2/tasks/child_create.c
index 79d0821382..023334bd43 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
similarity index 98%
rename from src/libcharon/sa/tasks/child_create.h
rename to src/libcharon/sa/ikev2/tasks/child_create.h
index fdec3bbb9f..938b843982 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
similarity index 100%
rename from src/libcharon/sa/tasks/child_delete.c
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/child_delete.h
rename to src/libcharon/sa/ikev2/tasks/child_delete.h
index 365807c687..34d399ce3b 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
similarity index 99%
rename from src/libcharon/sa/tasks/child_rekey.c
rename to src/libcharon/sa/ikev2/tasks/child_rekey.c
index fa916c4e50..50a8aad959 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
similarity index 98%
rename from src/libcharon/sa/tasks/child_rekey.h
rename to src/libcharon/sa/ikev2/tasks/child_rekey.h
index 3ba4176111..78314b0f9a 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_auth.c
rename to src/libcharon/sa/ikev2/tasks/ike_auth.c
index f9cf5c6131..183ca34404 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_auth.h
rename to src/libcharon/sa/ikev2/tasks/ike_auth.h
index c6c0100b05..cf507f8e6f 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_auth_lifetime.c
rename to src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c
index 31e3bffca5..a7d162e682 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_auth_lifetime.h
rename to src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
index 9052f42746..5259beb2a5 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_cert_post.c
rename to src/libcharon/sa/ikev2/tasks/ike_cert_post.c
index bedf323ff1..10bb4d19be 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_cert_post.h
rename to src/libcharon/sa/ikev2/tasks/ike_cert_post.h
index b3881a01ae..61d4c2d822 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
similarity index 100%
rename from src/libcharon/sa/tasks/ike_cert_pre.c
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_cert_pre.h
rename to src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
index 4b2d0d4703..7de1f32710 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_config.c
rename to src/libcharon/sa/ikev2/tasks/ike_config.c
index 332af465bb..da530a007c 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
similarity index 97%
rename from src/libcharon/sa/tasks/ike_config.h
rename to src/libcharon/sa/ikev2/tasks/ike_config.h
index d343761c11..239e35c43b 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
similarity index 100%
rename from src/libcharon/sa/tasks/ike_delete.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/tasks/ike_delete.h
rename to src/libcharon/sa/ikev2/tasks/ike_delete.h
index 82782f3939..039e068e6d 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
similarity index 100%
rename from src/libcharon/sa/tasks/ike_dpd.c
rename to 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
similarity index 97%
rename from src/libcharon/sa/tasks/ike_dpd.h
rename to src/libcharon/sa/ikev2/tasks/ike_dpd.h
index a9f68c31cd..5865572326 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_init.c
rename to src/libcharon/sa/ikev2/tasks/ike_init.c
index 3b0c4e8f87..ceae484d0b 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_init.h
rename to src/libcharon/sa/ikev2/tasks/ike_init.h
index 6855ac8394..aa3cfa8a94 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
similarity index 100%
rename from src/libcharon/sa/tasks/ike_me.c
rename to 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_me.h
rename to src/libcharon/sa/ikev2/tasks/ike_me.h
index 74dd1dedf4..a7fe0c5887 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_mobike.c
rename to src/libcharon/sa/ikev2/tasks/ike_mobike.c
index 6719bddd6b..c533506bb3 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_mobike.h
rename to src/libcharon/sa/ikev2/tasks/ike_mobike.h
index 16611939e3..04cd33f517 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
similarity index 100%
rename from src/libcharon/sa/tasks/ike_natd.c
rename to 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_natd.h
rename to src/libcharon/sa/ikev2/tasks/ike_natd.h
index 68114af42a..33ebfcae7f 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_reauth.c
rename to src/libcharon/sa/ikev2/tasks/ike_reauth.c
index 38c7a42723..d9f3fe8de7 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
similarity index 97%
rename from src/libcharon/sa/tasks/ike_reauth.h
rename to src/libcharon/sa/ikev2/tasks/ike_reauth.h
index 5e97b719c9..52c507ede3 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_rekey.c
rename to src/libcharon/sa/ikev2/tasks/ike_rekey.c
index a0d346040f..2cfcdc1fc8 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
similarity index 98%
rename from src/libcharon/sa/tasks/ike_rekey.h
rename to src/libcharon/sa/ikev2/tasks/ike_rekey.h
index 6a9d59b0e4..20fcd80ed4 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
similarity index 99%
rename from src/libcharon/sa/tasks/ike_vendor.c
rename to src/libcharon/sa/ikev2/tasks/ike_vendor.c
index 7b3cc6e913..b2b965a573 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
similarity index 97%
rename from src/libcharon/sa/tasks/ike_vendor.h
rename to src/libcharon/sa/ikev2/tasks/ike_vendor.h
index 6c353c447b..54aad95412 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 f132822b71..bcf131fd0b 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 5395c3776b..4a551a8f5a 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
similarity index 100%
rename from src/libcharon/sa/tasks/task.c
rename to src/libcharon/sa/task.c
diff --git a/src/libcharon/sa/tasks/task.h b/src/libcharon/sa/task.h
similarity index 100%
rename from src/libcharon/sa/tasks/task.h
rename to src/libcharon/sa/task.h
diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 3538087bc4..70f732fab5 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 42a04fb649..47b39a68aa 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.