diff --git a/openssl-1.1.0a/Android.mk b/openssl-1.1.0/Android.mk
similarity index 100%
rename from openssl-1.1.0a/Android.mk
rename to openssl-1.1.0/Android.mk
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/libcrypto.a b/openssl-1.1.0/armeabi-v7a/lib/libcrypto.a
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/libcrypto.a
rename to openssl-1.1.0/armeabi-v7a/lib/libcrypto.a
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/libcrypto.so b/openssl-1.1.0/armeabi-v7a/lib/libcrypto.so
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/libcrypto.so
rename to openssl-1.1.0/armeabi-v7a/lib/libcrypto.so
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/libcrypto.so.1.1 b/openssl-1.1.0/armeabi-v7a/lib/libcrypto.so.1.1
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/libcrypto.so.1.1
rename to openssl-1.1.0/armeabi-v7a/lib/libcrypto.so.1.1
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/libssl.a b/openssl-1.1.0/armeabi-v7a/lib/libssl.a
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/libssl.a
rename to openssl-1.1.0/armeabi-v7a/lib/libssl.a
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/libssl.so b/openssl-1.1.0/armeabi-v7a/lib/libssl.so
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/libssl.so
rename to openssl-1.1.0/armeabi-v7a/lib/libssl.so
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/libssl.so.1.1 b/openssl-1.1.0/armeabi-v7a/lib/libssl.so.1.1
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/libssl.so.1.1
rename to openssl-1.1.0/armeabi-v7a/lib/libssl.so.1.1
diff --git a/openssl-1.1.0a/armeabi-v7a/lib/symlink-windows.bat b/openssl-1.1.0/armeabi-v7a/lib/symlink-windows.bat
similarity index 100%
rename from openssl-1.1.0a/armeabi-v7a/lib/symlink-windows.bat
rename to openssl-1.1.0/armeabi-v7a/lib/symlink-windows.bat
diff --git a/openssl-1.1.0a/include/openssl/aes.h b/openssl-1.1.0/include/openssl/aes.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/aes.h
rename to openssl-1.1.0/include/openssl/aes.h
diff --git a/openssl-1.1.0a/include/openssl/asn1.h b/openssl-1.1.0/include/openssl/asn1.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/asn1.h
rename to openssl-1.1.0/include/openssl/asn1.h
diff --git a/openssl-1.1.0a/include/openssl/asn1_mac.h b/openssl-1.1.0/include/openssl/asn1_mac.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/asn1_mac.h
rename to openssl-1.1.0/include/openssl/asn1_mac.h
diff --git a/openssl-1.1.0a/include/openssl/asn1t.h b/openssl-1.1.0/include/openssl/asn1t.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/asn1t.h
rename to openssl-1.1.0/include/openssl/asn1t.h
diff --git a/openssl-1.1.0a/include/openssl/async.h b/openssl-1.1.0/include/openssl/async.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/async.h
rename to openssl-1.1.0/include/openssl/async.h
diff --git a/openssl-1.1.0a/include/openssl/bio.h b/openssl-1.1.0/include/openssl/bio.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/bio.h
rename to openssl-1.1.0/include/openssl/bio.h
diff --git a/openssl-1.1.0a/include/openssl/blowfish.h b/openssl-1.1.0/include/openssl/blowfish.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/blowfish.h
rename to openssl-1.1.0/include/openssl/blowfish.h
diff --git a/openssl-1.1.0a/include/openssl/bn.h b/openssl-1.1.0/include/openssl/bn.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/bn.h
rename to openssl-1.1.0/include/openssl/bn.h
diff --git a/openssl-1.1.0a/include/openssl/buffer.h b/openssl-1.1.0/include/openssl/buffer.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/buffer.h
rename to openssl-1.1.0/include/openssl/buffer.h
diff --git a/openssl-1.1.0a/include/openssl/camellia.h b/openssl-1.1.0/include/openssl/camellia.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/camellia.h
rename to openssl-1.1.0/include/openssl/camellia.h
diff --git a/openssl-1.1.0a/include/openssl/cast.h b/openssl-1.1.0/include/openssl/cast.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/cast.h
rename to openssl-1.1.0/include/openssl/cast.h
diff --git a/openssl-1.1.0a/include/openssl/cmac.h b/openssl-1.1.0/include/openssl/cmac.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/cmac.h
rename to openssl-1.1.0/include/openssl/cmac.h
diff --git a/openssl-1.1.0a/include/openssl/cms.h b/openssl-1.1.0/include/openssl/cms.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/cms.h
rename to openssl-1.1.0/include/openssl/cms.h
diff --git a/openssl-1.1.0a/include/openssl/comp.h b/openssl-1.1.0/include/openssl/comp.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/comp.h
rename to openssl-1.1.0/include/openssl/comp.h
diff --git a/openssl-1.1.0a/include/openssl/conf.h b/openssl-1.1.0/include/openssl/conf.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/conf.h
rename to openssl-1.1.0/include/openssl/conf.h
diff --git a/openssl-1.1.0a/include/openssl/conf_api.h b/openssl-1.1.0/include/openssl/conf_api.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/conf_api.h
rename to openssl-1.1.0/include/openssl/conf_api.h
diff --git a/openssl-1.1.0a/include/openssl/crypto.h b/openssl-1.1.0/include/openssl/crypto.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/crypto.h
rename to openssl-1.1.0/include/openssl/crypto.h
diff --git a/openssl-1.1.0a/include/openssl/ct.h b/openssl-1.1.0/include/openssl/ct.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ct.h
rename to openssl-1.1.0/include/openssl/ct.h
diff --git a/openssl-1.1.0a/include/openssl/des.h b/openssl-1.1.0/include/openssl/des.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/des.h
rename to openssl-1.1.0/include/openssl/des.h
diff --git a/openssl-1.1.0a/include/openssl/dh.h b/openssl-1.1.0/include/openssl/dh.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/dh.h
rename to openssl-1.1.0/include/openssl/dh.h
diff --git a/openssl-1.1.0a/include/openssl/dsa.h b/openssl-1.1.0/include/openssl/dsa.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/dsa.h
rename to openssl-1.1.0/include/openssl/dsa.h
diff --git a/openssl-1.1.0a/include/openssl/dtls1.h b/openssl-1.1.0/include/openssl/dtls1.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/dtls1.h
rename to openssl-1.1.0/include/openssl/dtls1.h
diff --git a/openssl-1.1.0a/include/openssl/e_os2.h b/openssl-1.1.0/include/openssl/e_os2.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/e_os2.h
rename to openssl-1.1.0/include/openssl/e_os2.h
diff --git a/openssl-1.1.0a/include/openssl/ebcdic.h b/openssl-1.1.0/include/openssl/ebcdic.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ebcdic.h
rename to openssl-1.1.0/include/openssl/ebcdic.h
diff --git a/openssl-1.1.0a/include/openssl/ec.h b/openssl-1.1.0/include/openssl/ec.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ec.h
rename to openssl-1.1.0/include/openssl/ec.h
diff --git a/openssl-1.1.0a/include/openssl/ecdh.h b/openssl-1.1.0/include/openssl/ecdh.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ecdh.h
rename to openssl-1.1.0/include/openssl/ecdh.h
diff --git a/openssl-1.1.0a/include/openssl/ecdsa.h b/openssl-1.1.0/include/openssl/ecdsa.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ecdsa.h
rename to openssl-1.1.0/include/openssl/ecdsa.h
diff --git a/openssl-1.1.0a/include/openssl/engine.h b/openssl-1.1.0/include/openssl/engine.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/engine.h
rename to openssl-1.1.0/include/openssl/engine.h
diff --git a/openssl-1.1.0a/include/openssl/err.h b/openssl-1.1.0/include/openssl/err.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/err.h
rename to openssl-1.1.0/include/openssl/err.h
diff --git a/openssl-1.1.0a/include/openssl/evp.h b/openssl-1.1.0/include/openssl/evp.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/evp.h
rename to openssl-1.1.0/include/openssl/evp.h
diff --git a/openssl-1.1.0a/include/openssl/hmac.h b/openssl-1.1.0/include/openssl/hmac.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/hmac.h
rename to openssl-1.1.0/include/openssl/hmac.h
diff --git a/openssl-1.1.0a/include/openssl/idea.h b/openssl-1.1.0/include/openssl/idea.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/idea.h
rename to openssl-1.1.0/include/openssl/idea.h
diff --git a/openssl-1.1.0a/include/openssl/kdf.h b/openssl-1.1.0/include/openssl/kdf.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/kdf.h
rename to openssl-1.1.0/include/openssl/kdf.h
diff --git a/openssl-1.1.0a/include/openssl/lhash.h b/openssl-1.1.0/include/openssl/lhash.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/lhash.h
rename to openssl-1.1.0/include/openssl/lhash.h
diff --git a/openssl-1.1.0a/include/openssl/md2.h b/openssl-1.1.0/include/openssl/md2.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/md2.h
rename to openssl-1.1.0/include/openssl/md2.h
diff --git a/openssl-1.1.0a/include/openssl/md4.h b/openssl-1.1.0/include/openssl/md4.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/md4.h
rename to openssl-1.1.0/include/openssl/md4.h
diff --git a/openssl-1.1.0a/include/openssl/md5.h b/openssl-1.1.0/include/openssl/md5.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/md5.h
rename to openssl-1.1.0/include/openssl/md5.h
diff --git a/openssl-1.1.0a/include/openssl/mdc2.h b/openssl-1.1.0/include/openssl/mdc2.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/mdc2.h
rename to openssl-1.1.0/include/openssl/mdc2.h
diff --git a/openssl-1.1.0a/include/openssl/modes.h b/openssl-1.1.0/include/openssl/modes.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/modes.h
rename to openssl-1.1.0/include/openssl/modes.h
diff --git a/openssl-1.1.0a/include/openssl/obj_mac.h b/openssl-1.1.0/include/openssl/obj_mac.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/obj_mac.h
rename to openssl-1.1.0/include/openssl/obj_mac.h
diff --git a/openssl-1.1.0a/include/openssl/objects.h b/openssl-1.1.0/include/openssl/objects.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/objects.h
rename to openssl-1.1.0/include/openssl/objects.h
diff --git a/openssl-1.1.0a/include/openssl/ocsp.h b/openssl-1.1.0/include/openssl/ocsp.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ocsp.h
rename to openssl-1.1.0/include/openssl/ocsp.h
diff --git a/openssl-1.1.0a/include/openssl/opensslconf.h b/openssl-1.1.0/include/openssl/opensslconf.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/opensslconf.h
rename to openssl-1.1.0/include/openssl/opensslconf.h
diff --git a/openssl-1.1.0a/include/openssl/opensslv.h b/openssl-1.1.0/include/openssl/opensslv.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/opensslv.h
rename to openssl-1.1.0/include/openssl/opensslv.h
diff --git a/openssl-1.1.0a/include/openssl/ossl_typ.h b/openssl-1.1.0/include/openssl/ossl_typ.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ossl_typ.h
rename to openssl-1.1.0/include/openssl/ossl_typ.h
diff --git a/openssl-1.1.0a/include/openssl/pem.h b/openssl-1.1.0/include/openssl/pem.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/pem.h
rename to openssl-1.1.0/include/openssl/pem.h
diff --git a/openssl-1.1.0a/include/openssl/pem2.h b/openssl-1.1.0/include/openssl/pem2.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/pem2.h
rename to openssl-1.1.0/include/openssl/pem2.h
diff --git a/openssl-1.1.0a/include/openssl/pkcs12.h b/openssl-1.1.0/include/openssl/pkcs12.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/pkcs12.h
rename to openssl-1.1.0/include/openssl/pkcs12.h
diff --git a/openssl-1.1.0a/include/openssl/pkcs7.h b/openssl-1.1.0/include/openssl/pkcs7.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/pkcs7.h
rename to openssl-1.1.0/include/openssl/pkcs7.h
diff --git a/openssl-1.1.0a/include/openssl/rand.h b/openssl-1.1.0/include/openssl/rand.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/rand.h
rename to openssl-1.1.0/include/openssl/rand.h
diff --git a/openssl-1.1.0a/include/openssl/rc2.h b/openssl-1.1.0/include/openssl/rc2.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/rc2.h
rename to openssl-1.1.0/include/openssl/rc2.h
diff --git a/openssl-1.1.0a/include/openssl/rc4.h b/openssl-1.1.0/include/openssl/rc4.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/rc4.h
rename to openssl-1.1.0/include/openssl/rc4.h
diff --git a/openssl-1.1.0a/include/openssl/rc5.h b/openssl-1.1.0/include/openssl/rc5.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/rc5.h
rename to openssl-1.1.0/include/openssl/rc5.h
diff --git a/openssl-1.1.0a/include/openssl/ripemd.h b/openssl-1.1.0/include/openssl/ripemd.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ripemd.h
rename to openssl-1.1.0/include/openssl/ripemd.h
diff --git a/openssl-1.1.0a/include/openssl/rsa.h b/openssl-1.1.0/include/openssl/rsa.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/rsa.h
rename to openssl-1.1.0/include/openssl/rsa.h
diff --git a/openssl-1.1.0a/include/openssl/safestack.h b/openssl-1.1.0/include/openssl/safestack.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/safestack.h
rename to openssl-1.1.0/include/openssl/safestack.h
diff --git a/openssl-1.1.0a/include/openssl/seed.h b/openssl-1.1.0/include/openssl/seed.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/seed.h
rename to openssl-1.1.0/include/openssl/seed.h
diff --git a/openssl-1.1.0a/include/openssl/sha.h b/openssl-1.1.0/include/openssl/sha.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/sha.h
rename to openssl-1.1.0/include/openssl/sha.h
diff --git a/openssl-1.1.0a/include/openssl/srp.h b/openssl-1.1.0/include/openssl/srp.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/srp.h
rename to openssl-1.1.0/include/openssl/srp.h
diff --git a/openssl-1.1.0a/include/openssl/srtp.h b/openssl-1.1.0/include/openssl/srtp.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/srtp.h
rename to openssl-1.1.0/include/openssl/srtp.h
diff --git a/openssl-1.1.0a/include/openssl/ssl.h b/openssl-1.1.0/include/openssl/ssl.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ssl.h
rename to openssl-1.1.0/include/openssl/ssl.h
diff --git a/openssl-1.1.0a/include/openssl/ssl2.h b/openssl-1.1.0/include/openssl/ssl2.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ssl2.h
rename to openssl-1.1.0/include/openssl/ssl2.h
diff --git a/openssl-1.1.0a/include/openssl/ssl3.h b/openssl-1.1.0/include/openssl/ssl3.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ssl3.h
rename to openssl-1.1.0/include/openssl/ssl3.h
diff --git a/openssl-1.1.0a/include/openssl/stack.h b/openssl-1.1.0/include/openssl/stack.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/stack.h
rename to openssl-1.1.0/include/openssl/stack.h
diff --git a/openssl-1.1.0a/include/openssl/symhacks.h b/openssl-1.1.0/include/openssl/symhacks.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/symhacks.h
rename to openssl-1.1.0/include/openssl/symhacks.h
diff --git a/openssl-1.1.0a/include/openssl/tls1.h b/openssl-1.1.0/include/openssl/tls1.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/tls1.h
rename to openssl-1.1.0/include/openssl/tls1.h
diff --git a/openssl-1.1.0a/include/openssl/ts.h b/openssl-1.1.0/include/openssl/ts.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ts.h
rename to openssl-1.1.0/include/openssl/ts.h
diff --git a/openssl-1.1.0a/include/openssl/txt_db.h b/openssl-1.1.0/include/openssl/txt_db.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/txt_db.h
rename to openssl-1.1.0/include/openssl/txt_db.h
diff --git a/openssl-1.1.0a/include/openssl/ui.h b/openssl-1.1.0/include/openssl/ui.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/ui.h
rename to openssl-1.1.0/include/openssl/ui.h
diff --git a/openssl-1.1.0a/include/openssl/whrlpool.h b/openssl-1.1.0/include/openssl/whrlpool.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/whrlpool.h
rename to openssl-1.1.0/include/openssl/whrlpool.h
diff --git a/openssl-1.1.0a/include/openssl/x509.h b/openssl-1.1.0/include/openssl/x509.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/x509.h
rename to openssl-1.1.0/include/openssl/x509.h
diff --git a/openssl-1.1.0a/include/openssl/x509_vfy.h b/openssl-1.1.0/include/openssl/x509_vfy.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/x509_vfy.h
rename to openssl-1.1.0/include/openssl/x509_vfy.h
diff --git a/openssl-1.1.0a/include/openssl/x509v3.h b/openssl-1.1.0/include/openssl/x509v3.h
similarity index 100%
rename from openssl-1.1.0a/include/openssl/x509v3.h
rename to openssl-1.1.0/include/openssl/x509v3.h
diff --git a/openssl-1.1.0a/x86/lib/libcrypto.a b/openssl-1.1.0/x86/lib/libcrypto.a
similarity index 100%
rename from openssl-1.1.0a/x86/lib/libcrypto.a
rename to openssl-1.1.0/x86/lib/libcrypto.a
diff --git a/openssl-1.1.0a/x86/lib/libcrypto.so b/openssl-1.1.0/x86/lib/libcrypto.so
similarity index 100%
rename from openssl-1.1.0a/x86/lib/libcrypto.so
rename to openssl-1.1.0/x86/lib/libcrypto.so
diff --git a/openssl-1.1.0a/x86/lib/libcrypto.so.1.1 b/openssl-1.1.0/x86/lib/libcrypto.so.1.1
similarity index 100%
rename from openssl-1.1.0a/x86/lib/libcrypto.so.1.1
rename to openssl-1.1.0/x86/lib/libcrypto.so.1.1
diff --git a/openssl-1.1.0a/x86/lib/libssl.a b/openssl-1.1.0/x86/lib/libssl.a
similarity index 100%
rename from openssl-1.1.0a/x86/lib/libssl.a
rename to openssl-1.1.0/x86/lib/libssl.a
diff --git a/openssl-1.1.0a/x86/lib/libssl.so b/openssl-1.1.0/x86/lib/libssl.so
similarity index 100%
rename from openssl-1.1.0a/x86/lib/libssl.so
rename to openssl-1.1.0/x86/lib/libssl.so
diff --git a/openssl-1.1.0a/x86/lib/libssl.so.1.1 b/openssl-1.1.0/x86/lib/libssl.so.1.1
similarity index 100%
rename from openssl-1.1.0a/x86/lib/libssl.so.1.1
rename to openssl-1.1.0/x86/lib/libssl.so.1.1
diff --git a/openssl-1.1.0a/x86/lib/symlink-windows.bat b/openssl-1.1.0/x86/lib/symlink-windows.bat
similarity index 100%
rename from openssl-1.1.0a/x86/lib/symlink-windows.bat
rename to openssl-1.1.0/x86/lib/symlink-windows.bat