wpa-supplicant: remove version tag from directory

diff --git a/contrib/wpa_supplicant-0.5.8/COPYING b/contrib/wpa_supplicant/COPYING
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/COPYING
rename to contrib/wpa_supplicant/COPYING

diff --git a/contrib/wpa_supplicant-0.5.8/README b/contrib/wpa_supplicant/README
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/README
rename to contrib/wpa_supplicant/README

diff --git a/contrib/wpa_supplicant-0.5.8/README.DELETE b/contrib/wpa_supplicant/README.DELETE
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/README.DELETE
rename to contrib/wpa_supplicant/README.DELETE

diff --git a/contrib/wpa_supplicant-0.5.8/README.DRAGONFLY b/contrib/wpa_supplicant/README.DRAGONFLY
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/README.DRAGONFLY
rename to contrib/wpa_supplicant/README.DRAGONFLY

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/config.c b/contrib/wpa_supplicant/config.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/config.c
rename to contrib/wpa_supplicant/config.c

diff --git a/contrib/wpa_supplicant-0.5.8/config.h b/contrib/wpa_supplicant/config.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/config.h
rename to contrib/wpa_supplicant/config.h

diff --git a/contrib/wpa_supplicant-0.5.8/config_file.c b/contrib/wpa_supplicant/config_file.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/config_file.c
rename to contrib/wpa_supplicant/config_file.c

diff --git a/contrib/wpa_supplicant-0.5.8/config_none.c b/contrib/wpa_supplicant/config_none.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/config_none.c
rename to contrib/wpa_supplicant/config_none.c

diff --git a/contrib/wpa_supplicant-0.5.8/config_ssid.h b/contrib/wpa_supplicant/config_ssid.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/config_ssid.h
rename to contrib/wpa_supplicant/config_ssid.h

diff --git a/contrib/wpa_supplicant-0.5.8/config_types.h b/contrib/wpa_supplicant/config_types.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/config_types.h
rename to contrib/wpa_supplicant/config_types.h

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

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

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

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

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/ctrl_iface.c b/contrib/wpa_supplicant/ctrl_iface.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/ctrl_iface.c
rename to contrib/wpa_supplicant/ctrl_iface.c

diff --git a/contrib/wpa_supplicant-0.5.8/ctrl_iface.h b/contrib/wpa_supplicant/ctrl_iface.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/ctrl_iface.h
rename to contrib/wpa_supplicant/ctrl_iface.h

diff --git a/contrib/wpa_supplicant-0.5.8/ctrl_iface_dbus.h b/contrib/wpa_supplicant/ctrl_iface_dbus.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/ctrl_iface_dbus.h
rename to contrib/wpa_supplicant/ctrl_iface_dbus.h

diff --git a/contrib/wpa_supplicant-0.5.8/ctrl_iface_udp.c b/contrib/wpa_supplicant/ctrl_iface_udp.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/ctrl_iface_udp.c
rename to contrib/wpa_supplicant/ctrl_iface_udp.c

diff --git a/contrib/wpa_supplicant-0.5.8/ctrl_iface_unix.c b/contrib/wpa_supplicant/ctrl_iface_unix.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/ctrl_iface_unix.c
rename to contrib/wpa_supplicant/ctrl_iface_unix.c

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/eap_tlv.c b/contrib/wpa_supplicant/eap_tlv.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/eap_tlv.c
rename to contrib/wpa_supplicant/eap_tlv.c

diff --git a/contrib/wpa_supplicant-0.5.8/eap_tlv.h b/contrib/wpa_supplicant/eap_tlv.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/eap_tlv.h
rename to contrib/wpa_supplicant/eap_tlv.h

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/eapol_sm.c b/contrib/wpa_supplicant/eapol_sm.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/eapol_sm.c
rename to contrib/wpa_supplicant/eapol_sm.c

diff --git a/contrib/wpa_supplicant-0.5.8/eapol_sm.h b/contrib/wpa_supplicant/eapol_sm.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/eapol_sm.h
rename to contrib/wpa_supplicant/eapol_sm.h

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

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/events.c b/contrib/wpa_supplicant/events.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/events.c
rename to contrib/wpa_supplicant/events.c

diff --git a/contrib/wpa_supplicant-0.5.8/examples/ieee8021x.conf b/contrib/wpa_supplicant/examples/ieee8021x.conf
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/examples/ieee8021x.conf
rename to contrib/wpa_supplicant/examples/ieee8021x.conf

diff --git a/contrib/wpa_supplicant-0.5.8/examples/plaintext.conf b/contrib/wpa_supplicant/examples/plaintext.conf
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/examples/plaintext.conf
rename to contrib/wpa_supplicant/examples/plaintext.conf

diff --git a/contrib/wpa_supplicant-0.5.8/examples/wep.conf b/contrib/wpa_supplicant/examples/wep.conf
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/examples/wep.conf
rename to contrib/wpa_supplicant/examples/wep.conf

diff --git a/contrib/wpa_supplicant-0.5.8/examples/wpa-psk-tkip.conf b/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/examples/wpa-psk-tkip.conf
rename to contrib/wpa_supplicant/examples/wpa-psk-tkip.conf

diff --git a/contrib/wpa_supplicant-0.5.8/examples/wpa2-eap-ccmp.conf b/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/examples/wpa2-eap-ccmp.conf
rename to contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf

diff --git a/contrib/wpa_supplicant-0.5.8/hostapd.h b/contrib/wpa_supplicant/hostapd.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/hostapd.h
rename to contrib/wpa_supplicant/hostapd.h

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/main.c b/contrib/wpa_supplicant/main.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/main.c
rename to contrib/wpa_supplicant/main.c

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/mlme.c b/contrib/wpa_supplicant/mlme.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/mlme.c
rename to contrib/wpa_supplicant/mlme.c

diff --git a/contrib/wpa_supplicant-0.5.8/mlme.h b/contrib/wpa_supplicant/mlme.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/mlme.h
rename to contrib/wpa_supplicant/mlme.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/wpa_cli.c b/contrib/wpa_supplicant/wpa_cli.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/wpa_cli.c
rename to contrib/wpa_supplicant/wpa_cli.c

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

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

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

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

diff --git a/contrib/wpa_supplicant-0.5.8/wpa_passphrase.c b/contrib/wpa_supplicant/wpa_passphrase.c
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/wpa_passphrase.c
rename to contrib/wpa_supplicant/wpa_passphrase.c

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

diff --git a/contrib/wpa_supplicant-0.5.8/wpa_supplicant.conf b/contrib/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/wpa_supplicant.conf
rename to contrib/wpa_supplicant/wpa_supplicant.conf

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

diff --git a/contrib/wpa_supplicant-0.5.8/wpa_supplicant_i.h b/contrib/wpa_supplicant/wpa_supplicant_i.h
similarity index 100%
rename from contrib/wpa_supplicant-0.5.8/wpa_supplicant_i.h
rename to contrib/wpa_supplicant/wpa_supplicant_i.h

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

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