diff --git a/Makefile b/Makefile index f1406d0e55..2dc9275720 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ export FREESWANSRCDIR include Makefile.inc # directories visited by all recursion -SUBDIRS=lib programs linux +SUBDIRS=lib src linux # declaration for make's benefit .PHONY: programs install clean distclean \ diff --git a/Makefile.ver b/Makefile.ver index 435dd73118..48f2cacda2 100644 --- a/Makefile.ver +++ b/Makefile.ver @@ -1 +1 @@ -IPSECVERSION=2.7.0 +IPSECVERSION=4.0.0 diff --git a/programs/Makefile b/src/Makefile similarity index 100% rename from programs/Makefile rename to src/Makefile diff --git a/programs/Makefile.program b/src/Makefile.program similarity index 100% rename from programs/Makefile.program rename to src/Makefile.program diff --git a/programs/_copyright/.cvsignore b/src/_copyright/.cvsignore similarity index 100% rename from programs/_copyright/.cvsignore rename to src/_copyright/.cvsignore diff --git a/programs/_copyright/Makefile b/src/_copyright/Makefile similarity index 100% rename from programs/_copyright/Makefile rename to src/_copyright/Makefile diff --git a/programs/_copyright/_copyright.8 b/src/_copyright/_copyright.8 similarity index 100% rename from programs/_copyright/_copyright.8 rename to src/_copyright/_copyright.8 diff --git a/programs/_copyright/_copyright.c b/src/_copyright/_copyright.c similarity index 100% rename from programs/_copyright/_copyright.c rename to src/_copyright/_copyright.c diff --git a/programs/_updown/.cvsignore b/src/_updown/.cvsignore similarity index 100% rename from programs/_updown/.cvsignore rename to src/_updown/.cvsignore diff --git a/programs/_updown/Makefile b/src/_updown/Makefile similarity index 100% rename from programs/_updown/Makefile rename to src/_updown/Makefile diff --git a/programs/_updown/_updown.8 b/src/_updown/_updown.8 similarity index 100% rename from programs/_updown/_updown.8 rename to src/_updown/_updown.8 diff --git a/programs/_updown/_updown.in b/src/_updown/_updown.in similarity index 100% rename from programs/_updown/_updown.in rename to src/_updown/_updown.in diff --git a/programs/_updown_espmark/Makefile b/src/_updown_espmark/Makefile similarity index 100% rename from programs/_updown_espmark/Makefile rename to src/_updown_espmark/Makefile diff --git a/programs/_updown_espmark/_updown_espmark.8 b/src/_updown_espmark/_updown_espmark.8 similarity index 100% rename from programs/_updown_espmark/_updown_espmark.8 rename to src/_updown_espmark/_updown_espmark.8 diff --git a/programs/_updown_espmark/_updown_espmark.in b/src/_updown_espmark/_updown_espmark.in similarity index 100% rename from programs/_updown_espmark/_updown_espmark.in rename to src/_updown_espmark/_updown_espmark.in diff --git a/programs/charon/Doxyfile b/src/charon/Doxyfile similarity index 100% rename from programs/charon/Doxyfile rename to src/charon/Doxyfile diff --git a/programs/charon/Makefile b/src/charon/Makefile similarity index 100% rename from programs/charon/Makefile rename to src/charon/Makefile diff --git a/programs/charon/charon.kdevelop b/src/charon/charon.kdevelop similarity index 100% rename from programs/charon/charon.kdevelop rename to src/charon/charon.kdevelop diff --git a/programs/charon/charon/Makefile.charon b/src/charon/charon/Makefile.charon similarity index 100% rename from programs/charon/charon/Makefile.charon rename to src/charon/charon/Makefile.charon diff --git a/programs/charon/charon/config/Makefile.config b/src/charon/charon/config/Makefile.config similarity index 100% rename from programs/charon/charon/config/Makefile.config rename to src/charon/charon/config/Makefile.config diff --git a/programs/charon/charon/config/configuration.c b/src/charon/charon/config/configuration.c similarity index 100% rename from programs/charon/charon/config/configuration.c rename to src/charon/charon/config/configuration.c diff --git a/programs/charon/charon/config/configuration.h b/src/charon/charon/config/configuration.h similarity index 100% rename from programs/charon/charon/config/configuration.h rename to src/charon/charon/config/configuration.h diff --git a/programs/charon/charon/config/connections/Makefile.connections b/src/charon/charon/config/connections/Makefile.connections similarity index 100% rename from programs/charon/charon/config/connections/Makefile.connections rename to src/charon/charon/config/connections/Makefile.connections diff --git a/programs/charon/charon/config/connections/connection.c b/src/charon/charon/config/connections/connection.c similarity index 100% rename from programs/charon/charon/config/connections/connection.c rename to src/charon/charon/config/connections/connection.c diff --git a/programs/charon/charon/config/connections/connection.h b/src/charon/charon/config/connections/connection.h similarity index 100% rename from programs/charon/charon/config/connections/connection.h rename to src/charon/charon/config/connections/connection.h diff --git a/programs/charon/charon/config/connections/connection_store.h b/src/charon/charon/config/connections/connection_store.h similarity index 100% rename from programs/charon/charon/config/connections/connection_store.h rename to src/charon/charon/config/connections/connection_store.h diff --git a/programs/charon/charon/config/connections/local_connection_store.c b/src/charon/charon/config/connections/local_connection_store.c similarity index 100% rename from programs/charon/charon/config/connections/local_connection_store.c rename to src/charon/charon/config/connections/local_connection_store.c diff --git a/programs/charon/charon/config/connections/local_connection_store.h b/src/charon/charon/config/connections/local_connection_store.h similarity index 100% rename from programs/charon/charon/config/connections/local_connection_store.h rename to src/charon/charon/config/connections/local_connection_store.h diff --git a/programs/charon/charon/config/credentials/Makefile.credentials b/src/charon/charon/config/credentials/Makefile.credentials similarity index 100% rename from programs/charon/charon/config/credentials/Makefile.credentials rename to src/charon/charon/config/credentials/Makefile.credentials diff --git a/programs/charon/charon/config/credentials/credential_store.h b/src/charon/charon/config/credentials/credential_store.h similarity index 100% rename from programs/charon/charon/config/credentials/credential_store.h rename to src/charon/charon/config/credentials/credential_store.h diff --git a/programs/charon/charon/config/credentials/local_credential_store.c b/src/charon/charon/config/credentials/local_credential_store.c similarity index 100% rename from programs/charon/charon/config/credentials/local_credential_store.c rename to src/charon/charon/config/credentials/local_credential_store.c diff --git a/programs/charon/charon/config/credentials/local_credential_store.h b/src/charon/charon/config/credentials/local_credential_store.h similarity index 100% rename from programs/charon/charon/config/credentials/local_credential_store.h rename to src/charon/charon/config/credentials/local_credential_store.h diff --git a/programs/charon/charon/config/policies/Makefile.policies b/src/charon/charon/config/policies/Makefile.policies similarity index 100% rename from programs/charon/charon/config/policies/Makefile.policies rename to src/charon/charon/config/policies/Makefile.policies diff --git a/programs/charon/charon/config/policies/local_policy_store.c b/src/charon/charon/config/policies/local_policy_store.c similarity index 100% rename from programs/charon/charon/config/policies/local_policy_store.c rename to src/charon/charon/config/policies/local_policy_store.c diff --git a/programs/charon/charon/config/policies/local_policy_store.h b/src/charon/charon/config/policies/local_policy_store.h similarity index 100% rename from programs/charon/charon/config/policies/local_policy_store.h rename to src/charon/charon/config/policies/local_policy_store.h diff --git a/programs/charon/charon/config/policies/policy.c b/src/charon/charon/config/policies/policy.c similarity index 100% rename from programs/charon/charon/config/policies/policy.c rename to src/charon/charon/config/policies/policy.c diff --git a/programs/charon/charon/config/policies/policy.h b/src/charon/charon/config/policies/policy.h similarity index 100% rename from programs/charon/charon/config/policies/policy.h rename to src/charon/charon/config/policies/policy.h diff --git a/programs/charon/charon/config/policies/policy_store.h b/src/charon/charon/config/policies/policy_store.h similarity index 100% rename from programs/charon/charon/config/policies/policy_store.h rename to src/charon/charon/config/policies/policy_store.h diff --git a/programs/charon/charon/config/proposal.c b/src/charon/charon/config/proposal.c similarity index 100% rename from programs/charon/charon/config/proposal.c rename to src/charon/charon/config/proposal.c diff --git a/programs/charon/charon/config/proposal.h b/src/charon/charon/config/proposal.h similarity index 100% rename from programs/charon/charon/config/proposal.h rename to src/charon/charon/config/proposal.h diff --git a/programs/charon/charon/config/traffic_selector.c b/src/charon/charon/config/traffic_selector.c similarity index 100% rename from programs/charon/charon/config/traffic_selector.c rename to src/charon/charon/config/traffic_selector.c diff --git a/programs/charon/charon/config/traffic_selector.h b/src/charon/charon/config/traffic_selector.h similarity index 100% rename from programs/charon/charon/config/traffic_selector.h rename to src/charon/charon/config/traffic_selector.h diff --git a/programs/charon/charon/daemon.c b/src/charon/charon/daemon.c similarity index 100% rename from programs/charon/charon/daemon.c rename to src/charon/charon/daemon.c diff --git a/programs/charon/charon/daemon.h b/src/charon/charon/daemon.h similarity index 100% rename from programs/charon/charon/daemon.h rename to src/charon/charon/daemon.h diff --git a/programs/charon/charon/encoding/Makefile.encoding b/src/charon/charon/encoding/Makefile.encoding similarity index 100% rename from programs/charon/charon/encoding/Makefile.encoding rename to src/charon/charon/encoding/Makefile.encoding diff --git a/programs/charon/charon/encoding/generator.c b/src/charon/charon/encoding/generator.c similarity index 100% rename from programs/charon/charon/encoding/generator.c rename to src/charon/charon/encoding/generator.c diff --git a/programs/charon/charon/encoding/generator.h b/src/charon/charon/encoding/generator.h similarity index 100% rename from programs/charon/charon/encoding/generator.h rename to src/charon/charon/encoding/generator.h diff --git a/programs/charon/charon/encoding/message.c b/src/charon/charon/encoding/message.c similarity index 100% rename from programs/charon/charon/encoding/message.c rename to src/charon/charon/encoding/message.c diff --git a/programs/charon/charon/encoding/message.h b/src/charon/charon/encoding/message.h similarity index 100% rename from programs/charon/charon/encoding/message.h rename to src/charon/charon/encoding/message.h diff --git a/programs/charon/charon/encoding/parser.c b/src/charon/charon/encoding/parser.c similarity index 100% rename from programs/charon/charon/encoding/parser.c rename to src/charon/charon/encoding/parser.c diff --git a/programs/charon/charon/encoding/parser.h b/src/charon/charon/encoding/parser.h similarity index 100% rename from programs/charon/charon/encoding/parser.h rename to src/charon/charon/encoding/parser.h diff --git a/programs/charon/charon/encoding/payloads/Makefile.payloads b/src/charon/charon/encoding/payloads/Makefile.payloads similarity index 100% rename from programs/charon/charon/encoding/payloads/Makefile.payloads rename to src/charon/charon/encoding/payloads/Makefile.payloads diff --git a/programs/charon/charon/encoding/payloads/auth_payload.c b/src/charon/charon/encoding/payloads/auth_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/auth_payload.c rename to src/charon/charon/encoding/payloads/auth_payload.c diff --git a/programs/charon/charon/encoding/payloads/auth_payload.h b/src/charon/charon/encoding/payloads/auth_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/auth_payload.h rename to src/charon/charon/encoding/payloads/auth_payload.h diff --git a/programs/charon/charon/encoding/payloads/cert_payload.c b/src/charon/charon/encoding/payloads/cert_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/cert_payload.c rename to src/charon/charon/encoding/payloads/cert_payload.c diff --git a/programs/charon/charon/encoding/payloads/cert_payload.h b/src/charon/charon/encoding/payloads/cert_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/cert_payload.h rename to src/charon/charon/encoding/payloads/cert_payload.h diff --git a/programs/charon/charon/encoding/payloads/certreq_payload.c b/src/charon/charon/encoding/payloads/certreq_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/certreq_payload.c rename to src/charon/charon/encoding/payloads/certreq_payload.c diff --git a/programs/charon/charon/encoding/payloads/certreq_payload.h b/src/charon/charon/encoding/payloads/certreq_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/certreq_payload.h rename to src/charon/charon/encoding/payloads/certreq_payload.h diff --git a/programs/charon/charon/encoding/payloads/configuration_attribute.c b/src/charon/charon/encoding/payloads/configuration_attribute.c similarity index 100% rename from programs/charon/charon/encoding/payloads/configuration_attribute.c rename to src/charon/charon/encoding/payloads/configuration_attribute.c diff --git a/programs/charon/charon/encoding/payloads/configuration_attribute.h b/src/charon/charon/encoding/payloads/configuration_attribute.h similarity index 100% rename from programs/charon/charon/encoding/payloads/configuration_attribute.h rename to src/charon/charon/encoding/payloads/configuration_attribute.h diff --git a/programs/charon/charon/encoding/payloads/cp_payload.c b/src/charon/charon/encoding/payloads/cp_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/cp_payload.c rename to src/charon/charon/encoding/payloads/cp_payload.c diff --git a/programs/charon/charon/encoding/payloads/cp_payload.h b/src/charon/charon/encoding/payloads/cp_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/cp_payload.h rename to src/charon/charon/encoding/payloads/cp_payload.h diff --git a/programs/charon/charon/encoding/payloads/delete_payload.c b/src/charon/charon/encoding/payloads/delete_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/delete_payload.c rename to src/charon/charon/encoding/payloads/delete_payload.c diff --git a/programs/charon/charon/encoding/payloads/delete_payload.h b/src/charon/charon/encoding/payloads/delete_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/delete_payload.h rename to src/charon/charon/encoding/payloads/delete_payload.h diff --git a/programs/charon/charon/encoding/payloads/eap_payload.c b/src/charon/charon/encoding/payloads/eap_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/eap_payload.c rename to src/charon/charon/encoding/payloads/eap_payload.c diff --git a/programs/charon/charon/encoding/payloads/eap_payload.h b/src/charon/charon/encoding/payloads/eap_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/eap_payload.h rename to src/charon/charon/encoding/payloads/eap_payload.h diff --git a/programs/charon/charon/encoding/payloads/encodings.c b/src/charon/charon/encoding/payloads/encodings.c similarity index 100% rename from programs/charon/charon/encoding/payloads/encodings.c rename to src/charon/charon/encoding/payloads/encodings.c diff --git a/programs/charon/charon/encoding/payloads/encodings.h b/src/charon/charon/encoding/payloads/encodings.h similarity index 100% rename from programs/charon/charon/encoding/payloads/encodings.h rename to src/charon/charon/encoding/payloads/encodings.h diff --git a/programs/charon/charon/encoding/payloads/encryption_payload.c b/src/charon/charon/encoding/payloads/encryption_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/encryption_payload.c rename to src/charon/charon/encoding/payloads/encryption_payload.c diff --git a/programs/charon/charon/encoding/payloads/encryption_payload.h b/src/charon/charon/encoding/payloads/encryption_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/encryption_payload.h rename to src/charon/charon/encoding/payloads/encryption_payload.h diff --git a/programs/charon/charon/encoding/payloads/id_payload.c b/src/charon/charon/encoding/payloads/id_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/id_payload.c rename to src/charon/charon/encoding/payloads/id_payload.c diff --git a/programs/charon/charon/encoding/payloads/id_payload.h b/src/charon/charon/encoding/payloads/id_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/id_payload.h rename to src/charon/charon/encoding/payloads/id_payload.h diff --git a/programs/charon/charon/encoding/payloads/ike_header.c b/src/charon/charon/encoding/payloads/ike_header.c similarity index 100% rename from programs/charon/charon/encoding/payloads/ike_header.c rename to src/charon/charon/encoding/payloads/ike_header.c diff --git a/programs/charon/charon/encoding/payloads/ike_header.h b/src/charon/charon/encoding/payloads/ike_header.h similarity index 100% rename from programs/charon/charon/encoding/payloads/ike_header.h rename to src/charon/charon/encoding/payloads/ike_header.h diff --git a/programs/charon/charon/encoding/payloads/ke_payload.c b/src/charon/charon/encoding/payloads/ke_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/ke_payload.c rename to src/charon/charon/encoding/payloads/ke_payload.c diff --git a/programs/charon/charon/encoding/payloads/ke_payload.h b/src/charon/charon/encoding/payloads/ke_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/ke_payload.h rename to src/charon/charon/encoding/payloads/ke_payload.h diff --git a/programs/charon/charon/encoding/payloads/nonce_payload.c b/src/charon/charon/encoding/payloads/nonce_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/nonce_payload.c rename to src/charon/charon/encoding/payloads/nonce_payload.c diff --git a/programs/charon/charon/encoding/payloads/nonce_payload.h b/src/charon/charon/encoding/payloads/nonce_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/nonce_payload.h rename to src/charon/charon/encoding/payloads/nonce_payload.h diff --git a/programs/charon/charon/encoding/payloads/notify_payload.c b/src/charon/charon/encoding/payloads/notify_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/notify_payload.c rename to src/charon/charon/encoding/payloads/notify_payload.c diff --git a/programs/charon/charon/encoding/payloads/notify_payload.h b/src/charon/charon/encoding/payloads/notify_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/notify_payload.h rename to src/charon/charon/encoding/payloads/notify_payload.h diff --git a/programs/charon/charon/encoding/payloads/payload.c b/src/charon/charon/encoding/payloads/payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/payload.c rename to src/charon/charon/encoding/payloads/payload.c diff --git a/programs/charon/charon/encoding/payloads/payload.h b/src/charon/charon/encoding/payloads/payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/payload.h rename to src/charon/charon/encoding/payloads/payload.h diff --git a/programs/charon/charon/encoding/payloads/proposal_substructure.c b/src/charon/charon/encoding/payloads/proposal_substructure.c similarity index 100% rename from programs/charon/charon/encoding/payloads/proposal_substructure.c rename to src/charon/charon/encoding/payloads/proposal_substructure.c diff --git a/programs/charon/charon/encoding/payloads/proposal_substructure.h b/src/charon/charon/encoding/payloads/proposal_substructure.h similarity index 100% rename from programs/charon/charon/encoding/payloads/proposal_substructure.h rename to src/charon/charon/encoding/payloads/proposal_substructure.h diff --git a/programs/charon/charon/encoding/payloads/sa_payload.c b/src/charon/charon/encoding/payloads/sa_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/sa_payload.c rename to src/charon/charon/encoding/payloads/sa_payload.c diff --git a/programs/charon/charon/encoding/payloads/sa_payload.h b/src/charon/charon/encoding/payloads/sa_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/sa_payload.h rename to src/charon/charon/encoding/payloads/sa_payload.h diff --git a/programs/charon/charon/encoding/payloads/traffic_selector_substructure.c b/src/charon/charon/encoding/payloads/traffic_selector_substructure.c similarity index 100% rename from programs/charon/charon/encoding/payloads/traffic_selector_substructure.c rename to src/charon/charon/encoding/payloads/traffic_selector_substructure.c diff --git a/programs/charon/charon/encoding/payloads/traffic_selector_substructure.h b/src/charon/charon/encoding/payloads/traffic_selector_substructure.h similarity index 100% rename from programs/charon/charon/encoding/payloads/traffic_selector_substructure.h rename to src/charon/charon/encoding/payloads/traffic_selector_substructure.h diff --git a/programs/charon/charon/encoding/payloads/transform_attribute.c b/src/charon/charon/encoding/payloads/transform_attribute.c similarity index 100% rename from programs/charon/charon/encoding/payloads/transform_attribute.c rename to src/charon/charon/encoding/payloads/transform_attribute.c diff --git a/programs/charon/charon/encoding/payloads/transform_attribute.h b/src/charon/charon/encoding/payloads/transform_attribute.h similarity index 100% rename from programs/charon/charon/encoding/payloads/transform_attribute.h rename to src/charon/charon/encoding/payloads/transform_attribute.h diff --git a/programs/charon/charon/encoding/payloads/transform_substructure.c b/src/charon/charon/encoding/payloads/transform_substructure.c similarity index 100% rename from programs/charon/charon/encoding/payloads/transform_substructure.c rename to src/charon/charon/encoding/payloads/transform_substructure.c diff --git a/programs/charon/charon/encoding/payloads/transform_substructure.h b/src/charon/charon/encoding/payloads/transform_substructure.h similarity index 100% rename from programs/charon/charon/encoding/payloads/transform_substructure.h rename to src/charon/charon/encoding/payloads/transform_substructure.h diff --git a/programs/charon/charon/encoding/payloads/ts_payload.c b/src/charon/charon/encoding/payloads/ts_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/ts_payload.c rename to src/charon/charon/encoding/payloads/ts_payload.c diff --git a/programs/charon/charon/encoding/payloads/ts_payload.h b/src/charon/charon/encoding/payloads/ts_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/ts_payload.h rename to src/charon/charon/encoding/payloads/ts_payload.h diff --git a/programs/charon/charon/encoding/payloads/unknown_payload.c b/src/charon/charon/encoding/payloads/unknown_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/unknown_payload.c rename to src/charon/charon/encoding/payloads/unknown_payload.c diff --git a/programs/charon/charon/encoding/payloads/unknown_payload.h b/src/charon/charon/encoding/payloads/unknown_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/unknown_payload.h rename to src/charon/charon/encoding/payloads/unknown_payload.h diff --git a/programs/charon/charon/encoding/payloads/vendor_id_payload.c b/src/charon/charon/encoding/payloads/vendor_id_payload.c similarity index 100% rename from programs/charon/charon/encoding/payloads/vendor_id_payload.c rename to src/charon/charon/encoding/payloads/vendor_id_payload.c diff --git a/programs/charon/charon/encoding/payloads/vendor_id_payload.h b/src/charon/charon/encoding/payloads/vendor_id_payload.h similarity index 100% rename from programs/charon/charon/encoding/payloads/vendor_id_payload.h rename to src/charon/charon/encoding/payloads/vendor_id_payload.h diff --git a/programs/charon/charon/network/Makefile.network b/src/charon/charon/network/Makefile.network similarity index 100% rename from programs/charon/charon/network/Makefile.network rename to src/charon/charon/network/Makefile.network diff --git a/programs/charon/charon/network/packet.c b/src/charon/charon/network/packet.c similarity index 100% rename from programs/charon/charon/network/packet.c rename to src/charon/charon/network/packet.c diff --git a/programs/charon/charon/network/packet.h b/src/charon/charon/network/packet.h similarity index 100% rename from programs/charon/charon/network/packet.h rename to src/charon/charon/network/packet.h diff --git a/programs/charon/charon/network/socket.c b/src/charon/charon/network/socket.c similarity index 100% rename from programs/charon/charon/network/socket.c rename to src/charon/charon/network/socket.c diff --git a/programs/charon/charon/network/socket.h b/src/charon/charon/network/socket.h similarity index 100% rename from programs/charon/charon/network/socket.h rename to src/charon/charon/network/socket.h diff --git a/programs/charon/charon/queues/Makefile.queues b/src/charon/charon/queues/Makefile.queues similarity index 100% rename from programs/charon/charon/queues/Makefile.queues rename to src/charon/charon/queues/Makefile.queues diff --git a/programs/charon/charon/queues/event_queue.c b/src/charon/charon/queues/event_queue.c similarity index 100% rename from programs/charon/charon/queues/event_queue.c rename to src/charon/charon/queues/event_queue.c diff --git a/programs/charon/charon/queues/event_queue.h b/src/charon/charon/queues/event_queue.h similarity index 100% rename from programs/charon/charon/queues/event_queue.h rename to src/charon/charon/queues/event_queue.h diff --git a/programs/charon/charon/queues/job_queue.c b/src/charon/charon/queues/job_queue.c similarity index 100% rename from programs/charon/charon/queues/job_queue.c rename to src/charon/charon/queues/job_queue.c diff --git a/programs/charon/charon/queues/job_queue.h b/src/charon/charon/queues/job_queue.h similarity index 100% rename from programs/charon/charon/queues/job_queue.h rename to src/charon/charon/queues/job_queue.h diff --git a/programs/charon/charon/queues/jobs/Makefile.jobs b/src/charon/charon/queues/jobs/Makefile.jobs similarity index 100% rename from programs/charon/charon/queues/jobs/Makefile.jobs rename to src/charon/charon/queues/jobs/Makefile.jobs diff --git a/programs/charon/charon/queues/jobs/delete_established_ike_sa_job.c b/src/charon/charon/queues/jobs/delete_established_ike_sa_job.c similarity index 100% rename from programs/charon/charon/queues/jobs/delete_established_ike_sa_job.c rename to src/charon/charon/queues/jobs/delete_established_ike_sa_job.c diff --git a/programs/charon/charon/queues/jobs/delete_established_ike_sa_job.h b/src/charon/charon/queues/jobs/delete_established_ike_sa_job.h similarity index 100% rename from programs/charon/charon/queues/jobs/delete_established_ike_sa_job.h rename to src/charon/charon/queues/jobs/delete_established_ike_sa_job.h diff --git a/programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c b/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c similarity index 100% rename from programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c rename to src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c diff --git a/programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h b/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h similarity index 100% rename from programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h rename to src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h diff --git a/programs/charon/charon/queues/jobs/incoming_packet_job.c b/src/charon/charon/queues/jobs/incoming_packet_job.c similarity index 100% rename from programs/charon/charon/queues/jobs/incoming_packet_job.c rename to src/charon/charon/queues/jobs/incoming_packet_job.c diff --git a/programs/charon/charon/queues/jobs/incoming_packet_job.h b/src/charon/charon/queues/jobs/incoming_packet_job.h similarity index 100% rename from programs/charon/charon/queues/jobs/incoming_packet_job.h rename to src/charon/charon/queues/jobs/incoming_packet_job.h diff --git a/programs/charon/charon/queues/jobs/initiate_ike_sa_job.c b/src/charon/charon/queues/jobs/initiate_ike_sa_job.c similarity index 100% rename from programs/charon/charon/queues/jobs/initiate_ike_sa_job.c rename to src/charon/charon/queues/jobs/initiate_ike_sa_job.c diff --git a/programs/charon/charon/queues/jobs/initiate_ike_sa_job.h b/src/charon/charon/queues/jobs/initiate_ike_sa_job.h similarity index 100% rename from programs/charon/charon/queues/jobs/initiate_ike_sa_job.h rename to src/charon/charon/queues/jobs/initiate_ike_sa_job.h diff --git a/programs/charon/charon/queues/jobs/job.c b/src/charon/charon/queues/jobs/job.c similarity index 100% rename from programs/charon/charon/queues/jobs/job.c rename to src/charon/charon/queues/jobs/job.c diff --git a/programs/charon/charon/queues/jobs/job.h b/src/charon/charon/queues/jobs/job.h similarity index 100% rename from programs/charon/charon/queues/jobs/job.h rename to src/charon/charon/queues/jobs/job.h diff --git a/programs/charon/charon/queues/jobs/retransmit_request_job.c b/src/charon/charon/queues/jobs/retransmit_request_job.c similarity index 100% rename from programs/charon/charon/queues/jobs/retransmit_request_job.c rename to src/charon/charon/queues/jobs/retransmit_request_job.c diff --git a/programs/charon/charon/queues/jobs/retransmit_request_job.h b/src/charon/charon/queues/jobs/retransmit_request_job.h similarity index 100% rename from programs/charon/charon/queues/jobs/retransmit_request_job.h rename to src/charon/charon/queues/jobs/retransmit_request_job.h diff --git a/programs/charon/charon/queues/send_queue.c b/src/charon/charon/queues/send_queue.c similarity index 100% rename from programs/charon/charon/queues/send_queue.c rename to src/charon/charon/queues/send_queue.c diff --git a/programs/charon/charon/queues/send_queue.h b/src/charon/charon/queues/send_queue.h similarity index 100% rename from programs/charon/charon/queues/send_queue.h rename to src/charon/charon/queues/send_queue.h diff --git a/programs/charon/charon/sa/Makefile.sa b/src/charon/charon/sa/Makefile.sa similarity index 100% rename from programs/charon/charon/sa/Makefile.sa rename to src/charon/charon/sa/Makefile.sa diff --git a/programs/charon/charon/sa/authenticator.c b/src/charon/charon/sa/authenticator.c similarity index 100% rename from programs/charon/charon/sa/authenticator.c rename to src/charon/charon/sa/authenticator.c diff --git a/programs/charon/charon/sa/authenticator.h b/src/charon/charon/sa/authenticator.h similarity index 100% rename from programs/charon/charon/sa/authenticator.h rename to src/charon/charon/sa/authenticator.h diff --git a/programs/charon/charon/sa/child_sa.c b/src/charon/charon/sa/child_sa.c similarity index 100% rename from programs/charon/charon/sa/child_sa.c rename to src/charon/charon/sa/child_sa.c diff --git a/programs/charon/charon/sa/child_sa.h b/src/charon/charon/sa/child_sa.h similarity index 100% rename from programs/charon/charon/sa/child_sa.h rename to src/charon/charon/sa/child_sa.h diff --git a/programs/charon/charon/sa/ike_sa.c b/src/charon/charon/sa/ike_sa.c similarity index 100% rename from programs/charon/charon/sa/ike_sa.c rename to src/charon/charon/sa/ike_sa.c diff --git a/programs/charon/charon/sa/ike_sa.h b/src/charon/charon/sa/ike_sa.h similarity index 100% rename from programs/charon/charon/sa/ike_sa.h rename to src/charon/charon/sa/ike_sa.h diff --git a/programs/charon/charon/sa/ike_sa_id.c b/src/charon/charon/sa/ike_sa_id.c similarity index 100% rename from programs/charon/charon/sa/ike_sa_id.c rename to src/charon/charon/sa/ike_sa_id.c diff --git a/programs/charon/charon/sa/ike_sa_id.h b/src/charon/charon/sa/ike_sa_id.h similarity index 100% rename from programs/charon/charon/sa/ike_sa_id.h rename to src/charon/charon/sa/ike_sa_id.h diff --git a/programs/charon/charon/sa/ike_sa_manager.c b/src/charon/charon/sa/ike_sa_manager.c similarity index 100% rename from programs/charon/charon/sa/ike_sa_manager.c rename to src/charon/charon/sa/ike_sa_manager.c diff --git a/programs/charon/charon/sa/ike_sa_manager.h b/src/charon/charon/sa/ike_sa_manager.h similarity index 100% rename from programs/charon/charon/sa/ike_sa_manager.h rename to src/charon/charon/sa/ike_sa_manager.h diff --git a/programs/charon/charon/sa/states/Makefile.states b/src/charon/charon/sa/states/Makefile.states similarity index 100% rename from programs/charon/charon/sa/states/Makefile.states rename to src/charon/charon/sa/states/Makefile.states diff --git a/programs/charon/charon/sa/states/ike_auth_requested.c b/src/charon/charon/sa/states/ike_auth_requested.c similarity index 100% rename from programs/charon/charon/sa/states/ike_auth_requested.c rename to src/charon/charon/sa/states/ike_auth_requested.c diff --git a/programs/charon/charon/sa/states/ike_auth_requested.h b/src/charon/charon/sa/states/ike_auth_requested.h similarity index 100% rename from programs/charon/charon/sa/states/ike_auth_requested.h rename to src/charon/charon/sa/states/ike_auth_requested.h diff --git a/programs/charon/charon/sa/states/ike_sa_established.c b/src/charon/charon/sa/states/ike_sa_established.c similarity index 100% rename from programs/charon/charon/sa/states/ike_sa_established.c rename to src/charon/charon/sa/states/ike_sa_established.c diff --git a/programs/charon/charon/sa/states/ike_sa_established.h b/src/charon/charon/sa/states/ike_sa_established.h similarity index 100% rename from programs/charon/charon/sa/states/ike_sa_established.h rename to src/charon/charon/sa/states/ike_sa_established.h diff --git a/programs/charon/charon/sa/states/ike_sa_init_requested.c b/src/charon/charon/sa/states/ike_sa_init_requested.c similarity index 100% rename from programs/charon/charon/sa/states/ike_sa_init_requested.c rename to src/charon/charon/sa/states/ike_sa_init_requested.c diff --git a/programs/charon/charon/sa/states/ike_sa_init_requested.h b/src/charon/charon/sa/states/ike_sa_init_requested.h similarity index 100% rename from programs/charon/charon/sa/states/ike_sa_init_requested.h rename to src/charon/charon/sa/states/ike_sa_init_requested.h diff --git a/programs/charon/charon/sa/states/ike_sa_init_responded.c b/src/charon/charon/sa/states/ike_sa_init_responded.c similarity index 100% rename from programs/charon/charon/sa/states/ike_sa_init_responded.c rename to src/charon/charon/sa/states/ike_sa_init_responded.c diff --git a/programs/charon/charon/sa/states/ike_sa_init_responded.h b/src/charon/charon/sa/states/ike_sa_init_responded.h similarity index 100% rename from programs/charon/charon/sa/states/ike_sa_init_responded.h rename to src/charon/charon/sa/states/ike_sa_init_responded.h diff --git a/programs/charon/charon/sa/states/initiator_init.c b/src/charon/charon/sa/states/initiator_init.c similarity index 100% rename from programs/charon/charon/sa/states/initiator_init.c rename to src/charon/charon/sa/states/initiator_init.c diff --git a/programs/charon/charon/sa/states/initiator_init.h b/src/charon/charon/sa/states/initiator_init.h similarity index 100% rename from programs/charon/charon/sa/states/initiator_init.h rename to src/charon/charon/sa/states/initiator_init.h diff --git a/programs/charon/charon/sa/states/responder_init.c b/src/charon/charon/sa/states/responder_init.c similarity index 100% rename from programs/charon/charon/sa/states/responder_init.c rename to src/charon/charon/sa/states/responder_init.c diff --git a/programs/charon/charon/sa/states/responder_init.h b/src/charon/charon/sa/states/responder_init.h similarity index 100% rename from programs/charon/charon/sa/states/responder_init.h rename to src/charon/charon/sa/states/responder_init.h diff --git a/programs/charon/charon/sa/states/state.c b/src/charon/charon/sa/states/state.c similarity index 100% rename from programs/charon/charon/sa/states/state.c rename to src/charon/charon/sa/states/state.c diff --git a/programs/charon/charon/sa/states/state.h b/src/charon/charon/sa/states/state.h similarity index 100% rename from programs/charon/charon/sa/states/state.h rename to src/charon/charon/sa/states/state.h diff --git a/programs/charon/charon/threads/Makefile.threads b/src/charon/charon/threads/Makefile.threads similarity index 100% rename from programs/charon/charon/threads/Makefile.threads rename to src/charon/charon/threads/Makefile.threads diff --git a/programs/charon/charon/threads/kernel_interface.c b/src/charon/charon/threads/kernel_interface.c similarity index 100% rename from programs/charon/charon/threads/kernel_interface.c rename to src/charon/charon/threads/kernel_interface.c diff --git a/programs/charon/charon/threads/kernel_interface.h b/src/charon/charon/threads/kernel_interface.h similarity index 100% rename from programs/charon/charon/threads/kernel_interface.h rename to src/charon/charon/threads/kernel_interface.h diff --git a/programs/charon/charon/threads/receiver.c b/src/charon/charon/threads/receiver.c similarity index 100% rename from programs/charon/charon/threads/receiver.c rename to src/charon/charon/threads/receiver.c diff --git a/programs/charon/charon/threads/receiver.h b/src/charon/charon/threads/receiver.h similarity index 100% rename from programs/charon/charon/threads/receiver.h rename to src/charon/charon/threads/receiver.h diff --git a/programs/charon/charon/threads/scheduler.c b/src/charon/charon/threads/scheduler.c similarity index 100% rename from programs/charon/charon/threads/scheduler.c rename to src/charon/charon/threads/scheduler.c diff --git a/programs/charon/charon/threads/scheduler.h b/src/charon/charon/threads/scheduler.h similarity index 100% rename from programs/charon/charon/threads/scheduler.h rename to src/charon/charon/threads/scheduler.h diff --git a/programs/charon/charon/threads/sender.c b/src/charon/charon/threads/sender.c similarity index 100% rename from programs/charon/charon/threads/sender.c rename to src/charon/charon/threads/sender.c diff --git a/programs/charon/charon/threads/sender.h b/src/charon/charon/threads/sender.h similarity index 100% rename from programs/charon/charon/threads/sender.h rename to src/charon/charon/threads/sender.h diff --git a/programs/charon/charon/threads/stroke_interface.c b/src/charon/charon/threads/stroke_interface.c similarity index 100% rename from programs/charon/charon/threads/stroke_interface.c rename to src/charon/charon/threads/stroke_interface.c diff --git a/programs/charon/charon/threads/stroke_interface.h b/src/charon/charon/threads/stroke_interface.h similarity index 100% rename from programs/charon/charon/threads/stroke_interface.h rename to src/charon/charon/threads/stroke_interface.h diff --git a/programs/charon/charon/threads/thread_pool.c b/src/charon/charon/threads/thread_pool.c similarity index 100% rename from programs/charon/charon/threads/thread_pool.c rename to src/charon/charon/threads/thread_pool.c diff --git a/programs/charon/charon/threads/thread_pool.h b/src/charon/charon/threads/thread_pool.h similarity index 100% rename from programs/charon/charon/threads/thread_pool.h rename to src/charon/charon/threads/thread_pool.h diff --git a/programs/charon/doc/Architecture.txt b/src/charon/doc/Architecture.txt similarity index 100% rename from programs/charon/doc/Architecture.txt rename to src/charon/doc/Architecture.txt diff --git a/programs/charon/doc/Known-bugs.txt b/src/charon/doc/Known-bugs.txt similarity index 100% rename from programs/charon/doc/Known-bugs.txt rename to src/charon/doc/Known-bugs.txt diff --git a/programs/charon/doc/Todo-list.txt b/src/charon/doc/Todo-list.txt similarity index 100% rename from programs/charon/doc/Todo-list.txt rename to src/charon/doc/Todo-list.txt diff --git a/programs/charon/lib/Makefile.lib b/src/charon/lib/Makefile.lib similarity index 100% rename from programs/charon/lib/Makefile.lib rename to src/charon/lib/Makefile.lib diff --git a/programs/charon/lib/asn1/Makefile.asn1 b/src/charon/lib/asn1/Makefile.asn1 similarity index 100% rename from programs/charon/lib/asn1/Makefile.asn1 rename to src/charon/lib/asn1/Makefile.asn1 diff --git a/programs/charon/lib/asn1/asn1.c b/src/charon/lib/asn1/asn1.c similarity index 100% rename from programs/charon/lib/asn1/asn1.c rename to src/charon/lib/asn1/asn1.c diff --git a/programs/charon/lib/asn1/asn1.h b/src/charon/lib/asn1/asn1.h similarity index 100% rename from programs/charon/lib/asn1/asn1.h rename to src/charon/lib/asn1/asn1.h diff --git a/programs/charon/lib/asn1/oid.c b/src/charon/lib/asn1/oid.c similarity index 100% rename from programs/charon/lib/asn1/oid.c rename to src/charon/lib/asn1/oid.c diff --git a/programs/charon/lib/asn1/oid.h b/src/charon/lib/asn1/oid.h similarity index 100% rename from programs/charon/lib/asn1/oid.h rename to src/charon/lib/asn1/oid.h diff --git a/programs/charon/lib/asn1/oid.pl b/src/charon/lib/asn1/oid.pl similarity index 100% rename from programs/charon/lib/asn1/oid.pl rename to src/charon/lib/asn1/oid.pl diff --git a/programs/charon/lib/asn1/oid.txt b/src/charon/lib/asn1/oid.txt similarity index 100% rename from programs/charon/lib/asn1/oid.txt rename to src/charon/lib/asn1/oid.txt diff --git a/programs/charon/lib/asn1/pem.c b/src/charon/lib/asn1/pem.c similarity index 100% rename from programs/charon/lib/asn1/pem.c rename to src/charon/lib/asn1/pem.c diff --git a/programs/charon/lib/asn1/pem.h b/src/charon/lib/asn1/pem.h similarity index 100% rename from programs/charon/lib/asn1/pem.h rename to src/charon/lib/asn1/pem.h diff --git a/programs/charon/lib/asn1/ttodata.c b/src/charon/lib/asn1/ttodata.c similarity index 100% rename from programs/charon/lib/asn1/ttodata.c rename to src/charon/lib/asn1/ttodata.c diff --git a/programs/charon/lib/asn1/ttodata.h b/src/charon/lib/asn1/ttodata.h similarity index 100% rename from programs/charon/lib/asn1/ttodata.h rename to src/charon/lib/asn1/ttodata.h diff --git a/programs/charon/lib/crypto/Makefile.transforms b/src/charon/lib/crypto/Makefile.transforms similarity index 100% rename from programs/charon/lib/crypto/Makefile.transforms rename to src/charon/lib/crypto/Makefile.transforms diff --git a/programs/charon/lib/crypto/crypters/Makefile.crypters b/src/charon/lib/crypto/crypters/Makefile.crypters similarity index 100% rename from programs/charon/lib/crypto/crypters/Makefile.crypters rename to src/charon/lib/crypto/crypters/Makefile.crypters diff --git a/programs/charon/lib/crypto/crypters/aes_cbc_crypter.c b/src/charon/lib/crypto/crypters/aes_cbc_crypter.c similarity index 100% rename from programs/charon/lib/crypto/crypters/aes_cbc_crypter.c rename to src/charon/lib/crypto/crypters/aes_cbc_crypter.c diff --git a/programs/charon/lib/crypto/crypters/aes_cbc_crypter.h b/src/charon/lib/crypto/crypters/aes_cbc_crypter.h similarity index 100% rename from programs/charon/lib/crypto/crypters/aes_cbc_crypter.h rename to src/charon/lib/crypto/crypters/aes_cbc_crypter.h diff --git a/programs/charon/lib/crypto/crypters/crypter.c b/src/charon/lib/crypto/crypters/crypter.c similarity index 100% rename from programs/charon/lib/crypto/crypters/crypter.c rename to src/charon/lib/crypto/crypters/crypter.c diff --git a/programs/charon/lib/crypto/crypters/crypter.h b/src/charon/lib/crypto/crypters/crypter.h similarity index 100% rename from programs/charon/lib/crypto/crypters/crypter.h rename to src/charon/lib/crypto/crypters/crypter.h diff --git a/programs/charon/lib/crypto/diffie_hellman.c b/src/charon/lib/crypto/diffie_hellman.c similarity index 100% rename from programs/charon/lib/crypto/diffie_hellman.c rename to src/charon/lib/crypto/diffie_hellman.c diff --git a/programs/charon/lib/crypto/diffie_hellman.h b/src/charon/lib/crypto/diffie_hellman.h similarity index 100% rename from programs/charon/lib/crypto/diffie_hellman.h rename to src/charon/lib/crypto/diffie_hellman.h diff --git a/programs/charon/lib/crypto/hashers/Makefile.hashers b/src/charon/lib/crypto/hashers/Makefile.hashers similarity index 100% rename from programs/charon/lib/crypto/hashers/Makefile.hashers rename to src/charon/lib/crypto/hashers/Makefile.hashers diff --git a/programs/charon/lib/crypto/hashers/hasher.c b/src/charon/lib/crypto/hashers/hasher.c similarity index 100% rename from programs/charon/lib/crypto/hashers/hasher.c rename to src/charon/lib/crypto/hashers/hasher.c diff --git a/programs/charon/lib/crypto/hashers/hasher.h b/src/charon/lib/crypto/hashers/hasher.h similarity index 100% rename from programs/charon/lib/crypto/hashers/hasher.h rename to src/charon/lib/crypto/hashers/hasher.h diff --git a/programs/charon/lib/crypto/hashers/md5_hasher.c b/src/charon/lib/crypto/hashers/md5_hasher.c similarity index 100% rename from programs/charon/lib/crypto/hashers/md5_hasher.c rename to src/charon/lib/crypto/hashers/md5_hasher.c diff --git a/programs/charon/lib/crypto/hashers/md5_hasher.h b/src/charon/lib/crypto/hashers/md5_hasher.h similarity index 100% rename from programs/charon/lib/crypto/hashers/md5_hasher.h rename to src/charon/lib/crypto/hashers/md5_hasher.h diff --git a/programs/charon/lib/crypto/hashers/sha1_hasher.c b/src/charon/lib/crypto/hashers/sha1_hasher.c similarity index 100% rename from programs/charon/lib/crypto/hashers/sha1_hasher.c rename to src/charon/lib/crypto/hashers/sha1_hasher.c diff --git a/programs/charon/lib/crypto/hashers/sha1_hasher.h b/src/charon/lib/crypto/hashers/sha1_hasher.h similarity index 100% rename from programs/charon/lib/crypto/hashers/sha1_hasher.h rename to src/charon/lib/crypto/hashers/sha1_hasher.h diff --git a/programs/charon/lib/crypto/hmac.c b/src/charon/lib/crypto/hmac.c similarity index 100% rename from programs/charon/lib/crypto/hmac.c rename to src/charon/lib/crypto/hmac.c diff --git a/programs/charon/lib/crypto/hmac.h b/src/charon/lib/crypto/hmac.h similarity index 100% rename from programs/charon/lib/crypto/hmac.h rename to src/charon/lib/crypto/hmac.h diff --git a/programs/charon/lib/crypto/prf_plus.c b/src/charon/lib/crypto/prf_plus.c similarity index 100% rename from programs/charon/lib/crypto/prf_plus.c rename to src/charon/lib/crypto/prf_plus.c diff --git a/programs/charon/lib/crypto/prf_plus.h b/src/charon/lib/crypto/prf_plus.h similarity index 100% rename from programs/charon/lib/crypto/prf_plus.h rename to src/charon/lib/crypto/prf_plus.h diff --git a/programs/charon/lib/crypto/prfs/Makefile.prfs b/src/charon/lib/crypto/prfs/Makefile.prfs similarity index 100% rename from programs/charon/lib/crypto/prfs/Makefile.prfs rename to src/charon/lib/crypto/prfs/Makefile.prfs diff --git a/programs/charon/lib/crypto/prfs/hmac_prf.c b/src/charon/lib/crypto/prfs/hmac_prf.c similarity index 100% rename from programs/charon/lib/crypto/prfs/hmac_prf.c rename to src/charon/lib/crypto/prfs/hmac_prf.c diff --git a/programs/charon/lib/crypto/prfs/hmac_prf.h b/src/charon/lib/crypto/prfs/hmac_prf.h similarity index 100% rename from programs/charon/lib/crypto/prfs/hmac_prf.h rename to src/charon/lib/crypto/prfs/hmac_prf.h diff --git a/programs/charon/lib/crypto/prfs/prf.c b/src/charon/lib/crypto/prfs/prf.c similarity index 100% rename from programs/charon/lib/crypto/prfs/prf.c rename to src/charon/lib/crypto/prfs/prf.c diff --git a/programs/charon/lib/crypto/prfs/prf.h b/src/charon/lib/crypto/prfs/prf.h similarity index 100% rename from programs/charon/lib/crypto/prfs/prf.h rename to src/charon/lib/crypto/prfs/prf.h diff --git a/programs/charon/lib/crypto/rsa/Makefile.rsa b/src/charon/lib/crypto/rsa/Makefile.rsa similarity index 100% rename from programs/charon/lib/crypto/rsa/Makefile.rsa rename to src/charon/lib/crypto/rsa/Makefile.rsa diff --git a/programs/charon/lib/crypto/rsa/rsa_private_key.c b/src/charon/lib/crypto/rsa/rsa_private_key.c similarity index 100% rename from programs/charon/lib/crypto/rsa/rsa_private_key.c rename to src/charon/lib/crypto/rsa/rsa_private_key.c diff --git a/programs/charon/lib/crypto/rsa/rsa_private_key.h b/src/charon/lib/crypto/rsa/rsa_private_key.h similarity index 100% rename from programs/charon/lib/crypto/rsa/rsa_private_key.h rename to src/charon/lib/crypto/rsa/rsa_private_key.h diff --git a/programs/charon/lib/crypto/rsa/rsa_public_key.c b/src/charon/lib/crypto/rsa/rsa_public_key.c similarity index 100% rename from programs/charon/lib/crypto/rsa/rsa_public_key.c rename to src/charon/lib/crypto/rsa/rsa_public_key.c diff --git a/programs/charon/lib/crypto/rsa/rsa_public_key.h b/src/charon/lib/crypto/rsa/rsa_public_key.h similarity index 100% rename from programs/charon/lib/crypto/rsa/rsa_public_key.h rename to src/charon/lib/crypto/rsa/rsa_public_key.h diff --git a/programs/charon/lib/crypto/signers/Makefile.signers b/src/charon/lib/crypto/signers/Makefile.signers similarity index 100% rename from programs/charon/lib/crypto/signers/Makefile.signers rename to src/charon/lib/crypto/signers/Makefile.signers diff --git a/programs/charon/lib/crypto/signers/hmac_signer.c b/src/charon/lib/crypto/signers/hmac_signer.c similarity index 100% rename from programs/charon/lib/crypto/signers/hmac_signer.c rename to src/charon/lib/crypto/signers/hmac_signer.c diff --git a/programs/charon/lib/crypto/signers/hmac_signer.h b/src/charon/lib/crypto/signers/hmac_signer.h similarity index 100% rename from programs/charon/lib/crypto/signers/hmac_signer.h rename to src/charon/lib/crypto/signers/hmac_signer.h diff --git a/programs/charon/lib/crypto/signers/signer.c b/src/charon/lib/crypto/signers/signer.c similarity index 100% rename from programs/charon/lib/crypto/signers/signer.c rename to src/charon/lib/crypto/signers/signer.c diff --git a/programs/charon/lib/crypto/signers/signer.h b/src/charon/lib/crypto/signers/signer.h similarity index 100% rename from programs/charon/lib/crypto/signers/signer.h rename to src/charon/lib/crypto/signers/signer.h diff --git a/programs/charon/lib/crypto/x509.c b/src/charon/lib/crypto/x509.c similarity index 100% rename from programs/charon/lib/crypto/x509.c rename to src/charon/lib/crypto/x509.c diff --git a/programs/charon/lib/crypto/x509.h b/src/charon/lib/crypto/x509.h similarity index 100% rename from programs/charon/lib/crypto/x509.h rename to src/charon/lib/crypto/x509.h diff --git a/programs/charon/lib/definitions.c b/src/charon/lib/definitions.c similarity index 100% rename from programs/charon/lib/definitions.c rename to src/charon/lib/definitions.c diff --git a/programs/charon/lib/definitions.h b/src/charon/lib/definitions.h similarity index 100% rename from programs/charon/lib/definitions.h rename to src/charon/lib/definitions.h diff --git a/programs/charon/lib/library.c b/src/charon/lib/library.c similarity index 100% rename from programs/charon/lib/library.c rename to src/charon/lib/library.c diff --git a/programs/charon/lib/library.h b/src/charon/lib/library.h similarity index 100% rename from programs/charon/lib/library.h rename to src/charon/lib/library.h diff --git a/programs/charon/lib/types.c b/src/charon/lib/types.c similarity index 100% rename from programs/charon/lib/types.c rename to src/charon/lib/types.c diff --git a/programs/charon/lib/types.h b/src/charon/lib/types.h similarity index 100% rename from programs/charon/lib/types.h rename to src/charon/lib/types.h diff --git a/programs/charon/lib/utils/Makefile.utils b/src/charon/lib/utils/Makefile.utils similarity index 100% rename from programs/charon/lib/utils/Makefile.utils rename to src/charon/lib/utils/Makefile.utils diff --git a/programs/charon/lib/utils/host.c b/src/charon/lib/utils/host.c similarity index 100% rename from programs/charon/lib/utils/host.c rename to src/charon/lib/utils/host.c diff --git a/programs/charon/lib/utils/host.h b/src/charon/lib/utils/host.h similarity index 100% rename from programs/charon/lib/utils/host.h rename to src/charon/lib/utils/host.h diff --git a/programs/charon/lib/utils/identification.c b/src/charon/lib/utils/identification.c similarity index 100% rename from programs/charon/lib/utils/identification.c rename to src/charon/lib/utils/identification.c diff --git a/programs/charon/lib/utils/identification.h b/src/charon/lib/utils/identification.h similarity index 100% rename from programs/charon/lib/utils/identification.h rename to src/charon/lib/utils/identification.h diff --git a/programs/charon/lib/utils/iterator.h b/src/charon/lib/utils/iterator.h similarity index 100% rename from programs/charon/lib/utils/iterator.h rename to src/charon/lib/utils/iterator.h diff --git a/programs/charon/lib/utils/leak_detective.c b/src/charon/lib/utils/leak_detective.c similarity index 100% rename from programs/charon/lib/utils/leak_detective.c rename to src/charon/lib/utils/leak_detective.c diff --git a/programs/charon/lib/utils/leak_detective.h b/src/charon/lib/utils/leak_detective.h similarity index 100% rename from programs/charon/lib/utils/leak_detective.h rename to src/charon/lib/utils/leak_detective.h diff --git a/programs/charon/lib/utils/linked_list.c b/src/charon/lib/utils/linked_list.c similarity index 100% rename from programs/charon/lib/utils/linked_list.c rename to src/charon/lib/utils/linked_list.c diff --git a/programs/charon/lib/utils/linked_list.h b/src/charon/lib/utils/linked_list.h similarity index 100% rename from programs/charon/lib/utils/linked_list.h rename to src/charon/lib/utils/linked_list.h diff --git a/programs/charon/lib/utils/logger.c b/src/charon/lib/utils/logger.c similarity index 100% rename from programs/charon/lib/utils/logger.c rename to src/charon/lib/utils/logger.c diff --git a/programs/charon/lib/utils/logger.h b/src/charon/lib/utils/logger.h similarity index 100% rename from programs/charon/lib/utils/logger.h rename to src/charon/lib/utils/logger.h diff --git a/programs/charon/lib/utils/logger_manager.c b/src/charon/lib/utils/logger_manager.c similarity index 100% rename from programs/charon/lib/utils/logger_manager.c rename to src/charon/lib/utils/logger_manager.c diff --git a/programs/charon/lib/utils/logger_manager.h b/src/charon/lib/utils/logger_manager.h similarity index 100% rename from programs/charon/lib/utils/logger_manager.h rename to src/charon/lib/utils/logger_manager.h diff --git a/programs/charon/lib/utils/randomizer.c b/src/charon/lib/utils/randomizer.c similarity index 100% rename from programs/charon/lib/utils/randomizer.c rename to src/charon/lib/utils/randomizer.c diff --git a/programs/charon/lib/utils/randomizer.h b/src/charon/lib/utils/randomizer.h similarity index 100% rename from programs/charon/lib/utils/randomizer.h rename to src/charon/lib/utils/randomizer.h diff --git a/programs/charon/lib/utils/tester.c b/src/charon/lib/utils/tester.c similarity index 100% rename from programs/charon/lib/utils/tester.c rename to src/charon/lib/utils/tester.c diff --git a/programs/charon/lib/utils/tester.h b/src/charon/lib/utils/tester.h similarity index 100% rename from programs/charon/lib/utils/tester.h rename to src/charon/lib/utils/tester.h diff --git a/programs/charon/patches/strongswan-2.7.0.patch b/src/charon/patches/strongswan-2.7.0.patch similarity index 100% rename from programs/charon/patches/strongswan-2.7.0.patch rename to src/charon/patches/strongswan-2.7.0.patch diff --git a/programs/charon/scripts/alice-key.der b/src/charon/scripts/alice-key.der similarity index 100% rename from programs/charon/scripts/alice-key.der rename to src/charon/scripts/alice-key.der diff --git a/programs/charon/scripts/alice.der b/src/charon/scripts/alice.der similarity index 100% rename from programs/charon/scripts/alice.der rename to src/charon/scripts/alice.der diff --git a/programs/charon/scripts/bob-key.der b/src/charon/scripts/bob-key.der similarity index 100% rename from programs/charon/scripts/bob-key.der rename to src/charon/scripts/bob-key.der diff --git a/programs/charon/scripts/bob.der b/src/charon/scripts/bob.der similarity index 100% rename from programs/charon/scripts/bob.der rename to src/charon/scripts/bob.der diff --git a/programs/charon/scripts/complex1.der b/src/charon/scripts/complex1.der similarity index 100% rename from programs/charon/scripts/complex1.der rename to src/charon/scripts/complex1.der diff --git a/programs/charon/scripts/complex2.der b/src/charon/scripts/complex2.der similarity index 100% rename from programs/charon/scripts/complex2.der rename to src/charon/scripts/complex2.der diff --git a/programs/charon/scripts/daemon-loop.sh b/src/charon/scripts/daemon-loop.sh similarity index 100% rename from programs/charon/scripts/daemon-loop.sh rename to src/charon/scripts/daemon-loop.sh diff --git a/programs/charon/scripts/deleteline b/src/charon/scripts/deleteline similarity index 100% rename from programs/charon/scripts/deleteline rename to src/charon/scripts/deleteline diff --git a/programs/charon/scripts/replace b/src/charon/scripts/replace similarity index 100% rename from programs/charon/scripts/replace rename to src/charon/scripts/replace diff --git a/programs/charon/scripts/to-alice.sh b/src/charon/scripts/to-alice.sh similarity index 100% rename from programs/charon/scripts/to-alice.sh rename to src/charon/scripts/to-alice.sh diff --git a/programs/charon/scripts/to-bob.sh b/src/charon/scripts/to-bob.sh similarity index 100% rename from programs/charon/scripts/to-bob.sh rename to src/charon/scripts/to-bob.sh diff --git a/programs/charon/stroke/Makefile.stroke b/src/charon/stroke/Makefile.stroke similarity index 100% rename from programs/charon/stroke/Makefile.stroke rename to src/charon/stroke/Makefile.stroke diff --git a/programs/charon/stroke/stroke.c b/src/charon/stroke/stroke.c similarity index 100% rename from programs/charon/stroke/stroke.c rename to src/charon/stroke/stroke.c diff --git a/programs/charon/stroke/stroke.h b/src/charon/stroke/stroke.h similarity index 100% rename from programs/charon/stroke/stroke.h rename to src/charon/stroke/stroke.h diff --git a/programs/charon/testing/Makefile.testcases b/src/charon/testing/Makefile.testcases similarity index 100% rename from programs/charon/testing/Makefile.testcases rename to src/charon/testing/Makefile.testcases diff --git a/programs/charon/testing/aes_cbc_crypter_test.c b/src/charon/testing/aes_cbc_crypter_test.c similarity index 100% rename from programs/charon/testing/aes_cbc_crypter_test.c rename to src/charon/testing/aes_cbc_crypter_test.c diff --git a/programs/charon/testing/aes_cbc_crypter_test.h b/src/charon/testing/aes_cbc_crypter_test.h similarity index 100% rename from programs/charon/testing/aes_cbc_crypter_test.h rename to src/charon/testing/aes_cbc_crypter_test.h diff --git a/programs/charon/testing/certificate_test.c b/src/charon/testing/certificate_test.c similarity index 100% rename from programs/charon/testing/certificate_test.c rename to src/charon/testing/certificate_test.c diff --git a/programs/charon/testing/certificate_test.h b/src/charon/testing/certificate_test.h similarity index 100% rename from programs/charon/testing/certificate_test.h rename to src/charon/testing/certificate_test.h diff --git a/programs/charon/testing/child_sa_test.c b/src/charon/testing/child_sa_test.c similarity index 100% rename from programs/charon/testing/child_sa_test.c rename to src/charon/testing/child_sa_test.c diff --git a/programs/charon/testing/child_sa_test.h b/src/charon/testing/child_sa_test.h similarity index 100% rename from programs/charon/testing/child_sa_test.h rename to src/charon/testing/child_sa_test.h diff --git a/programs/charon/testing/connection_test.c b/src/charon/testing/connection_test.c similarity index 100% rename from programs/charon/testing/connection_test.c rename to src/charon/testing/connection_test.c diff --git a/programs/charon/testing/connection_test.h b/src/charon/testing/connection_test.h similarity index 100% rename from programs/charon/testing/connection_test.h rename to src/charon/testing/connection_test.h diff --git a/programs/charon/testing/diffie_hellman_test.c b/src/charon/testing/diffie_hellman_test.c similarity index 100% rename from programs/charon/testing/diffie_hellman_test.c rename to src/charon/testing/diffie_hellman_test.c diff --git a/programs/charon/testing/diffie_hellman_test.h b/src/charon/testing/diffie_hellman_test.h similarity index 100% rename from programs/charon/testing/diffie_hellman_test.h rename to src/charon/testing/diffie_hellman_test.h diff --git a/programs/charon/testing/encryption_payload_test.c b/src/charon/testing/encryption_payload_test.c similarity index 100% rename from programs/charon/testing/encryption_payload_test.c rename to src/charon/testing/encryption_payload_test.c diff --git a/programs/charon/testing/encryption_payload_test.h b/src/charon/testing/encryption_payload_test.h similarity index 100% rename from programs/charon/testing/encryption_payload_test.h rename to src/charon/testing/encryption_payload_test.h diff --git a/programs/charon/testing/event_queue_test.c b/src/charon/testing/event_queue_test.c similarity index 100% rename from programs/charon/testing/event_queue_test.c rename to src/charon/testing/event_queue_test.c diff --git a/programs/charon/testing/event_queue_test.h b/src/charon/testing/event_queue_test.h similarity index 100% rename from programs/charon/testing/event_queue_test.h rename to src/charon/testing/event_queue_test.h diff --git a/programs/charon/testing/generator_test.c b/src/charon/testing/generator_test.c similarity index 100% rename from programs/charon/testing/generator_test.c rename to src/charon/testing/generator_test.c diff --git a/programs/charon/testing/generator_test.h b/src/charon/testing/generator_test.h similarity index 100% rename from programs/charon/testing/generator_test.h rename to src/charon/testing/generator_test.h diff --git a/programs/charon/testing/hasher_test.c b/src/charon/testing/hasher_test.c similarity index 100% rename from programs/charon/testing/hasher_test.c rename to src/charon/testing/hasher_test.c diff --git a/programs/charon/testing/hasher_test.h b/src/charon/testing/hasher_test.h similarity index 100% rename from programs/charon/testing/hasher_test.h rename to src/charon/testing/hasher_test.h diff --git a/programs/charon/testing/hmac_signer_test.c b/src/charon/testing/hmac_signer_test.c similarity index 100% rename from programs/charon/testing/hmac_signer_test.c rename to src/charon/testing/hmac_signer_test.c diff --git a/programs/charon/testing/hmac_signer_test.h b/src/charon/testing/hmac_signer_test.h similarity index 100% rename from programs/charon/testing/hmac_signer_test.h rename to src/charon/testing/hmac_signer_test.h diff --git a/programs/charon/testing/hmac_test.c b/src/charon/testing/hmac_test.c similarity index 100% rename from programs/charon/testing/hmac_test.c rename to src/charon/testing/hmac_test.c diff --git a/programs/charon/testing/hmac_test.h b/src/charon/testing/hmac_test.h similarity index 100% rename from programs/charon/testing/hmac_test.h rename to src/charon/testing/hmac_test.h diff --git a/programs/charon/testing/identification_test.c b/src/charon/testing/identification_test.c similarity index 100% rename from programs/charon/testing/identification_test.c rename to src/charon/testing/identification_test.c diff --git a/programs/charon/testing/identification_test.h b/src/charon/testing/identification_test.h similarity index 100% rename from programs/charon/testing/identification_test.h rename to src/charon/testing/identification_test.h diff --git a/programs/charon/testing/ike_sa_id_test.c b/src/charon/testing/ike_sa_id_test.c similarity index 100% rename from programs/charon/testing/ike_sa_id_test.c rename to src/charon/testing/ike_sa_id_test.c diff --git a/programs/charon/testing/ike_sa_id_test.h b/src/charon/testing/ike_sa_id_test.h similarity index 100% rename from programs/charon/testing/ike_sa_id_test.h rename to src/charon/testing/ike_sa_id_test.h diff --git a/programs/charon/testing/ike_sa_manager_test.c b/src/charon/testing/ike_sa_manager_test.c similarity index 100% rename from programs/charon/testing/ike_sa_manager_test.c rename to src/charon/testing/ike_sa_manager_test.c diff --git a/programs/charon/testing/ike_sa_manager_test.h b/src/charon/testing/ike_sa_manager_test.h similarity index 100% rename from programs/charon/testing/ike_sa_manager_test.h rename to src/charon/testing/ike_sa_manager_test.h diff --git a/programs/charon/testing/ike_sa_test.c b/src/charon/testing/ike_sa_test.c similarity index 100% rename from programs/charon/testing/ike_sa_test.c rename to src/charon/testing/ike_sa_test.c diff --git a/programs/charon/testing/ike_sa_test.h b/src/charon/testing/ike_sa_test.h similarity index 100% rename from programs/charon/testing/ike_sa_test.h rename to src/charon/testing/ike_sa_test.h diff --git a/programs/charon/testing/job_queue_test.c b/src/charon/testing/job_queue_test.c similarity index 100% rename from programs/charon/testing/job_queue_test.c rename to src/charon/testing/job_queue_test.c diff --git a/programs/charon/testing/job_queue_test.h b/src/charon/testing/job_queue_test.h similarity index 100% rename from programs/charon/testing/job_queue_test.h rename to src/charon/testing/job_queue_test.h diff --git a/programs/charon/testing/kernel_interface_test.c b/src/charon/testing/kernel_interface_test.c similarity index 100% rename from programs/charon/testing/kernel_interface_test.c rename to src/charon/testing/kernel_interface_test.c diff --git a/programs/charon/testing/kernel_interface_test.h b/src/charon/testing/kernel_interface_test.h similarity index 100% rename from programs/charon/testing/kernel_interface_test.h rename to src/charon/testing/kernel_interface_test.h diff --git a/programs/charon/testing/leak_detective_test.c b/src/charon/testing/leak_detective_test.c similarity index 100% rename from programs/charon/testing/leak_detective_test.c rename to src/charon/testing/leak_detective_test.c diff --git a/programs/charon/testing/leak_detective_test.h b/src/charon/testing/leak_detective_test.h similarity index 100% rename from programs/charon/testing/leak_detective_test.h rename to src/charon/testing/leak_detective_test.h diff --git a/programs/charon/testing/linked_list_test.c b/src/charon/testing/linked_list_test.c similarity index 100% rename from programs/charon/testing/linked_list_test.c rename to src/charon/testing/linked_list_test.c diff --git a/programs/charon/testing/linked_list_test.h b/src/charon/testing/linked_list_test.h similarity index 100% rename from programs/charon/testing/linked_list_test.h rename to src/charon/testing/linked_list_test.h diff --git a/programs/charon/testing/packet_test.c b/src/charon/testing/packet_test.c similarity index 100% rename from programs/charon/testing/packet_test.c rename to src/charon/testing/packet_test.c diff --git a/programs/charon/testing/packet_test.h b/src/charon/testing/packet_test.h similarity index 100% rename from programs/charon/testing/packet_test.h rename to src/charon/testing/packet_test.h diff --git a/programs/charon/testing/parser_test.c b/src/charon/testing/parser_test.c similarity index 100% rename from programs/charon/testing/parser_test.c rename to src/charon/testing/parser_test.c diff --git a/programs/charon/testing/parser_test.h b/src/charon/testing/parser_test.h similarity index 100% rename from programs/charon/testing/parser_test.h rename to src/charon/testing/parser_test.h diff --git a/programs/charon/testing/policy_test.c b/src/charon/testing/policy_test.c similarity index 100% rename from programs/charon/testing/policy_test.c rename to src/charon/testing/policy_test.c diff --git a/programs/charon/testing/policy_test.h b/src/charon/testing/policy_test.h similarity index 100% rename from programs/charon/testing/policy_test.h rename to src/charon/testing/policy_test.h diff --git a/programs/charon/testing/prf_plus_test.c b/src/charon/testing/prf_plus_test.c similarity index 100% rename from programs/charon/testing/prf_plus_test.c rename to src/charon/testing/prf_plus_test.c diff --git a/programs/charon/testing/prf_plus_test.h b/src/charon/testing/prf_plus_test.h similarity index 100% rename from programs/charon/testing/prf_plus_test.h rename to src/charon/testing/prf_plus_test.h diff --git a/programs/charon/testing/proposal_test.c b/src/charon/testing/proposal_test.c similarity index 100% rename from programs/charon/testing/proposal_test.c rename to src/charon/testing/proposal_test.c diff --git a/programs/charon/testing/proposal_test.h b/src/charon/testing/proposal_test.h similarity index 100% rename from programs/charon/testing/proposal_test.h rename to src/charon/testing/proposal_test.h diff --git a/programs/charon/testing/rsa_test.c b/src/charon/testing/rsa_test.c similarity index 100% rename from programs/charon/testing/rsa_test.c rename to src/charon/testing/rsa_test.c diff --git a/programs/charon/testing/rsa_test.h b/src/charon/testing/rsa_test.h similarity index 100% rename from programs/charon/testing/rsa_test.h rename to src/charon/testing/rsa_test.h diff --git a/programs/charon/testing/scheduler_test.c b/src/charon/testing/scheduler_test.c similarity index 100% rename from programs/charon/testing/scheduler_test.c rename to src/charon/testing/scheduler_test.c diff --git a/programs/charon/testing/scheduler_test.h b/src/charon/testing/scheduler_test.h similarity index 100% rename from programs/charon/testing/scheduler_test.h rename to src/charon/testing/scheduler_test.h diff --git a/programs/charon/testing/send_queue_test.c b/src/charon/testing/send_queue_test.c similarity index 100% rename from programs/charon/testing/send_queue_test.c rename to src/charon/testing/send_queue_test.c diff --git a/programs/charon/testing/send_queue_test.h b/src/charon/testing/send_queue_test.h similarity index 100% rename from programs/charon/testing/send_queue_test.h rename to src/charon/testing/send_queue_test.h diff --git a/programs/charon/testing/sender_test.c b/src/charon/testing/sender_test.c similarity index 100% rename from programs/charon/testing/sender_test.c rename to src/charon/testing/sender_test.c diff --git a/programs/charon/testing/sender_test.h b/src/charon/testing/sender_test.h similarity index 100% rename from programs/charon/testing/sender_test.h rename to src/charon/testing/sender_test.h diff --git a/programs/charon/testing/socket_test.c b/src/charon/testing/socket_test.c similarity index 100% rename from programs/charon/testing/socket_test.c rename to src/charon/testing/socket_test.c diff --git a/programs/charon/testing/socket_test.h b/src/charon/testing/socket_test.h similarity index 100% rename from programs/charon/testing/socket_test.h rename to src/charon/testing/socket_test.h diff --git a/programs/charon/testing/testcases.c b/src/charon/testing/testcases.c similarity index 100% rename from programs/charon/testing/testcases.c rename to src/charon/testing/testcases.c diff --git a/programs/charon/testing/thread_pool_test.c b/src/charon/testing/thread_pool_test.c similarity index 100% rename from programs/charon/testing/thread_pool_test.c rename to src/charon/testing/thread_pool_test.c diff --git a/programs/charon/testing/thread_pool_test.h b/src/charon/testing/thread_pool_test.h similarity index 100% rename from programs/charon/testing/thread_pool_test.h rename to src/charon/testing/thread_pool_test.h diff --git a/programs/ipsec/.cvsignore b/src/ipsec/.cvsignore similarity index 100% rename from programs/ipsec/.cvsignore rename to src/ipsec/.cvsignore diff --git a/programs/ipsec/Makefile b/src/ipsec/Makefile similarity index 100% rename from programs/ipsec/Makefile rename to src/ipsec/Makefile diff --git a/programs/ipsec/distro.txt b/src/ipsec/distro.txt similarity index 100% rename from programs/ipsec/distro.txt rename to src/ipsec/distro.txt diff --git a/programs/ipsec/ipsec.8 b/src/ipsec/ipsec.8 similarity index 100% rename from programs/ipsec/ipsec.8 rename to src/ipsec/ipsec.8 diff --git a/programs/ipsec/ipsec.in b/src/ipsec/ipsec.in similarity index 100% rename from programs/ipsec/ipsec.in rename to src/ipsec/ipsec.in diff --git a/programs/openac/Makefile b/src/openac/Makefile similarity index 100% rename from programs/openac/Makefile rename to src/openac/Makefile diff --git a/programs/openac/build.c b/src/openac/build.c similarity index 100% rename from programs/openac/build.c rename to src/openac/build.c diff --git a/programs/openac/build.h b/src/openac/build.h similarity index 100% rename from programs/openac/build.h rename to src/openac/build.h diff --git a/programs/openac/loglite.c b/src/openac/loglite.c similarity index 100% rename from programs/openac/loglite.c rename to src/openac/loglite.c diff --git a/programs/openac/openac.8 b/src/openac/openac.8 similarity index 100% rename from programs/openac/openac.8 rename to src/openac/openac.8 diff --git a/programs/openac/openac.c b/src/openac/openac.c similarity index 100% rename from programs/openac/openac.c rename to src/openac/openac.c diff --git a/programs/pluto/.cvsignore b/src/pluto/.cvsignore similarity index 100% rename from programs/pluto/.cvsignore rename to src/pluto/.cvsignore diff --git a/programs/pluto/Makefile b/src/pluto/Makefile similarity index 100% rename from programs/pluto/Makefile rename to src/pluto/Makefile diff --git a/programs/pluto/PLUTO-CONVENTIONS b/src/pluto/PLUTO-CONVENTIONS similarity index 100% rename from programs/pluto/PLUTO-CONVENTIONS rename to src/pluto/PLUTO-CONVENTIONS diff --git a/programs/pluto/TODO b/src/pluto/TODO similarity index 100% rename from programs/pluto/TODO rename to src/pluto/TODO diff --git a/programs/pluto/ac.c b/src/pluto/ac.c similarity index 100% rename from programs/pluto/ac.c rename to src/pluto/ac.c diff --git a/programs/pluto/ac.h b/src/pluto/ac.h similarity index 100% rename from programs/pluto/ac.h rename to src/pluto/ac.h diff --git a/programs/pluto/adns.c b/src/pluto/adns.c similarity index 100% rename from programs/pluto/adns.c rename to src/pluto/adns.c diff --git a/programs/pluto/adns.h b/src/pluto/adns.h similarity index 100% rename from programs/pluto/adns.h rename to src/pluto/adns.h diff --git a/programs/pluto/alg/Config.ike_alg b/src/pluto/alg/Config.ike_alg similarity index 100% rename from programs/pluto/alg/Config.ike_alg rename to src/pluto/alg/Config.ike_alg diff --git a/programs/pluto/alg/Makefile b/src/pluto/alg/Makefile similarity index 100% rename from programs/pluto/alg/Makefile rename to src/pluto/alg/Makefile diff --git a/programs/pluto/alg/Makefile.ike_alg_aes b/src/pluto/alg/Makefile.ike_alg_aes similarity index 100% rename from programs/pluto/alg/Makefile.ike_alg_aes rename to src/pluto/alg/Makefile.ike_alg_aes diff --git a/programs/pluto/alg/Makefile.ike_alg_blowfish b/src/pluto/alg/Makefile.ike_alg_blowfish similarity index 100% rename from programs/pluto/alg/Makefile.ike_alg_blowfish rename to src/pluto/alg/Makefile.ike_alg_blowfish diff --git a/programs/pluto/alg/Makefile.ike_alg_serpent b/src/pluto/alg/Makefile.ike_alg_serpent similarity index 100% rename from programs/pluto/alg/Makefile.ike_alg_serpent rename to src/pluto/alg/Makefile.ike_alg_serpent diff --git a/programs/pluto/alg/Makefile.ike_alg_sha2 b/src/pluto/alg/Makefile.ike_alg_sha2 similarity index 100% rename from programs/pluto/alg/Makefile.ike_alg_sha2 rename to src/pluto/alg/Makefile.ike_alg_sha2 diff --git a/programs/pluto/alg/Makefile.ike_alg_twofish b/src/pluto/alg/Makefile.ike_alg_twofish similarity index 100% rename from programs/pluto/alg/Makefile.ike_alg_twofish rename to src/pluto/alg/Makefile.ike_alg_twofish diff --git a/programs/pluto/alg/ike_alg_aes.c b/src/pluto/alg/ike_alg_aes.c similarity index 100% rename from programs/pluto/alg/ike_alg_aes.c rename to src/pluto/alg/ike_alg_aes.c diff --git a/programs/pluto/alg/ike_alg_blowfish.c b/src/pluto/alg/ike_alg_blowfish.c similarity index 100% rename from programs/pluto/alg/ike_alg_blowfish.c rename to src/pluto/alg/ike_alg_blowfish.c diff --git a/programs/pluto/alg/ike_alg_serpent.c b/src/pluto/alg/ike_alg_serpent.c similarity index 100% rename from programs/pluto/alg/ike_alg_serpent.c rename to src/pluto/alg/ike_alg_serpent.c diff --git a/programs/pluto/alg/ike_alg_sha2.c b/src/pluto/alg/ike_alg_sha2.c similarity index 100% rename from programs/pluto/alg/ike_alg_sha2.c rename to src/pluto/alg/ike_alg_sha2.c diff --git a/programs/pluto/alg/ike_alg_twofish.c b/src/pluto/alg/ike_alg_twofish.c similarity index 100% rename from programs/pluto/alg/ike_alg_twofish.c rename to src/pluto/alg/ike_alg_twofish.c diff --git a/programs/pluto/alg_info.c b/src/pluto/alg_info.c similarity index 100% rename from programs/pluto/alg_info.c rename to src/pluto/alg_info.c diff --git a/programs/pluto/alg_info.h b/src/pluto/alg_info.h similarity index 100% rename from programs/pluto/alg_info.h rename to src/pluto/alg_info.h diff --git a/programs/pluto/asn1.c b/src/pluto/asn1.c similarity index 100% rename from programs/pluto/asn1.c rename to src/pluto/asn1.c diff --git a/programs/pluto/asn1.h b/src/pluto/asn1.h similarity index 100% rename from programs/pluto/asn1.h rename to src/pluto/asn1.h diff --git a/programs/pluto/ca.c b/src/pluto/ca.c similarity index 100% rename from programs/pluto/ca.c rename to src/pluto/ca.c diff --git a/programs/pluto/ca.h b/src/pluto/ca.h similarity index 100% rename from programs/pluto/ca.h rename to src/pluto/ca.h diff --git a/programs/pluto/certs.c b/src/pluto/certs.c similarity index 100% rename from programs/pluto/certs.c rename to src/pluto/certs.c diff --git a/programs/pluto/certs.h b/src/pluto/certs.h similarity index 100% rename from programs/pluto/certs.h rename to src/pluto/certs.h diff --git a/programs/pluto/connections.c b/src/pluto/connections.c similarity index 100% rename from programs/pluto/connections.c rename to src/pluto/connections.c diff --git a/programs/pluto/connections.h b/src/pluto/connections.h similarity index 100% rename from programs/pluto/connections.h rename to src/pluto/connections.h diff --git a/programs/pluto/constants.c b/src/pluto/constants.c similarity index 100% rename from programs/pluto/constants.c rename to src/pluto/constants.c diff --git a/programs/pluto/constants.h b/src/pluto/constants.h similarity index 100% rename from programs/pluto/constants.h rename to src/pluto/constants.h diff --git a/programs/pluto/cookie.c b/src/pluto/cookie.c similarity index 100% rename from programs/pluto/cookie.c rename to src/pluto/cookie.c diff --git a/programs/pluto/cookie.h b/src/pluto/cookie.h similarity index 100% rename from programs/pluto/cookie.h rename to src/pluto/cookie.h diff --git a/programs/pluto/crl.c b/src/pluto/crl.c similarity index 100% rename from programs/pluto/crl.c rename to src/pluto/crl.c diff --git a/programs/pluto/crl.h b/src/pluto/crl.h similarity index 100% rename from programs/pluto/crl.h rename to src/pluto/crl.h diff --git a/programs/pluto/crypto.c b/src/pluto/crypto.c similarity index 100% rename from programs/pluto/crypto.c rename to src/pluto/crypto.c diff --git a/programs/pluto/crypto.h b/src/pluto/crypto.h similarity index 100% rename from programs/pluto/crypto.h rename to src/pluto/crypto.h diff --git a/programs/pluto/db_ops.c b/src/pluto/db_ops.c similarity index 100% rename from programs/pluto/db_ops.c rename to src/pluto/db_ops.c diff --git a/programs/pluto/db_ops.h b/src/pluto/db_ops.h similarity index 100% rename from programs/pluto/db_ops.h rename to src/pluto/db_ops.h diff --git a/programs/pluto/defs.c b/src/pluto/defs.c similarity index 100% rename from programs/pluto/defs.c rename to src/pluto/defs.c diff --git a/programs/pluto/defs.h b/src/pluto/defs.h similarity index 100% rename from programs/pluto/defs.h rename to src/pluto/defs.h diff --git a/programs/pluto/demux.c b/src/pluto/demux.c similarity index 100% rename from programs/pluto/demux.c rename to src/pluto/demux.c diff --git a/programs/pluto/demux.h b/src/pluto/demux.h similarity index 100% rename from programs/pluto/demux.h rename to src/pluto/demux.h diff --git a/programs/pluto/dnskey.c b/src/pluto/dnskey.c similarity index 100% rename from programs/pluto/dnskey.c rename to src/pluto/dnskey.c diff --git a/programs/pluto/dnskey.h b/src/pluto/dnskey.h similarity index 100% rename from programs/pluto/dnskey.h rename to src/pluto/dnskey.h diff --git a/programs/pluto/dsa.c b/src/pluto/dsa.c similarity index 100% rename from programs/pluto/dsa.c rename to src/pluto/dsa.c diff --git a/programs/pluto/dsa.h b/src/pluto/dsa.h similarity index 100% rename from programs/pluto/dsa.h rename to src/pluto/dsa.h diff --git a/programs/pluto/elgamal.c b/src/pluto/elgamal.c similarity index 100% rename from programs/pluto/elgamal.c rename to src/pluto/elgamal.c diff --git a/programs/pluto/elgamal.h b/src/pluto/elgamal.h similarity index 100% rename from programs/pluto/elgamal.h rename to src/pluto/elgamal.h diff --git a/programs/pluto/fetch.c b/src/pluto/fetch.c similarity index 100% rename from programs/pluto/fetch.c rename to src/pluto/fetch.c diff --git a/programs/pluto/fetch.h b/src/pluto/fetch.h similarity index 100% rename from programs/pluto/fetch.h rename to src/pluto/fetch.h diff --git a/programs/pluto/foodgroups.c b/src/pluto/foodgroups.c similarity index 100% rename from programs/pluto/foodgroups.c rename to src/pluto/foodgroups.c diff --git a/programs/pluto/foodgroups.h b/src/pluto/foodgroups.h similarity index 100% rename from programs/pluto/foodgroups.h rename to src/pluto/foodgroups.h diff --git a/programs/pluto/gcryptfix.c b/src/pluto/gcryptfix.c similarity index 100% rename from programs/pluto/gcryptfix.c rename to src/pluto/gcryptfix.c diff --git a/programs/pluto/gcryptfix.h b/src/pluto/gcryptfix.h similarity index 100% rename from programs/pluto/gcryptfix.h rename to src/pluto/gcryptfix.h diff --git a/programs/pluto/id.c b/src/pluto/id.c similarity index 100% rename from programs/pluto/id.c rename to src/pluto/id.c diff --git a/programs/pluto/id.h b/src/pluto/id.h similarity index 100% rename from programs/pluto/id.h rename to src/pluto/id.h diff --git a/programs/pluto/ike_alg.c b/src/pluto/ike_alg.c similarity index 100% rename from programs/pluto/ike_alg.c rename to src/pluto/ike_alg.c diff --git a/programs/pluto/ike_alg.h b/src/pluto/ike_alg.h similarity index 100% rename from programs/pluto/ike_alg.h rename to src/pluto/ike_alg.h diff --git a/programs/pluto/ipsec.secrets.5 b/src/pluto/ipsec.secrets.5 similarity index 100% rename from programs/pluto/ipsec.secrets.5 rename to src/pluto/ipsec.secrets.5 diff --git a/programs/pluto/ipsec_doi.c b/src/pluto/ipsec_doi.c similarity index 100% rename from programs/pluto/ipsec_doi.c rename to src/pluto/ipsec_doi.c diff --git a/programs/pluto/ipsec_doi.h b/src/pluto/ipsec_doi.h similarity index 100% rename from programs/pluto/ipsec_doi.h rename to src/pluto/ipsec_doi.h diff --git a/programs/pluto/kameipsec.h b/src/pluto/kameipsec.h similarity index 100% rename from programs/pluto/kameipsec.h rename to src/pluto/kameipsec.h diff --git a/programs/pluto/kernel.c b/src/pluto/kernel.c similarity index 100% rename from programs/pluto/kernel.c rename to src/pluto/kernel.c diff --git a/programs/pluto/kernel.h b/src/pluto/kernel.h similarity index 100% rename from programs/pluto/kernel.h rename to src/pluto/kernel.h diff --git a/programs/pluto/kernel_alg.c b/src/pluto/kernel_alg.c similarity index 100% rename from programs/pluto/kernel_alg.c rename to src/pluto/kernel_alg.c diff --git a/programs/pluto/kernel_alg.h b/src/pluto/kernel_alg.h similarity index 100% rename from programs/pluto/kernel_alg.h rename to src/pluto/kernel_alg.h diff --git a/programs/pluto/kernel_netlink.c b/src/pluto/kernel_netlink.c similarity index 100% rename from programs/pluto/kernel_netlink.c rename to src/pluto/kernel_netlink.c diff --git a/programs/pluto/kernel_netlink.h b/src/pluto/kernel_netlink.h similarity index 100% rename from programs/pluto/kernel_netlink.h rename to src/pluto/kernel_netlink.h diff --git a/programs/pluto/kernel_noklips.c b/src/pluto/kernel_noklips.c similarity index 100% rename from programs/pluto/kernel_noklips.c rename to src/pluto/kernel_noklips.c diff --git a/programs/pluto/kernel_noklips.h b/src/pluto/kernel_noklips.h similarity index 100% rename from programs/pluto/kernel_noklips.h rename to src/pluto/kernel_noklips.h diff --git a/programs/pluto/kernel_pfkey.c b/src/pluto/kernel_pfkey.c similarity index 100% rename from programs/pluto/kernel_pfkey.c rename to src/pluto/kernel_pfkey.c diff --git a/programs/pluto/kernel_pfkey.h b/src/pluto/kernel_pfkey.h similarity index 100% rename from programs/pluto/kernel_pfkey.h rename to src/pluto/kernel_pfkey.h diff --git a/programs/pluto/keys.c b/src/pluto/keys.c similarity index 100% rename from programs/pluto/keys.c rename to src/pluto/keys.c diff --git a/programs/pluto/keys.h b/src/pluto/keys.h similarity index 100% rename from programs/pluto/keys.h rename to src/pluto/keys.h diff --git a/programs/pluto/lex.c b/src/pluto/lex.c similarity index 100% rename from programs/pluto/lex.c rename to src/pluto/lex.c diff --git a/programs/pluto/lex.h b/src/pluto/lex.h similarity index 100% rename from programs/pluto/lex.h rename to src/pluto/lex.h diff --git a/programs/pluto/linux26/netlink.h b/src/pluto/linux26/netlink.h similarity index 100% rename from programs/pluto/linux26/netlink.h rename to src/pluto/linux26/netlink.h diff --git a/programs/pluto/linux26/rtnetlink.h b/src/pluto/linux26/rtnetlink.h similarity index 100% rename from programs/pluto/linux26/rtnetlink.h rename to src/pluto/linux26/rtnetlink.h diff --git a/programs/pluto/linux26/xfrm.h b/src/pluto/linux26/xfrm.h similarity index 100% rename from programs/pluto/linux26/xfrm.h rename to src/pluto/linux26/xfrm.h diff --git a/programs/pluto/log.c b/src/pluto/log.c similarity index 100% rename from programs/pluto/log.c rename to src/pluto/log.c diff --git a/programs/pluto/log.h b/src/pluto/log.h similarity index 100% rename from programs/pluto/log.h rename to src/pluto/log.h diff --git a/programs/pluto/md2.c b/src/pluto/md2.c similarity index 100% rename from programs/pluto/md2.c rename to src/pluto/md2.c diff --git a/programs/pluto/md2.h b/src/pluto/md2.h similarity index 100% rename from programs/pluto/md2.h rename to src/pluto/md2.h diff --git a/programs/pluto/md5.c b/src/pluto/md5.c similarity index 100% rename from programs/pluto/md5.c rename to src/pluto/md5.c diff --git a/programs/pluto/md5.h b/src/pluto/md5.h similarity index 100% rename from programs/pluto/md5.h rename to src/pluto/md5.h diff --git a/programs/pluto/modecfg.c b/src/pluto/modecfg.c similarity index 100% rename from programs/pluto/modecfg.c rename to src/pluto/modecfg.c diff --git a/programs/pluto/modecfg.h b/src/pluto/modecfg.h similarity index 100% rename from programs/pluto/modecfg.h rename to src/pluto/modecfg.h diff --git a/programs/pluto/mp_defs.c b/src/pluto/mp_defs.c similarity index 100% rename from programs/pluto/mp_defs.c rename to src/pluto/mp_defs.c diff --git a/programs/pluto/mp_defs.h b/src/pluto/mp_defs.h similarity index 100% rename from programs/pluto/mp_defs.h rename to src/pluto/mp_defs.h diff --git a/programs/pluto/nat_traversal.c b/src/pluto/nat_traversal.c similarity index 100% rename from programs/pluto/nat_traversal.c rename to src/pluto/nat_traversal.c diff --git a/programs/pluto/nat_traversal.h b/src/pluto/nat_traversal.h similarity index 100% rename from programs/pluto/nat_traversal.h rename to src/pluto/nat_traversal.h diff --git a/programs/pluto/ocsp.c b/src/pluto/ocsp.c similarity index 100% rename from programs/pluto/ocsp.c rename to src/pluto/ocsp.c diff --git a/programs/pluto/ocsp.h b/src/pluto/ocsp.h similarity index 100% rename from programs/pluto/ocsp.h rename to src/pluto/ocsp.h diff --git a/programs/pluto/oid.c b/src/pluto/oid.c similarity index 100% rename from programs/pluto/oid.c rename to src/pluto/oid.c diff --git a/programs/pluto/oid.h b/src/pluto/oid.h similarity index 100% rename from programs/pluto/oid.h rename to src/pluto/oid.h diff --git a/programs/pluto/oid.pl b/src/pluto/oid.pl similarity index 100% rename from programs/pluto/oid.pl rename to src/pluto/oid.pl diff --git a/programs/pluto/oid.txt b/src/pluto/oid.txt similarity index 100% rename from programs/pluto/oid.txt rename to src/pluto/oid.txt diff --git a/programs/pluto/packet.c b/src/pluto/packet.c similarity index 100% rename from programs/pluto/packet.c rename to src/pluto/packet.c diff --git a/programs/pluto/packet.h b/src/pluto/packet.h similarity index 100% rename from programs/pluto/packet.h rename to src/pluto/packet.h diff --git a/programs/pluto/pem.c b/src/pluto/pem.c similarity index 100% rename from programs/pluto/pem.c rename to src/pluto/pem.c diff --git a/programs/pluto/pem.h b/src/pluto/pem.h similarity index 100% rename from programs/pluto/pem.h rename to src/pluto/pem.h diff --git a/programs/pluto/pgp.c b/src/pluto/pgp.c similarity index 100% rename from programs/pluto/pgp.c rename to src/pluto/pgp.c diff --git a/programs/pluto/pgp.h b/src/pluto/pgp.h similarity index 100% rename from programs/pluto/pgp.h rename to src/pluto/pgp.h diff --git a/programs/pluto/pkcs1.c b/src/pluto/pkcs1.c similarity index 100% rename from programs/pluto/pkcs1.c rename to src/pluto/pkcs1.c diff --git a/programs/pluto/pkcs1.h b/src/pluto/pkcs1.h similarity index 100% rename from programs/pluto/pkcs1.h rename to src/pluto/pkcs1.h diff --git a/programs/pluto/pkcs7.c b/src/pluto/pkcs7.c similarity index 100% rename from programs/pluto/pkcs7.c rename to src/pluto/pkcs7.c diff --git a/programs/pluto/pkcs7.h b/src/pluto/pkcs7.h similarity index 100% rename from programs/pluto/pkcs7.h rename to src/pluto/pkcs7.h diff --git a/programs/pluto/pluto-style.el b/src/pluto/pluto-style.el similarity index 100% rename from programs/pluto/pluto-style.el rename to src/pluto/pluto-style.el diff --git a/programs/pluto/pluto.8 b/src/pluto/pluto.8 similarity index 100% rename from programs/pluto/pluto.8 rename to src/pluto/pluto.8 diff --git a/programs/pluto/plutomain.c b/src/pluto/plutomain.c similarity index 100% rename from programs/pluto/plutomain.c rename to src/pluto/plutomain.c diff --git a/programs/pluto/primegen.c b/src/pluto/primegen.c similarity index 100% rename from programs/pluto/primegen.c rename to src/pluto/primegen.c diff --git a/programs/pluto/rcv_info.c b/src/pluto/rcv_info.c similarity index 100% rename from programs/pluto/rcv_info.c rename to src/pluto/rcv_info.c diff --git a/programs/pluto/rcv_info.h b/src/pluto/rcv_info.h similarity index 100% rename from programs/pluto/rcv_info.h rename to src/pluto/rcv_info.h diff --git a/programs/pluto/rcv_whack.c b/src/pluto/rcv_whack.c similarity index 100% rename from programs/pluto/rcv_whack.c rename to src/pluto/rcv_whack.c diff --git a/programs/pluto/rcv_whack.h b/src/pluto/rcv_whack.h similarity index 100% rename from programs/pluto/rcv_whack.h rename to src/pluto/rcv_whack.h diff --git a/programs/pluto/rnd.c b/src/pluto/rnd.c similarity index 100% rename from programs/pluto/rnd.c rename to src/pluto/rnd.c diff --git a/programs/pluto/rnd.h b/src/pluto/rnd.h similarity index 100% rename from programs/pluto/rnd.h rename to src/pluto/rnd.h diff --git a/programs/pluto/routing.txt b/src/pluto/routing.txt similarity index 100% rename from programs/pluto/routing.txt rename to src/pluto/routing.txt diff --git a/programs/pluto/rsaref/pkcs11.h b/src/pluto/rsaref/pkcs11.h similarity index 100% rename from programs/pluto/rsaref/pkcs11.h rename to src/pluto/rsaref/pkcs11.h diff --git a/programs/pluto/rsaref/pkcs11f.h b/src/pluto/rsaref/pkcs11f.h similarity index 100% rename from programs/pluto/rsaref/pkcs11f.h rename to src/pluto/rsaref/pkcs11f.h diff --git a/programs/pluto/rsaref/pkcs11t.h b/src/pluto/rsaref/pkcs11t.h similarity index 100% rename from programs/pluto/rsaref/pkcs11t.h rename to src/pluto/rsaref/pkcs11t.h diff --git a/programs/pluto/rsaref/unix.h b/src/pluto/rsaref/unix.h similarity index 100% rename from programs/pluto/rsaref/unix.h rename to src/pluto/rsaref/unix.h diff --git a/programs/pluto/server.c b/src/pluto/server.c similarity index 100% rename from programs/pluto/server.c rename to src/pluto/server.c diff --git a/programs/pluto/server.h b/src/pluto/server.h similarity index 100% rename from programs/pluto/server.h rename to src/pluto/server.h diff --git a/programs/pluto/sha1.c b/src/pluto/sha1.c similarity index 100% rename from programs/pluto/sha1.c rename to src/pluto/sha1.c diff --git a/programs/pluto/sha1.h b/src/pluto/sha1.h similarity index 100% rename from programs/pluto/sha1.h rename to src/pluto/sha1.h diff --git a/programs/pluto/smallprime.c b/src/pluto/smallprime.c similarity index 100% rename from programs/pluto/smallprime.c rename to src/pluto/smallprime.c diff --git a/programs/pluto/smartcard.c b/src/pluto/smartcard.c similarity index 100% rename from programs/pluto/smartcard.c rename to src/pluto/smartcard.c diff --git a/programs/pluto/smartcard.h b/src/pluto/smartcard.h similarity index 100% rename from programs/pluto/smartcard.h rename to src/pluto/smartcard.h diff --git a/programs/pluto/spdb.c b/src/pluto/spdb.c similarity index 100% rename from programs/pluto/spdb.c rename to src/pluto/spdb.c diff --git a/programs/pluto/spdb.h b/src/pluto/spdb.h similarity index 100% rename from programs/pluto/spdb.h rename to src/pluto/spdb.h diff --git a/programs/pluto/state.c b/src/pluto/state.c similarity index 100% rename from programs/pluto/state.c rename to src/pluto/state.c diff --git a/programs/pluto/state.h b/src/pluto/state.h similarity index 100% rename from programs/pluto/state.h rename to src/pluto/state.h diff --git a/programs/pluto/timer.c b/src/pluto/timer.c similarity index 100% rename from programs/pluto/timer.c rename to src/pluto/timer.c diff --git a/programs/pluto/timer.h b/src/pluto/timer.h similarity index 100% rename from programs/pluto/timer.h rename to src/pluto/timer.h diff --git a/programs/pluto/vendor.c b/src/pluto/vendor.c similarity index 100% rename from programs/pluto/vendor.c rename to src/pluto/vendor.c diff --git a/programs/pluto/vendor.h b/src/pluto/vendor.h similarity index 100% rename from programs/pluto/vendor.h rename to src/pluto/vendor.h diff --git a/programs/pluto/virtual.c b/src/pluto/virtual.c similarity index 100% rename from programs/pluto/virtual.c rename to src/pluto/virtual.c diff --git a/programs/pluto/virtual.h b/src/pluto/virtual.h similarity index 100% rename from programs/pluto/virtual.h rename to src/pluto/virtual.h diff --git a/programs/pluto/whack.c b/src/pluto/whack.c similarity index 100% rename from programs/pluto/whack.c rename to src/pluto/whack.c diff --git a/programs/pluto/whack.h b/src/pluto/whack.h similarity index 100% rename from programs/pluto/whack.h rename to src/pluto/whack.h diff --git a/programs/pluto/x509.c b/src/pluto/x509.c similarity index 100% rename from programs/pluto/x509.c rename to src/pluto/x509.c diff --git a/programs/pluto/x509.h b/src/pluto/x509.h similarity index 100% rename from programs/pluto/x509.h rename to src/pluto/x509.h diff --git a/programs/scepclient/Makefile b/src/scepclient/Makefile similarity index 100% rename from programs/scepclient/Makefile rename to src/scepclient/Makefile diff --git a/programs/scepclient/pkcs10.c b/src/scepclient/pkcs10.c similarity index 100% rename from programs/scepclient/pkcs10.c rename to src/scepclient/pkcs10.c diff --git a/programs/scepclient/pkcs10.h b/src/scepclient/pkcs10.h similarity index 100% rename from programs/scepclient/pkcs10.h rename to src/scepclient/pkcs10.h diff --git a/programs/scepclient/rsakey.c b/src/scepclient/rsakey.c similarity index 100% rename from programs/scepclient/rsakey.c rename to src/scepclient/rsakey.c diff --git a/programs/scepclient/rsakey.h b/src/scepclient/rsakey.h similarity index 100% rename from programs/scepclient/rsakey.h rename to src/scepclient/rsakey.h diff --git a/programs/scepclient/scep.c b/src/scepclient/scep.c similarity index 100% rename from programs/scepclient/scep.c rename to src/scepclient/scep.c diff --git a/programs/scepclient/scep.h b/src/scepclient/scep.h similarity index 100% rename from programs/scepclient/scep.h rename to src/scepclient/scep.h diff --git a/programs/scepclient/scepclient.8 b/src/scepclient/scepclient.8 similarity index 100% rename from programs/scepclient/scepclient.8 rename to src/scepclient/scepclient.8 diff --git a/programs/scepclient/scepclient.c b/src/scepclient/scepclient.c similarity index 100% rename from programs/scepclient/scepclient.c rename to src/scepclient/scepclient.c diff --git a/programs/starter/Makefile b/src/starter/Makefile similarity index 100% rename from programs/starter/Makefile rename to src/starter/Makefile diff --git a/programs/starter/README b/src/starter/README similarity index 100% rename from programs/starter/README rename to src/starter/README diff --git a/programs/starter/args.c b/src/starter/args.c similarity index 100% rename from programs/starter/args.c rename to src/starter/args.c diff --git a/programs/starter/args.h b/src/starter/args.h similarity index 100% rename from programs/starter/args.h rename to src/starter/args.h diff --git a/programs/starter/cmp.c b/src/starter/cmp.c similarity index 100% rename from programs/starter/cmp.c rename to src/starter/cmp.c diff --git a/programs/starter/cmp.h b/src/starter/cmp.h similarity index 100% rename from programs/starter/cmp.h rename to src/starter/cmp.h diff --git a/programs/starter/confread.c b/src/starter/confread.c similarity index 100% rename from programs/starter/confread.c rename to src/starter/confread.c diff --git a/programs/starter/confread.h b/src/starter/confread.h similarity index 100% rename from programs/starter/confread.h rename to src/starter/confread.h diff --git a/programs/starter/exec.c b/src/starter/exec.c similarity index 100% rename from programs/starter/exec.c rename to src/starter/exec.c diff --git a/programs/starter/exec.h b/src/starter/exec.h similarity index 100% rename from programs/starter/exec.h rename to src/starter/exec.h diff --git a/programs/starter/files.h b/src/starter/files.h similarity index 100% rename from programs/starter/files.h rename to src/starter/files.h diff --git a/programs/starter/interfaces.c b/src/starter/interfaces.c similarity index 100% rename from programs/starter/interfaces.c rename to src/starter/interfaces.c diff --git a/programs/starter/interfaces.h b/src/starter/interfaces.h similarity index 100% rename from programs/starter/interfaces.h rename to src/starter/interfaces.h diff --git a/programs/starter/invokecharon.c b/src/starter/invokecharon.c similarity index 100% rename from programs/starter/invokecharon.c rename to src/starter/invokecharon.c diff --git a/programs/starter/invokecharon.h b/src/starter/invokecharon.h similarity index 100% rename from programs/starter/invokecharon.h rename to src/starter/invokecharon.h diff --git a/programs/starter/invokepluto.c b/src/starter/invokepluto.c similarity index 100% rename from programs/starter/invokepluto.c rename to src/starter/invokepluto.c diff --git a/programs/starter/invokepluto.h b/src/starter/invokepluto.h similarity index 100% rename from programs/starter/invokepluto.h rename to src/starter/invokepluto.h diff --git a/programs/starter/keywords.c b/src/starter/keywords.c similarity index 100% rename from programs/starter/keywords.c rename to src/starter/keywords.c diff --git a/programs/starter/keywords.h b/src/starter/keywords.h similarity index 100% rename from programs/starter/keywords.h rename to src/starter/keywords.h diff --git a/programs/starter/keywords.txt b/src/starter/keywords.txt similarity index 100% rename from programs/starter/keywords.txt rename to src/starter/keywords.txt diff --git a/programs/starter/lex.yy.c b/src/starter/lex.yy.c similarity index 100% rename from programs/starter/lex.yy.c rename to src/starter/lex.yy.c diff --git a/programs/starter/netkey.c b/src/starter/netkey.c similarity index 100% rename from programs/starter/netkey.c rename to src/starter/netkey.c diff --git a/programs/starter/netkey.h b/src/starter/netkey.h similarity index 100% rename from programs/starter/netkey.h rename to src/starter/netkey.h diff --git a/programs/starter/parser.h b/src/starter/parser.h similarity index 100% rename from programs/starter/parser.h rename to src/starter/parser.h diff --git a/programs/starter/parser.l b/src/starter/parser.l similarity index 100% rename from programs/starter/parser.l rename to src/starter/parser.l diff --git a/programs/starter/parser.output b/src/starter/parser.output similarity index 100% rename from programs/starter/parser.output rename to src/starter/parser.output diff --git a/programs/starter/parser.tab.c b/src/starter/parser.tab.c similarity index 100% rename from programs/starter/parser.tab.c rename to src/starter/parser.tab.c diff --git a/programs/starter/parser.tab.h b/src/starter/parser.tab.h similarity index 100% rename from programs/starter/parser.tab.h rename to src/starter/parser.tab.h diff --git a/programs/starter/parser.y b/src/starter/parser.y similarity index 100% rename from programs/starter/parser.y rename to src/starter/parser.y diff --git a/programs/starter/starter.8 b/src/starter/starter.8 similarity index 100% rename from programs/starter/starter.8 rename to src/starter/starter.8 diff --git a/programs/starter/starter.c b/src/starter/starter.c similarity index 100% rename from programs/starter/starter.c rename to src/starter/starter.c diff --git a/programs/starter/starterstroke.c b/src/starter/starterstroke.c similarity index 100% rename from programs/starter/starterstroke.c rename to src/starter/starterstroke.c diff --git a/programs/starter/starterstroke.h b/src/starter/starterstroke.h similarity index 100% rename from programs/starter/starterstroke.h rename to src/starter/starterstroke.h diff --git a/programs/starter/starterwhack.c b/src/starter/starterwhack.c similarity index 100% rename from programs/starter/starterwhack.c rename to src/starter/starterwhack.c diff --git a/programs/starter/starterwhack.h b/src/starter/starterwhack.h similarity index 100% rename from programs/starter/starterwhack.h rename to src/starter/starterwhack.h