(no commit message)

diff --git a/src/charon/charon/Architecture.txt b/src/charon/Architecture.txt
similarity index 100%
rename from src/charon/charon/Architecture.txt
rename to src/charon/Architecture.txt

diff --git a/src/charon/charon/Known-bugs.txt b/src/charon/Known-bugs.txt
similarity index 100%
rename from src/charon/charon/Known-bugs.txt
rename to src/charon/Known-bugs.txt

diff --git a/src/charon/charon/Makefile.charon b/src/charon/Makefile.charon
similarity index 100%
rename from src/charon/charon/Makefile.charon
rename to src/charon/Makefile.charon

diff --git a/src/charon/charon/Todo-list.txt b/src/charon/Todo-list.txt
similarity index 100%
rename from src/charon/charon/Todo-list.txt
rename to src/charon/Todo-list.txt

diff --git a/src/charon/charon.kdevelop b/src/charon/charon.kdevelop
deleted file mode 100644 (file)
index 270e815..0000000
--- a/src/charon/charon.kdevelop
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Martin Willi</author>
-    <email>martin@strongswan.org</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C</primarylanguage>
-    <ignoreparts/>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>Source</mainprogram>
-      <directoryradio>executable</directoryradio>
-    </run>
-    <general>
-      <activedir/>
-    </general>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>libstdc++</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="c" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
-    <references/>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-  </kdevcppsupport>
-  <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-</kdevelop>

diff --git a/src/charon/charon/config/Makefile.config b/src/charon/config/Makefile.config
similarity index 100%
rename from src/charon/charon/config/Makefile.config
rename to src/charon/config/Makefile.config

diff --git a/src/charon/charon/config/configuration.c b/src/charon/config/configuration.c
similarity index 100%
rename from src/charon/charon/config/configuration.c
rename to src/charon/config/configuration.c

diff --git a/src/charon/charon/config/configuration.h b/src/charon/config/configuration.h
similarity index 100%
rename from src/charon/charon/config/configuration.h
rename to src/charon/config/configuration.h

diff --git a/src/charon/charon/config/connections/Makefile.connections b/src/charon/config/connections/Makefile.connections
similarity index 100%
rename from src/charon/charon/config/connections/Makefile.connections
rename to src/charon/config/connections/Makefile.connections

diff --git a/src/charon/charon/config/connections/connection.c b/src/charon/config/connections/connection.c
similarity index 100%
rename from src/charon/charon/config/connections/connection.c
rename to src/charon/config/connections/connection.c

diff --git a/src/charon/charon/config/connections/connection.h b/src/charon/config/connections/connection.h
similarity index 100%
rename from src/charon/charon/config/connections/connection.h
rename to src/charon/config/connections/connection.h

diff --git a/src/charon/charon/config/connections/connection_store.h b/src/charon/config/connections/connection_store.h
similarity index 100%
rename from src/charon/charon/config/connections/connection_store.h
rename to src/charon/config/connections/connection_store.h

diff --git a/src/charon/charon/config/connections/local_connection_store.c b/src/charon/config/connections/local_connection_store.c
similarity index 100%
rename from src/charon/charon/config/connections/local_connection_store.c
rename to src/charon/config/connections/local_connection_store.c

diff --git a/src/charon/charon/config/connections/local_connection_store.h b/src/charon/config/connections/local_connection_store.h
similarity index 100%
rename from src/charon/charon/config/connections/local_connection_store.h
rename to src/charon/config/connections/local_connection_store.h

diff --git a/src/charon/charon/config/credentials/Makefile.credentials b/src/charon/config/credentials/Makefile.credentials
similarity index 100%
rename from src/charon/charon/config/credentials/Makefile.credentials
rename to src/charon/config/credentials/Makefile.credentials

diff --git a/src/charon/charon/config/credentials/credential_store.h b/src/charon/config/credentials/credential_store.h
similarity index 100%
rename from src/charon/charon/config/credentials/credential_store.h
rename to src/charon/config/credentials/credential_store.h

diff --git a/src/charon/charon/config/credentials/local_credential_store.c b/src/charon/config/credentials/local_credential_store.c
similarity index 100%
rename from src/charon/charon/config/credentials/local_credential_store.c
rename to src/charon/config/credentials/local_credential_store.c

diff --git a/src/charon/charon/config/credentials/local_credential_store.h b/src/charon/config/credentials/local_credential_store.h
similarity index 100%
rename from src/charon/charon/config/credentials/local_credential_store.h
rename to src/charon/config/credentials/local_credential_store.h

diff --git a/src/charon/charon/config/policies/Makefile.policies b/src/charon/config/policies/Makefile.policies
similarity index 100%
rename from src/charon/charon/config/policies/Makefile.policies
rename to src/charon/config/policies/Makefile.policies

diff --git a/src/charon/charon/config/policies/local_policy_store.c b/src/charon/config/policies/local_policy_store.c
similarity index 100%
rename from src/charon/charon/config/policies/local_policy_store.c
rename to src/charon/config/policies/local_policy_store.c

diff --git a/src/charon/charon/config/policies/local_policy_store.h b/src/charon/config/policies/local_policy_store.h
similarity index 100%
rename from src/charon/charon/config/policies/local_policy_store.h
rename to src/charon/config/policies/local_policy_store.h

diff --git a/src/charon/charon/config/policies/policy.c b/src/charon/config/policies/policy.c
similarity index 100%
rename from src/charon/charon/config/policies/policy.c
rename to src/charon/config/policies/policy.c

diff --git a/src/charon/charon/config/policies/policy.h b/src/charon/config/policies/policy.h
similarity index 100%
rename from src/charon/charon/config/policies/policy.h
rename to src/charon/config/policies/policy.h

diff --git a/src/charon/charon/config/policies/policy_store.h b/src/charon/config/policies/policy_store.h
similarity index 100%
rename from src/charon/charon/config/policies/policy_store.h
rename to src/charon/config/policies/policy_store.h

diff --git a/src/charon/charon/config/proposal.c b/src/charon/config/proposal.c
similarity index 100%
rename from src/charon/charon/config/proposal.c
rename to src/charon/config/proposal.c

diff --git a/src/charon/charon/config/proposal.h b/src/charon/config/proposal.h
similarity index 100%
rename from src/charon/charon/config/proposal.h
rename to src/charon/config/proposal.h

diff --git a/src/charon/charon/config/traffic_selector.c b/src/charon/config/traffic_selector.c
similarity index 100%
rename from src/charon/charon/config/traffic_selector.c
rename to src/charon/config/traffic_selector.c

diff --git a/src/charon/charon/config/traffic_selector.h b/src/charon/config/traffic_selector.h
similarity index 100%
rename from src/charon/charon/config/traffic_selector.h
rename to src/charon/config/traffic_selector.h

diff --git a/src/charon/charon/daemon.c b/src/charon/daemon.c
similarity index 100%
rename from src/charon/charon/daemon.c
rename to src/charon/daemon.c

diff --git a/src/charon/charon/daemon.h b/src/charon/daemon.h
similarity index 100%
rename from src/charon/charon/daemon.h
rename to src/charon/daemon.h

diff --git a/src/charon/charon/encoding/Makefile.encoding b/src/charon/encoding/Makefile.encoding
similarity index 100%
rename from src/charon/charon/encoding/Makefile.encoding
rename to src/charon/encoding/Makefile.encoding

diff --git a/src/charon/charon/encoding/generator.c b/src/charon/encoding/generator.c
similarity index 100%
rename from src/charon/charon/encoding/generator.c
rename to src/charon/encoding/generator.c

diff --git a/src/charon/charon/encoding/generator.h b/src/charon/encoding/generator.h
similarity index 100%
rename from src/charon/charon/encoding/generator.h
rename to src/charon/encoding/generator.h

diff --git a/src/charon/charon/encoding/message.c b/src/charon/encoding/message.c
similarity index 100%
rename from src/charon/charon/encoding/message.c
rename to src/charon/encoding/message.c

diff --git a/src/charon/charon/encoding/message.h b/src/charon/encoding/message.h
similarity index 100%
rename from src/charon/charon/encoding/message.h
rename to src/charon/encoding/message.h

diff --git a/src/charon/charon/encoding/parser.c b/src/charon/encoding/parser.c
similarity index 100%
rename from src/charon/charon/encoding/parser.c
rename to src/charon/encoding/parser.c

diff --git a/src/charon/charon/encoding/parser.h b/src/charon/encoding/parser.h
similarity index 100%
rename from src/charon/charon/encoding/parser.h
rename to src/charon/encoding/parser.h

diff --git a/src/charon/charon/encoding/payloads/Makefile.payloads b/src/charon/encoding/payloads/Makefile.payloads
similarity index 100%
rename from src/charon/charon/encoding/payloads/Makefile.payloads
rename to src/charon/encoding/payloads/Makefile.payloads

diff --git a/src/charon/charon/encoding/payloads/auth_payload.c b/src/charon/encoding/payloads/auth_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/auth_payload.c
rename to src/charon/encoding/payloads/auth_payload.c

diff --git a/src/charon/charon/encoding/payloads/auth_payload.h b/src/charon/encoding/payloads/auth_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/auth_payload.h
rename to src/charon/encoding/payloads/auth_payload.h

diff --git a/src/charon/charon/encoding/payloads/cert_payload.c b/src/charon/encoding/payloads/cert_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/cert_payload.c
rename to src/charon/encoding/payloads/cert_payload.c

diff --git a/src/charon/charon/encoding/payloads/cert_payload.h b/src/charon/encoding/payloads/cert_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/cert_payload.h
rename to src/charon/encoding/payloads/cert_payload.h

diff --git a/src/charon/charon/encoding/payloads/certreq_payload.c b/src/charon/encoding/payloads/certreq_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/certreq_payload.c
rename to src/charon/encoding/payloads/certreq_payload.c

diff --git a/src/charon/charon/encoding/payloads/certreq_payload.h b/src/charon/encoding/payloads/certreq_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/certreq_payload.h
rename to src/charon/encoding/payloads/certreq_payload.h

diff --git a/src/charon/charon/encoding/payloads/configuration_attribute.c b/src/charon/encoding/payloads/configuration_attribute.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/configuration_attribute.c
rename to src/charon/encoding/payloads/configuration_attribute.c

diff --git a/src/charon/charon/encoding/payloads/configuration_attribute.h b/src/charon/encoding/payloads/configuration_attribute.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/configuration_attribute.h
rename to src/charon/encoding/payloads/configuration_attribute.h

diff --git a/src/charon/charon/encoding/payloads/cp_payload.c b/src/charon/encoding/payloads/cp_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/cp_payload.c
rename to src/charon/encoding/payloads/cp_payload.c

diff --git a/src/charon/charon/encoding/payloads/cp_payload.h b/src/charon/encoding/payloads/cp_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/cp_payload.h
rename to src/charon/encoding/payloads/cp_payload.h

diff --git a/src/charon/charon/encoding/payloads/delete_payload.c b/src/charon/encoding/payloads/delete_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/delete_payload.c
rename to src/charon/encoding/payloads/delete_payload.c

diff --git a/src/charon/charon/encoding/payloads/delete_payload.h b/src/charon/encoding/payloads/delete_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/delete_payload.h
rename to src/charon/encoding/payloads/delete_payload.h

diff --git a/src/charon/charon/encoding/payloads/eap_payload.c b/src/charon/encoding/payloads/eap_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/eap_payload.c
rename to src/charon/encoding/payloads/eap_payload.c

diff --git a/src/charon/charon/encoding/payloads/eap_payload.h b/src/charon/encoding/payloads/eap_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/eap_payload.h
rename to src/charon/encoding/payloads/eap_payload.h

diff --git a/src/charon/charon/encoding/payloads/encodings.c b/src/charon/encoding/payloads/encodings.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/encodings.c
rename to src/charon/encoding/payloads/encodings.c

diff --git a/src/charon/charon/encoding/payloads/encodings.h b/src/charon/encoding/payloads/encodings.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/encodings.h
rename to src/charon/encoding/payloads/encodings.h

diff --git a/src/charon/charon/encoding/payloads/encryption_payload.c b/src/charon/encoding/payloads/encryption_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/encryption_payload.c
rename to src/charon/encoding/payloads/encryption_payload.c

diff --git a/src/charon/charon/encoding/payloads/encryption_payload.h b/src/charon/encoding/payloads/encryption_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/encryption_payload.h
rename to src/charon/encoding/payloads/encryption_payload.h

diff --git a/src/charon/charon/encoding/payloads/id_payload.c b/src/charon/encoding/payloads/id_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/id_payload.c
rename to src/charon/encoding/payloads/id_payload.c

diff --git a/src/charon/charon/encoding/payloads/id_payload.h b/src/charon/encoding/payloads/id_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/id_payload.h
rename to src/charon/encoding/payloads/id_payload.h

diff --git a/src/charon/charon/encoding/payloads/ike_header.c b/src/charon/encoding/payloads/ike_header.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/ike_header.c
rename to src/charon/encoding/payloads/ike_header.c

diff --git a/src/charon/charon/encoding/payloads/ike_header.h b/src/charon/encoding/payloads/ike_header.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/ike_header.h
rename to src/charon/encoding/payloads/ike_header.h

diff --git a/src/charon/charon/encoding/payloads/ke_payload.c b/src/charon/encoding/payloads/ke_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/ke_payload.c
rename to src/charon/encoding/payloads/ke_payload.c

diff --git a/src/charon/charon/encoding/payloads/ke_payload.h b/src/charon/encoding/payloads/ke_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/ke_payload.h
rename to src/charon/encoding/payloads/ke_payload.h

diff --git a/src/charon/charon/encoding/payloads/nonce_payload.c b/src/charon/encoding/payloads/nonce_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/nonce_payload.c
rename to src/charon/encoding/payloads/nonce_payload.c

diff --git a/src/charon/charon/encoding/payloads/nonce_payload.h b/src/charon/encoding/payloads/nonce_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/nonce_payload.h
rename to src/charon/encoding/payloads/nonce_payload.h

diff --git a/src/charon/charon/encoding/payloads/notify_payload.c b/src/charon/encoding/payloads/notify_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/notify_payload.c
rename to src/charon/encoding/payloads/notify_payload.c

diff --git a/src/charon/charon/encoding/payloads/notify_payload.h b/src/charon/encoding/payloads/notify_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/notify_payload.h
rename to src/charon/encoding/payloads/notify_payload.h

diff --git a/src/charon/charon/encoding/payloads/payload.c b/src/charon/encoding/payloads/payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/payload.c
rename to src/charon/encoding/payloads/payload.c

diff --git a/src/charon/charon/encoding/payloads/payload.h b/src/charon/encoding/payloads/payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/payload.h
rename to src/charon/encoding/payloads/payload.h

diff --git a/src/charon/charon/encoding/payloads/proposal_substructure.c b/src/charon/encoding/payloads/proposal_substructure.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/proposal_substructure.c
rename to src/charon/encoding/payloads/proposal_substructure.c

diff --git a/src/charon/charon/encoding/payloads/proposal_substructure.h b/src/charon/encoding/payloads/proposal_substructure.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/proposal_substructure.h
rename to src/charon/encoding/payloads/proposal_substructure.h

diff --git a/src/charon/charon/encoding/payloads/sa_payload.c b/src/charon/encoding/payloads/sa_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/sa_payload.c
rename to src/charon/encoding/payloads/sa_payload.c

diff --git a/src/charon/charon/encoding/payloads/sa_payload.h b/src/charon/encoding/payloads/sa_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/sa_payload.h
rename to src/charon/encoding/payloads/sa_payload.h

diff --git a/src/charon/charon/encoding/payloads/traffic_selector_substructure.c b/src/charon/encoding/payloads/traffic_selector_substructure.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/traffic_selector_substructure.c
rename to src/charon/encoding/payloads/traffic_selector_substructure.c

diff --git a/src/charon/charon/encoding/payloads/traffic_selector_substructure.h b/src/charon/encoding/payloads/traffic_selector_substructure.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/traffic_selector_substructure.h
rename to src/charon/encoding/payloads/traffic_selector_substructure.h

diff --git a/src/charon/charon/encoding/payloads/transform_attribute.c b/src/charon/encoding/payloads/transform_attribute.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/transform_attribute.c
rename to src/charon/encoding/payloads/transform_attribute.c

diff --git a/src/charon/charon/encoding/payloads/transform_attribute.h b/src/charon/encoding/payloads/transform_attribute.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/transform_attribute.h
rename to src/charon/encoding/payloads/transform_attribute.h

diff --git a/src/charon/charon/encoding/payloads/transform_substructure.c b/src/charon/encoding/payloads/transform_substructure.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/transform_substructure.c
rename to src/charon/encoding/payloads/transform_substructure.c

diff --git a/src/charon/charon/encoding/payloads/transform_substructure.h b/src/charon/encoding/payloads/transform_substructure.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/transform_substructure.h
rename to src/charon/encoding/payloads/transform_substructure.h

diff --git a/src/charon/charon/encoding/payloads/ts_payload.c b/src/charon/encoding/payloads/ts_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/ts_payload.c
rename to src/charon/encoding/payloads/ts_payload.c

diff --git a/src/charon/charon/encoding/payloads/ts_payload.h b/src/charon/encoding/payloads/ts_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/ts_payload.h
rename to src/charon/encoding/payloads/ts_payload.h

diff --git a/src/charon/charon/encoding/payloads/unknown_payload.c b/src/charon/encoding/payloads/unknown_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/unknown_payload.c
rename to src/charon/encoding/payloads/unknown_payload.c

diff --git a/src/charon/charon/encoding/payloads/unknown_payload.h b/src/charon/encoding/payloads/unknown_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/unknown_payload.h
rename to src/charon/encoding/payloads/unknown_payload.h

diff --git a/src/charon/charon/encoding/payloads/vendor_id_payload.c b/src/charon/encoding/payloads/vendor_id_payload.c
similarity index 100%
rename from src/charon/charon/encoding/payloads/vendor_id_payload.c
rename to src/charon/encoding/payloads/vendor_id_payload.c

diff --git a/src/charon/charon/encoding/payloads/vendor_id_payload.h b/src/charon/encoding/payloads/vendor_id_payload.h
similarity index 100%
rename from src/charon/charon/encoding/payloads/vendor_id_payload.h
rename to src/charon/encoding/payloads/vendor_id_payload.h

diff --git a/src/charon/charon/network/Makefile.network b/src/charon/network/Makefile.network
similarity index 100%
rename from src/charon/charon/network/Makefile.network
rename to src/charon/network/Makefile.network

diff --git a/src/charon/charon/network/packet.c b/src/charon/network/packet.c
similarity index 100%
rename from src/charon/charon/network/packet.c
rename to src/charon/network/packet.c

diff --git a/src/charon/charon/network/packet.h b/src/charon/network/packet.h
similarity index 100%
rename from src/charon/charon/network/packet.h
rename to src/charon/network/packet.h

diff --git a/src/charon/charon/network/socket.c b/src/charon/network/socket.c
similarity index 100%
rename from src/charon/charon/network/socket.c
rename to src/charon/network/socket.c

diff --git a/src/charon/charon/network/socket.h b/src/charon/network/socket.h
similarity index 100%
rename from src/charon/charon/network/socket.h
rename to src/charon/network/socket.h

diff --git a/src/charon/charon/queues/Makefile.queues b/src/charon/queues/Makefile.queues
similarity index 100%
rename from src/charon/charon/queues/Makefile.queues
rename to src/charon/queues/Makefile.queues

diff --git a/src/charon/charon/queues/event_queue.c b/src/charon/queues/event_queue.c
similarity index 100%
rename from src/charon/charon/queues/event_queue.c
rename to src/charon/queues/event_queue.c

diff --git a/src/charon/charon/queues/event_queue.h b/src/charon/queues/event_queue.h
similarity index 100%
rename from src/charon/charon/queues/event_queue.h
rename to src/charon/queues/event_queue.h

diff --git a/src/charon/charon/queues/job_queue.c b/src/charon/queues/job_queue.c
similarity index 100%
rename from src/charon/charon/queues/job_queue.c
rename to src/charon/queues/job_queue.c

diff --git a/src/charon/charon/queues/job_queue.h b/src/charon/queues/job_queue.h
similarity index 100%
rename from src/charon/charon/queues/job_queue.h
rename to src/charon/queues/job_queue.h

diff --git a/src/charon/charon/queues/jobs/Makefile.jobs b/src/charon/queues/jobs/Makefile.jobs
similarity index 100%
rename from src/charon/charon/queues/jobs/Makefile.jobs
rename to src/charon/queues/jobs/Makefile.jobs

diff --git a/src/charon/charon/queues/jobs/delete_established_ike_sa_job.c b/src/charon/queues/jobs/delete_established_ike_sa_job.c
similarity index 100%
rename from src/charon/charon/queues/jobs/delete_established_ike_sa_job.c
rename to src/charon/queues/jobs/delete_established_ike_sa_job.c

diff --git a/src/charon/charon/queues/jobs/delete_established_ike_sa_job.h b/src/charon/queues/jobs/delete_established_ike_sa_job.h
similarity index 100%
rename from src/charon/charon/queues/jobs/delete_established_ike_sa_job.h
rename to src/charon/queues/jobs/delete_established_ike_sa_job.h

diff --git a/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c b/src/charon/queues/jobs/delete_half_open_ike_sa_job.c
similarity index 100%
rename from src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c
rename to src/charon/queues/jobs/delete_half_open_ike_sa_job.c

diff --git a/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h b/src/charon/queues/jobs/delete_half_open_ike_sa_job.h
similarity index 100%
rename from src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h
rename to src/charon/queues/jobs/delete_half_open_ike_sa_job.h

diff --git a/src/charon/charon/queues/jobs/incoming_packet_job.c b/src/charon/queues/jobs/incoming_packet_job.c
similarity index 100%
rename from src/charon/charon/queues/jobs/incoming_packet_job.c
rename to src/charon/queues/jobs/incoming_packet_job.c

diff --git a/src/charon/charon/queues/jobs/incoming_packet_job.h b/src/charon/queues/jobs/incoming_packet_job.h
similarity index 100%
rename from src/charon/charon/queues/jobs/incoming_packet_job.h
rename to src/charon/queues/jobs/incoming_packet_job.h

diff --git a/src/charon/charon/queues/jobs/initiate_ike_sa_job.c b/src/charon/queues/jobs/initiate_ike_sa_job.c
similarity index 100%
rename from src/charon/charon/queues/jobs/initiate_ike_sa_job.c
rename to src/charon/queues/jobs/initiate_ike_sa_job.c

diff --git a/src/charon/charon/queues/jobs/initiate_ike_sa_job.h b/src/charon/queues/jobs/initiate_ike_sa_job.h
similarity index 100%
rename from src/charon/charon/queues/jobs/initiate_ike_sa_job.h
rename to src/charon/queues/jobs/initiate_ike_sa_job.h

diff --git a/src/charon/charon/queues/jobs/job.c b/src/charon/queues/jobs/job.c
similarity index 100%
rename from src/charon/charon/queues/jobs/job.c
rename to src/charon/queues/jobs/job.c

diff --git a/src/charon/charon/queues/jobs/job.h b/src/charon/queues/jobs/job.h
similarity index 100%
rename from src/charon/charon/queues/jobs/job.h
rename to src/charon/queues/jobs/job.h

diff --git a/src/charon/charon/queues/jobs/retransmit_request_job.c b/src/charon/queues/jobs/retransmit_request_job.c
similarity index 100%
rename from src/charon/charon/queues/jobs/retransmit_request_job.c
rename to src/charon/queues/jobs/retransmit_request_job.c

diff --git a/src/charon/charon/queues/jobs/retransmit_request_job.h b/src/charon/queues/jobs/retransmit_request_job.h
similarity index 100%
rename from src/charon/charon/queues/jobs/retransmit_request_job.h
rename to src/charon/queues/jobs/retransmit_request_job.h

diff --git a/src/charon/charon/queues/send_queue.c b/src/charon/queues/send_queue.c
similarity index 100%
rename from src/charon/charon/queues/send_queue.c
rename to src/charon/queues/send_queue.c

diff --git a/src/charon/charon/queues/send_queue.h b/src/charon/queues/send_queue.h
similarity index 100%
rename from src/charon/charon/queues/send_queue.h
rename to src/charon/queues/send_queue.h

diff --git a/src/charon/charon/sa/Makefile.sa b/src/charon/sa/Makefile.sa
similarity index 100%
rename from src/charon/charon/sa/Makefile.sa
rename to src/charon/sa/Makefile.sa

diff --git a/src/charon/charon/sa/authenticator.c b/src/charon/sa/authenticator.c
similarity index 100%
rename from src/charon/charon/sa/authenticator.c
rename to src/charon/sa/authenticator.c

diff --git a/src/charon/charon/sa/authenticator.h b/src/charon/sa/authenticator.h
similarity index 100%
rename from src/charon/charon/sa/authenticator.h
rename to src/charon/sa/authenticator.h

diff --git a/src/charon/charon/sa/child_sa.c b/src/charon/sa/child_sa.c
similarity index 100%
rename from src/charon/charon/sa/child_sa.c
rename to src/charon/sa/child_sa.c

diff --git a/src/charon/charon/sa/child_sa.h b/src/charon/sa/child_sa.h
similarity index 100%
rename from src/charon/charon/sa/child_sa.h
rename to src/charon/sa/child_sa.h

diff --git a/src/charon/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c
similarity index 100%
rename from src/charon/charon/sa/ike_sa.c
rename to src/charon/sa/ike_sa.c

diff --git a/src/charon/charon/sa/ike_sa.h b/src/charon/sa/ike_sa.h
similarity index 100%
rename from src/charon/charon/sa/ike_sa.h
rename to src/charon/sa/ike_sa.h

diff --git a/src/charon/charon/sa/ike_sa_id.c b/src/charon/sa/ike_sa_id.c
similarity index 100%
rename from src/charon/charon/sa/ike_sa_id.c
rename to src/charon/sa/ike_sa_id.c

diff --git a/src/charon/charon/sa/ike_sa_id.h b/src/charon/sa/ike_sa_id.h
similarity index 100%
rename from src/charon/charon/sa/ike_sa_id.h
rename to src/charon/sa/ike_sa_id.h

diff --git a/src/charon/charon/sa/ike_sa_manager.c b/src/charon/sa/ike_sa_manager.c
similarity index 100%
rename from src/charon/charon/sa/ike_sa_manager.c
rename to src/charon/sa/ike_sa_manager.c

diff --git a/src/charon/charon/sa/ike_sa_manager.h b/src/charon/sa/ike_sa_manager.h
similarity index 100%
rename from src/charon/charon/sa/ike_sa_manager.h
rename to src/charon/sa/ike_sa_manager.h

diff --git a/src/charon/charon/sa/states/Makefile.states b/src/charon/sa/states/Makefile.states
similarity index 100%
rename from src/charon/charon/sa/states/Makefile.states
rename to src/charon/sa/states/Makefile.states

diff --git a/src/charon/charon/sa/states/ike_auth_requested.c b/src/charon/sa/states/ike_auth_requested.c
similarity index 100%
rename from src/charon/charon/sa/states/ike_auth_requested.c
rename to src/charon/sa/states/ike_auth_requested.c

diff --git a/src/charon/charon/sa/states/ike_auth_requested.h b/src/charon/sa/states/ike_auth_requested.h
similarity index 100%
rename from src/charon/charon/sa/states/ike_auth_requested.h
rename to src/charon/sa/states/ike_auth_requested.h

diff --git a/src/charon/charon/sa/states/ike_sa_established.c b/src/charon/sa/states/ike_sa_established.c
similarity index 100%
rename from src/charon/charon/sa/states/ike_sa_established.c
rename to src/charon/sa/states/ike_sa_established.c

diff --git a/src/charon/charon/sa/states/ike_sa_established.h b/src/charon/sa/states/ike_sa_established.h
similarity index 100%
rename from src/charon/charon/sa/states/ike_sa_established.h
rename to src/charon/sa/states/ike_sa_established.h

diff --git a/src/charon/charon/sa/states/ike_sa_init_requested.c b/src/charon/sa/states/ike_sa_init_requested.c
similarity index 100%
rename from src/charon/charon/sa/states/ike_sa_init_requested.c
rename to src/charon/sa/states/ike_sa_init_requested.c

diff --git a/src/charon/charon/sa/states/ike_sa_init_requested.h b/src/charon/sa/states/ike_sa_init_requested.h
similarity index 100%
rename from src/charon/charon/sa/states/ike_sa_init_requested.h
rename to src/charon/sa/states/ike_sa_init_requested.h

diff --git a/src/charon/charon/sa/states/ike_sa_init_responded.c b/src/charon/sa/states/ike_sa_init_responded.c
similarity index 100%
rename from src/charon/charon/sa/states/ike_sa_init_responded.c
rename to src/charon/sa/states/ike_sa_init_responded.c

diff --git a/src/charon/charon/sa/states/ike_sa_init_responded.h b/src/charon/sa/states/ike_sa_init_responded.h
similarity index 100%
rename from src/charon/charon/sa/states/ike_sa_init_responded.h
rename to src/charon/sa/states/ike_sa_init_responded.h

diff --git a/src/charon/charon/sa/states/initiator_init.c b/src/charon/sa/states/initiator_init.c
similarity index 100%
rename from src/charon/charon/sa/states/initiator_init.c
rename to src/charon/sa/states/initiator_init.c

diff --git a/src/charon/charon/sa/states/initiator_init.h b/src/charon/sa/states/initiator_init.h
similarity index 100%
rename from src/charon/charon/sa/states/initiator_init.h
rename to src/charon/sa/states/initiator_init.h

diff --git a/src/charon/charon/sa/states/responder_init.c b/src/charon/sa/states/responder_init.c
similarity index 100%
rename from src/charon/charon/sa/states/responder_init.c
rename to src/charon/sa/states/responder_init.c

diff --git a/src/charon/charon/sa/states/responder_init.h b/src/charon/sa/states/responder_init.h
similarity index 100%
rename from src/charon/charon/sa/states/responder_init.h
rename to src/charon/sa/states/responder_init.h

diff --git a/src/charon/charon/sa/states/state.c b/src/charon/sa/states/state.c
similarity index 100%
rename from src/charon/charon/sa/states/state.c
rename to src/charon/sa/states/state.c

diff --git a/src/charon/charon/sa/states/state.h b/src/charon/sa/states/state.h
similarity index 100%
rename from src/charon/charon/sa/states/state.h
rename to src/charon/sa/states/state.h

diff --git a/src/charon/charon/threads/Makefile.threads b/src/charon/threads/Makefile.threads
similarity index 100%
rename from src/charon/charon/threads/Makefile.threads
rename to src/charon/threads/Makefile.threads

diff --git a/src/charon/charon/threads/kernel_interface.c b/src/charon/threads/kernel_interface.c
similarity index 100%
rename from src/charon/charon/threads/kernel_interface.c
rename to src/charon/threads/kernel_interface.c

diff --git a/src/charon/charon/threads/kernel_interface.h b/src/charon/threads/kernel_interface.h
similarity index 100%
rename from src/charon/charon/threads/kernel_interface.h
rename to src/charon/threads/kernel_interface.h

diff --git a/src/charon/charon/threads/receiver.c b/src/charon/threads/receiver.c
similarity index 100%
rename from src/charon/charon/threads/receiver.c
rename to src/charon/threads/receiver.c

diff --git a/src/charon/charon/threads/receiver.h b/src/charon/threads/receiver.h
similarity index 100%
rename from src/charon/charon/threads/receiver.h
rename to src/charon/threads/receiver.h

diff --git a/src/charon/charon/threads/scheduler.c b/src/charon/threads/scheduler.c
similarity index 100%
rename from src/charon/charon/threads/scheduler.c
rename to src/charon/threads/scheduler.c

diff --git a/src/charon/charon/threads/scheduler.h b/src/charon/threads/scheduler.h
similarity index 100%
rename from src/charon/charon/threads/scheduler.h
rename to src/charon/threads/scheduler.h

diff --git a/src/charon/charon/threads/sender.c b/src/charon/threads/sender.c
similarity index 100%
rename from src/charon/charon/threads/sender.c
rename to src/charon/threads/sender.c

diff --git a/src/charon/charon/threads/sender.h b/src/charon/threads/sender.h
similarity index 100%
rename from src/charon/charon/threads/sender.h
rename to src/charon/threads/sender.h

diff --git a/src/charon/charon/threads/stroke_interface.c b/src/charon/threads/stroke_interface.c
similarity index 100%
rename from src/charon/charon/threads/stroke_interface.c
rename to src/charon/threads/stroke_interface.c

diff --git a/src/charon/charon/threads/stroke_interface.h b/src/charon/threads/stroke_interface.h
similarity index 100%
rename from src/charon/charon/threads/stroke_interface.h
rename to src/charon/threads/stroke_interface.h

diff --git a/src/charon/charon/threads/thread_pool.c b/src/charon/threads/thread_pool.c
similarity index 100%
rename from src/charon/charon/threads/thread_pool.c
rename to src/charon/threads/thread_pool.c

diff --git a/src/charon/charon/threads/thread_pool.h b/src/charon/threads/thread_pool.h
similarity index 100%
rename from src/charon/charon/threads/thread_pool.h
rename to src/charon/threads/thread_pool.h