diff --git a/src/charon/.gitignore b/src/libcharon/.gitignore
similarity index 100%
rename from src/charon/.gitignore
rename to src/libcharon/.gitignore
diff --git a/src/charon/Android.mk b/src/libcharon/Android.mk
similarity index 100%
rename from src/charon/Android.mk
rename to src/libcharon/Android.mk
diff --git a/src/charon/Makefile.am b/src/libcharon/Makefile.am
similarity index 100%
rename from src/charon/Makefile.am
rename to src/libcharon/Makefile.am
diff --git a/src/charon/bus/bus.c b/src/libcharon/bus/bus.c
similarity index 100%
rename from src/charon/bus/bus.c
rename to src/libcharon/bus/bus.c
diff --git a/src/charon/bus/bus.h b/src/libcharon/bus/bus.h
similarity index 100%
rename from src/charon/bus/bus.h
rename to src/libcharon/bus/bus.h
diff --git a/src/charon/bus/listeners/file_logger.c b/src/libcharon/bus/listeners/file_logger.c
similarity index 100%
rename from src/charon/bus/listeners/file_logger.c
rename to src/libcharon/bus/listeners/file_logger.c
diff --git a/src/charon/bus/listeners/file_logger.h b/src/libcharon/bus/listeners/file_logger.h
similarity index 100%
rename from src/charon/bus/listeners/file_logger.h
rename to src/libcharon/bus/listeners/file_logger.h
diff --git a/src/charon/bus/listeners/listener.h b/src/libcharon/bus/listeners/listener.h
similarity index 100%
rename from src/charon/bus/listeners/listener.h
rename to src/libcharon/bus/listeners/listener.h
diff --git a/src/charon/bus/listeners/sys_logger.c b/src/libcharon/bus/listeners/sys_logger.c
similarity index 100%
rename from src/charon/bus/listeners/sys_logger.c
rename to src/libcharon/bus/listeners/sys_logger.c
diff --git a/src/charon/bus/listeners/sys_logger.h b/src/libcharon/bus/listeners/sys_logger.h
similarity index 100%
rename from src/charon/bus/listeners/sys_logger.h
rename to src/libcharon/bus/listeners/sys_logger.h
diff --git a/src/charon/config/auth_cfg.c b/src/libcharon/config/auth_cfg.c
similarity index 100%
rename from src/charon/config/auth_cfg.c
rename to src/libcharon/config/auth_cfg.c
diff --git a/src/charon/config/auth_cfg.h b/src/libcharon/config/auth_cfg.h
similarity index 100%
rename from src/charon/config/auth_cfg.h
rename to src/libcharon/config/auth_cfg.h
diff --git a/src/charon/config/backend.h b/src/libcharon/config/backend.h
similarity index 100%
rename from src/charon/config/backend.h
rename to src/libcharon/config/backend.h
diff --git a/src/charon/config/backend_manager.c b/src/libcharon/config/backend_manager.c
similarity index 100%
rename from src/charon/config/backend_manager.c
rename to src/libcharon/config/backend_manager.c
diff --git a/src/charon/config/backend_manager.h b/src/libcharon/config/backend_manager.h
similarity index 100%
rename from src/charon/config/backend_manager.h
rename to src/libcharon/config/backend_manager.h
diff --git a/src/charon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
similarity index 100%
rename from src/charon/config/child_cfg.c
rename to src/libcharon/config/child_cfg.c
diff --git a/src/charon/config/child_cfg.h b/src/libcharon/config/child_cfg.h
similarity index 100%
rename from src/charon/config/child_cfg.h
rename to src/libcharon/config/child_cfg.h
diff --git a/src/charon/config/ike_cfg.c b/src/libcharon/config/ike_cfg.c
similarity index 100%
rename from src/charon/config/ike_cfg.c
rename to src/libcharon/config/ike_cfg.c
diff --git a/src/charon/config/ike_cfg.h b/src/libcharon/config/ike_cfg.h
similarity index 100%
rename from src/charon/config/ike_cfg.h
rename to src/libcharon/config/ike_cfg.h
diff --git a/src/charon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
similarity index 100%
rename from src/charon/config/peer_cfg.c
rename to src/libcharon/config/peer_cfg.c
diff --git a/src/charon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
similarity index 100%
rename from src/charon/config/peer_cfg.h
rename to src/libcharon/config/peer_cfg.h
diff --git a/src/charon/config/proposal.c b/src/libcharon/config/proposal.c
similarity index 100%
rename from src/charon/config/proposal.c
rename to src/libcharon/config/proposal.c
diff --git a/src/charon/config/proposal.h b/src/libcharon/config/proposal.h
similarity index 100%
rename from src/charon/config/proposal.h
rename to src/libcharon/config/proposal.h
diff --git a/src/charon/control/controller.c b/src/libcharon/control/controller.c
similarity index 100%
rename from src/charon/control/controller.c
rename to src/libcharon/control/controller.c
diff --git a/src/charon/control/controller.h b/src/libcharon/control/controller.h
similarity index 100%
rename from src/charon/control/controller.h
rename to src/libcharon/control/controller.h
diff --git a/src/charon/credentials/credential_manager.c b/src/libcharon/credentials/credential_manager.c
similarity index 100%
rename from src/charon/credentials/credential_manager.c
rename to src/libcharon/credentials/credential_manager.c
diff --git a/src/charon/credentials/credential_manager.h b/src/libcharon/credentials/credential_manager.h
similarity index 100%
rename from src/charon/credentials/credential_manager.h
rename to src/libcharon/credentials/credential_manager.h
diff --git a/src/charon/credentials/credential_set.h b/src/libcharon/credentials/credential_set.h
similarity index 100%
rename from src/charon/credentials/credential_set.h
rename to src/libcharon/credentials/credential_set.h
diff --git a/src/charon/credentials/sets/auth_cfg_wrapper.c b/src/libcharon/credentials/sets/auth_cfg_wrapper.c
similarity index 100%
rename from src/charon/credentials/sets/auth_cfg_wrapper.c
rename to src/libcharon/credentials/sets/auth_cfg_wrapper.c
diff --git a/src/charon/credentials/sets/auth_cfg_wrapper.h b/src/libcharon/credentials/sets/auth_cfg_wrapper.h
similarity index 100%
rename from src/charon/credentials/sets/auth_cfg_wrapper.h
rename to src/libcharon/credentials/sets/auth_cfg_wrapper.h
diff --git a/src/charon/credentials/sets/cert_cache.c b/src/libcharon/credentials/sets/cert_cache.c
similarity index 100%
rename from src/charon/credentials/sets/cert_cache.c
rename to src/libcharon/credentials/sets/cert_cache.c
diff --git a/src/charon/credentials/sets/cert_cache.h b/src/libcharon/credentials/sets/cert_cache.h
similarity index 100%
rename from src/charon/credentials/sets/cert_cache.h
rename to src/libcharon/credentials/sets/cert_cache.h
diff --git a/src/charon/credentials/sets/ocsp_response_wrapper.c b/src/libcharon/credentials/sets/ocsp_response_wrapper.c
similarity index 100%
rename from src/charon/credentials/sets/ocsp_response_wrapper.c
rename to src/libcharon/credentials/sets/ocsp_response_wrapper.c
diff --git a/src/charon/credentials/sets/ocsp_response_wrapper.h b/src/libcharon/credentials/sets/ocsp_response_wrapper.h
similarity index 100%
rename from src/charon/credentials/sets/ocsp_response_wrapper.h
rename to src/libcharon/credentials/sets/ocsp_response_wrapper.h
diff --git a/src/charon/daemon.c b/src/libcharon/daemon.c
similarity index 100%
rename from src/charon/daemon.c
rename to src/libcharon/daemon.c
diff --git a/src/charon/daemon.h b/src/libcharon/daemon.h
similarity index 100%
rename from src/charon/daemon.h
rename to src/libcharon/daemon.h
diff --git a/src/charon/debug b/src/libcharon/debug
similarity index 100%
rename from src/charon/debug
rename to src/libcharon/debug
diff --git a/src/charon/encoding/generator.c b/src/libcharon/encoding/generator.c
similarity index 100%
rename from src/charon/encoding/generator.c
rename to src/libcharon/encoding/generator.c
diff --git a/src/charon/encoding/generator.h b/src/libcharon/encoding/generator.h
similarity index 100%
rename from src/charon/encoding/generator.h
rename to src/libcharon/encoding/generator.h
diff --git a/src/charon/encoding/message.c b/src/libcharon/encoding/message.c
similarity index 100%
rename from src/charon/encoding/message.c
rename to src/libcharon/encoding/message.c
diff --git a/src/charon/encoding/message.h b/src/libcharon/encoding/message.h
similarity index 100%
rename from src/charon/encoding/message.h
rename to src/libcharon/encoding/message.h
diff --git a/src/charon/encoding/parser.c b/src/libcharon/encoding/parser.c
similarity index 100%
rename from src/charon/encoding/parser.c
rename to src/libcharon/encoding/parser.c
diff --git a/src/charon/encoding/parser.h b/src/libcharon/encoding/parser.h
similarity index 100%
rename from src/charon/encoding/parser.h
rename to src/libcharon/encoding/parser.h
diff --git a/src/charon/encoding/payloads/auth_payload.c b/src/libcharon/encoding/payloads/auth_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/auth_payload.c
rename to src/libcharon/encoding/payloads/auth_payload.c
diff --git a/src/charon/encoding/payloads/auth_payload.h b/src/libcharon/encoding/payloads/auth_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/auth_payload.h
rename to src/libcharon/encoding/payloads/auth_payload.h
diff --git a/src/charon/encoding/payloads/cert_payload.c b/src/libcharon/encoding/payloads/cert_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/cert_payload.c
rename to src/libcharon/encoding/payloads/cert_payload.c
diff --git a/src/charon/encoding/payloads/cert_payload.h b/src/libcharon/encoding/payloads/cert_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/cert_payload.h
rename to src/libcharon/encoding/payloads/cert_payload.h
diff --git a/src/charon/encoding/payloads/certreq_payload.c b/src/libcharon/encoding/payloads/certreq_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/certreq_payload.c
rename to src/libcharon/encoding/payloads/certreq_payload.c
diff --git a/src/charon/encoding/payloads/certreq_payload.h b/src/libcharon/encoding/payloads/certreq_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/certreq_payload.h
rename to src/libcharon/encoding/payloads/certreq_payload.h
diff --git a/src/charon/encoding/payloads/configuration_attribute.c b/src/libcharon/encoding/payloads/configuration_attribute.c
similarity index 100%
rename from src/charon/encoding/payloads/configuration_attribute.c
rename to src/libcharon/encoding/payloads/configuration_attribute.c
diff --git a/src/charon/encoding/payloads/configuration_attribute.h b/src/libcharon/encoding/payloads/configuration_attribute.h
similarity index 100%
rename from src/charon/encoding/payloads/configuration_attribute.h
rename to src/libcharon/encoding/payloads/configuration_attribute.h
diff --git a/src/charon/encoding/payloads/cp_payload.c b/src/libcharon/encoding/payloads/cp_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/cp_payload.c
rename to src/libcharon/encoding/payloads/cp_payload.c
diff --git a/src/charon/encoding/payloads/cp_payload.h b/src/libcharon/encoding/payloads/cp_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/cp_payload.h
rename to src/libcharon/encoding/payloads/cp_payload.h
diff --git a/src/charon/encoding/payloads/delete_payload.c b/src/libcharon/encoding/payloads/delete_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/delete_payload.c
rename to src/libcharon/encoding/payloads/delete_payload.c
diff --git a/src/charon/encoding/payloads/delete_payload.h b/src/libcharon/encoding/payloads/delete_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/delete_payload.h
rename to src/libcharon/encoding/payloads/delete_payload.h
diff --git a/src/charon/encoding/payloads/eap_payload.c b/src/libcharon/encoding/payloads/eap_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/eap_payload.c
rename to src/libcharon/encoding/payloads/eap_payload.c
diff --git a/src/charon/encoding/payloads/eap_payload.h b/src/libcharon/encoding/payloads/eap_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/eap_payload.h
rename to src/libcharon/encoding/payloads/eap_payload.h
diff --git a/src/charon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c
similarity index 100%
rename from src/charon/encoding/payloads/encodings.c
rename to src/libcharon/encoding/payloads/encodings.c
diff --git a/src/charon/encoding/payloads/encodings.h b/src/libcharon/encoding/payloads/encodings.h
similarity index 100%
rename from src/charon/encoding/payloads/encodings.h
rename to src/libcharon/encoding/payloads/encodings.h
diff --git a/src/charon/encoding/payloads/encryption_payload.c b/src/libcharon/encoding/payloads/encryption_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/encryption_payload.c
rename to src/libcharon/encoding/payloads/encryption_payload.c
diff --git a/src/charon/encoding/payloads/encryption_payload.h b/src/libcharon/encoding/payloads/encryption_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/encryption_payload.h
rename to src/libcharon/encoding/payloads/encryption_payload.h
diff --git a/src/charon/encoding/payloads/endpoint_notify.c b/src/libcharon/encoding/payloads/endpoint_notify.c
similarity index 100%
rename from src/charon/encoding/payloads/endpoint_notify.c
rename to src/libcharon/encoding/payloads/endpoint_notify.c
diff --git a/src/charon/encoding/payloads/endpoint_notify.h b/src/libcharon/encoding/payloads/endpoint_notify.h
similarity index 100%
rename from src/charon/encoding/payloads/endpoint_notify.h
rename to src/libcharon/encoding/payloads/endpoint_notify.h
diff --git a/src/charon/encoding/payloads/id_payload.c b/src/libcharon/encoding/payloads/id_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/id_payload.c
rename to src/libcharon/encoding/payloads/id_payload.c
diff --git a/src/charon/encoding/payloads/id_payload.h b/src/libcharon/encoding/payloads/id_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/id_payload.h
rename to src/libcharon/encoding/payloads/id_payload.h
diff --git a/src/charon/encoding/payloads/ike_header.c b/src/libcharon/encoding/payloads/ike_header.c
similarity index 100%
rename from src/charon/encoding/payloads/ike_header.c
rename to src/libcharon/encoding/payloads/ike_header.c
diff --git a/src/charon/encoding/payloads/ike_header.h b/src/libcharon/encoding/payloads/ike_header.h
similarity index 100%
rename from src/charon/encoding/payloads/ike_header.h
rename to src/libcharon/encoding/payloads/ike_header.h
diff --git a/src/charon/encoding/payloads/ke_payload.c b/src/libcharon/encoding/payloads/ke_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/ke_payload.c
rename to src/libcharon/encoding/payloads/ke_payload.c
diff --git a/src/charon/encoding/payloads/ke_payload.h b/src/libcharon/encoding/payloads/ke_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/ke_payload.h
rename to src/libcharon/encoding/payloads/ke_payload.h
diff --git a/src/charon/encoding/payloads/nonce_payload.c b/src/libcharon/encoding/payloads/nonce_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/nonce_payload.c
rename to src/libcharon/encoding/payloads/nonce_payload.c
diff --git a/src/charon/encoding/payloads/nonce_payload.h b/src/libcharon/encoding/payloads/nonce_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/nonce_payload.h
rename to src/libcharon/encoding/payloads/nonce_payload.h
diff --git a/src/charon/encoding/payloads/notify_payload.c b/src/libcharon/encoding/payloads/notify_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/notify_payload.c
rename to src/libcharon/encoding/payloads/notify_payload.c
diff --git a/src/charon/encoding/payloads/notify_payload.h b/src/libcharon/encoding/payloads/notify_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/notify_payload.h
rename to src/libcharon/encoding/payloads/notify_payload.h
diff --git a/src/charon/encoding/payloads/payload.c b/src/libcharon/encoding/payloads/payload.c
similarity index 100%
rename from src/charon/encoding/payloads/payload.c
rename to src/libcharon/encoding/payloads/payload.c
diff --git a/src/charon/encoding/payloads/payload.h b/src/libcharon/encoding/payloads/payload.h
similarity index 100%
rename from src/charon/encoding/payloads/payload.h
rename to src/libcharon/encoding/payloads/payload.h
diff --git a/src/charon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
similarity index 100%
rename from src/charon/encoding/payloads/proposal_substructure.c
rename to src/libcharon/encoding/payloads/proposal_substructure.c
diff --git a/src/charon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h
similarity index 100%
rename from src/charon/encoding/payloads/proposal_substructure.h
rename to src/libcharon/encoding/payloads/proposal_substructure.h
diff --git a/src/charon/encoding/payloads/sa_payload.c b/src/libcharon/encoding/payloads/sa_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/sa_payload.c
rename to src/libcharon/encoding/payloads/sa_payload.c
diff --git a/src/charon/encoding/payloads/sa_payload.h b/src/libcharon/encoding/payloads/sa_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/sa_payload.h
rename to src/libcharon/encoding/payloads/sa_payload.h
diff --git a/src/charon/encoding/payloads/traffic_selector_substructure.c b/src/libcharon/encoding/payloads/traffic_selector_substructure.c
similarity index 100%
rename from src/charon/encoding/payloads/traffic_selector_substructure.c
rename to src/libcharon/encoding/payloads/traffic_selector_substructure.c
diff --git a/src/charon/encoding/payloads/traffic_selector_substructure.h b/src/libcharon/encoding/payloads/traffic_selector_substructure.h
similarity index 100%
rename from src/charon/encoding/payloads/traffic_selector_substructure.h
rename to src/libcharon/encoding/payloads/traffic_selector_substructure.h
diff --git a/src/charon/encoding/payloads/transform_attribute.c b/src/libcharon/encoding/payloads/transform_attribute.c
similarity index 100%
rename from src/charon/encoding/payloads/transform_attribute.c
rename to src/libcharon/encoding/payloads/transform_attribute.c
diff --git a/src/charon/encoding/payloads/transform_attribute.h b/src/libcharon/encoding/payloads/transform_attribute.h
similarity index 100%
rename from src/charon/encoding/payloads/transform_attribute.h
rename to src/libcharon/encoding/payloads/transform_attribute.h
diff --git a/src/charon/encoding/payloads/transform_substructure.c b/src/libcharon/encoding/payloads/transform_substructure.c
similarity index 100%
rename from src/charon/encoding/payloads/transform_substructure.c
rename to src/libcharon/encoding/payloads/transform_substructure.c
diff --git a/src/charon/encoding/payloads/transform_substructure.h b/src/libcharon/encoding/payloads/transform_substructure.h
similarity index 100%
rename from src/charon/encoding/payloads/transform_substructure.h
rename to src/libcharon/encoding/payloads/transform_substructure.h
diff --git a/src/charon/encoding/payloads/ts_payload.c b/src/libcharon/encoding/payloads/ts_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/ts_payload.c
rename to src/libcharon/encoding/payloads/ts_payload.c
diff --git a/src/charon/encoding/payloads/ts_payload.h b/src/libcharon/encoding/payloads/ts_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/ts_payload.h
rename to src/libcharon/encoding/payloads/ts_payload.h
diff --git a/src/charon/encoding/payloads/unknown_payload.c b/src/libcharon/encoding/payloads/unknown_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/unknown_payload.c
rename to src/libcharon/encoding/payloads/unknown_payload.c
diff --git a/src/charon/encoding/payloads/unknown_payload.h b/src/libcharon/encoding/payloads/unknown_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/unknown_payload.h
rename to src/libcharon/encoding/payloads/unknown_payload.h
diff --git a/src/charon/encoding/payloads/vendor_id_payload.c b/src/libcharon/encoding/payloads/vendor_id_payload.c
similarity index 100%
rename from src/charon/encoding/payloads/vendor_id_payload.c
rename to src/libcharon/encoding/payloads/vendor_id_payload.c
diff --git a/src/charon/encoding/payloads/vendor_id_payload.h b/src/libcharon/encoding/payloads/vendor_id_payload.h
similarity index 100%
rename from src/charon/encoding/payloads/vendor_id_payload.h
rename to src/libcharon/encoding/payloads/vendor_id_payload.h
diff --git a/src/charon/kernel/kernel_interface.c b/src/libcharon/kernel/kernel_interface.c
similarity index 100%
rename from src/charon/kernel/kernel_interface.c
rename to src/libcharon/kernel/kernel_interface.c
diff --git a/src/charon/kernel/kernel_interface.h b/src/libcharon/kernel/kernel_interface.h
similarity index 100%
rename from src/charon/kernel/kernel_interface.h
rename to src/libcharon/kernel/kernel_interface.h
diff --git a/src/charon/kernel/kernel_ipsec.c b/src/libcharon/kernel/kernel_ipsec.c
similarity index 100%
rename from src/charon/kernel/kernel_ipsec.c
rename to src/libcharon/kernel/kernel_ipsec.c
diff --git a/src/charon/kernel/kernel_ipsec.h b/src/libcharon/kernel/kernel_ipsec.h
similarity index 100%
rename from src/charon/kernel/kernel_ipsec.h
rename to src/libcharon/kernel/kernel_ipsec.h
diff --git a/src/charon/kernel/kernel_net.h b/src/libcharon/kernel/kernel_net.h
similarity index 100%
rename from src/charon/kernel/kernel_net.h
rename to src/libcharon/kernel/kernel_net.h
diff --git a/src/charon/network/packet.c b/src/libcharon/network/packet.c
similarity index 100%
rename from src/charon/network/packet.c
rename to src/libcharon/network/packet.c
diff --git a/src/charon/network/packet.h b/src/libcharon/network/packet.h
similarity index 100%
rename from src/charon/network/packet.h
rename to src/libcharon/network/packet.h
diff --git a/src/charon/network/receiver.c b/src/libcharon/network/receiver.c
similarity index 100%
rename from src/charon/network/receiver.c
rename to src/libcharon/network/receiver.c
diff --git a/src/charon/network/receiver.h b/src/libcharon/network/receiver.h
similarity index 100%
rename from src/charon/network/receiver.h
rename to src/libcharon/network/receiver.h
diff --git a/src/charon/network/sender.c b/src/libcharon/network/sender.c
similarity index 100%
rename from src/charon/network/sender.c
rename to src/libcharon/network/sender.c
diff --git a/src/charon/network/sender.h b/src/libcharon/network/sender.h
similarity index 100%
rename from src/charon/network/sender.h
rename to src/libcharon/network/sender.h
diff --git a/src/charon/network/socket.h b/src/libcharon/network/socket.h
similarity index 100%
rename from src/charon/network/socket.h
rename to src/libcharon/network/socket.h
diff --git a/src/charon/network/socket_manager.c b/src/libcharon/network/socket_manager.c
similarity index 100%
rename from src/charon/network/socket_manager.c
rename to src/libcharon/network/socket_manager.c
diff --git a/src/charon/network/socket_manager.h b/src/libcharon/network/socket_manager.h
similarity index 100%
rename from src/charon/network/socket_manager.h
rename to src/libcharon/network/socket_manager.h
diff --git a/src/charon/plugins/android/Makefile.am b/src/libcharon/plugins/android/Makefile.am
similarity index 100%
rename from src/charon/plugins/android/Makefile.am
rename to src/libcharon/plugins/android/Makefile.am
diff --git a/src/charon/plugins/android/android_handler.c b/src/libcharon/plugins/android/android_handler.c
similarity index 100%
rename from src/charon/plugins/android/android_handler.c
rename to src/libcharon/plugins/android/android_handler.c
diff --git a/src/charon/plugins/android/android_handler.h b/src/libcharon/plugins/android/android_handler.h
similarity index 100%
rename from src/charon/plugins/android/android_handler.h
rename to src/libcharon/plugins/android/android_handler.h
diff --git a/src/charon/plugins/android/android_plugin.c b/src/libcharon/plugins/android/android_plugin.c
similarity index 100%
rename from src/charon/plugins/android/android_plugin.c
rename to src/libcharon/plugins/android/android_plugin.c
diff --git a/src/charon/plugins/android/android_plugin.h b/src/libcharon/plugins/android/android_plugin.h
similarity index 100%
rename from src/charon/plugins/android/android_plugin.h
rename to src/libcharon/plugins/android/android_plugin.h
diff --git a/src/charon/plugins/attr/Makefile.am b/src/libcharon/plugins/attr/Makefile.am
similarity index 100%
rename from src/charon/plugins/attr/Makefile.am
rename to src/libcharon/plugins/attr/Makefile.am
diff --git a/src/charon/plugins/attr/attr_plugin.c b/src/libcharon/plugins/attr/attr_plugin.c
similarity index 100%
rename from src/charon/plugins/attr/attr_plugin.c
rename to src/libcharon/plugins/attr/attr_plugin.c
diff --git a/src/charon/plugins/attr/attr_plugin.h b/src/libcharon/plugins/attr/attr_plugin.h
similarity index 100%
rename from src/charon/plugins/attr/attr_plugin.h
rename to src/libcharon/plugins/attr/attr_plugin.h
diff --git a/src/charon/plugins/attr/attr_provider.c b/src/libcharon/plugins/attr/attr_provider.c
similarity index 100%
rename from src/charon/plugins/attr/attr_provider.c
rename to src/libcharon/plugins/attr/attr_provider.c
diff --git a/src/charon/plugins/attr/attr_provider.h b/src/libcharon/plugins/attr/attr_provider.h
similarity index 100%
rename from src/charon/plugins/attr/attr_provider.h
rename to src/libcharon/plugins/attr/attr_provider.h
diff --git a/src/charon/plugins/eap_aka/Makefile.am b/src/libcharon/plugins/eap_aka/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_aka/Makefile.am
rename to src/libcharon/plugins/eap_aka/Makefile.am
diff --git a/src/charon/plugins/eap_aka/eap_aka_peer.c b/src/libcharon/plugins/eap_aka/eap_aka_peer.c
similarity index 100%
rename from src/charon/plugins/eap_aka/eap_aka_peer.c
rename to src/libcharon/plugins/eap_aka/eap_aka_peer.c
diff --git a/src/charon/plugins/eap_aka/eap_aka_peer.h b/src/libcharon/plugins/eap_aka/eap_aka_peer.h
similarity index 100%
rename from src/charon/plugins/eap_aka/eap_aka_peer.h
rename to src/libcharon/plugins/eap_aka/eap_aka_peer.h
diff --git a/src/charon/plugins/eap_aka/eap_aka_plugin.c b/src/libcharon/plugins/eap_aka/eap_aka_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_aka/eap_aka_plugin.c
rename to src/libcharon/plugins/eap_aka/eap_aka_plugin.c
diff --git a/src/charon/plugins/eap_aka/eap_aka_plugin.h b/src/libcharon/plugins/eap_aka/eap_aka_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_aka/eap_aka_plugin.h
rename to src/libcharon/plugins/eap_aka/eap_aka_plugin.h
diff --git a/src/charon/plugins/eap_aka/eap_aka_server.c b/src/libcharon/plugins/eap_aka/eap_aka_server.c
similarity index 100%
rename from src/charon/plugins/eap_aka/eap_aka_server.c
rename to src/libcharon/plugins/eap_aka/eap_aka_server.c
diff --git a/src/charon/plugins/eap_aka/eap_aka_server.h b/src/libcharon/plugins/eap_aka/eap_aka_server.h
similarity index 100%
rename from src/charon/plugins/eap_aka/eap_aka_server.h
rename to src/libcharon/plugins/eap_aka/eap_aka_server.h
diff --git a/src/charon/plugins/eap_aka_3gpp2/Makefile.am b/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/Makefile.am
rename to src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.c b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.c
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.c
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.c
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.h b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.h
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.h
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.h
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.c b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.c
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.c
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.c
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.h b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.h
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.h
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.h
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.h b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.h
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.h
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c
diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.h b/src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.h
similarity index 100%
rename from src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.h
rename to src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.h
diff --git a/src/charon/plugins/eap_gtc/Makefile.am b/src/libcharon/plugins/eap_gtc/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_gtc/Makefile.am
rename to src/libcharon/plugins/eap_gtc/Makefile.am
diff --git a/src/charon/plugins/eap_gtc/eap_gtc.c b/src/libcharon/plugins/eap_gtc/eap_gtc.c
similarity index 100%
rename from src/charon/plugins/eap_gtc/eap_gtc.c
rename to src/libcharon/plugins/eap_gtc/eap_gtc.c
diff --git a/src/charon/plugins/eap_gtc/eap_gtc.h b/src/libcharon/plugins/eap_gtc/eap_gtc.h
similarity index 100%
rename from src/charon/plugins/eap_gtc/eap_gtc.h
rename to src/libcharon/plugins/eap_gtc/eap_gtc.h
diff --git a/src/charon/plugins/eap_gtc/eap_gtc_plugin.c b/src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_gtc/eap_gtc_plugin.c
rename to src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c
diff --git a/src/charon/plugins/eap_gtc/eap_gtc_plugin.h b/src/libcharon/plugins/eap_gtc/eap_gtc_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_gtc/eap_gtc_plugin.h
rename to src/libcharon/plugins/eap_gtc/eap_gtc_plugin.h
diff --git a/src/charon/plugins/eap_identity/Makefile.am b/src/libcharon/plugins/eap_identity/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_identity/Makefile.am
rename to src/libcharon/plugins/eap_identity/Makefile.am
diff --git a/src/charon/plugins/eap_identity/eap_identity.c b/src/libcharon/plugins/eap_identity/eap_identity.c
similarity index 100%
rename from src/charon/plugins/eap_identity/eap_identity.c
rename to src/libcharon/plugins/eap_identity/eap_identity.c
diff --git a/src/charon/plugins/eap_identity/eap_identity.h b/src/libcharon/plugins/eap_identity/eap_identity.h
similarity index 100%
rename from src/charon/plugins/eap_identity/eap_identity.h
rename to src/libcharon/plugins/eap_identity/eap_identity.h
diff --git a/src/charon/plugins/eap_identity/eap_identity_plugin.c b/src/libcharon/plugins/eap_identity/eap_identity_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_identity/eap_identity_plugin.c
rename to src/libcharon/plugins/eap_identity/eap_identity_plugin.c
diff --git a/src/charon/plugins/eap_identity/eap_identity_plugin.h b/src/libcharon/plugins/eap_identity/eap_identity_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_identity/eap_identity_plugin.h
rename to src/libcharon/plugins/eap_identity/eap_identity_plugin.h
diff --git a/src/charon/plugins/eap_md5/Makefile.am b/src/libcharon/plugins/eap_md5/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_md5/Makefile.am
rename to src/libcharon/plugins/eap_md5/Makefile.am
diff --git a/src/charon/plugins/eap_md5/eap_md5.c b/src/libcharon/plugins/eap_md5/eap_md5.c
similarity index 100%
rename from src/charon/plugins/eap_md5/eap_md5.c
rename to src/libcharon/plugins/eap_md5/eap_md5.c
diff --git a/src/charon/plugins/eap_md5/eap_md5.h b/src/libcharon/plugins/eap_md5/eap_md5.h
similarity index 100%
rename from src/charon/plugins/eap_md5/eap_md5.h
rename to src/libcharon/plugins/eap_md5/eap_md5.h
diff --git a/src/charon/plugins/eap_md5/eap_md5_plugin.c b/src/libcharon/plugins/eap_md5/eap_md5_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_md5/eap_md5_plugin.c
rename to src/libcharon/plugins/eap_md5/eap_md5_plugin.c
diff --git a/src/charon/plugins/eap_md5/eap_md5_plugin.h b/src/libcharon/plugins/eap_md5/eap_md5_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_md5/eap_md5_plugin.h
rename to src/libcharon/plugins/eap_md5/eap_md5_plugin.h
diff --git a/src/charon/plugins/eap_mschapv2/Makefile.am b/src/libcharon/plugins/eap_mschapv2/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_mschapv2/Makefile.am
rename to src/libcharon/plugins/eap_mschapv2/Makefile.am
diff --git a/src/charon/plugins/eap_mschapv2/eap_mschapv2.c b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
similarity index 100%
rename from src/charon/plugins/eap_mschapv2/eap_mschapv2.c
rename to src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
diff --git a/src/charon/plugins/eap_mschapv2/eap_mschapv2.h b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h
similarity index 100%
rename from src/charon/plugins/eap_mschapv2/eap_mschapv2.h
rename to src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h
diff --git a/src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.c b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
rename to src/libcharon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
diff --git a/src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.h b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.h
rename to src/libcharon/plugins/eap_mschapv2/eap_mschapv2_plugin.h
diff --git a/src/charon/plugins/eap_radius/Makefile.am b/src/libcharon/plugins/eap_radius/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_radius/Makefile.am
rename to src/libcharon/plugins/eap_radius/Makefile.am
diff --git a/src/charon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c
similarity index 100%
rename from src/charon/plugins/eap_radius/eap_radius.c
rename to src/libcharon/plugins/eap_radius/eap_radius.c
diff --git a/src/charon/plugins/eap_radius/eap_radius.h b/src/libcharon/plugins/eap_radius/eap_radius.h
similarity index 100%
rename from src/charon/plugins/eap_radius/eap_radius.h
rename to src/libcharon/plugins/eap_radius/eap_radius.h
diff --git a/src/charon/plugins/eap_radius/eap_radius_plugin.c b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_radius/eap_radius_plugin.c
rename to src/libcharon/plugins/eap_radius/eap_radius_plugin.c
diff --git a/src/charon/plugins/eap_radius/eap_radius_plugin.h b/src/libcharon/plugins/eap_radius/eap_radius_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_radius/eap_radius_plugin.h
rename to src/libcharon/plugins/eap_radius/eap_radius_plugin.h
diff --git a/src/charon/plugins/eap_radius/radius_client.c b/src/libcharon/plugins/eap_radius/radius_client.c
similarity index 100%
rename from src/charon/plugins/eap_radius/radius_client.c
rename to src/libcharon/plugins/eap_radius/radius_client.c
diff --git a/src/charon/plugins/eap_radius/radius_client.h b/src/libcharon/plugins/eap_radius/radius_client.h
similarity index 100%
rename from src/charon/plugins/eap_radius/radius_client.h
rename to src/libcharon/plugins/eap_radius/radius_client.h
diff --git a/src/charon/plugins/eap_radius/radius_message.c b/src/libcharon/plugins/eap_radius/radius_message.c
similarity index 100%
rename from src/charon/plugins/eap_radius/radius_message.c
rename to src/libcharon/plugins/eap_radius/radius_message.c
diff --git a/src/charon/plugins/eap_radius/radius_message.h b/src/libcharon/plugins/eap_radius/radius_message.h
similarity index 100%
rename from src/charon/plugins/eap_radius/radius_message.h
rename to src/libcharon/plugins/eap_radius/radius_message.h
diff --git a/src/charon/plugins/eap_sim/Makefile.am b/src/libcharon/plugins/eap_sim/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_sim/Makefile.am
rename to src/libcharon/plugins/eap_sim/Makefile.am
diff --git a/src/charon/plugins/eap_sim/eap_sim_peer.c b/src/libcharon/plugins/eap_sim/eap_sim_peer.c
similarity index 100%
rename from src/charon/plugins/eap_sim/eap_sim_peer.c
rename to src/libcharon/plugins/eap_sim/eap_sim_peer.c
diff --git a/src/charon/plugins/eap_sim/eap_sim_peer.h b/src/libcharon/plugins/eap_sim/eap_sim_peer.h
similarity index 100%
rename from src/charon/plugins/eap_sim/eap_sim_peer.h
rename to src/libcharon/plugins/eap_sim/eap_sim_peer.h
diff --git a/src/charon/plugins/eap_sim/eap_sim_plugin.c b/src/libcharon/plugins/eap_sim/eap_sim_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_sim/eap_sim_plugin.c
rename to src/libcharon/plugins/eap_sim/eap_sim_plugin.c
diff --git a/src/charon/plugins/eap_sim/eap_sim_plugin.h b/src/libcharon/plugins/eap_sim/eap_sim_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_sim/eap_sim_plugin.h
rename to src/libcharon/plugins/eap_sim/eap_sim_plugin.h
diff --git a/src/charon/plugins/eap_sim/eap_sim_server.c b/src/libcharon/plugins/eap_sim/eap_sim_server.c
similarity index 100%
rename from src/charon/plugins/eap_sim/eap_sim_server.c
rename to src/libcharon/plugins/eap_sim/eap_sim_server.c
diff --git a/src/charon/plugins/eap_sim/eap_sim_server.h b/src/libcharon/plugins/eap_sim/eap_sim_server.h
similarity index 100%
rename from src/charon/plugins/eap_sim/eap_sim_server.h
rename to src/libcharon/plugins/eap_sim/eap_sim_server.h
diff --git a/src/charon/plugins/eap_sim_file/Makefile.am b/src/libcharon/plugins/eap_sim_file/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_sim_file/Makefile.am
rename to src/libcharon/plugins/eap_sim_file/Makefile.am
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_card.c b/src/libcharon/plugins/eap_sim_file/eap_sim_file_card.c
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_card.c
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_card.c
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_card.h b/src/libcharon/plugins/eap_sim_file/eap_sim_file_card.h
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_card.h
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_card.h
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c b/src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.c
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_plugin.h b/src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_plugin.h
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.h
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_provider.c b/src/libcharon/plugins/eap_sim_file/eap_sim_file_provider.c
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_provider.c
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_provider.c
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_provider.h b/src/libcharon/plugins/eap_sim_file/eap_sim_file_provider.h
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_provider.h
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_provider.h
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_triplets.c b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_triplets.c
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c
diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_triplets.h b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h
similarity index 100%
rename from src/charon/plugins/eap_sim_file/eap_sim_file_triplets.h
rename to src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h
diff --git a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/Makefile.am
rename to src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c
rename to src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c
diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.h b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.h
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.h
rename to src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.h
diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
rename to src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.h b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.h
rename to src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.h
diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c
rename to src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c
diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h
similarity index 100%
rename from src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h
rename to src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h
diff --git a/src/charon/plugins/eap_simaka_reauth/Makefile.am b/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/Makefile.am
rename to src/libcharon/plugins/eap_simaka_reauth/Makefile.am
diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c
rename to src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c
diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.h b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.h
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.h
rename to src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.h
diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
rename to src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.h b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.h
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.h
rename to src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.h
diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
rename to src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.h b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.h
similarity index 100%
rename from src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.h
rename to src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.h
diff --git a/src/charon/plugins/kernel_klips/Makefile.am b/src/libcharon/plugins/kernel_klips/Makefile.am
similarity index 100%
rename from src/charon/plugins/kernel_klips/Makefile.am
rename to src/libcharon/plugins/kernel_klips/Makefile.am
diff --git a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c b/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c
similarity index 100%
rename from src/charon/plugins/kernel_klips/kernel_klips_ipsec.c
rename to src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c
diff --git a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.h b/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.h
similarity index 100%
rename from src/charon/plugins/kernel_klips/kernel_klips_ipsec.h
rename to src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.h
diff --git a/src/charon/plugins/kernel_klips/kernel_klips_plugin.c b/src/libcharon/plugins/kernel_klips/kernel_klips_plugin.c
similarity index 100%
rename from src/charon/plugins/kernel_klips/kernel_klips_plugin.c
rename to src/libcharon/plugins/kernel_klips/kernel_klips_plugin.c
diff --git a/src/charon/plugins/kernel_klips/kernel_klips_plugin.h b/src/libcharon/plugins/kernel_klips/kernel_klips_plugin.h
similarity index 100%
rename from src/charon/plugins/kernel_klips/kernel_klips_plugin.h
rename to src/libcharon/plugins/kernel_klips/kernel_klips_plugin.h
diff --git a/src/charon/plugins/kernel_klips/pfkeyv2.h b/src/libcharon/plugins/kernel_klips/pfkeyv2.h
similarity index 100%
rename from src/charon/plugins/kernel_klips/pfkeyv2.h
rename to src/libcharon/plugins/kernel_klips/pfkeyv2.h
diff --git a/src/charon/plugins/kernel_netlink/Makefile.am b/src/libcharon/plugins/kernel_netlink/Makefile.am
similarity index 100%
rename from src/charon/plugins/kernel_netlink/Makefile.am
rename to src/libcharon/plugins/kernel_netlink/Makefile.am
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.h
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.h
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.h
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_net.c
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.h
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_net.h
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_net.h
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_plugin.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_plugin.c
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_plugin.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.h
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_plugin.h
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.h
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_shared.c
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_shared.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
similarity index 100%
rename from src/charon/plugins/kernel_netlink/kernel_netlink_shared.h
rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
diff --git a/src/charon/plugins/kernel_pfkey/Makefile.am b/src/libcharon/plugins/kernel_pfkey/Makefile.am
similarity index 100%
rename from src/charon/plugins/kernel_pfkey/Makefile.am
rename to src/libcharon/plugins/kernel_pfkey/Makefile.am
diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
similarity index 100%
rename from src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.h b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.h
similarity index 100%
rename from src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.h
rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.h
diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c
similarity index 100%
rename from src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.c
rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c
diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.h b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.h
similarity index 100%
rename from src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.h
rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.h
diff --git a/src/charon/plugins/kernel_pfroute/Makefile.am b/src/libcharon/plugins/kernel_pfroute/Makefile.am
similarity index 100%
rename from src/charon/plugins/kernel_pfroute/Makefile.am
rename to src/libcharon/plugins/kernel_pfroute/Makefile.am
diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c
similarity index 100%
rename from src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c
rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c
diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.h b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.h
similarity index 100%
rename from src/charon/plugins/kernel_pfroute/kernel_pfroute_net.h
rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.h
diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c
similarity index 100%
rename from src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.c
rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c
diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.h b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.h
similarity index 100%
rename from src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.h
rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.h
diff --git a/src/charon/plugins/load_tester/Makefile.am b/src/libcharon/plugins/load_tester/Makefile.am
similarity index 100%
rename from src/charon/plugins/load_tester/Makefile.am
rename to src/libcharon/plugins/load_tester/Makefile.am
diff --git a/src/charon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_config.c
rename to src/libcharon/plugins/load_tester/load_tester_config.c
diff --git a/src/charon/plugins/load_tester/load_tester_config.h b/src/libcharon/plugins/load_tester/load_tester_config.h
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_config.h
rename to src/libcharon/plugins/load_tester/load_tester_config.h
diff --git a/src/charon/plugins/load_tester/load_tester_creds.c b/src/libcharon/plugins/load_tester/load_tester_creds.c
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_creds.c
rename to src/libcharon/plugins/load_tester/load_tester_creds.c
diff --git a/src/charon/plugins/load_tester/load_tester_creds.h b/src/libcharon/plugins/load_tester/load_tester_creds.h
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_creds.h
rename to src/libcharon/plugins/load_tester/load_tester_creds.h
diff --git a/src/charon/plugins/load_tester/load_tester_diffie_hellman.c b/src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_diffie_hellman.c
rename to src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c
diff --git a/src/charon/plugins/load_tester/load_tester_diffie_hellman.h b/src/libcharon/plugins/load_tester/load_tester_diffie_hellman.h
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_diffie_hellman.h
rename to src/libcharon/plugins/load_tester/load_tester_diffie_hellman.h
diff --git a/src/charon/plugins/load_tester/load_tester_ipsec.c b/src/libcharon/plugins/load_tester/load_tester_ipsec.c
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_ipsec.c
rename to src/libcharon/plugins/load_tester/load_tester_ipsec.c
diff --git a/src/charon/plugins/load_tester/load_tester_ipsec.h b/src/libcharon/plugins/load_tester/load_tester_ipsec.h
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_ipsec.h
rename to src/libcharon/plugins/load_tester/load_tester_ipsec.h
diff --git a/src/charon/plugins/load_tester/load_tester_listener.c b/src/libcharon/plugins/load_tester/load_tester_listener.c
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_listener.c
rename to src/libcharon/plugins/load_tester/load_tester_listener.c
diff --git a/src/charon/plugins/load_tester/load_tester_listener.h b/src/libcharon/plugins/load_tester/load_tester_listener.h
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_listener.h
rename to src/libcharon/plugins/load_tester/load_tester_listener.h
diff --git a/src/charon/plugins/load_tester/load_tester_plugin.c b/src/libcharon/plugins/load_tester/load_tester_plugin.c
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_plugin.c
rename to src/libcharon/plugins/load_tester/load_tester_plugin.c
diff --git a/src/charon/plugins/load_tester/load_tester_plugin.h b/src/libcharon/plugins/load_tester/load_tester_plugin.h
similarity index 100%
rename from src/charon/plugins/load_tester/load_tester_plugin.h
rename to src/libcharon/plugins/load_tester/load_tester_plugin.h
diff --git a/src/charon/plugins/medcli/Makefile.am b/src/libcharon/plugins/medcli/Makefile.am
similarity index 100%
rename from src/charon/plugins/medcli/Makefile.am
rename to src/libcharon/plugins/medcli/Makefile.am
diff --git a/src/charon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
similarity index 100%
rename from src/charon/plugins/medcli/medcli_config.c
rename to src/libcharon/plugins/medcli/medcli_config.c
diff --git a/src/charon/plugins/medcli/medcli_config.h b/src/libcharon/plugins/medcli/medcli_config.h
similarity index 100%
rename from src/charon/plugins/medcli/medcli_config.h
rename to src/libcharon/plugins/medcli/medcli_config.h
diff --git a/src/charon/plugins/medcli/medcli_creds.c b/src/libcharon/plugins/medcli/medcli_creds.c
similarity index 100%
rename from src/charon/plugins/medcli/medcli_creds.c
rename to src/libcharon/plugins/medcli/medcli_creds.c
diff --git a/src/charon/plugins/medcli/medcli_creds.h b/src/libcharon/plugins/medcli/medcli_creds.h
similarity index 100%
rename from src/charon/plugins/medcli/medcli_creds.h
rename to src/libcharon/plugins/medcli/medcli_creds.h
diff --git a/src/charon/plugins/medcli/medcli_listener.c b/src/libcharon/plugins/medcli/medcli_listener.c
similarity index 100%
rename from src/charon/plugins/medcli/medcli_listener.c
rename to src/libcharon/plugins/medcli/medcli_listener.c
diff --git a/src/charon/plugins/medcli/medcli_listener.h b/src/libcharon/plugins/medcli/medcli_listener.h
similarity index 100%
rename from src/charon/plugins/medcli/medcli_listener.h
rename to src/libcharon/plugins/medcli/medcli_listener.h
diff --git a/src/charon/plugins/medcli/medcli_plugin.c b/src/libcharon/plugins/medcli/medcli_plugin.c
similarity index 100%
rename from src/charon/plugins/medcli/medcli_plugin.c
rename to src/libcharon/plugins/medcli/medcli_plugin.c
diff --git a/src/charon/plugins/medcli/medcli_plugin.h b/src/libcharon/plugins/medcli/medcli_plugin.h
similarity index 100%
rename from src/charon/plugins/medcli/medcli_plugin.h
rename to src/libcharon/plugins/medcli/medcli_plugin.h
diff --git a/src/charon/plugins/medcli/mysql.sql b/src/libcharon/plugins/medcli/mysql.sql
similarity index 100%
rename from src/charon/plugins/medcli/mysql.sql
rename to src/libcharon/plugins/medcli/mysql.sql
diff --git a/src/charon/plugins/medsrv/Makefile.am b/src/libcharon/plugins/medsrv/Makefile.am
similarity index 100%
rename from src/charon/plugins/medsrv/Makefile.am
rename to src/libcharon/plugins/medsrv/Makefile.am
diff --git a/src/charon/plugins/medsrv/medsrv_config.c b/src/libcharon/plugins/medsrv/medsrv_config.c
similarity index 100%
rename from src/charon/plugins/medsrv/medsrv_config.c
rename to src/libcharon/plugins/medsrv/medsrv_config.c
diff --git a/src/charon/plugins/medsrv/medsrv_config.h b/src/libcharon/plugins/medsrv/medsrv_config.h
similarity index 100%
rename from src/charon/plugins/medsrv/medsrv_config.h
rename to src/libcharon/plugins/medsrv/medsrv_config.h
diff --git a/src/charon/plugins/medsrv/medsrv_creds.c b/src/libcharon/plugins/medsrv/medsrv_creds.c
similarity index 100%
rename from src/charon/plugins/medsrv/medsrv_creds.c
rename to src/libcharon/plugins/medsrv/medsrv_creds.c
diff --git a/src/charon/plugins/medsrv/medsrv_creds.h b/src/libcharon/plugins/medsrv/medsrv_creds.h
similarity index 100%
rename from src/charon/plugins/medsrv/medsrv_creds.h
rename to src/libcharon/plugins/medsrv/medsrv_creds.h
diff --git a/src/charon/plugins/medsrv/medsrv_plugin.c b/src/libcharon/plugins/medsrv/medsrv_plugin.c
similarity index 100%
rename from src/charon/plugins/medsrv/medsrv_plugin.c
rename to src/libcharon/plugins/medsrv/medsrv_plugin.c
diff --git a/src/charon/plugins/medsrv/medsrv_plugin.h b/src/libcharon/plugins/medsrv/medsrv_plugin.h
similarity index 100%
rename from src/charon/plugins/medsrv/medsrv_plugin.h
rename to src/libcharon/plugins/medsrv/medsrv_plugin.h
diff --git a/src/charon/plugins/medsrv/mysql.sql b/src/libcharon/plugins/medsrv/mysql.sql
similarity index 100%
rename from src/charon/plugins/medsrv/mysql.sql
rename to src/libcharon/plugins/medsrv/mysql.sql
diff --git a/src/charon/plugins/medsrv/test.sql b/src/libcharon/plugins/medsrv/test.sql
similarity index 100%
rename from src/charon/plugins/medsrv/test.sql
rename to src/libcharon/plugins/medsrv/test.sql
diff --git a/src/charon/plugins/nm/.gitignore b/src/libcharon/plugins/nm/.gitignore
similarity index 100%
rename from src/charon/plugins/nm/.gitignore
rename to src/libcharon/plugins/nm/.gitignore
diff --git a/src/charon/plugins/nm/Makefile.am b/src/libcharon/plugins/nm/Makefile.am
similarity index 100%
rename from src/charon/plugins/nm/Makefile.am
rename to src/libcharon/plugins/nm/Makefile.am
diff --git a/src/charon/plugins/nm/gnome/.gitignore b/src/libcharon/plugins/nm/gnome/.gitignore
similarity index 100%
rename from src/charon/plugins/nm/gnome/.gitignore
rename to src/libcharon/plugins/nm/gnome/.gitignore
diff --git a/src/charon/plugins/nm/gnome/Makefile.am b/src/libcharon/plugins/nm/gnome/Makefile.am
similarity index 100%
rename from src/charon/plugins/nm/gnome/Makefile.am
rename to src/libcharon/plugins/nm/gnome/Makefile.am
diff --git a/src/charon/plugins/nm/gnome/NEWS b/src/libcharon/plugins/nm/gnome/NEWS
similarity index 100%
rename from src/charon/plugins/nm/gnome/NEWS
rename to src/libcharon/plugins/nm/gnome/NEWS
diff --git a/src/charon/plugins/nm/gnome/auth-dialog/.gitignore b/src/libcharon/plugins/nm/gnome/auth-dialog/.gitignore
similarity index 100%
rename from src/charon/plugins/nm/gnome/auth-dialog/.gitignore
rename to src/libcharon/plugins/nm/gnome/auth-dialog/.gitignore
diff --git a/src/charon/plugins/nm/gnome/auth-dialog/Makefile.am b/src/libcharon/plugins/nm/gnome/auth-dialog/Makefile.am
similarity index 100%
rename from src/charon/plugins/nm/gnome/auth-dialog/Makefile.am
rename to src/libcharon/plugins/nm/gnome/auth-dialog/Makefile.am
diff --git a/src/charon/plugins/nm/gnome/auth-dialog/main.c b/src/libcharon/plugins/nm/gnome/auth-dialog/main.c
similarity index 100%
rename from src/charon/plugins/nm/gnome/auth-dialog/main.c
rename to src/libcharon/plugins/nm/gnome/auth-dialog/main.c
diff --git a/src/charon/plugins/nm/gnome/autogen.sh b/src/libcharon/plugins/nm/gnome/autogen.sh
similarity index 100%
rename from src/charon/plugins/nm/gnome/autogen.sh
rename to src/libcharon/plugins/nm/gnome/autogen.sh
diff --git a/src/charon/plugins/nm/gnome/configure.ac b/src/libcharon/plugins/nm/gnome/configure.ac
similarity index 100%
rename from src/charon/plugins/nm/gnome/configure.ac
rename to src/libcharon/plugins/nm/gnome/configure.ac
diff --git a/src/charon/plugins/nm/gnome/debian/.gitignore b/src/libcharon/plugins/nm/gnome/debian/.gitignore
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/.gitignore
rename to src/libcharon/plugins/nm/gnome/debian/.gitignore
diff --git a/src/charon/plugins/nm/gnome/debian/changelog b/src/libcharon/plugins/nm/gnome/debian/changelog
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/changelog
rename to src/libcharon/plugins/nm/gnome/debian/changelog
diff --git a/src/charon/plugins/nm/gnome/debian/compat b/src/libcharon/plugins/nm/gnome/debian/compat
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/compat
rename to src/libcharon/plugins/nm/gnome/debian/compat
diff --git a/src/charon/plugins/nm/gnome/debian/control b/src/libcharon/plugins/nm/gnome/debian/control
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/control
rename to src/libcharon/plugins/nm/gnome/debian/control
diff --git a/src/charon/plugins/nm/gnome/debian/copyright b/src/libcharon/plugins/nm/gnome/debian/copyright
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/copyright
rename to src/libcharon/plugins/nm/gnome/debian/copyright
diff --git a/src/charon/plugins/nm/gnome/debian/docs b/src/libcharon/plugins/nm/gnome/debian/docs
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/docs
rename to src/libcharon/plugins/nm/gnome/debian/docs
diff --git a/src/charon/plugins/nm/gnome/debian/network-manager-strongswan.postinst b/src/libcharon/plugins/nm/gnome/debian/network-manager-strongswan.postinst
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/network-manager-strongswan.postinst
rename to src/libcharon/plugins/nm/gnome/debian/network-manager-strongswan.postinst
diff --git a/src/charon/plugins/nm/gnome/debian/rules b/src/libcharon/plugins/nm/gnome/debian/rules
similarity index 100%
rename from src/charon/plugins/nm/gnome/debian/rules
rename to src/libcharon/plugins/nm/gnome/debian/rules
diff --git a/src/charon/plugins/nm/gnome/m4/.gitignore b/src/libcharon/plugins/nm/gnome/m4/.gitignore
similarity index 100%
rename from src/charon/plugins/nm/gnome/m4/.gitignore
rename to src/libcharon/plugins/nm/gnome/m4/.gitignore
diff --git a/src/charon/plugins/nm/gnome/m4/compiler_warnings.m4 b/src/libcharon/plugins/nm/gnome/m4/compiler_warnings.m4
similarity index 100%
rename from src/charon/plugins/nm/gnome/m4/compiler_warnings.m4
rename to src/libcharon/plugins/nm/gnome/m4/compiler_warnings.m4
diff --git a/src/charon/plugins/nm/gnome/nm-strongswan-service.conf b/src/libcharon/plugins/nm/gnome/nm-strongswan-service.conf
similarity index 100%
rename from src/charon/plugins/nm/gnome/nm-strongswan-service.conf
rename to src/libcharon/plugins/nm/gnome/nm-strongswan-service.conf
diff --git a/src/charon/plugins/nm/gnome/nm-strongswan-service.name.in b/src/libcharon/plugins/nm/gnome/nm-strongswan-service.name.in
similarity index 100%
rename from src/charon/plugins/nm/gnome/nm-strongswan-service.name.in
rename to src/libcharon/plugins/nm/gnome/nm-strongswan-service.name.in
diff --git a/src/charon/plugins/nm/gnome/po/.gitignore b/src/libcharon/plugins/nm/gnome/po/.gitignore
similarity index 100%
rename from src/charon/plugins/nm/gnome/po/.gitignore
rename to src/libcharon/plugins/nm/gnome/po/.gitignore
diff --git a/src/charon/plugins/nm/gnome/po/ChangeLog b/src/libcharon/plugins/nm/gnome/po/ChangeLog
similarity index 100%
rename from src/charon/plugins/nm/gnome/po/ChangeLog
rename to src/libcharon/plugins/nm/gnome/po/ChangeLog
diff --git a/src/charon/plugins/nm/gnome/po/LINGUAS b/src/libcharon/plugins/nm/gnome/po/LINGUAS
similarity index 100%
rename from src/charon/plugins/nm/gnome/po/LINGUAS
rename to src/libcharon/plugins/nm/gnome/po/LINGUAS
diff --git a/src/charon/plugins/nm/gnome/po/POTFILES.in b/src/libcharon/plugins/nm/gnome/po/POTFILES.in
similarity index 100%
rename from src/charon/plugins/nm/gnome/po/POTFILES.in
rename to src/libcharon/plugins/nm/gnome/po/POTFILES.in
diff --git a/src/charon/plugins/nm/gnome/po/de.po b/src/libcharon/plugins/nm/gnome/po/de.po
similarity index 100%
rename from src/charon/plugins/nm/gnome/po/de.po
rename to src/libcharon/plugins/nm/gnome/po/de.po
diff --git a/src/charon/plugins/nm/gnome/properties/Makefile.am b/src/libcharon/plugins/nm/gnome/properties/Makefile.am
similarity index 100%
rename from src/charon/plugins/nm/gnome/properties/Makefile.am
rename to src/libcharon/plugins/nm/gnome/properties/Makefile.am
diff --git a/src/charon/plugins/nm/gnome/properties/nm-strongswan-dialog.glade b/src/libcharon/plugins/nm/gnome/properties/nm-strongswan-dialog.glade
similarity index 100%
rename from src/charon/plugins/nm/gnome/properties/nm-strongswan-dialog.glade
rename to src/libcharon/plugins/nm/gnome/properties/nm-strongswan-dialog.glade
diff --git a/src/charon/plugins/nm/gnome/properties/nm-strongswan.c b/src/libcharon/plugins/nm/gnome/properties/nm-strongswan.c
similarity index 100%
rename from src/charon/plugins/nm/gnome/properties/nm-strongswan.c
rename to src/libcharon/plugins/nm/gnome/properties/nm-strongswan.c
diff --git a/src/charon/plugins/nm/gnome/properties/nm-strongswan.h b/src/libcharon/plugins/nm/gnome/properties/nm-strongswan.h
similarity index 100%
rename from src/charon/plugins/nm/gnome/properties/nm-strongswan.h
rename to src/libcharon/plugins/nm/gnome/properties/nm-strongswan.h
diff --git a/src/charon/plugins/nm/nm_creds.c b/src/libcharon/plugins/nm/nm_creds.c
similarity index 100%
rename from src/charon/plugins/nm/nm_creds.c
rename to src/libcharon/plugins/nm/nm_creds.c
diff --git a/src/charon/plugins/nm/nm_creds.h b/src/libcharon/plugins/nm/nm_creds.h
similarity index 100%
rename from src/charon/plugins/nm/nm_creds.h
rename to src/libcharon/plugins/nm/nm_creds.h
diff --git a/src/charon/plugins/nm/nm_handler.c b/src/libcharon/plugins/nm/nm_handler.c
similarity index 100%
rename from src/charon/plugins/nm/nm_handler.c
rename to src/libcharon/plugins/nm/nm_handler.c
diff --git a/src/charon/plugins/nm/nm_handler.h b/src/libcharon/plugins/nm/nm_handler.h
similarity index 100%
rename from src/charon/plugins/nm/nm_handler.h
rename to src/libcharon/plugins/nm/nm_handler.h
diff --git a/src/charon/plugins/nm/nm_plugin.c b/src/libcharon/plugins/nm/nm_plugin.c
similarity index 100%
rename from src/charon/plugins/nm/nm_plugin.c
rename to src/libcharon/plugins/nm/nm_plugin.c
diff --git a/src/charon/plugins/nm/nm_plugin.h b/src/libcharon/plugins/nm/nm_plugin.h
similarity index 100%
rename from src/charon/plugins/nm/nm_plugin.h
rename to src/libcharon/plugins/nm/nm_plugin.h
diff --git a/src/charon/plugins/nm/nm_service.c b/src/libcharon/plugins/nm/nm_service.c
similarity index 100%
rename from src/charon/plugins/nm/nm_service.c
rename to src/libcharon/plugins/nm/nm_service.c
diff --git a/src/charon/plugins/nm/nm_service.h b/src/libcharon/plugins/nm/nm_service.h
similarity index 100%
rename from src/charon/plugins/nm/nm_service.h
rename to src/libcharon/plugins/nm/nm_service.h
diff --git a/src/charon/plugins/resolve/Makefile.am b/src/libcharon/plugins/resolve/Makefile.am
similarity index 100%
rename from src/charon/plugins/resolve/Makefile.am
rename to src/libcharon/plugins/resolve/Makefile.am
diff --git a/src/charon/plugins/resolve/resolve_handler.c b/src/libcharon/plugins/resolve/resolve_handler.c
similarity index 100%
rename from src/charon/plugins/resolve/resolve_handler.c
rename to src/libcharon/plugins/resolve/resolve_handler.c
diff --git a/src/charon/plugins/resolve/resolve_handler.h b/src/libcharon/plugins/resolve/resolve_handler.h
similarity index 100%
rename from src/charon/plugins/resolve/resolve_handler.h
rename to src/libcharon/plugins/resolve/resolve_handler.h
diff --git a/src/charon/plugins/resolve/resolve_plugin.c b/src/libcharon/plugins/resolve/resolve_plugin.c
similarity index 100%
rename from src/charon/plugins/resolve/resolve_plugin.c
rename to src/libcharon/plugins/resolve/resolve_plugin.c
diff --git a/src/charon/plugins/resolve/resolve_plugin.h b/src/libcharon/plugins/resolve/resolve_plugin.h
similarity index 100%
rename from src/charon/plugins/resolve/resolve_plugin.h
rename to src/libcharon/plugins/resolve/resolve_plugin.h
diff --git a/src/charon/plugins/smp/Makefile.am b/src/libcharon/plugins/smp/Makefile.am
similarity index 100%
rename from src/charon/plugins/smp/Makefile.am
rename to src/libcharon/plugins/smp/Makefile.am
diff --git a/src/charon/plugins/smp/schema.xml b/src/libcharon/plugins/smp/schema.xml
similarity index 100%
rename from src/charon/plugins/smp/schema.xml
rename to src/libcharon/plugins/smp/schema.xml
diff --git a/src/charon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
similarity index 100%
rename from src/charon/plugins/smp/smp.c
rename to src/libcharon/plugins/smp/smp.c
diff --git a/src/charon/plugins/smp/smp.h b/src/libcharon/plugins/smp/smp.h
similarity index 100%
rename from src/charon/plugins/smp/smp.h
rename to src/libcharon/plugins/smp/smp.h
diff --git a/src/charon/plugins/socket_default/Makefile.am b/src/libcharon/plugins/socket_default/Makefile.am
similarity index 100%
rename from src/charon/plugins/socket_default/Makefile.am
rename to src/libcharon/plugins/socket_default/Makefile.am
diff --git a/src/charon/plugins/socket_default/socket_default_plugin.c b/src/libcharon/plugins/socket_default/socket_default_plugin.c
similarity index 100%
rename from src/charon/plugins/socket_default/socket_default_plugin.c
rename to src/libcharon/plugins/socket_default/socket_default_plugin.c
diff --git a/src/charon/plugins/socket_default/socket_default_plugin.h b/src/libcharon/plugins/socket_default/socket_default_plugin.h
similarity index 100%
rename from src/charon/plugins/socket_default/socket_default_plugin.h
rename to src/libcharon/plugins/socket_default/socket_default_plugin.h
diff --git a/src/charon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
similarity index 100%
rename from src/charon/plugins/socket_default/socket_default_socket.c
rename to src/libcharon/plugins/socket_default/socket_default_socket.c
diff --git a/src/charon/plugins/socket_default/socket_default_socket.h b/src/libcharon/plugins/socket_default/socket_default_socket.h
similarity index 100%
rename from src/charon/plugins/socket_default/socket_default_socket.h
rename to src/libcharon/plugins/socket_default/socket_default_socket.h
diff --git a/src/charon/plugins/socket_dynamic/Makefile.am b/src/libcharon/plugins/socket_dynamic/Makefile.am
similarity index 100%
rename from src/charon/plugins/socket_dynamic/Makefile.am
rename to src/libcharon/plugins/socket_dynamic/Makefile.am
diff --git a/src/charon/plugins/socket_dynamic/socket_dynamic_plugin.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c
similarity index 100%
rename from src/charon/plugins/socket_dynamic/socket_dynamic_plugin.c
rename to src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c
diff --git a/src/charon/plugins/socket_dynamic/socket_dynamic_plugin.h b/src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.h
similarity index 100%
rename from src/charon/plugins/socket_dynamic/socket_dynamic_plugin.h
rename to src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.h
diff --git a/src/charon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
similarity index 100%
rename from src/charon/plugins/socket_dynamic/socket_dynamic_socket.c
rename to src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
diff --git a/src/charon/plugins/socket_dynamic/socket_dynamic_socket.h b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.h
similarity index 100%
rename from src/charon/plugins/socket_dynamic/socket_dynamic_socket.h
rename to src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.h
diff --git a/src/charon/plugins/socket_raw/Makefile.am b/src/libcharon/plugins/socket_raw/Makefile.am
similarity index 100%
rename from src/charon/plugins/socket_raw/Makefile.am
rename to src/libcharon/plugins/socket_raw/Makefile.am
diff --git a/src/charon/plugins/socket_raw/socket_raw_plugin.c b/src/libcharon/plugins/socket_raw/socket_raw_plugin.c
similarity index 100%
rename from src/charon/plugins/socket_raw/socket_raw_plugin.c
rename to src/libcharon/plugins/socket_raw/socket_raw_plugin.c
diff --git a/src/charon/plugins/socket_raw/socket_raw_plugin.h b/src/libcharon/plugins/socket_raw/socket_raw_plugin.h
similarity index 100%
rename from src/charon/plugins/socket_raw/socket_raw_plugin.h
rename to src/libcharon/plugins/socket_raw/socket_raw_plugin.h
diff --git a/src/charon/plugins/socket_raw/socket_raw_socket.c b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
similarity index 100%
rename from src/charon/plugins/socket_raw/socket_raw_socket.c
rename to src/libcharon/plugins/socket_raw/socket_raw_socket.c
diff --git a/src/charon/plugins/socket_raw/socket_raw_socket.h b/src/libcharon/plugins/socket_raw/socket_raw_socket.h
similarity index 100%
rename from src/charon/plugins/socket_raw/socket_raw_socket.h
rename to src/libcharon/plugins/socket_raw/socket_raw_socket.h
diff --git a/src/charon/plugins/sql/Makefile.am b/src/libcharon/plugins/sql/Makefile.am
similarity index 100%
rename from src/charon/plugins/sql/Makefile.am
rename to src/libcharon/plugins/sql/Makefile.am
diff --git a/src/charon/plugins/sql/cred.sql b/src/libcharon/plugins/sql/cred.sql
similarity index 100%
rename from src/charon/plugins/sql/cred.sql
rename to src/libcharon/plugins/sql/cred.sql
diff --git a/src/charon/plugins/sql/mysql.sql b/src/libcharon/plugins/sql/mysql.sql
similarity index 100%
rename from src/charon/plugins/sql/mysql.sql
rename to src/libcharon/plugins/sql/mysql.sql
diff --git a/src/charon/plugins/sql/sql_config.c b/src/libcharon/plugins/sql/sql_config.c
similarity index 100%
rename from src/charon/plugins/sql/sql_config.c
rename to src/libcharon/plugins/sql/sql_config.c
diff --git a/src/charon/plugins/sql/sql_config.h b/src/libcharon/plugins/sql/sql_config.h
similarity index 100%
rename from src/charon/plugins/sql/sql_config.h
rename to src/libcharon/plugins/sql/sql_config.h
diff --git a/src/charon/plugins/sql/sql_cred.c b/src/libcharon/plugins/sql/sql_cred.c
similarity index 100%
rename from src/charon/plugins/sql/sql_cred.c
rename to src/libcharon/plugins/sql/sql_cred.c
diff --git a/src/charon/plugins/sql/sql_cred.h b/src/libcharon/plugins/sql/sql_cred.h
similarity index 100%
rename from src/charon/plugins/sql/sql_cred.h
rename to src/libcharon/plugins/sql/sql_cred.h
diff --git a/src/charon/plugins/sql/sql_logger.c b/src/libcharon/plugins/sql/sql_logger.c
similarity index 100%
rename from src/charon/plugins/sql/sql_logger.c
rename to src/libcharon/plugins/sql/sql_logger.c
diff --git a/src/charon/plugins/sql/sql_logger.h b/src/libcharon/plugins/sql/sql_logger.h
similarity index 100%
rename from src/charon/plugins/sql/sql_logger.h
rename to src/libcharon/plugins/sql/sql_logger.h
diff --git a/src/charon/plugins/sql/sql_plugin.c b/src/libcharon/plugins/sql/sql_plugin.c
similarity index 100%
rename from src/charon/plugins/sql/sql_plugin.c
rename to src/libcharon/plugins/sql/sql_plugin.c
diff --git a/src/charon/plugins/sql/sql_plugin.h b/src/libcharon/plugins/sql/sql_plugin.h
similarity index 100%
rename from src/charon/plugins/sql/sql_plugin.h
rename to src/libcharon/plugins/sql/sql_plugin.h
diff --git a/src/charon/plugins/sql/sqlite.sql b/src/libcharon/plugins/sql/sqlite.sql
similarity index 100%
rename from src/charon/plugins/sql/sqlite.sql
rename to src/libcharon/plugins/sql/sqlite.sql
diff --git a/src/charon/plugins/sql/test.sql b/src/libcharon/plugins/sql/test.sql
similarity index 100%
rename from src/charon/plugins/sql/test.sql
rename to src/libcharon/plugins/sql/test.sql
diff --git a/src/charon/plugins/stroke/Makefile.am b/src/libcharon/plugins/stroke/Makefile.am
similarity index 100%
rename from src/charon/plugins/stroke/Makefile.am
rename to src/libcharon/plugins/stroke/Makefile.am
diff --git a/src/charon/plugins/stroke/stroke_attribute.c b/src/libcharon/plugins/stroke/stroke_attribute.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_attribute.c
rename to src/libcharon/plugins/stroke/stroke_attribute.c
diff --git a/src/charon/plugins/stroke/stroke_attribute.h b/src/libcharon/plugins/stroke/stroke_attribute.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_attribute.h
rename to src/libcharon/plugins/stroke/stroke_attribute.h
diff --git a/src/charon/plugins/stroke/stroke_ca.c b/src/libcharon/plugins/stroke/stroke_ca.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_ca.c
rename to src/libcharon/plugins/stroke/stroke_ca.c
diff --git a/src/charon/plugins/stroke/stroke_ca.h b/src/libcharon/plugins/stroke/stroke_ca.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_ca.h
rename to src/libcharon/plugins/stroke/stroke_ca.h
diff --git a/src/charon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_config.c
rename to src/libcharon/plugins/stroke/stroke_config.c
diff --git a/src/charon/plugins/stroke/stroke_config.h b/src/libcharon/plugins/stroke/stroke_config.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_config.h
rename to src/libcharon/plugins/stroke/stroke_config.h
diff --git a/src/charon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_control.c
rename to src/libcharon/plugins/stroke/stroke_control.c
diff --git a/src/charon/plugins/stroke/stroke_control.h b/src/libcharon/plugins/stroke/stroke_control.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_control.h
rename to src/libcharon/plugins/stroke/stroke_control.h
diff --git a/src/charon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_cred.c
rename to src/libcharon/plugins/stroke/stroke_cred.c
diff --git a/src/charon/plugins/stroke/stroke_cred.h b/src/libcharon/plugins/stroke/stroke_cred.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_cred.h
rename to src/libcharon/plugins/stroke/stroke_cred.h
diff --git a/src/charon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_list.c
rename to src/libcharon/plugins/stroke/stroke_list.c
diff --git a/src/charon/plugins/stroke/stroke_list.h b/src/libcharon/plugins/stroke/stroke_list.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_list.h
rename to src/libcharon/plugins/stroke/stroke_list.h
diff --git a/src/charon/plugins/stroke/stroke_plugin.c b/src/libcharon/plugins/stroke/stroke_plugin.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_plugin.c
rename to src/libcharon/plugins/stroke/stroke_plugin.c
diff --git a/src/charon/plugins/stroke/stroke_plugin.h b/src/libcharon/plugins/stroke/stroke_plugin.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_plugin.h
rename to src/libcharon/plugins/stroke/stroke_plugin.h
diff --git a/src/charon/plugins/stroke/stroke_shared_key.c b/src/libcharon/plugins/stroke/stroke_shared_key.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_shared_key.c
rename to src/libcharon/plugins/stroke/stroke_shared_key.c
diff --git a/src/charon/plugins/stroke/stroke_shared_key.h b/src/libcharon/plugins/stroke/stroke_shared_key.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_shared_key.h
rename to src/libcharon/plugins/stroke/stroke_shared_key.h
diff --git a/src/charon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c
similarity index 100%
rename from src/charon/plugins/stroke/stroke_socket.c
rename to src/libcharon/plugins/stroke/stroke_socket.c
diff --git a/src/charon/plugins/stroke/stroke_socket.h b/src/libcharon/plugins/stroke/stroke_socket.h
similarity index 100%
rename from src/charon/plugins/stroke/stroke_socket.h
rename to src/libcharon/plugins/stroke/stroke_socket.h
diff --git a/src/charon/plugins/uci/Makefile.am b/src/libcharon/plugins/uci/Makefile.am
similarity index 100%
rename from src/charon/plugins/uci/Makefile.am
rename to src/libcharon/plugins/uci/Makefile.am
diff --git a/src/charon/plugins/uci/uci_config.c b/src/libcharon/plugins/uci/uci_config.c
similarity index 100%
rename from src/charon/plugins/uci/uci_config.c
rename to src/libcharon/plugins/uci/uci_config.c
diff --git a/src/charon/plugins/uci/uci_config.h b/src/libcharon/plugins/uci/uci_config.h
similarity index 100%
rename from src/charon/plugins/uci/uci_config.h
rename to src/libcharon/plugins/uci/uci_config.h
diff --git a/src/charon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c
similarity index 100%
rename from src/charon/plugins/uci/uci_control.c
rename to src/libcharon/plugins/uci/uci_control.c
diff --git a/src/charon/plugins/uci/uci_control.h b/src/libcharon/plugins/uci/uci_control.h
similarity index 100%
rename from src/charon/plugins/uci/uci_control.h
rename to src/libcharon/plugins/uci/uci_control.h
diff --git a/src/charon/plugins/uci/uci_creds.c b/src/libcharon/plugins/uci/uci_creds.c
similarity index 100%
rename from src/charon/plugins/uci/uci_creds.c
rename to src/libcharon/plugins/uci/uci_creds.c
diff --git a/src/charon/plugins/uci/uci_creds.h b/src/libcharon/plugins/uci/uci_creds.h
similarity index 100%
rename from src/charon/plugins/uci/uci_creds.h
rename to src/libcharon/plugins/uci/uci_creds.h
diff --git a/src/charon/plugins/uci/uci_parser.c b/src/libcharon/plugins/uci/uci_parser.c
similarity index 100%
rename from src/charon/plugins/uci/uci_parser.c
rename to src/libcharon/plugins/uci/uci_parser.c
diff --git a/src/charon/plugins/uci/uci_parser.h b/src/libcharon/plugins/uci/uci_parser.h
similarity index 100%
rename from src/charon/plugins/uci/uci_parser.h
rename to src/libcharon/plugins/uci/uci_parser.h
diff --git a/src/charon/plugins/uci/uci_plugin.c b/src/libcharon/plugins/uci/uci_plugin.c
similarity index 100%
rename from src/charon/plugins/uci/uci_plugin.c
rename to src/libcharon/plugins/uci/uci_plugin.c
diff --git a/src/charon/plugins/uci/uci_plugin.h b/src/libcharon/plugins/uci/uci_plugin.h
similarity index 100%
rename from src/charon/plugins/uci/uci_plugin.h
rename to src/libcharon/plugins/uci/uci_plugin.h
diff --git a/src/charon/plugins/unit_tester/Makefile.am b/src/libcharon/plugins/unit_tester/Makefile.am
similarity index 100%
rename from src/charon/plugins/unit_tester/Makefile.am
rename to src/libcharon/plugins/unit_tester/Makefile.am
diff --git a/src/charon/plugins/unit_tester/tests.h b/src/libcharon/plugins/unit_tester/tests.h
similarity index 100%
rename from src/charon/plugins/unit_tester/tests.h
rename to src/libcharon/plugins/unit_tester/tests.h
diff --git a/src/charon/plugins/unit_tester/tests/test_agent.c b/src/libcharon/plugins/unit_tester/tests/test_agent.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_agent.c
rename to src/libcharon/plugins/unit_tester/tests/test_agent.c
diff --git a/src/charon/plugins/unit_tester/tests/test_auth_info.c b/src/libcharon/plugins/unit_tester/tests/test_auth_info.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_auth_info.c
rename to src/libcharon/plugins/unit_tester/tests/test_auth_info.c
diff --git a/src/charon/plugins/unit_tester/tests/test_cert.c b/src/libcharon/plugins/unit_tester/tests/test_cert.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_cert.c
rename to src/libcharon/plugins/unit_tester/tests/test_cert.c
diff --git a/src/charon/plugins/unit_tester/tests/test_chunk.c b/src/libcharon/plugins/unit_tester/tests/test_chunk.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_chunk.c
rename to src/libcharon/plugins/unit_tester/tests/test_chunk.c
diff --git a/src/charon/plugins/unit_tester/tests/test_curl.c b/src/libcharon/plugins/unit_tester/tests/test_curl.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_curl.c
rename to src/libcharon/plugins/unit_tester/tests/test_curl.c
diff --git a/src/charon/plugins/unit_tester/tests/test_enumerator.c b/src/libcharon/plugins/unit_tester/tests/test_enumerator.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_enumerator.c
rename to src/libcharon/plugins/unit_tester/tests/test_enumerator.c
diff --git a/src/charon/plugins/unit_tester/tests/test_id.c b/src/libcharon/plugins/unit_tester/tests/test_id.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_id.c
rename to src/libcharon/plugins/unit_tester/tests/test_id.c
diff --git a/src/charon/plugins/unit_tester/tests/test_med_db.c b/src/libcharon/plugins/unit_tester/tests/test_med_db.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_med_db.c
rename to src/libcharon/plugins/unit_tester/tests/test_med_db.c
diff --git a/src/charon/plugins/unit_tester/tests/test_mutex.c b/src/libcharon/plugins/unit_tester/tests/test_mutex.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_mutex.c
rename to src/libcharon/plugins/unit_tester/tests/test_mutex.c
diff --git a/src/charon/plugins/unit_tester/tests/test_mysql.c b/src/libcharon/plugins/unit_tester/tests/test_mysql.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_mysql.c
rename to src/libcharon/plugins/unit_tester/tests/test_mysql.c
diff --git a/src/charon/plugins/unit_tester/tests/test_pool.c b/src/libcharon/plugins/unit_tester/tests/test_pool.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_pool.c
rename to src/libcharon/plugins/unit_tester/tests/test_pool.c
diff --git a/src/charon/plugins/unit_tester/tests/test_rsa_gen.c b/src/libcharon/plugins/unit_tester/tests/test_rsa_gen.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_rsa_gen.c
rename to src/libcharon/plugins/unit_tester/tests/test_rsa_gen.c
diff --git a/src/charon/plugins/unit_tester/tests/test_sqlite.c b/src/libcharon/plugins/unit_tester/tests/test_sqlite.c
similarity index 100%
rename from src/charon/plugins/unit_tester/tests/test_sqlite.c
rename to src/libcharon/plugins/unit_tester/tests/test_sqlite.c
diff --git a/src/charon/plugins/unit_tester/unit_tester.c b/src/libcharon/plugins/unit_tester/unit_tester.c
similarity index 100%
rename from src/charon/plugins/unit_tester/unit_tester.c
rename to src/libcharon/plugins/unit_tester/unit_tester.c
diff --git a/src/charon/plugins/unit_tester/unit_tester.h b/src/libcharon/plugins/unit_tester/unit_tester.h
similarity index 100%
rename from src/charon/plugins/unit_tester/unit_tester.h
rename to src/libcharon/plugins/unit_tester/unit_tester.h
diff --git a/src/charon/plugins/updown/Makefile.am b/src/libcharon/plugins/updown/Makefile.am
similarity index 100%
rename from src/charon/plugins/updown/Makefile.am
rename to src/libcharon/plugins/updown/Makefile.am
diff --git a/src/charon/plugins/updown/updown_listener.c b/src/libcharon/plugins/updown/updown_listener.c
similarity index 100%
rename from src/charon/plugins/updown/updown_listener.c
rename to src/libcharon/plugins/updown/updown_listener.c
diff --git a/src/charon/plugins/updown/updown_listener.h b/src/libcharon/plugins/updown/updown_listener.h
similarity index 100%
rename from src/charon/plugins/updown/updown_listener.h
rename to src/libcharon/plugins/updown/updown_listener.h
diff --git a/src/charon/plugins/updown/updown_plugin.c b/src/libcharon/plugins/updown/updown_plugin.c
similarity index 100%
rename from src/charon/plugins/updown/updown_plugin.c
rename to src/libcharon/plugins/updown/updown_plugin.c
diff --git a/src/charon/plugins/updown/updown_plugin.h b/src/libcharon/plugins/updown/updown_plugin.h
similarity index 100%
rename from src/charon/plugins/updown/updown_plugin.h
rename to src/libcharon/plugins/updown/updown_plugin.h
diff --git a/src/charon/processing/jobs/acquire_job.c b/src/libcharon/processing/jobs/acquire_job.c
similarity index 100%
rename from src/charon/processing/jobs/acquire_job.c
rename to src/libcharon/processing/jobs/acquire_job.c
diff --git a/src/charon/processing/jobs/acquire_job.h b/src/libcharon/processing/jobs/acquire_job.h
similarity index 100%
rename from src/charon/processing/jobs/acquire_job.h
rename to src/libcharon/processing/jobs/acquire_job.h
diff --git a/src/charon/processing/jobs/callback_job.c b/src/libcharon/processing/jobs/callback_job.c
similarity index 100%
rename from src/charon/processing/jobs/callback_job.c
rename to src/libcharon/processing/jobs/callback_job.c
diff --git a/src/charon/processing/jobs/callback_job.h b/src/libcharon/processing/jobs/callback_job.h
similarity index 100%
rename from src/charon/processing/jobs/callback_job.h
rename to src/libcharon/processing/jobs/callback_job.h
diff --git a/src/charon/processing/jobs/delete_child_sa_job.c b/src/libcharon/processing/jobs/delete_child_sa_job.c
similarity index 100%
rename from src/charon/processing/jobs/delete_child_sa_job.c
rename to src/libcharon/processing/jobs/delete_child_sa_job.c
diff --git a/src/charon/processing/jobs/delete_child_sa_job.h b/src/libcharon/processing/jobs/delete_child_sa_job.h
similarity index 100%
rename from src/charon/processing/jobs/delete_child_sa_job.h
rename to src/libcharon/processing/jobs/delete_child_sa_job.h
diff --git a/src/charon/processing/jobs/delete_ike_sa_job.c b/src/libcharon/processing/jobs/delete_ike_sa_job.c
similarity index 100%
rename from src/charon/processing/jobs/delete_ike_sa_job.c
rename to src/libcharon/processing/jobs/delete_ike_sa_job.c
diff --git a/src/charon/processing/jobs/delete_ike_sa_job.h b/src/libcharon/processing/jobs/delete_ike_sa_job.h
similarity index 100%
rename from src/charon/processing/jobs/delete_ike_sa_job.h
rename to src/libcharon/processing/jobs/delete_ike_sa_job.h
diff --git a/src/charon/processing/jobs/inactivity_job.c b/src/libcharon/processing/jobs/inactivity_job.c
similarity index 100%
rename from src/charon/processing/jobs/inactivity_job.c
rename to src/libcharon/processing/jobs/inactivity_job.c
diff --git a/src/charon/processing/jobs/inactivity_job.h b/src/libcharon/processing/jobs/inactivity_job.h
similarity index 100%
rename from src/charon/processing/jobs/inactivity_job.h
rename to src/libcharon/processing/jobs/inactivity_job.h
diff --git a/src/charon/processing/jobs/initiate_mediation_job.c b/src/libcharon/processing/jobs/initiate_mediation_job.c
similarity index 100%
rename from src/charon/processing/jobs/initiate_mediation_job.c
rename to src/libcharon/processing/jobs/initiate_mediation_job.c
diff --git a/src/charon/processing/jobs/initiate_mediation_job.h b/src/libcharon/processing/jobs/initiate_mediation_job.h
similarity index 100%
rename from src/charon/processing/jobs/initiate_mediation_job.h
rename to src/libcharon/processing/jobs/initiate_mediation_job.h
diff --git a/src/charon/processing/jobs/job.h b/src/libcharon/processing/jobs/job.h
similarity index 100%
rename from src/charon/processing/jobs/job.h
rename to src/libcharon/processing/jobs/job.h
diff --git a/src/charon/processing/jobs/mediation_job.c b/src/libcharon/processing/jobs/mediation_job.c
similarity index 100%
rename from src/charon/processing/jobs/mediation_job.c
rename to src/libcharon/processing/jobs/mediation_job.c
diff --git a/src/charon/processing/jobs/mediation_job.h b/src/libcharon/processing/jobs/mediation_job.h
similarity index 100%
rename from src/charon/processing/jobs/mediation_job.h
rename to src/libcharon/processing/jobs/mediation_job.h
diff --git a/src/charon/processing/jobs/migrate_job.c b/src/libcharon/processing/jobs/migrate_job.c
similarity index 100%
rename from src/charon/processing/jobs/migrate_job.c
rename to src/libcharon/processing/jobs/migrate_job.c
diff --git a/src/charon/processing/jobs/migrate_job.h b/src/libcharon/processing/jobs/migrate_job.h
similarity index 100%
rename from src/charon/processing/jobs/migrate_job.h
rename to src/libcharon/processing/jobs/migrate_job.h
diff --git a/src/charon/processing/jobs/process_message_job.c b/src/libcharon/processing/jobs/process_message_job.c
similarity index 100%
rename from src/charon/processing/jobs/process_message_job.c
rename to src/libcharon/processing/jobs/process_message_job.c
diff --git a/src/charon/processing/jobs/process_message_job.h b/src/libcharon/processing/jobs/process_message_job.h
similarity index 100%
rename from src/charon/processing/jobs/process_message_job.h
rename to src/libcharon/processing/jobs/process_message_job.h
diff --git a/src/charon/processing/jobs/rekey_child_sa_job.c b/src/libcharon/processing/jobs/rekey_child_sa_job.c
similarity index 100%
rename from src/charon/processing/jobs/rekey_child_sa_job.c
rename to src/libcharon/processing/jobs/rekey_child_sa_job.c
diff --git a/src/charon/processing/jobs/rekey_child_sa_job.h b/src/libcharon/processing/jobs/rekey_child_sa_job.h
similarity index 100%
rename from src/charon/processing/jobs/rekey_child_sa_job.h
rename to src/libcharon/processing/jobs/rekey_child_sa_job.h
diff --git a/src/charon/processing/jobs/rekey_ike_sa_job.c b/src/libcharon/processing/jobs/rekey_ike_sa_job.c
similarity index 100%
rename from src/charon/processing/jobs/rekey_ike_sa_job.c
rename to src/libcharon/processing/jobs/rekey_ike_sa_job.c
diff --git a/src/charon/processing/jobs/rekey_ike_sa_job.h b/src/libcharon/processing/jobs/rekey_ike_sa_job.h
similarity index 100%
rename from src/charon/processing/jobs/rekey_ike_sa_job.h
rename to src/libcharon/processing/jobs/rekey_ike_sa_job.h
diff --git a/src/charon/processing/jobs/retransmit_job.c b/src/libcharon/processing/jobs/retransmit_job.c
similarity index 100%
rename from src/charon/processing/jobs/retransmit_job.c
rename to src/libcharon/processing/jobs/retransmit_job.c
diff --git a/src/charon/processing/jobs/retransmit_job.h b/src/libcharon/processing/jobs/retransmit_job.h
similarity index 100%
rename from src/charon/processing/jobs/retransmit_job.h
rename to src/libcharon/processing/jobs/retransmit_job.h
diff --git a/src/charon/processing/jobs/roam_job.c b/src/libcharon/processing/jobs/roam_job.c
similarity index 100%
rename from src/charon/processing/jobs/roam_job.c
rename to src/libcharon/processing/jobs/roam_job.c
diff --git a/src/charon/processing/jobs/roam_job.h b/src/libcharon/processing/jobs/roam_job.h
similarity index 100%
rename from src/charon/processing/jobs/roam_job.h
rename to src/libcharon/processing/jobs/roam_job.h
diff --git a/src/charon/processing/jobs/send_dpd_job.c b/src/libcharon/processing/jobs/send_dpd_job.c
similarity index 100%
rename from src/charon/processing/jobs/send_dpd_job.c
rename to src/libcharon/processing/jobs/send_dpd_job.c
diff --git a/src/charon/processing/jobs/send_dpd_job.h b/src/libcharon/processing/jobs/send_dpd_job.h
similarity index 100%
rename from src/charon/processing/jobs/send_dpd_job.h
rename to src/libcharon/processing/jobs/send_dpd_job.h
diff --git a/src/charon/processing/jobs/send_keepalive_job.c b/src/libcharon/processing/jobs/send_keepalive_job.c
similarity index 100%
rename from src/charon/processing/jobs/send_keepalive_job.c
rename to src/libcharon/processing/jobs/send_keepalive_job.c
diff --git a/src/charon/processing/jobs/send_keepalive_job.h b/src/libcharon/processing/jobs/send_keepalive_job.h
similarity index 100%
rename from src/charon/processing/jobs/send_keepalive_job.h
rename to src/libcharon/processing/jobs/send_keepalive_job.h
diff --git a/src/charon/processing/jobs/update_sa_job.c b/src/libcharon/processing/jobs/update_sa_job.c
similarity index 100%
rename from src/charon/processing/jobs/update_sa_job.c
rename to src/libcharon/processing/jobs/update_sa_job.c
diff --git a/src/charon/processing/jobs/update_sa_job.h b/src/libcharon/processing/jobs/update_sa_job.h
similarity index 100%
rename from src/charon/processing/jobs/update_sa_job.h
rename to src/libcharon/processing/jobs/update_sa_job.h
diff --git a/src/charon/processing/processor.c b/src/libcharon/processing/processor.c
similarity index 100%
rename from src/charon/processing/processor.c
rename to src/libcharon/processing/processor.c
diff --git a/src/charon/processing/processor.h b/src/libcharon/processing/processor.h
similarity index 100%
rename from src/charon/processing/processor.h
rename to src/libcharon/processing/processor.h
diff --git a/src/charon/processing/scheduler.c b/src/libcharon/processing/scheduler.c
similarity index 100%
rename from src/charon/processing/scheduler.c
rename to src/libcharon/processing/scheduler.c
diff --git a/src/charon/processing/scheduler.h b/src/libcharon/processing/scheduler.h
similarity index 100%
rename from src/charon/processing/scheduler.h
rename to src/libcharon/processing/scheduler.h
diff --git a/src/charon/sa/authenticators/authenticator.c b/src/libcharon/sa/authenticators/authenticator.c
similarity index 100%
rename from src/charon/sa/authenticators/authenticator.c
rename to src/libcharon/sa/authenticators/authenticator.c
diff --git a/src/charon/sa/authenticators/authenticator.h b/src/libcharon/sa/authenticators/authenticator.h
similarity index 100%
rename from src/charon/sa/authenticators/authenticator.h
rename to src/libcharon/sa/authenticators/authenticator.h
diff --git a/src/charon/sa/authenticators/eap/eap_manager.c b/src/libcharon/sa/authenticators/eap/eap_manager.c
similarity index 100%
rename from src/charon/sa/authenticators/eap/eap_manager.c
rename to src/libcharon/sa/authenticators/eap/eap_manager.c
diff --git a/src/charon/sa/authenticators/eap/eap_manager.h b/src/libcharon/sa/authenticators/eap/eap_manager.h
similarity index 100%
rename from src/charon/sa/authenticators/eap/eap_manager.h
rename to src/libcharon/sa/authenticators/eap/eap_manager.h
diff --git a/src/charon/sa/authenticators/eap/eap_method.c b/src/libcharon/sa/authenticators/eap/eap_method.c
similarity index 100%
rename from src/charon/sa/authenticators/eap/eap_method.c
rename to src/libcharon/sa/authenticators/eap/eap_method.c
diff --git a/src/charon/sa/authenticators/eap/eap_method.h b/src/libcharon/sa/authenticators/eap/eap_method.h
similarity index 100%
rename from src/charon/sa/authenticators/eap/eap_method.h
rename to src/libcharon/sa/authenticators/eap/eap_method.h
diff --git a/src/charon/sa/authenticators/eap/sim_manager.c b/src/libcharon/sa/authenticators/eap/sim_manager.c
similarity index 100%
rename from src/charon/sa/authenticators/eap/sim_manager.c
rename to src/libcharon/sa/authenticators/eap/sim_manager.c
diff --git a/src/charon/sa/authenticators/eap/sim_manager.h b/src/libcharon/sa/authenticators/eap/sim_manager.h
similarity index 100%
rename from src/charon/sa/authenticators/eap/sim_manager.h
rename to src/libcharon/sa/authenticators/eap/sim_manager.h
diff --git a/src/charon/sa/authenticators/eap_authenticator.c b/src/libcharon/sa/authenticators/eap_authenticator.c
similarity index 100%
rename from src/charon/sa/authenticators/eap_authenticator.c
rename to src/libcharon/sa/authenticators/eap_authenticator.c
diff --git a/src/charon/sa/authenticators/eap_authenticator.h b/src/libcharon/sa/authenticators/eap_authenticator.h
similarity index 100%
rename from src/charon/sa/authenticators/eap_authenticator.h
rename to src/libcharon/sa/authenticators/eap_authenticator.h
diff --git a/src/charon/sa/authenticators/psk_authenticator.c b/src/libcharon/sa/authenticators/psk_authenticator.c
similarity index 100%
rename from src/charon/sa/authenticators/psk_authenticator.c
rename to src/libcharon/sa/authenticators/psk_authenticator.c
diff --git a/src/charon/sa/authenticators/psk_authenticator.h b/src/libcharon/sa/authenticators/psk_authenticator.h
similarity index 100%
rename from src/charon/sa/authenticators/psk_authenticator.h
rename to src/libcharon/sa/authenticators/psk_authenticator.h
diff --git a/src/charon/sa/authenticators/pubkey_authenticator.c b/src/libcharon/sa/authenticators/pubkey_authenticator.c
similarity index 100%
rename from src/charon/sa/authenticators/pubkey_authenticator.c
rename to src/libcharon/sa/authenticators/pubkey_authenticator.c
diff --git a/src/charon/sa/authenticators/pubkey_authenticator.h b/src/libcharon/sa/authenticators/pubkey_authenticator.h
similarity index 100%
rename from src/charon/sa/authenticators/pubkey_authenticator.h
rename to src/libcharon/sa/authenticators/pubkey_authenticator.h
diff --git a/src/charon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
similarity index 100%
rename from src/charon/sa/child_sa.c
rename to src/libcharon/sa/child_sa.c
diff --git a/src/charon/sa/child_sa.h b/src/libcharon/sa/child_sa.h
similarity index 100%
rename from src/charon/sa/child_sa.h
rename to src/libcharon/sa/child_sa.h
diff --git a/src/charon/sa/connect_manager.c b/src/libcharon/sa/connect_manager.c
similarity index 100%
rename from src/charon/sa/connect_manager.c
rename to src/libcharon/sa/connect_manager.c
diff --git a/src/charon/sa/connect_manager.h b/src/libcharon/sa/connect_manager.h
similarity index 100%
rename from src/charon/sa/connect_manager.h
rename to src/libcharon/sa/connect_manager.h
diff --git a/src/charon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
similarity index 100%
rename from src/charon/sa/ike_sa.c
rename to src/libcharon/sa/ike_sa.c
diff --git a/src/charon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
similarity index 100%
rename from src/charon/sa/ike_sa.h
rename to src/libcharon/sa/ike_sa.h
diff --git a/src/charon/sa/ike_sa_id.c b/src/libcharon/sa/ike_sa_id.c
similarity index 100%
rename from src/charon/sa/ike_sa_id.c
rename to src/libcharon/sa/ike_sa_id.c
diff --git a/src/charon/sa/ike_sa_id.h b/src/libcharon/sa/ike_sa_id.h
similarity index 100%
rename from src/charon/sa/ike_sa_id.h
rename to src/libcharon/sa/ike_sa_id.h
diff --git a/src/charon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
similarity index 100%
rename from src/charon/sa/ike_sa_manager.c
rename to src/libcharon/sa/ike_sa_manager.c
diff --git a/src/charon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
similarity index 100%
rename from src/charon/sa/ike_sa_manager.h
rename to src/libcharon/sa/ike_sa_manager.h
diff --git a/src/charon/sa/keymat.c b/src/libcharon/sa/keymat.c
similarity index 100%
rename from src/charon/sa/keymat.c
rename to src/libcharon/sa/keymat.c
diff --git a/src/charon/sa/keymat.h b/src/libcharon/sa/keymat.h
similarity index 100%
rename from src/charon/sa/keymat.h
rename to src/libcharon/sa/keymat.h
diff --git a/src/charon/sa/mediation_manager.c b/src/libcharon/sa/mediation_manager.c
similarity index 100%
rename from src/charon/sa/mediation_manager.c
rename to src/libcharon/sa/mediation_manager.c
diff --git a/src/charon/sa/mediation_manager.h b/src/libcharon/sa/mediation_manager.h
similarity index 100%
rename from src/charon/sa/mediation_manager.h
rename to src/libcharon/sa/mediation_manager.h
diff --git a/src/charon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
similarity index 100%
rename from src/charon/sa/task_manager.c
rename to src/libcharon/sa/task_manager.c
diff --git a/src/charon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
similarity index 100%
rename from src/charon/sa/task_manager.h
rename to src/libcharon/sa/task_manager.h
diff --git a/src/charon/sa/tasks/child_create.c b/src/libcharon/sa/tasks/child_create.c
similarity index 100%
rename from src/charon/sa/tasks/child_create.c
rename to src/libcharon/sa/tasks/child_create.c
diff --git a/src/charon/sa/tasks/child_create.h b/src/libcharon/sa/tasks/child_create.h
similarity index 100%
rename from src/charon/sa/tasks/child_create.h
rename to src/libcharon/sa/tasks/child_create.h
diff --git a/src/charon/sa/tasks/child_delete.c b/src/libcharon/sa/tasks/child_delete.c
similarity index 100%
rename from src/charon/sa/tasks/child_delete.c
rename to src/libcharon/sa/tasks/child_delete.c
diff --git a/src/charon/sa/tasks/child_delete.h b/src/libcharon/sa/tasks/child_delete.h
similarity index 100%
rename from src/charon/sa/tasks/child_delete.h
rename to src/libcharon/sa/tasks/child_delete.h
diff --git a/src/charon/sa/tasks/child_rekey.c b/src/libcharon/sa/tasks/child_rekey.c
similarity index 100%
rename from src/charon/sa/tasks/child_rekey.c
rename to src/libcharon/sa/tasks/child_rekey.c
diff --git a/src/charon/sa/tasks/child_rekey.h b/src/libcharon/sa/tasks/child_rekey.h
similarity index 100%
rename from src/charon/sa/tasks/child_rekey.h
rename to src/libcharon/sa/tasks/child_rekey.h
diff --git a/src/charon/sa/tasks/ike_auth.c b/src/libcharon/sa/tasks/ike_auth.c
similarity index 100%
rename from src/charon/sa/tasks/ike_auth.c
rename to src/libcharon/sa/tasks/ike_auth.c
diff --git a/src/charon/sa/tasks/ike_auth.h b/src/libcharon/sa/tasks/ike_auth.h
similarity index 100%
rename from src/charon/sa/tasks/ike_auth.h
rename to src/libcharon/sa/tasks/ike_auth.h
diff --git a/src/charon/sa/tasks/ike_auth_lifetime.c b/src/libcharon/sa/tasks/ike_auth_lifetime.c
similarity index 100%
rename from src/charon/sa/tasks/ike_auth_lifetime.c
rename to src/libcharon/sa/tasks/ike_auth_lifetime.c
diff --git a/src/charon/sa/tasks/ike_auth_lifetime.h b/src/libcharon/sa/tasks/ike_auth_lifetime.h
similarity index 100%
rename from src/charon/sa/tasks/ike_auth_lifetime.h
rename to src/libcharon/sa/tasks/ike_auth_lifetime.h
diff --git a/src/charon/sa/tasks/ike_cert_post.c b/src/libcharon/sa/tasks/ike_cert_post.c
similarity index 100%
rename from src/charon/sa/tasks/ike_cert_post.c
rename to src/libcharon/sa/tasks/ike_cert_post.c
diff --git a/src/charon/sa/tasks/ike_cert_post.h b/src/libcharon/sa/tasks/ike_cert_post.h
similarity index 100%
rename from src/charon/sa/tasks/ike_cert_post.h
rename to src/libcharon/sa/tasks/ike_cert_post.h
diff --git a/src/charon/sa/tasks/ike_cert_pre.c b/src/libcharon/sa/tasks/ike_cert_pre.c
similarity index 100%
rename from src/charon/sa/tasks/ike_cert_pre.c
rename to src/libcharon/sa/tasks/ike_cert_pre.c
diff --git a/src/charon/sa/tasks/ike_cert_pre.h b/src/libcharon/sa/tasks/ike_cert_pre.h
similarity index 100%
rename from src/charon/sa/tasks/ike_cert_pre.h
rename to src/libcharon/sa/tasks/ike_cert_pre.h
diff --git a/src/charon/sa/tasks/ike_config.c b/src/libcharon/sa/tasks/ike_config.c
similarity index 100%
rename from src/charon/sa/tasks/ike_config.c
rename to src/libcharon/sa/tasks/ike_config.c
diff --git a/src/charon/sa/tasks/ike_config.h b/src/libcharon/sa/tasks/ike_config.h
similarity index 100%
rename from src/charon/sa/tasks/ike_config.h
rename to src/libcharon/sa/tasks/ike_config.h
diff --git a/src/charon/sa/tasks/ike_delete.c b/src/libcharon/sa/tasks/ike_delete.c
similarity index 100%
rename from src/charon/sa/tasks/ike_delete.c
rename to src/libcharon/sa/tasks/ike_delete.c
diff --git a/src/charon/sa/tasks/ike_delete.h b/src/libcharon/sa/tasks/ike_delete.h
similarity index 100%
rename from src/charon/sa/tasks/ike_delete.h
rename to src/libcharon/sa/tasks/ike_delete.h
diff --git a/src/charon/sa/tasks/ike_dpd.c b/src/libcharon/sa/tasks/ike_dpd.c
similarity index 100%
rename from src/charon/sa/tasks/ike_dpd.c
rename to src/libcharon/sa/tasks/ike_dpd.c
diff --git a/src/charon/sa/tasks/ike_dpd.h b/src/libcharon/sa/tasks/ike_dpd.h
similarity index 100%
rename from src/charon/sa/tasks/ike_dpd.h
rename to src/libcharon/sa/tasks/ike_dpd.h
diff --git a/src/charon/sa/tasks/ike_init.c b/src/libcharon/sa/tasks/ike_init.c
similarity index 100%
rename from src/charon/sa/tasks/ike_init.c
rename to src/libcharon/sa/tasks/ike_init.c
diff --git a/src/charon/sa/tasks/ike_init.h b/src/libcharon/sa/tasks/ike_init.h
similarity index 100%
rename from src/charon/sa/tasks/ike_init.h
rename to src/libcharon/sa/tasks/ike_init.h
diff --git a/src/charon/sa/tasks/ike_me.c b/src/libcharon/sa/tasks/ike_me.c
similarity index 100%
rename from src/charon/sa/tasks/ike_me.c
rename to src/libcharon/sa/tasks/ike_me.c
diff --git a/src/charon/sa/tasks/ike_me.h b/src/libcharon/sa/tasks/ike_me.h
similarity index 100%
rename from src/charon/sa/tasks/ike_me.h
rename to src/libcharon/sa/tasks/ike_me.h
diff --git a/src/charon/sa/tasks/ike_mobike.c b/src/libcharon/sa/tasks/ike_mobike.c
similarity index 100%
rename from src/charon/sa/tasks/ike_mobike.c
rename to src/libcharon/sa/tasks/ike_mobike.c
diff --git a/src/charon/sa/tasks/ike_mobike.h b/src/libcharon/sa/tasks/ike_mobike.h
similarity index 100%
rename from src/charon/sa/tasks/ike_mobike.h
rename to src/libcharon/sa/tasks/ike_mobike.h
diff --git a/src/charon/sa/tasks/ike_natd.c b/src/libcharon/sa/tasks/ike_natd.c
similarity index 100%
rename from src/charon/sa/tasks/ike_natd.c
rename to src/libcharon/sa/tasks/ike_natd.c
diff --git a/src/charon/sa/tasks/ike_natd.h b/src/libcharon/sa/tasks/ike_natd.h
similarity index 100%
rename from src/charon/sa/tasks/ike_natd.h
rename to src/libcharon/sa/tasks/ike_natd.h
diff --git a/src/charon/sa/tasks/ike_reauth.c b/src/libcharon/sa/tasks/ike_reauth.c
similarity index 100%
rename from src/charon/sa/tasks/ike_reauth.c
rename to src/libcharon/sa/tasks/ike_reauth.c
diff --git a/src/charon/sa/tasks/ike_reauth.h b/src/libcharon/sa/tasks/ike_reauth.h
similarity index 100%
rename from src/charon/sa/tasks/ike_reauth.h
rename to src/libcharon/sa/tasks/ike_reauth.h
diff --git a/src/charon/sa/tasks/ike_rekey.c b/src/libcharon/sa/tasks/ike_rekey.c
similarity index 100%
rename from src/charon/sa/tasks/ike_rekey.c
rename to src/libcharon/sa/tasks/ike_rekey.c
diff --git a/src/charon/sa/tasks/ike_rekey.h b/src/libcharon/sa/tasks/ike_rekey.h
similarity index 100%
rename from src/charon/sa/tasks/ike_rekey.h
rename to src/libcharon/sa/tasks/ike_rekey.h
diff --git a/src/charon/sa/tasks/ike_vendor.c b/src/libcharon/sa/tasks/ike_vendor.c
similarity index 100%
rename from src/charon/sa/tasks/ike_vendor.c
rename to src/libcharon/sa/tasks/ike_vendor.c
diff --git a/src/charon/sa/tasks/ike_vendor.h b/src/libcharon/sa/tasks/ike_vendor.h
similarity index 100%
rename from src/charon/sa/tasks/ike_vendor.h
rename to src/libcharon/sa/tasks/ike_vendor.h
diff --git a/src/charon/sa/tasks/task.c b/src/libcharon/sa/tasks/task.c
similarity index 100%
rename from src/charon/sa/tasks/task.c
rename to src/libcharon/sa/tasks/task.c
diff --git a/src/charon/sa/tasks/task.h b/src/libcharon/sa/tasks/task.h
similarity index 100%
rename from src/charon/sa/tasks/task.h
rename to src/libcharon/sa/tasks/task.h
diff --git a/src/charon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
similarity index 100%
rename from src/charon/sa/trap_manager.c
rename to src/libcharon/sa/trap_manager.c
diff --git a/src/charon/sa/trap_manager.h b/src/libcharon/sa/trap_manager.h
similarity index 100%
rename from src/charon/sa/trap_manager.h
rename to src/libcharon/sa/trap_manager.h