Adopt wpa_supplicant build structure to Android build

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

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

diff --git a/src/common/.gitignore b/wpa_supplicant/src/common/.gitignore
similarity index 100%
rename from src/common/.gitignore
rename to wpa_supplicant/src/common/.gitignore

diff --git a/src/common/Makefile b/wpa_supplicant/src/common/Makefile
similarity index 100%
rename from src/common/Makefile
rename to wpa_supplicant/src/common/Makefile

diff --git a/src/common/defs.h b/wpa_supplicant/src/common/defs.h
similarity index 100%
rename from src/common/defs.h
rename to wpa_supplicant/src/common/defs.h

diff --git a/src/common/eapol_common.h b/wpa_supplicant/src/common/eapol_common.h
similarity index 100%
rename from src/common/eapol_common.h
rename to wpa_supplicant/src/common/eapol_common.h

diff --git a/src/common/ieee802_11_common.c b/wpa_supplicant/src/common/ieee802_11_common.c
similarity index 100%
rename from src/common/ieee802_11_common.c
rename to wpa_supplicant/src/common/ieee802_11_common.c

diff --git a/src/common/ieee802_11_common.h b/wpa_supplicant/src/common/ieee802_11_common.h
similarity index 100%
rename from src/common/ieee802_11_common.h
rename to wpa_supplicant/src/common/ieee802_11_common.h

diff --git a/src/common/ieee802_11_defs.h b/wpa_supplicant/src/common/ieee802_11_defs.h
similarity index 100%
rename from src/common/ieee802_11_defs.h
rename to wpa_supplicant/src/common/ieee802_11_defs.h

diff --git a/src/common/nl80211_copy.h b/wpa_supplicant/src/common/nl80211_copy.h
similarity index 100%
rename from src/common/nl80211_copy.h
rename to wpa_supplicant/src/common/nl80211_copy.h

diff --git a/src/common/privsep_commands.h b/wpa_supplicant/src/common/privsep_commands.h
similarity index 100%
rename from src/common/privsep_commands.h
rename to wpa_supplicant/src/common/privsep_commands.h

diff --git a/src/common/version.h b/wpa_supplicant/src/common/version.h
similarity index 100%
rename from src/common/version.h
rename to wpa_supplicant/src/common/version.h

diff --git a/src/common/wireless_copy.h b/wpa_supplicant/src/common/wireless_copy.h
similarity index 100%
rename from src/common/wireless_copy.h
rename to wpa_supplicant/src/common/wireless_copy.h

diff --git a/src/common/wpa_common.c b/wpa_supplicant/src/common/wpa_common.c
similarity index 100%
rename from src/common/wpa_common.c
rename to wpa_supplicant/src/common/wpa_common.c

diff --git a/src/common/wpa_common.h b/wpa_supplicant/src/common/wpa_common.h
similarity index 100%
rename from src/common/wpa_common.h
rename to wpa_supplicant/src/common/wpa_common.h

diff --git a/src/common/wpa_ctrl.c b/wpa_supplicant/src/common/wpa_ctrl.c
similarity index 100%
rename from src/common/wpa_ctrl.c
rename to wpa_supplicant/src/common/wpa_ctrl.c

diff --git a/src/common/wpa_ctrl.h b/wpa_supplicant/src/common/wpa_ctrl.h
similarity index 100%
rename from src/common/wpa_ctrl.h
rename to wpa_supplicant/src/common/wpa_ctrl.h

diff --git a/src/crypto/.gitignore b/wpa_supplicant/src/crypto/.gitignore
similarity index 100%
rename from src/crypto/.gitignore
rename to wpa_supplicant/src/crypto/.gitignore

diff --git a/src/crypto/Makefile b/wpa_supplicant/src/crypto/Makefile
similarity index 100%
rename from src/crypto/Makefile
rename to wpa_supplicant/src/crypto/Makefile

diff --git a/src/crypto/aes.c b/wpa_supplicant/src/crypto/aes.c
similarity index 100%
rename from src/crypto/aes.c
rename to wpa_supplicant/src/crypto/aes.c

diff --git a/src/crypto/aes.h b/wpa_supplicant/src/crypto/aes.h
similarity index 100%
rename from src/crypto/aes.h
rename to wpa_supplicant/src/crypto/aes.h

diff --git a/src/crypto/aes_wrap.c b/wpa_supplicant/src/crypto/aes_wrap.c
similarity index 100%
rename from src/crypto/aes_wrap.c
rename to wpa_supplicant/src/crypto/aes_wrap.c

diff --git a/src/crypto/aes_wrap.h b/wpa_supplicant/src/crypto/aes_wrap.h
similarity index 100%
rename from src/crypto/aes_wrap.h
rename to wpa_supplicant/src/crypto/aes_wrap.h

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

diff --git a/src/crypto/crypto_cryptoapi.c b/wpa_supplicant/src/crypto/crypto_cryptoapi.c
similarity index 100%
rename from src/crypto/crypto_cryptoapi.c
rename to wpa_supplicant/src/crypto/crypto_cryptoapi.c

diff --git a/src/crypto/crypto_gnutls.c b/wpa_supplicant/src/crypto/crypto_gnutls.c
similarity index 100%
rename from src/crypto/crypto_gnutls.c
rename to wpa_supplicant/src/crypto/crypto_gnutls.c

diff --git a/src/crypto/crypto_internal.c b/wpa_supplicant/src/crypto/crypto_internal.c
similarity index 100%
rename from src/crypto/crypto_internal.c
rename to wpa_supplicant/src/crypto/crypto_internal.c

diff --git a/src/crypto/crypto_libtomcrypt.c b/wpa_supplicant/src/crypto/crypto_libtomcrypt.c
similarity index 100%
rename from src/crypto/crypto_libtomcrypt.c
rename to wpa_supplicant/src/crypto/crypto_libtomcrypt.c

diff --git a/src/crypto/crypto_none.c b/wpa_supplicant/src/crypto/crypto_none.c
similarity index 100%
rename from src/crypto/crypto_none.c
rename to wpa_supplicant/src/crypto/crypto_none.c

diff --git a/src/crypto/crypto_openssl.c b/wpa_supplicant/src/crypto/crypto_openssl.c
similarity index 100%
rename from src/crypto/crypto_openssl.c
rename to wpa_supplicant/src/crypto/crypto_openssl.c

diff --git a/src/crypto/des.c b/wpa_supplicant/src/crypto/des.c
similarity index 100%
rename from src/crypto/des.c
rename to wpa_supplicant/src/crypto/des.c

diff --git a/src/crypto/dh_groups.c b/wpa_supplicant/src/crypto/dh_groups.c
similarity index 100%
rename from src/crypto/dh_groups.c
rename to wpa_supplicant/src/crypto/dh_groups.c

diff --git a/src/crypto/dh_groups.h b/wpa_supplicant/src/crypto/dh_groups.h
similarity index 100%
rename from src/crypto/dh_groups.h
rename to wpa_supplicant/src/crypto/dh_groups.h

diff --git a/src/crypto/md4.c b/wpa_supplicant/src/crypto/md4.c
similarity index 100%
rename from src/crypto/md4.c
rename to wpa_supplicant/src/crypto/md4.c

diff --git a/src/crypto/md5.c b/wpa_supplicant/src/crypto/md5.c
similarity index 100%
rename from src/crypto/md5.c
rename to wpa_supplicant/src/crypto/md5.c

diff --git a/src/crypto/md5.h b/wpa_supplicant/src/crypto/md5.h
similarity index 100%
rename from src/crypto/md5.h
rename to wpa_supplicant/src/crypto/md5.h

diff --git a/src/crypto/ms_funcs.c b/wpa_supplicant/src/crypto/ms_funcs.c
similarity index 100%
rename from src/crypto/ms_funcs.c
rename to wpa_supplicant/src/crypto/ms_funcs.c

diff --git a/src/crypto/ms_funcs.h b/wpa_supplicant/src/crypto/ms_funcs.h
similarity index 100%
rename from src/crypto/ms_funcs.h
rename to wpa_supplicant/src/crypto/ms_funcs.h

diff --git a/src/crypto/rc4.c b/wpa_supplicant/src/crypto/rc4.c
similarity index 100%
rename from src/crypto/rc4.c
rename to wpa_supplicant/src/crypto/rc4.c

diff --git a/src/crypto/rc4.h b/wpa_supplicant/src/crypto/rc4.h
similarity index 100%
rename from src/crypto/rc4.h
rename to wpa_supplicant/src/crypto/rc4.h

diff --git a/src/crypto/sha1.c b/wpa_supplicant/src/crypto/sha1.c
similarity index 100%
rename from src/crypto/sha1.c
rename to wpa_supplicant/src/crypto/sha1.c

diff --git a/src/crypto/sha1.h b/wpa_supplicant/src/crypto/sha1.h
similarity index 100%
rename from src/crypto/sha1.h
rename to wpa_supplicant/src/crypto/sha1.h

diff --git a/src/crypto/sha256.c b/wpa_supplicant/src/crypto/sha256.c
similarity index 100%
rename from src/crypto/sha256.c
rename to wpa_supplicant/src/crypto/sha256.c

diff --git a/src/crypto/sha256.h b/wpa_supplicant/src/crypto/sha256.h
similarity index 100%
rename from src/crypto/sha256.h
rename to wpa_supplicant/src/crypto/sha256.h

diff --git a/src/crypto/tls.h b/wpa_supplicant/src/crypto/tls.h
similarity index 100%
rename from src/crypto/tls.h
rename to wpa_supplicant/src/crypto/tls.h

diff --git a/src/crypto/tls_gnutls.c b/wpa_supplicant/src/crypto/tls_gnutls.c
similarity index 100%
rename from src/crypto/tls_gnutls.c
rename to wpa_supplicant/src/crypto/tls_gnutls.c

diff --git a/src/crypto/tls_internal.c b/wpa_supplicant/src/crypto/tls_internal.c
similarity index 100%
rename from src/crypto/tls_internal.c
rename to wpa_supplicant/src/crypto/tls_internal.c

diff --git a/src/crypto/tls_none.c b/wpa_supplicant/src/crypto/tls_none.c
similarity index 100%
rename from src/crypto/tls_none.c
rename to wpa_supplicant/src/crypto/tls_none.c

diff --git a/src/crypto/tls_openssl.c b/wpa_supplicant/src/crypto/tls_openssl.c
similarity index 100%
rename from src/crypto/tls_openssl.c
rename to wpa_supplicant/src/crypto/tls_openssl.c

diff --git a/src/crypto/tls_schannel.c b/wpa_supplicant/src/crypto/tls_schannel.c
similarity index 100%
rename from src/crypto/tls_schannel.c
rename to wpa_supplicant/src/crypto/tls_schannel.c

diff --git a/src/drivers/.gitignore b/wpa_supplicant/src/drivers/.gitignore
similarity index 100%
rename from src/drivers/.gitignore
rename to wpa_supplicant/src/drivers/.gitignore

diff --git a/src/drivers/Apple80211.h b/wpa_supplicant/src/drivers/Apple80211.h
similarity index 100%
rename from src/drivers/Apple80211.h
rename to wpa_supplicant/src/drivers/Apple80211.h

diff --git a/src/drivers/Makefile b/wpa_supplicant/src/drivers/Makefile
similarity index 100%
rename from src/drivers/Makefile
rename to wpa_supplicant/src/drivers/Makefile

diff --git a/src/drivers/MobileApple80211.c b/wpa_supplicant/src/drivers/MobileApple80211.c
similarity index 100%
rename from src/drivers/MobileApple80211.c
rename to wpa_supplicant/src/drivers/MobileApple80211.c

diff --git a/src/drivers/MobileApple80211.h b/wpa_supplicant/src/drivers/MobileApple80211.h
similarity index 100%
rename from src/drivers/MobileApple80211.h
rename to wpa_supplicant/src/drivers/MobileApple80211.h

diff --git a/src/drivers/driver.h b/wpa_supplicant/src/drivers/driver.h
similarity index 100%
rename from src/drivers/driver.h
rename to wpa_supplicant/src/drivers/driver.h

diff --git a/src/drivers/driver_atmel.c b/wpa_supplicant/src/drivers/driver_atmel.c
similarity index 100%
rename from src/drivers/driver_atmel.c
rename to wpa_supplicant/src/drivers/driver_atmel.c

diff --git a/src/drivers/driver_broadcom.c b/wpa_supplicant/src/drivers/driver_broadcom.c
similarity index 100%
rename from src/drivers/driver_broadcom.c
rename to wpa_supplicant/src/drivers/driver_broadcom.c

diff --git a/src/drivers/driver_bsd.c b/wpa_supplicant/src/drivers/driver_bsd.c
similarity index 100%
rename from src/drivers/driver_bsd.c
rename to wpa_supplicant/src/drivers/driver_bsd.c

diff --git a/src/drivers/driver_hostap.c b/wpa_supplicant/src/drivers/driver_hostap.c
similarity index 100%
rename from src/drivers/driver_hostap.c
rename to wpa_supplicant/src/drivers/driver_hostap.c

diff --git a/src/drivers/driver_hostap.h b/wpa_supplicant/src/drivers/driver_hostap.h
similarity index 100%
rename from src/drivers/driver_hostap.h
rename to wpa_supplicant/src/drivers/driver_hostap.h

diff --git a/src/drivers/driver_iphone.m b/wpa_supplicant/src/drivers/driver_iphone.m
similarity index 100%
rename from src/drivers/driver_iphone.m
rename to wpa_supplicant/src/drivers/driver_iphone.m

diff --git a/src/drivers/driver_ipw.c b/wpa_supplicant/src/drivers/driver_ipw.c
similarity index 100%
rename from src/drivers/driver_ipw.c
rename to wpa_supplicant/src/drivers/driver_ipw.c

diff --git a/src/drivers/driver_madwifi.c b/wpa_supplicant/src/drivers/driver_madwifi.c
similarity index 100%
rename from src/drivers/driver_madwifi.c
rename to wpa_supplicant/src/drivers/driver_madwifi.c

diff --git a/src/drivers/driver_ndis.c b/wpa_supplicant/src/drivers/driver_ndis.c
similarity index 100%
rename from src/drivers/driver_ndis.c
rename to wpa_supplicant/src/drivers/driver_ndis.c

diff --git a/src/drivers/driver_ndis.h b/wpa_supplicant/src/drivers/driver_ndis.h
similarity index 100%
rename from src/drivers/driver_ndis.h
rename to wpa_supplicant/src/drivers/driver_ndis.h

diff --git a/src/drivers/driver_ndis_.c b/wpa_supplicant/src/drivers/driver_ndis_.c
similarity index 100%
rename from src/drivers/driver_ndis_.c
rename to wpa_supplicant/src/drivers/driver_ndis_.c

diff --git a/src/drivers/driver_ndiswrapper.c b/wpa_supplicant/src/drivers/driver_ndiswrapper.c
similarity index 100%
rename from src/drivers/driver_ndiswrapper.c
rename to wpa_supplicant/src/drivers/driver_ndiswrapper.c

diff --git a/src/drivers/driver_nl80211.c b/wpa_supplicant/src/drivers/driver_nl80211.c
similarity index 100%
rename from src/drivers/driver_nl80211.c
rename to wpa_supplicant/src/drivers/driver_nl80211.c

diff --git a/src/drivers/driver_osx.m b/wpa_supplicant/src/drivers/driver_osx.m
similarity index 100%
rename from src/drivers/driver_osx.m
rename to wpa_supplicant/src/drivers/driver_osx.m

diff --git a/src/drivers/driver_prism54.c b/wpa_supplicant/src/drivers/driver_prism54.c
similarity index 100%
rename from src/drivers/driver_prism54.c
rename to wpa_supplicant/src/drivers/driver_prism54.c

diff --git a/src/drivers/driver_privsep.c b/wpa_supplicant/src/drivers/driver_privsep.c
similarity index 100%
rename from src/drivers/driver_privsep.c
rename to wpa_supplicant/src/drivers/driver_privsep.c

diff --git a/src/drivers/driver_ps3.c b/wpa_supplicant/src/drivers/driver_ps3.c
similarity index 100%
rename from src/drivers/driver_ps3.c
rename to wpa_supplicant/src/drivers/driver_ps3.c

diff --git a/src/drivers/driver_ralink.c b/wpa_supplicant/src/drivers/driver_ralink.c
similarity index 100%
rename from src/drivers/driver_ralink.c
rename to wpa_supplicant/src/drivers/driver_ralink.c

diff --git a/src/drivers/driver_ralink.h b/wpa_supplicant/src/drivers/driver_ralink.h
similarity index 100%
rename from src/drivers/driver_ralink.h
rename to wpa_supplicant/src/drivers/driver_ralink.h

diff --git a/src/drivers/driver_roboswitch.c b/wpa_supplicant/src/drivers/driver_roboswitch.c
similarity index 100%
rename from src/drivers/driver_roboswitch.c
rename to wpa_supplicant/src/drivers/driver_roboswitch.c

diff --git a/src/drivers/driver_test.c b/wpa_supplicant/src/drivers/driver_test.c
similarity index 100%
rename from src/drivers/driver_test.c
rename to wpa_supplicant/src/drivers/driver_test.c

diff --git a/src/drivers/driver_wext.c b/wpa_supplicant/src/drivers/driver_wext.c
similarity index 100%
rename from src/drivers/driver_wext.c
rename to wpa_supplicant/src/drivers/driver_wext.c

diff --git a/src/drivers/driver_wext.h b/wpa_supplicant/src/drivers/driver_wext.h
similarity index 100%
rename from src/drivers/driver_wext.h
rename to wpa_supplicant/src/drivers/driver_wext.h

diff --git a/src/drivers/driver_wired.c b/wpa_supplicant/src/drivers/driver_wired.c
similarity index 100%
rename from src/drivers/driver_wired.c
rename to wpa_supplicant/src/drivers/driver_wired.c

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

diff --git a/src/drivers/ndis_events.c b/wpa_supplicant/src/drivers/ndis_events.c
similarity index 100%
rename from src/drivers/ndis_events.c
rename to wpa_supplicant/src/drivers/ndis_events.c

diff --git a/src/drivers/priv_netlink.h b/wpa_supplicant/src/drivers/priv_netlink.h
similarity index 100%
rename from src/drivers/priv_netlink.h
rename to wpa_supplicant/src/drivers/priv_netlink.h

diff --git a/src/drivers/radiotap.c b/wpa_supplicant/src/drivers/radiotap.c
similarity index 100%
rename from src/drivers/radiotap.c
rename to wpa_supplicant/src/drivers/radiotap.c

diff --git a/src/drivers/radiotap.h b/wpa_supplicant/src/drivers/radiotap.h
similarity index 100%
rename from src/drivers/radiotap.h
rename to wpa_supplicant/src/drivers/radiotap.h

diff --git a/src/drivers/radiotap_iter.h b/wpa_supplicant/src/drivers/radiotap_iter.h
similarity index 100%
rename from src/drivers/radiotap_iter.h
rename to wpa_supplicant/src/drivers/radiotap_iter.h

diff --git a/src/drivers/scan_helpers.c b/wpa_supplicant/src/drivers/scan_helpers.c
similarity index 100%
rename from src/drivers/scan_helpers.c
rename to wpa_supplicant/src/drivers/scan_helpers.c

diff --git a/src/eap_common/.gitignore b/wpa_supplicant/src/eap_common/.gitignore
similarity index 100%
rename from src/eap_common/.gitignore
rename to wpa_supplicant/src/eap_common/.gitignore

diff --git a/src/eap_common/Makefile b/wpa_supplicant/src/eap_common/Makefile
similarity index 100%
rename from src/eap_common/Makefile
rename to wpa_supplicant/src/eap_common/Makefile

diff --git a/src/eap_common/chap.c b/wpa_supplicant/src/eap_common/chap.c
similarity index 100%
rename from src/eap_common/chap.c
rename to wpa_supplicant/src/eap_common/chap.c

diff --git a/src/eap_common/chap.h b/wpa_supplicant/src/eap_common/chap.h
similarity index 100%
rename from src/eap_common/chap.h
rename to wpa_supplicant/src/eap_common/chap.h

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

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

diff --git a/src/eap_common/eap_defs.h b/wpa_supplicant/src/eap_common/eap_defs.h
similarity index 100%
rename from src/eap_common/eap_defs.h
rename to wpa_supplicant/src/eap_common/eap_defs.h

diff --git a/src/eap_common/eap_fast_common.c b/wpa_supplicant/src/eap_common/eap_fast_common.c
similarity index 100%
rename from src/eap_common/eap_fast_common.c
rename to wpa_supplicant/src/eap_common/eap_fast_common.c

diff --git a/src/eap_common/eap_fast_common.h b/wpa_supplicant/src/eap_common/eap_fast_common.h
similarity index 100%
rename from src/eap_common/eap_fast_common.h
rename to wpa_supplicant/src/eap_common/eap_fast_common.h

diff --git a/src/eap_common/eap_gpsk_common.c b/wpa_supplicant/src/eap_common/eap_gpsk_common.c
similarity index 100%
rename from src/eap_common/eap_gpsk_common.c
rename to wpa_supplicant/src/eap_common/eap_gpsk_common.c

diff --git a/src/eap_common/eap_gpsk_common.h b/wpa_supplicant/src/eap_common/eap_gpsk_common.h
similarity index 100%
rename from src/eap_common/eap_gpsk_common.h
rename to wpa_supplicant/src/eap_common/eap_gpsk_common.h

diff --git a/src/eap_common/eap_ikev2_common.c b/wpa_supplicant/src/eap_common/eap_ikev2_common.c
similarity index 100%
rename from src/eap_common/eap_ikev2_common.c
rename to wpa_supplicant/src/eap_common/eap_ikev2_common.c

diff --git a/src/eap_common/eap_ikev2_common.h b/wpa_supplicant/src/eap_common/eap_ikev2_common.h
similarity index 100%
rename from src/eap_common/eap_ikev2_common.h
rename to wpa_supplicant/src/eap_common/eap_ikev2_common.h

diff --git a/src/eap_common/eap_pax_common.c b/wpa_supplicant/src/eap_common/eap_pax_common.c
similarity index 100%
rename from src/eap_common/eap_pax_common.c
rename to wpa_supplicant/src/eap_common/eap_pax_common.c

diff --git a/src/eap_common/eap_pax_common.h b/wpa_supplicant/src/eap_common/eap_pax_common.h
similarity index 100%
rename from src/eap_common/eap_pax_common.h
rename to wpa_supplicant/src/eap_common/eap_pax_common.h

diff --git a/src/eap_common/eap_peap_common.c b/wpa_supplicant/src/eap_common/eap_peap_common.c
similarity index 100%
rename from src/eap_common/eap_peap_common.c
rename to wpa_supplicant/src/eap_common/eap_peap_common.c

diff --git a/src/eap_common/eap_peap_common.h b/wpa_supplicant/src/eap_common/eap_peap_common.h
similarity index 100%
rename from src/eap_common/eap_peap_common.h
rename to wpa_supplicant/src/eap_common/eap_peap_common.h

diff --git a/src/eap_common/eap_psk_common.c b/wpa_supplicant/src/eap_common/eap_psk_common.c
similarity index 100%
rename from src/eap_common/eap_psk_common.c
rename to wpa_supplicant/src/eap_common/eap_psk_common.c

diff --git a/src/eap_common/eap_psk_common.h b/wpa_supplicant/src/eap_common/eap_psk_common.h
similarity index 100%
rename from src/eap_common/eap_psk_common.h
rename to wpa_supplicant/src/eap_common/eap_psk_common.h

diff --git a/src/eap_common/eap_sake_common.c b/wpa_supplicant/src/eap_common/eap_sake_common.c
similarity index 100%
rename from src/eap_common/eap_sake_common.c
rename to wpa_supplicant/src/eap_common/eap_sake_common.c

diff --git a/src/eap_common/eap_sake_common.h b/wpa_supplicant/src/eap_common/eap_sake_common.h
similarity index 100%
rename from src/eap_common/eap_sake_common.h
rename to wpa_supplicant/src/eap_common/eap_sake_common.h

diff --git a/src/eap_common/eap_sim_common.c b/wpa_supplicant/src/eap_common/eap_sim_common.c
similarity index 100%
rename from src/eap_common/eap_sim_common.c
rename to wpa_supplicant/src/eap_common/eap_sim_common.c

diff --git a/src/eap_common/eap_sim_common.h b/wpa_supplicant/src/eap_common/eap_sim_common.h
similarity index 100%
rename from src/eap_common/eap_sim_common.h
rename to wpa_supplicant/src/eap_common/eap_sim_common.h

diff --git a/src/eap_common/eap_tlv_common.h b/wpa_supplicant/src/eap_common/eap_tlv_common.h
similarity index 100%
rename from src/eap_common/eap_tlv_common.h
rename to wpa_supplicant/src/eap_common/eap_tlv_common.h

diff --git a/src/eap_common/eap_ttls.h b/wpa_supplicant/src/eap_common/eap_ttls.h
similarity index 100%
rename from src/eap_common/eap_ttls.h
rename to wpa_supplicant/src/eap_common/eap_ttls.h

diff --git a/src/eap_common/eap_wsc_common.c b/wpa_supplicant/src/eap_common/eap_wsc_common.c
similarity index 100%
rename from src/eap_common/eap_wsc_common.c
rename to wpa_supplicant/src/eap_common/eap_wsc_common.c

diff --git a/src/eap_common/eap_wsc_common.h b/wpa_supplicant/src/eap_common/eap_wsc_common.h
similarity index 100%
rename from src/eap_common/eap_wsc_common.h
rename to wpa_supplicant/src/eap_common/eap_wsc_common.h

diff --git a/src/eap_common/ikev2_common.c b/wpa_supplicant/src/eap_common/ikev2_common.c
similarity index 100%
rename from src/eap_common/ikev2_common.c
rename to wpa_supplicant/src/eap_common/ikev2_common.c

diff --git a/src/eap_common/ikev2_common.h b/wpa_supplicant/src/eap_common/ikev2_common.h
similarity index 100%
rename from src/eap_common/ikev2_common.h
rename to wpa_supplicant/src/eap_common/ikev2_common.h

diff --git a/src/eap_peer/.gitignore b/wpa_supplicant/src/eap_peer/.gitignore
similarity index 100%
rename from src/eap_peer/.gitignore
rename to wpa_supplicant/src/eap_peer/.gitignore

diff --git a/src/eap_peer/Makefile b/wpa_supplicant/src/eap_peer/Makefile
similarity index 100%
rename from src/eap_peer/Makefile
rename to wpa_supplicant/src/eap_peer/Makefile

diff --git a/src/eap_peer/eap.c b/wpa_supplicant/src/eap_peer/eap.c
similarity index 100%
rename from src/eap_peer/eap.c
rename to wpa_supplicant/src/eap_peer/eap.c

diff --git a/src/eap_peer/eap.h b/wpa_supplicant/src/eap_peer/eap.h
similarity index 100%
rename from src/eap_peer/eap.h
rename to wpa_supplicant/src/eap_peer/eap.h

diff --git a/src/eap_peer/eap_aka.c b/wpa_supplicant/src/eap_peer/eap_aka.c
similarity index 100%
rename from src/eap_peer/eap_aka.c
rename to wpa_supplicant/src/eap_peer/eap_aka.c

diff --git a/src/eap_peer/eap_config.h b/wpa_supplicant/src/eap_peer/eap_config.h
similarity index 100%
rename from src/eap_peer/eap_config.h
rename to wpa_supplicant/src/eap_peer/eap_config.h

diff --git a/src/eap_peer/eap_fast.c b/wpa_supplicant/src/eap_peer/eap_fast.c
similarity index 100%
rename from src/eap_peer/eap_fast.c
rename to wpa_supplicant/src/eap_peer/eap_fast.c

diff --git a/src/eap_peer/eap_fast_pac.c b/wpa_supplicant/src/eap_peer/eap_fast_pac.c
similarity index 100%
rename from src/eap_peer/eap_fast_pac.c
rename to wpa_supplicant/src/eap_peer/eap_fast_pac.c

diff --git a/src/eap_peer/eap_fast_pac.h b/wpa_supplicant/src/eap_peer/eap_fast_pac.h
similarity index 100%
rename from src/eap_peer/eap_fast_pac.h
rename to wpa_supplicant/src/eap_peer/eap_fast_pac.h

diff --git a/src/eap_peer/eap_gpsk.c b/wpa_supplicant/src/eap_peer/eap_gpsk.c
similarity index 100%
rename from src/eap_peer/eap_gpsk.c
rename to wpa_supplicant/src/eap_peer/eap_gpsk.c

diff --git a/src/eap_peer/eap_gtc.c b/wpa_supplicant/src/eap_peer/eap_gtc.c
similarity index 100%
rename from src/eap_peer/eap_gtc.c
rename to wpa_supplicant/src/eap_peer/eap_gtc.c

diff --git a/src/eap_peer/eap_i.h b/wpa_supplicant/src/eap_peer/eap_i.h
similarity index 100%
rename from src/eap_peer/eap_i.h
rename to wpa_supplicant/src/eap_peer/eap_i.h

diff --git a/src/eap_peer/eap_ikev2.c b/wpa_supplicant/src/eap_peer/eap_ikev2.c
similarity index 100%
rename from src/eap_peer/eap_ikev2.c
rename to wpa_supplicant/src/eap_peer/eap_ikev2.c

diff --git a/src/eap_peer/eap_leap.c b/wpa_supplicant/src/eap_peer/eap_leap.c
similarity index 100%
rename from src/eap_peer/eap_leap.c
rename to wpa_supplicant/src/eap_peer/eap_leap.c

diff --git a/src/eap_peer/eap_md5.c b/wpa_supplicant/src/eap_peer/eap_md5.c
similarity index 100%
rename from src/eap_peer/eap_md5.c
rename to wpa_supplicant/src/eap_peer/eap_md5.c

diff --git a/src/eap_peer/eap_methods.c b/wpa_supplicant/src/eap_peer/eap_methods.c
similarity index 100%
rename from src/eap_peer/eap_methods.c
rename to wpa_supplicant/src/eap_peer/eap_methods.c

diff --git a/src/eap_peer/eap_methods.h b/wpa_supplicant/src/eap_peer/eap_methods.h
similarity index 100%
rename from src/eap_peer/eap_methods.h
rename to wpa_supplicant/src/eap_peer/eap_methods.h

diff --git a/src/eap_peer/eap_mschapv2.c b/wpa_supplicant/src/eap_peer/eap_mschapv2.c
similarity index 100%
rename from src/eap_peer/eap_mschapv2.c
rename to wpa_supplicant/src/eap_peer/eap_mschapv2.c

diff --git a/src/eap_peer/eap_otp.c b/wpa_supplicant/src/eap_peer/eap_otp.c
similarity index 100%
rename from src/eap_peer/eap_otp.c
rename to wpa_supplicant/src/eap_peer/eap_otp.c

diff --git a/src/eap_peer/eap_pax.c b/wpa_supplicant/src/eap_peer/eap_pax.c
similarity index 100%
rename from src/eap_peer/eap_pax.c
rename to wpa_supplicant/src/eap_peer/eap_pax.c

diff --git a/src/eap_peer/eap_peap.c b/wpa_supplicant/src/eap_peer/eap_peap.c
similarity index 100%
rename from src/eap_peer/eap_peap.c
rename to wpa_supplicant/src/eap_peer/eap_peap.c

diff --git a/src/eap_peer/eap_psk.c b/wpa_supplicant/src/eap_peer/eap_psk.c
similarity index 100%
rename from src/eap_peer/eap_psk.c
rename to wpa_supplicant/src/eap_peer/eap_psk.c

diff --git a/src/eap_peer/eap_sake.c b/wpa_supplicant/src/eap_peer/eap_sake.c
similarity index 100%
rename from src/eap_peer/eap_sake.c
rename to wpa_supplicant/src/eap_peer/eap_sake.c

diff --git a/src/eap_peer/eap_sim.c b/wpa_supplicant/src/eap_peer/eap_sim.c
similarity index 100%
rename from src/eap_peer/eap_sim.c
rename to wpa_supplicant/src/eap_peer/eap_sim.c

diff --git a/src/eap_peer/eap_tls.c b/wpa_supplicant/src/eap_peer/eap_tls.c
similarity index 100%
rename from src/eap_peer/eap_tls.c
rename to wpa_supplicant/src/eap_peer/eap_tls.c

diff --git a/src/eap_peer/eap_tls_common.c b/wpa_supplicant/src/eap_peer/eap_tls_common.c
similarity index 100%
rename from src/eap_peer/eap_tls_common.c
rename to wpa_supplicant/src/eap_peer/eap_tls_common.c

diff --git a/src/eap_peer/eap_tls_common.h b/wpa_supplicant/src/eap_peer/eap_tls_common.h
similarity index 100%
rename from src/eap_peer/eap_tls_common.h
rename to wpa_supplicant/src/eap_peer/eap_tls_common.h

diff --git a/src/eap_peer/eap_tnc.c b/wpa_supplicant/src/eap_peer/eap_tnc.c
similarity index 100%
rename from src/eap_peer/eap_tnc.c
rename to wpa_supplicant/src/eap_peer/eap_tnc.c

diff --git a/src/eap_peer/eap_ttls.c b/wpa_supplicant/src/eap_peer/eap_ttls.c
similarity index 100%
rename from src/eap_peer/eap_ttls.c
rename to wpa_supplicant/src/eap_peer/eap_ttls.c

diff --git a/src/eap_peer/eap_vendor_test.c b/wpa_supplicant/src/eap_peer/eap_vendor_test.c
similarity index 100%
rename from src/eap_peer/eap_vendor_test.c
rename to wpa_supplicant/src/eap_peer/eap_vendor_test.c

diff --git a/src/eap_peer/eap_wsc.c b/wpa_supplicant/src/eap_peer/eap_wsc.c
similarity index 100%
rename from src/eap_peer/eap_wsc.c
rename to wpa_supplicant/src/eap_peer/eap_wsc.c

diff --git a/src/eap_peer/ikev2.c b/wpa_supplicant/src/eap_peer/ikev2.c
similarity index 100%
rename from src/eap_peer/ikev2.c
rename to wpa_supplicant/src/eap_peer/ikev2.c

diff --git a/src/eap_peer/ikev2.h b/wpa_supplicant/src/eap_peer/ikev2.h
similarity index 100%
rename from src/eap_peer/ikev2.h
rename to wpa_supplicant/src/eap_peer/ikev2.h

diff --git a/src/eap_peer/mschapv2.c b/wpa_supplicant/src/eap_peer/mschapv2.c
similarity index 100%
rename from src/eap_peer/mschapv2.c
rename to wpa_supplicant/src/eap_peer/mschapv2.c

diff --git a/src/eap_peer/mschapv2.h b/wpa_supplicant/src/eap_peer/mschapv2.h
similarity index 100%
rename from src/eap_peer/mschapv2.h
rename to wpa_supplicant/src/eap_peer/mschapv2.h

diff --git a/src/eap_peer/tncc.c b/wpa_supplicant/src/eap_peer/tncc.c
similarity index 100%
rename from src/eap_peer/tncc.c
rename to wpa_supplicant/src/eap_peer/tncc.c

diff --git a/src/eap_peer/tncc.h b/wpa_supplicant/src/eap_peer/tncc.h
similarity index 100%
rename from src/eap_peer/tncc.h
rename to wpa_supplicant/src/eap_peer/tncc.h

diff --git a/src/eap_server/.gitignore b/wpa_supplicant/src/eap_server/.gitignore
similarity index 100%
rename from src/eap_server/.gitignore
rename to wpa_supplicant/src/eap_server/.gitignore

diff --git a/src/eap_server/Makefile b/wpa_supplicant/src/eap_server/Makefile
similarity index 100%
rename from src/eap_server/Makefile
rename to wpa_supplicant/src/eap_server/Makefile

diff --git a/src/eap_server/eap.c b/wpa_supplicant/src/eap_server/eap.c
similarity index 100%
rename from src/eap_server/eap.c
rename to wpa_supplicant/src/eap_server/eap.c

diff --git a/src/eap_server/eap.h b/wpa_supplicant/src/eap_server/eap.h
similarity index 100%
rename from src/eap_server/eap.h
rename to wpa_supplicant/src/eap_server/eap.h

diff --git a/src/eap_server/eap_aka.c b/wpa_supplicant/src/eap_server/eap_aka.c
similarity index 100%
rename from src/eap_server/eap_aka.c
rename to wpa_supplicant/src/eap_server/eap_aka.c

diff --git a/src/eap_server/eap_fast.c b/wpa_supplicant/src/eap_server/eap_fast.c
similarity index 100%
rename from src/eap_server/eap_fast.c
rename to wpa_supplicant/src/eap_server/eap_fast.c

diff --git a/src/eap_server/eap_gpsk.c b/wpa_supplicant/src/eap_server/eap_gpsk.c
similarity index 100%
rename from src/eap_server/eap_gpsk.c
rename to wpa_supplicant/src/eap_server/eap_gpsk.c

diff --git a/src/eap_server/eap_gtc.c b/wpa_supplicant/src/eap_server/eap_gtc.c
similarity index 100%
rename from src/eap_server/eap_gtc.c
rename to wpa_supplicant/src/eap_server/eap_gtc.c

diff --git a/src/eap_server/eap_i.h b/wpa_supplicant/src/eap_server/eap_i.h
similarity index 100%
rename from src/eap_server/eap_i.h
rename to wpa_supplicant/src/eap_server/eap_i.h

diff --git a/src/eap_server/eap_identity.c b/wpa_supplicant/src/eap_server/eap_identity.c
similarity index 100%
rename from src/eap_server/eap_identity.c
rename to wpa_supplicant/src/eap_server/eap_identity.c

diff --git a/src/eap_server/eap_ikev2.c b/wpa_supplicant/src/eap_server/eap_ikev2.c
similarity index 100%
rename from src/eap_server/eap_ikev2.c
rename to wpa_supplicant/src/eap_server/eap_ikev2.c

diff --git a/src/eap_server/eap_md5.c b/wpa_supplicant/src/eap_server/eap_md5.c
similarity index 100%
rename from src/eap_server/eap_md5.c
rename to wpa_supplicant/src/eap_server/eap_md5.c

diff --git a/src/eap_server/eap_methods.c b/wpa_supplicant/src/eap_server/eap_methods.c
similarity index 100%
rename from src/eap_server/eap_methods.c
rename to wpa_supplicant/src/eap_server/eap_methods.c

diff --git a/src/eap_server/eap_methods.h b/wpa_supplicant/src/eap_server/eap_methods.h
similarity index 100%
rename from src/eap_server/eap_methods.h
rename to wpa_supplicant/src/eap_server/eap_methods.h

diff --git a/src/eap_server/eap_mschapv2.c b/wpa_supplicant/src/eap_server/eap_mschapv2.c
similarity index 100%
rename from src/eap_server/eap_mschapv2.c
rename to wpa_supplicant/src/eap_server/eap_mschapv2.c

diff --git a/src/eap_server/eap_pax.c b/wpa_supplicant/src/eap_server/eap_pax.c
similarity index 100%
rename from src/eap_server/eap_pax.c
rename to wpa_supplicant/src/eap_server/eap_pax.c

diff --git a/src/eap_server/eap_peap.c b/wpa_supplicant/src/eap_server/eap_peap.c
similarity index 100%
rename from src/eap_server/eap_peap.c
rename to wpa_supplicant/src/eap_server/eap_peap.c

diff --git a/src/eap_server/eap_psk.c b/wpa_supplicant/src/eap_server/eap_psk.c
similarity index 100%
rename from src/eap_server/eap_psk.c
rename to wpa_supplicant/src/eap_server/eap_psk.c

diff --git a/src/eap_server/eap_sake.c b/wpa_supplicant/src/eap_server/eap_sake.c
similarity index 100%
rename from src/eap_server/eap_sake.c
rename to wpa_supplicant/src/eap_server/eap_sake.c

diff --git a/src/eap_server/eap_sim.c b/wpa_supplicant/src/eap_server/eap_sim.c
similarity index 100%
rename from src/eap_server/eap_sim.c
rename to wpa_supplicant/src/eap_server/eap_sim.c

diff --git a/src/eap_server/eap_sim_db.c b/wpa_supplicant/src/eap_server/eap_sim_db.c
similarity index 100%
rename from src/eap_server/eap_sim_db.c
rename to wpa_supplicant/src/eap_server/eap_sim_db.c

diff --git a/src/eap_server/eap_sim_db.h b/wpa_supplicant/src/eap_server/eap_sim_db.h
similarity index 100%
rename from src/eap_server/eap_sim_db.h
rename to wpa_supplicant/src/eap_server/eap_sim_db.h

diff --git a/src/eap_server/eap_tls.c b/wpa_supplicant/src/eap_server/eap_tls.c
similarity index 100%
rename from src/eap_server/eap_tls.c
rename to wpa_supplicant/src/eap_server/eap_tls.c

diff --git a/src/eap_server/eap_tls_common.c b/wpa_supplicant/src/eap_server/eap_tls_common.c
similarity index 100%
rename from src/eap_server/eap_tls_common.c
rename to wpa_supplicant/src/eap_server/eap_tls_common.c

diff --git a/src/eap_server/eap_tls_common.h b/wpa_supplicant/src/eap_server/eap_tls_common.h
similarity index 100%
rename from src/eap_server/eap_tls_common.h
rename to wpa_supplicant/src/eap_server/eap_tls_common.h

diff --git a/src/eap_server/eap_tnc.c b/wpa_supplicant/src/eap_server/eap_tnc.c
similarity index 100%
rename from src/eap_server/eap_tnc.c
rename to wpa_supplicant/src/eap_server/eap_tnc.c

diff --git a/src/eap_server/eap_ttls.c b/wpa_supplicant/src/eap_server/eap_ttls.c
similarity index 100%
rename from src/eap_server/eap_ttls.c
rename to wpa_supplicant/src/eap_server/eap_ttls.c

diff --git a/src/eap_server/eap_vendor_test.c b/wpa_supplicant/src/eap_server/eap_vendor_test.c
similarity index 100%
rename from src/eap_server/eap_vendor_test.c
rename to wpa_supplicant/src/eap_server/eap_vendor_test.c

diff --git a/src/eap_server/eap_wsc.c b/wpa_supplicant/src/eap_server/eap_wsc.c
similarity index 100%
rename from src/eap_server/eap_wsc.c
rename to wpa_supplicant/src/eap_server/eap_wsc.c

diff --git a/src/eap_server/ikev2.c b/wpa_supplicant/src/eap_server/ikev2.c
similarity index 100%
rename from src/eap_server/ikev2.c
rename to wpa_supplicant/src/eap_server/ikev2.c

diff --git a/src/eap_server/ikev2.h b/wpa_supplicant/src/eap_server/ikev2.h
similarity index 100%
rename from src/eap_server/ikev2.h
rename to wpa_supplicant/src/eap_server/ikev2.h

diff --git a/src/eap_server/tncs.c b/wpa_supplicant/src/eap_server/tncs.c
similarity index 100%
rename from src/eap_server/tncs.c
rename to wpa_supplicant/src/eap_server/tncs.c

diff --git a/src/eap_server/tncs.h b/wpa_supplicant/src/eap_server/tncs.h
similarity index 100%
rename from src/eap_server/tncs.h
rename to wpa_supplicant/src/eap_server/tncs.h

diff --git a/src/eapol_supp/.gitignore b/wpa_supplicant/src/eapol_supp/.gitignore
similarity index 100%
rename from src/eapol_supp/.gitignore
rename to wpa_supplicant/src/eapol_supp/.gitignore

diff --git a/src/eapol_supp/Makefile b/wpa_supplicant/src/eapol_supp/Makefile
similarity index 100%
rename from src/eapol_supp/Makefile
rename to wpa_supplicant/src/eapol_supp/Makefile

diff --git a/src/eapol_supp/eapol_supp_sm.c b/wpa_supplicant/src/eapol_supp/eapol_supp_sm.c
similarity index 100%
rename from src/eapol_supp/eapol_supp_sm.c
rename to wpa_supplicant/src/eapol_supp/eapol_supp_sm.c

diff --git a/src/eapol_supp/eapol_supp_sm.h b/wpa_supplicant/src/eapol_supp/eapol_supp_sm.h
similarity index 100%
rename from src/eapol_supp/eapol_supp_sm.h
rename to wpa_supplicant/src/eapol_supp/eapol_supp_sm.h

diff --git a/src/hlr_auc_gw/.gitignore b/wpa_supplicant/src/hlr_auc_gw/.gitignore
similarity index 100%
rename from src/hlr_auc_gw/.gitignore
rename to wpa_supplicant/src/hlr_auc_gw/.gitignore

diff --git a/src/hlr_auc_gw/Makefile b/wpa_supplicant/src/hlr_auc_gw/Makefile
similarity index 100%
rename from src/hlr_auc_gw/Makefile
rename to wpa_supplicant/src/hlr_auc_gw/Makefile

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

diff --git a/src/hlr_auc_gw/hlr_auc_gw.milenage_db b/wpa_supplicant/src/hlr_auc_gw/hlr_auc_gw.milenage_db
similarity index 100%
rename from src/hlr_auc_gw/hlr_auc_gw.milenage_db
rename to wpa_supplicant/src/hlr_auc_gw/hlr_auc_gw.milenage_db

diff --git a/src/hlr_auc_gw/milenage.c b/wpa_supplicant/src/hlr_auc_gw/milenage.c
similarity index 100%
rename from src/hlr_auc_gw/milenage.c
rename to wpa_supplicant/src/hlr_auc_gw/milenage.c

diff --git a/src/hlr_auc_gw/milenage.h b/wpa_supplicant/src/hlr_auc_gw/milenage.h
similarity index 100%
rename from src/hlr_auc_gw/milenage.h
rename to wpa_supplicant/src/hlr_auc_gw/milenage.h

diff --git a/src/l2_packet/.gitignore b/wpa_supplicant/src/l2_packet/.gitignore
similarity index 100%
rename from src/l2_packet/.gitignore
rename to wpa_supplicant/src/l2_packet/.gitignore

diff --git a/src/l2_packet/Makefile b/wpa_supplicant/src/l2_packet/Makefile
similarity index 100%
rename from src/l2_packet/Makefile
rename to wpa_supplicant/src/l2_packet/Makefile

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

diff --git a/src/l2_packet/l2_packet_freebsd.c b/wpa_supplicant/src/l2_packet/l2_packet_freebsd.c
similarity index 100%
rename from src/l2_packet/l2_packet_freebsd.c
rename to wpa_supplicant/src/l2_packet/l2_packet_freebsd.c

diff --git a/src/l2_packet/l2_packet_linux.c b/wpa_supplicant/src/l2_packet/l2_packet_linux.c
similarity index 100%
rename from src/l2_packet/l2_packet_linux.c
rename to wpa_supplicant/src/l2_packet/l2_packet_linux.c

diff --git a/src/l2_packet/l2_packet_ndis.c b/wpa_supplicant/src/l2_packet/l2_packet_ndis.c
similarity index 100%
rename from src/l2_packet/l2_packet_ndis.c
rename to wpa_supplicant/src/l2_packet/l2_packet_ndis.c

diff --git a/src/l2_packet/l2_packet_none.c b/wpa_supplicant/src/l2_packet/l2_packet_none.c
similarity index 100%
rename from src/l2_packet/l2_packet_none.c
rename to wpa_supplicant/src/l2_packet/l2_packet_none.c

diff --git a/src/l2_packet/l2_packet_pcap.c b/wpa_supplicant/src/l2_packet/l2_packet_pcap.c
similarity index 100%
rename from src/l2_packet/l2_packet_pcap.c
rename to wpa_supplicant/src/l2_packet/l2_packet_pcap.c

diff --git a/src/l2_packet/l2_packet_privsep.c b/wpa_supplicant/src/l2_packet/l2_packet_privsep.c
similarity index 100%
rename from src/l2_packet/l2_packet_privsep.c
rename to wpa_supplicant/src/l2_packet/l2_packet_privsep.c

diff --git a/src/l2_packet/l2_packet_winpcap.c b/wpa_supplicant/src/l2_packet/l2_packet_winpcap.c
similarity index 100%
rename from src/l2_packet/l2_packet_winpcap.c
rename to wpa_supplicant/src/l2_packet/l2_packet_winpcap.c

diff --git a/src/radius/.gitignore b/wpa_supplicant/src/radius/.gitignore
similarity index 100%
rename from src/radius/.gitignore
rename to wpa_supplicant/src/radius/.gitignore

diff --git a/src/radius/Makefile b/wpa_supplicant/src/radius/Makefile
similarity index 100%
rename from src/radius/Makefile
rename to wpa_supplicant/src/radius/Makefile

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

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

diff --git a/src/radius/radius_client.c b/wpa_supplicant/src/radius/radius_client.c
similarity index 100%
rename from src/radius/radius_client.c
rename to wpa_supplicant/src/radius/radius_client.c

diff --git a/src/radius/radius_client.h b/wpa_supplicant/src/radius/radius_client.h
similarity index 100%
rename from src/radius/radius_client.h
rename to wpa_supplicant/src/radius/radius_client.h

diff --git a/src/radius/radius_server.c b/wpa_supplicant/src/radius/radius_server.c
similarity index 100%
rename from src/radius/radius_server.c
rename to wpa_supplicant/src/radius/radius_server.c

diff --git a/src/radius/radius_server.h b/wpa_supplicant/src/radius/radius_server.h
similarity index 100%
rename from src/radius/radius_server.h
rename to wpa_supplicant/src/radius/radius_server.h

diff --git a/src/rsn_supp/.gitignore b/wpa_supplicant/src/rsn_supp/.gitignore
similarity index 100%
rename from src/rsn_supp/.gitignore
rename to wpa_supplicant/src/rsn_supp/.gitignore

diff --git a/src/rsn_supp/Makefile b/wpa_supplicant/src/rsn_supp/Makefile
similarity index 100%
rename from src/rsn_supp/Makefile
rename to wpa_supplicant/src/rsn_supp/Makefile

diff --git a/src/rsn_supp/peerkey.c b/wpa_supplicant/src/rsn_supp/peerkey.c
similarity index 100%
rename from src/rsn_supp/peerkey.c
rename to wpa_supplicant/src/rsn_supp/peerkey.c

diff --git a/src/rsn_supp/peerkey.h b/wpa_supplicant/src/rsn_supp/peerkey.h
similarity index 100%
rename from src/rsn_supp/peerkey.h
rename to wpa_supplicant/src/rsn_supp/peerkey.h

diff --git a/src/rsn_supp/pmksa_cache.c b/wpa_supplicant/src/rsn_supp/pmksa_cache.c
similarity index 100%
rename from src/rsn_supp/pmksa_cache.c
rename to wpa_supplicant/src/rsn_supp/pmksa_cache.c

diff --git a/src/rsn_supp/pmksa_cache.h b/wpa_supplicant/src/rsn_supp/pmksa_cache.h
similarity index 100%
rename from src/rsn_supp/pmksa_cache.h
rename to wpa_supplicant/src/rsn_supp/pmksa_cache.h

diff --git a/src/rsn_supp/preauth.c b/wpa_supplicant/src/rsn_supp/preauth.c
similarity index 100%
rename from src/rsn_supp/preauth.c
rename to wpa_supplicant/src/rsn_supp/preauth.c

diff --git a/src/rsn_supp/preauth.h b/wpa_supplicant/src/rsn_supp/preauth.h
similarity index 100%
rename from src/rsn_supp/preauth.h
rename to wpa_supplicant/src/rsn_supp/preauth.h

diff --git a/src/rsn_supp/wpa.c b/wpa_supplicant/src/rsn_supp/wpa.c
similarity index 100%
rename from src/rsn_supp/wpa.c
rename to wpa_supplicant/src/rsn_supp/wpa.c

diff --git a/src/rsn_supp/wpa.h b/wpa_supplicant/src/rsn_supp/wpa.h
similarity index 100%
rename from src/rsn_supp/wpa.h
rename to wpa_supplicant/src/rsn_supp/wpa.h

diff --git a/src/rsn_supp/wpa_ft.c b/wpa_supplicant/src/rsn_supp/wpa_ft.c
similarity index 100%
rename from src/rsn_supp/wpa_ft.c
rename to wpa_supplicant/src/rsn_supp/wpa_ft.c

diff --git a/src/rsn_supp/wpa_i.h b/wpa_supplicant/src/rsn_supp/wpa_i.h
similarity index 100%
rename from src/rsn_supp/wpa_i.h
rename to wpa_supplicant/src/rsn_supp/wpa_i.h

diff --git a/src/rsn_supp/wpa_ie.c b/wpa_supplicant/src/rsn_supp/wpa_ie.c
similarity index 100%
rename from src/rsn_supp/wpa_ie.c
rename to wpa_supplicant/src/rsn_supp/wpa_ie.c

diff --git a/src/rsn_supp/wpa_ie.h b/wpa_supplicant/src/rsn_supp/wpa_ie.h
similarity index 100%
rename from src/rsn_supp/wpa_ie.h
rename to wpa_supplicant/src/rsn_supp/wpa_ie.h

diff --git a/src/tls/.gitignore b/wpa_supplicant/src/tls/.gitignore
similarity index 100%
rename from src/tls/.gitignore
rename to wpa_supplicant/src/tls/.gitignore

diff --git a/src/tls/Makefile b/wpa_supplicant/src/tls/Makefile
similarity index 100%
rename from src/tls/Makefile
rename to wpa_supplicant/src/tls/Makefile

diff --git a/src/tls/asn1.c b/wpa_supplicant/src/tls/asn1.c
similarity index 100%
rename from src/tls/asn1.c
rename to wpa_supplicant/src/tls/asn1.c

diff --git a/src/tls/asn1.h b/wpa_supplicant/src/tls/asn1.h
similarity index 100%
rename from src/tls/asn1.h
rename to wpa_supplicant/src/tls/asn1.h

diff --git a/src/tls/asn1_test.c b/wpa_supplicant/src/tls/asn1_test.c
similarity index 100%
rename from src/tls/asn1_test.c
rename to wpa_supplicant/src/tls/asn1_test.c

diff --git a/src/tls/bignum.c b/wpa_supplicant/src/tls/bignum.c
similarity index 100%
rename from src/tls/bignum.c
rename to wpa_supplicant/src/tls/bignum.c

diff --git a/src/tls/bignum.h b/wpa_supplicant/src/tls/bignum.h
similarity index 100%
rename from src/tls/bignum.h
rename to wpa_supplicant/src/tls/bignum.h

diff --git a/src/tls/libtommath.c b/wpa_supplicant/src/tls/libtommath.c
similarity index 100%
rename from src/tls/libtommath.c
rename to wpa_supplicant/src/tls/libtommath.c

diff --git a/src/tls/rsa.c b/wpa_supplicant/src/tls/rsa.c
similarity index 100%
rename from src/tls/rsa.c
rename to wpa_supplicant/src/tls/rsa.c

diff --git a/src/tls/rsa.h b/wpa_supplicant/src/tls/rsa.h
similarity index 100%
rename from src/tls/rsa.h
rename to wpa_supplicant/src/tls/rsa.h

diff --git a/src/tls/tlsv1_client.c b/wpa_supplicant/src/tls/tlsv1_client.c
similarity index 100%
rename from src/tls/tlsv1_client.c
rename to wpa_supplicant/src/tls/tlsv1_client.c

diff --git a/src/tls/tlsv1_client.h b/wpa_supplicant/src/tls/tlsv1_client.h
similarity index 100%
rename from src/tls/tlsv1_client.h
rename to wpa_supplicant/src/tls/tlsv1_client.h

diff --git a/src/tls/tlsv1_client_i.h b/wpa_supplicant/src/tls/tlsv1_client_i.h
similarity index 100%
rename from src/tls/tlsv1_client_i.h
rename to wpa_supplicant/src/tls/tlsv1_client_i.h

diff --git a/src/tls/tlsv1_client_read.c b/wpa_supplicant/src/tls/tlsv1_client_read.c
similarity index 100%
rename from src/tls/tlsv1_client_read.c
rename to wpa_supplicant/src/tls/tlsv1_client_read.c

diff --git a/src/tls/tlsv1_client_write.c b/wpa_supplicant/src/tls/tlsv1_client_write.c
similarity index 100%
rename from src/tls/tlsv1_client_write.c
rename to wpa_supplicant/src/tls/tlsv1_client_write.c

diff --git a/src/tls/tlsv1_common.c b/wpa_supplicant/src/tls/tlsv1_common.c
similarity index 100%
rename from src/tls/tlsv1_common.c
rename to wpa_supplicant/src/tls/tlsv1_common.c

diff --git a/src/tls/tlsv1_common.h b/wpa_supplicant/src/tls/tlsv1_common.h
similarity index 100%
rename from src/tls/tlsv1_common.h
rename to wpa_supplicant/src/tls/tlsv1_common.h

diff --git a/src/tls/tlsv1_cred.c b/wpa_supplicant/src/tls/tlsv1_cred.c
similarity index 100%
rename from src/tls/tlsv1_cred.c
rename to wpa_supplicant/src/tls/tlsv1_cred.c

diff --git a/src/tls/tlsv1_cred.h b/wpa_supplicant/src/tls/tlsv1_cred.h
similarity index 100%
rename from src/tls/tlsv1_cred.h
rename to wpa_supplicant/src/tls/tlsv1_cred.h

diff --git a/src/tls/tlsv1_record.c b/wpa_supplicant/src/tls/tlsv1_record.c
similarity index 100%
rename from src/tls/tlsv1_record.c
rename to wpa_supplicant/src/tls/tlsv1_record.c

diff --git a/src/tls/tlsv1_record.h b/wpa_supplicant/src/tls/tlsv1_record.h
similarity index 100%
rename from src/tls/tlsv1_record.h
rename to wpa_supplicant/src/tls/tlsv1_record.h

diff --git a/src/tls/tlsv1_server.c b/wpa_supplicant/src/tls/tlsv1_server.c
similarity index 100%
rename from src/tls/tlsv1_server.c
rename to wpa_supplicant/src/tls/tlsv1_server.c

diff --git a/src/tls/tlsv1_server.h b/wpa_supplicant/src/tls/tlsv1_server.h
similarity index 100%
rename from src/tls/tlsv1_server.h
rename to wpa_supplicant/src/tls/tlsv1_server.h

diff --git a/src/tls/tlsv1_server_i.h b/wpa_supplicant/src/tls/tlsv1_server_i.h
similarity index 100%
rename from src/tls/tlsv1_server_i.h
rename to wpa_supplicant/src/tls/tlsv1_server_i.h

diff --git a/src/tls/tlsv1_server_read.c b/wpa_supplicant/src/tls/tlsv1_server_read.c
similarity index 100%
rename from src/tls/tlsv1_server_read.c
rename to wpa_supplicant/src/tls/tlsv1_server_read.c

diff --git a/src/tls/tlsv1_server_write.c b/wpa_supplicant/src/tls/tlsv1_server_write.c
similarity index 100%
rename from src/tls/tlsv1_server_write.c
rename to wpa_supplicant/src/tls/tlsv1_server_write.c

diff --git a/src/tls/x509v3.c b/wpa_supplicant/src/tls/x509v3.c
similarity index 100%
rename from src/tls/x509v3.c
rename to wpa_supplicant/src/tls/x509v3.c

diff --git a/src/tls/x509v3.h b/wpa_supplicant/src/tls/x509v3.h
similarity index 100%
rename from src/tls/x509v3.h
rename to wpa_supplicant/src/tls/x509v3.h

diff --git a/src/utils/.gitignore b/wpa_supplicant/src/utils/.gitignore
similarity index 100%
rename from src/utils/.gitignore
rename to wpa_supplicant/src/utils/.gitignore

diff --git a/src/utils/Makefile b/wpa_supplicant/src/utils/Makefile
similarity index 100%
rename from src/utils/Makefile
rename to wpa_supplicant/src/utils/Makefile

diff --git a/src/utils/base64.c b/wpa_supplicant/src/utils/base64.c
similarity index 100%
rename from src/utils/base64.c
rename to wpa_supplicant/src/utils/base64.c

diff --git a/src/utils/base64.h b/wpa_supplicant/src/utils/base64.h
similarity index 100%
rename from src/utils/base64.h
rename to wpa_supplicant/src/utils/base64.h

diff --git a/src/utils/build_config.h b/wpa_supplicant/src/utils/build_config.h
similarity index 100%
rename from src/utils/build_config.h
rename to wpa_supplicant/src/utils/build_config.h

diff --git a/src/utils/common.c b/wpa_supplicant/src/utils/common.c
similarity index 100%
rename from src/utils/common.c
rename to wpa_supplicant/src/utils/common.c

diff --git a/src/utils/common.h b/wpa_supplicant/src/utils/common.h
similarity index 100%
rename from src/utils/common.h
rename to wpa_supplicant/src/utils/common.h

diff --git a/src/utils/eloop.c b/wpa_supplicant/src/utils/eloop.c
similarity index 100%
rename from src/utils/eloop.c
rename to wpa_supplicant/src/utils/eloop.c

diff --git a/src/utils/eloop.h b/wpa_supplicant/src/utils/eloop.h
similarity index 100%
rename from src/utils/eloop.h
rename to wpa_supplicant/src/utils/eloop.h

diff --git a/src/utils/eloop_none.c b/wpa_supplicant/src/utils/eloop_none.c
similarity index 100%
rename from src/utils/eloop_none.c
rename to wpa_supplicant/src/utils/eloop_none.c

diff --git a/src/utils/eloop_win.c b/wpa_supplicant/src/utils/eloop_win.c
similarity index 100%
rename from src/utils/eloop_win.c
rename to wpa_supplicant/src/utils/eloop_win.c

diff --git a/src/utils/includes.h b/wpa_supplicant/src/utils/includes.h
similarity index 100%
rename from src/utils/includes.h
rename to wpa_supplicant/src/utils/includes.h

diff --git a/src/utils/ip_addr.c b/wpa_supplicant/src/utils/ip_addr.c
similarity index 100%
rename from src/utils/ip_addr.c
rename to wpa_supplicant/src/utils/ip_addr.c

diff --git a/src/utils/ip_addr.h b/wpa_supplicant/src/utils/ip_addr.h
similarity index 100%
rename from src/utils/ip_addr.h
rename to wpa_supplicant/src/utils/ip_addr.h

diff --git a/src/utils/os.h b/wpa_supplicant/src/utils/os.h
similarity index 100%
rename from src/utils/os.h
rename to wpa_supplicant/src/utils/os.h

diff --git a/src/utils/os_internal.c b/wpa_supplicant/src/utils/os_internal.c
similarity index 100%
rename from src/utils/os_internal.c
rename to wpa_supplicant/src/utils/os_internal.c

diff --git a/src/utils/os_none.c b/wpa_supplicant/src/utils/os_none.c
similarity index 100%
rename from src/utils/os_none.c
rename to wpa_supplicant/src/utils/os_none.c

diff --git a/src/utils/os_unix.c b/wpa_supplicant/src/utils/os_unix.c
similarity index 100%
rename from src/utils/os_unix.c
rename to wpa_supplicant/src/utils/os_unix.c

diff --git a/src/utils/os_win32.c b/wpa_supplicant/src/utils/os_win32.c
similarity index 100%
rename from src/utils/os_win32.c
rename to wpa_supplicant/src/utils/os_win32.c

diff --git a/src/utils/pcsc_funcs.c b/wpa_supplicant/src/utils/pcsc_funcs.c
similarity index 100%
rename from src/utils/pcsc_funcs.c
rename to wpa_supplicant/src/utils/pcsc_funcs.c

diff --git a/src/utils/pcsc_funcs.h b/wpa_supplicant/src/utils/pcsc_funcs.h
similarity index 100%
rename from src/utils/pcsc_funcs.h
rename to wpa_supplicant/src/utils/pcsc_funcs.h

diff --git a/src/utils/state_machine.h b/wpa_supplicant/src/utils/state_machine.h
similarity index 100%
rename from src/utils/state_machine.h
rename to wpa_supplicant/src/utils/state_machine.h

diff --git a/src/utils/uuid.c b/wpa_supplicant/src/utils/uuid.c
similarity index 100%
rename from src/utils/uuid.c
rename to wpa_supplicant/src/utils/uuid.c

diff --git a/src/utils/uuid.h b/wpa_supplicant/src/utils/uuid.h
similarity index 100%
rename from src/utils/uuid.h
rename to wpa_supplicant/src/utils/uuid.h

diff --git a/src/utils/wpa_debug.c b/wpa_supplicant/src/utils/wpa_debug.c
similarity index 100%
rename from src/utils/wpa_debug.c
rename to wpa_supplicant/src/utils/wpa_debug.c

diff --git a/src/utils/wpa_debug.h b/wpa_supplicant/src/utils/wpa_debug.h
similarity index 100%
rename from src/utils/wpa_debug.h
rename to wpa_supplicant/src/utils/wpa_debug.h

diff --git a/src/utils/wpabuf.c b/wpa_supplicant/src/utils/wpabuf.c
similarity index 100%
rename from src/utils/wpabuf.c
rename to wpa_supplicant/src/utils/wpabuf.c

diff --git a/src/utils/wpabuf.h b/wpa_supplicant/src/utils/wpabuf.h
similarity index 100%
rename from src/utils/wpabuf.h
rename to wpa_supplicant/src/utils/wpabuf.h

diff --git a/src/wps/.gitignore b/wpa_supplicant/src/wps/.gitignore
similarity index 100%
rename from src/wps/.gitignore
rename to wpa_supplicant/src/wps/.gitignore

diff --git a/src/wps/Makefile b/wpa_supplicant/src/wps/Makefile
similarity index 100%
rename from src/wps/Makefile
rename to wpa_supplicant/src/wps/Makefile

diff --git a/src/wps/httpread.c b/wpa_supplicant/src/wps/httpread.c
similarity index 100%
rename from src/wps/httpread.c
rename to wpa_supplicant/src/wps/httpread.c

diff --git a/src/wps/httpread.h b/wpa_supplicant/src/wps/httpread.h
similarity index 100%
rename from src/wps/httpread.h
rename to wpa_supplicant/src/wps/httpread.h

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

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

diff --git a/src/wps/wps_attr_build.c b/wpa_supplicant/src/wps/wps_attr_build.c
similarity index 100%
rename from src/wps/wps_attr_build.c
rename to wpa_supplicant/src/wps/wps_attr_build.c

diff --git a/src/wps/wps_attr_parse.c b/wpa_supplicant/src/wps/wps_attr_parse.c
similarity index 100%
rename from src/wps/wps_attr_parse.c
rename to wpa_supplicant/src/wps/wps_attr_parse.c

diff --git a/src/wps/wps_attr_process.c b/wpa_supplicant/src/wps/wps_attr_process.c
similarity index 100%
rename from src/wps/wps_attr_process.c
rename to wpa_supplicant/src/wps/wps_attr_process.c

diff --git a/src/wps/wps_common.c b/wpa_supplicant/src/wps/wps_common.c
similarity index 100%
rename from src/wps/wps_common.c
rename to wpa_supplicant/src/wps/wps_common.c

diff --git a/src/wps/wps_defs.h b/wpa_supplicant/src/wps/wps_defs.h
similarity index 100%
rename from src/wps/wps_defs.h
rename to wpa_supplicant/src/wps/wps_defs.h

diff --git a/src/wps/wps_dev_attr.c b/wpa_supplicant/src/wps/wps_dev_attr.c
similarity index 100%
rename from src/wps/wps_dev_attr.c
rename to wpa_supplicant/src/wps/wps_dev_attr.c

diff --git a/src/wps/wps_dev_attr.h b/wpa_supplicant/src/wps/wps_dev_attr.h
similarity index 100%
rename from src/wps/wps_dev_attr.h
rename to wpa_supplicant/src/wps/wps_dev_attr.h

diff --git a/src/wps/wps_enrollee.c b/wpa_supplicant/src/wps/wps_enrollee.c
similarity index 100%
rename from src/wps/wps_enrollee.c
rename to wpa_supplicant/src/wps/wps_enrollee.c

diff --git a/src/wps/wps_i.h b/wpa_supplicant/src/wps/wps_i.h
similarity index 100%
rename from src/wps/wps_i.h
rename to wpa_supplicant/src/wps/wps_i.h

diff --git a/src/wps/wps_registrar.c b/wpa_supplicant/src/wps/wps_registrar.c
similarity index 100%
rename from src/wps/wps_registrar.c
rename to wpa_supplicant/src/wps/wps_registrar.c

diff --git a/src/wps/wps_upnp.c b/wpa_supplicant/src/wps/wps_upnp.c
similarity index 100%
rename from src/wps/wps_upnp.c
rename to wpa_supplicant/src/wps/wps_upnp.c

diff --git a/src/wps/wps_upnp.h b/wpa_supplicant/src/wps/wps_upnp.h
similarity index 100%
rename from src/wps/wps_upnp.h
rename to wpa_supplicant/src/wps/wps_upnp.h

diff --git a/src/wps/wps_upnp_event.c b/wpa_supplicant/src/wps/wps_upnp_event.c
similarity index 100%
rename from src/wps/wps_upnp_event.c
rename to wpa_supplicant/src/wps/wps_upnp_event.c

diff --git a/src/wps/wps_upnp_i.h b/wpa_supplicant/src/wps/wps_upnp_i.h
similarity index 100%
rename from src/wps/wps_upnp_i.h
rename to wpa_supplicant/src/wps/wps_upnp_i.h

diff --git a/src/wps/wps_upnp_ssdp.c b/wpa_supplicant/src/wps/wps_upnp_ssdp.c
similarity index 100%
rename from src/wps/wps_upnp_ssdp.c
rename to wpa_supplicant/src/wps/wps_upnp_ssdp.c

diff --git a/src/wps/wps_upnp_web.c b/wpa_supplicant/src/wps/wps_upnp_web.c
similarity index 100%
rename from src/wps/wps_upnp_web.c
rename to wpa_supplicant/src/wps/wps_upnp_web.c