diff --git a/CMakeLists.txt b/CMakeLists.txt
index eac9d890..f0540012 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,23 +292,22 @@ else() # not-unix
 endif()
 
 if (WIN32)
+    set(OPENSSL_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/windows)
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(OPENSSL_ARCH_DIR win64)
+        set(OPENSSL_BASE_DIR "${OPENSSL_BASE_DIR}/x64")
 	else()
-        set(OPENSSL_ARCH_DIR win32)
+        set(OPENSSL_BASE_DIR "${OPENSSL_BASE_DIR}/x86")
 	endif()
-    set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/include)
 	set(OPENSSL_LIBS
-        ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/lib/libeay32.lib
-        ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/lib/ssleay32.lib
+        ${OPENSSL_BASE_DIR}/lib/libeay32.lib
+        ${OPENSSL_BASE_DIR}/lib/ssleay32.lib
 	)
 endif()
 
 if (UNIX)
 	if (APPLE)
         set(OPENSSL_BASE_DIR /usr/local/opt/openssl)
-        set(OPENSSL_INCLUDE ${OPENSSL_BASE_DIR}/include)
-		set(OPENSSL_LIBS
+        set(OPENSSL_LIBS
             ${OPENSSL_BASE_DIR}/lib/libssl.a
             ${OPENSSL_BASE_DIR}/lib/libcrypto.a
 		)
@@ -317,6 +316,8 @@ if (UNIX)
 	endif()
 endif()
 
+set(OPENSSL_INCLUDE ${OPENSSL_BASE_DIR}/include)
+
 if (WIN32)
 	# TODO:	consider using /analyze to uncover potential bugs in the source code.
 
diff --git a/ext/openssl/win64/bin/libeay32.dll b/ext/openssl/windows/x64/bin/libeay32.dll
similarity index 100%
rename from ext/openssl/win64/bin/libeay32.dll
rename to ext/openssl/windows/x64/bin/libeay32.dll
diff --git a/ext/openssl/win64/bin/openssl.exe b/ext/openssl/windows/x64/bin/openssl.exe
similarity index 100%
rename from ext/openssl/win64/bin/openssl.exe
rename to ext/openssl/windows/x64/bin/openssl.exe
diff --git a/ext/openssl/win64/bin/ssleay32.dll b/ext/openssl/windows/x64/bin/ssleay32.dll
similarity index 100%
rename from ext/openssl/win64/bin/ssleay32.dll
rename to ext/openssl/windows/x64/bin/ssleay32.dll
diff --git a/ext/openssl/win32/include/openssl/aes.h b/ext/openssl/windows/x64/include/openssl/aes.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/aes.h
rename to ext/openssl/windows/x64/include/openssl/aes.h
diff --git a/ext/openssl/win32/include/openssl/applink.c b/ext/openssl/windows/x64/include/openssl/applink.c
similarity index 100%
rename from ext/openssl/win32/include/openssl/applink.c
rename to ext/openssl/windows/x64/include/openssl/applink.c
diff --git a/ext/openssl/win32/include/openssl/asn1.h b/ext/openssl/windows/x64/include/openssl/asn1.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/asn1.h
rename to ext/openssl/windows/x64/include/openssl/asn1.h
diff --git a/ext/openssl/win32/include/openssl/asn1_mac.h b/ext/openssl/windows/x64/include/openssl/asn1_mac.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/asn1_mac.h
rename to ext/openssl/windows/x64/include/openssl/asn1_mac.h
diff --git a/ext/openssl/win32/include/openssl/asn1t.h b/ext/openssl/windows/x64/include/openssl/asn1t.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/asn1t.h
rename to ext/openssl/windows/x64/include/openssl/asn1t.h
diff --git a/ext/openssl/win32/include/openssl/bio.h b/ext/openssl/windows/x64/include/openssl/bio.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/bio.h
rename to ext/openssl/windows/x64/include/openssl/bio.h
diff --git a/ext/openssl/win32/include/openssl/blowfish.h b/ext/openssl/windows/x64/include/openssl/blowfish.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/blowfish.h
rename to ext/openssl/windows/x64/include/openssl/blowfish.h
diff --git a/ext/openssl/win32/include/openssl/bn.h b/ext/openssl/windows/x64/include/openssl/bn.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/bn.h
rename to ext/openssl/windows/x64/include/openssl/bn.h
diff --git a/ext/openssl/win32/include/openssl/buffer.h b/ext/openssl/windows/x64/include/openssl/buffer.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/buffer.h
rename to ext/openssl/windows/x64/include/openssl/buffer.h
diff --git a/ext/openssl/win32/include/openssl/camellia.h b/ext/openssl/windows/x64/include/openssl/camellia.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/camellia.h
rename to ext/openssl/windows/x64/include/openssl/camellia.h
diff --git a/ext/openssl/win32/include/openssl/cast.h b/ext/openssl/windows/x64/include/openssl/cast.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/cast.h
rename to ext/openssl/windows/x64/include/openssl/cast.h
diff --git a/ext/openssl/win32/include/openssl/cmac.h b/ext/openssl/windows/x64/include/openssl/cmac.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/cmac.h
rename to ext/openssl/windows/x64/include/openssl/cmac.h
diff --git a/ext/openssl/win32/include/openssl/cms.h b/ext/openssl/windows/x64/include/openssl/cms.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/cms.h
rename to ext/openssl/windows/x64/include/openssl/cms.h
diff --git a/ext/openssl/win32/include/openssl/comp.h b/ext/openssl/windows/x64/include/openssl/comp.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/comp.h
rename to ext/openssl/windows/x64/include/openssl/comp.h
diff --git a/ext/openssl/win32/include/openssl/conf.h b/ext/openssl/windows/x64/include/openssl/conf.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/conf.h
rename to ext/openssl/windows/x64/include/openssl/conf.h
diff --git a/ext/openssl/win32/include/openssl/conf_api.h b/ext/openssl/windows/x64/include/openssl/conf_api.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/conf_api.h
rename to ext/openssl/windows/x64/include/openssl/conf_api.h
diff --git a/ext/openssl/win32/include/openssl/crypto.h b/ext/openssl/windows/x64/include/openssl/crypto.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/crypto.h
rename to ext/openssl/windows/x64/include/openssl/crypto.h
diff --git a/ext/openssl/win32/include/openssl/des.h b/ext/openssl/windows/x64/include/openssl/des.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/des.h
rename to ext/openssl/windows/x64/include/openssl/des.h
diff --git a/ext/openssl/win32/include/openssl/des_old.h b/ext/openssl/windows/x64/include/openssl/des_old.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/des_old.h
rename to ext/openssl/windows/x64/include/openssl/des_old.h
diff --git a/ext/openssl/win32/include/openssl/dh.h b/ext/openssl/windows/x64/include/openssl/dh.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/dh.h
rename to ext/openssl/windows/x64/include/openssl/dh.h
diff --git a/ext/openssl/win32/include/openssl/dsa.h b/ext/openssl/windows/x64/include/openssl/dsa.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/dsa.h
rename to ext/openssl/windows/x64/include/openssl/dsa.h
diff --git a/ext/openssl/win32/include/openssl/dso.h b/ext/openssl/windows/x64/include/openssl/dso.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/dso.h
rename to ext/openssl/windows/x64/include/openssl/dso.h
diff --git a/ext/openssl/win32/include/openssl/dtls1.h b/ext/openssl/windows/x64/include/openssl/dtls1.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/dtls1.h
rename to ext/openssl/windows/x64/include/openssl/dtls1.h
diff --git a/ext/openssl/win32/include/openssl/e_os2.h b/ext/openssl/windows/x64/include/openssl/e_os2.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/e_os2.h
rename to ext/openssl/windows/x64/include/openssl/e_os2.h
diff --git a/ext/openssl/win32/include/openssl/ebcdic.h b/ext/openssl/windows/x64/include/openssl/ebcdic.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ebcdic.h
rename to ext/openssl/windows/x64/include/openssl/ebcdic.h
diff --git a/ext/openssl/win32/include/openssl/ec.h b/ext/openssl/windows/x64/include/openssl/ec.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ec.h
rename to ext/openssl/windows/x64/include/openssl/ec.h
diff --git a/ext/openssl/win32/include/openssl/ecdh.h b/ext/openssl/windows/x64/include/openssl/ecdh.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ecdh.h
rename to ext/openssl/windows/x64/include/openssl/ecdh.h
diff --git a/ext/openssl/win32/include/openssl/ecdsa.h b/ext/openssl/windows/x64/include/openssl/ecdsa.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ecdsa.h
rename to ext/openssl/windows/x64/include/openssl/ecdsa.h
diff --git a/ext/openssl/win32/include/openssl/engine.h b/ext/openssl/windows/x64/include/openssl/engine.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/engine.h
rename to ext/openssl/windows/x64/include/openssl/engine.h
diff --git a/ext/openssl/win32/include/openssl/err.h b/ext/openssl/windows/x64/include/openssl/err.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/err.h
rename to ext/openssl/windows/x64/include/openssl/err.h
diff --git a/ext/openssl/win32/include/openssl/evp.h b/ext/openssl/windows/x64/include/openssl/evp.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/evp.h
rename to ext/openssl/windows/x64/include/openssl/evp.h
diff --git a/ext/openssl/win32/include/openssl/hmac.h b/ext/openssl/windows/x64/include/openssl/hmac.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/hmac.h
rename to ext/openssl/windows/x64/include/openssl/hmac.h
diff --git a/ext/openssl/win32/include/openssl/idea.h b/ext/openssl/windows/x64/include/openssl/idea.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/idea.h
rename to ext/openssl/windows/x64/include/openssl/idea.h
diff --git a/ext/openssl/win32/include/openssl/krb5_asn.h b/ext/openssl/windows/x64/include/openssl/krb5_asn.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/krb5_asn.h
rename to ext/openssl/windows/x64/include/openssl/krb5_asn.h
diff --git a/ext/openssl/win32/include/openssl/kssl.h b/ext/openssl/windows/x64/include/openssl/kssl.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/kssl.h
rename to ext/openssl/windows/x64/include/openssl/kssl.h
diff --git a/ext/openssl/win32/include/openssl/lhash.h b/ext/openssl/windows/x64/include/openssl/lhash.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/lhash.h
rename to ext/openssl/windows/x64/include/openssl/lhash.h
diff --git a/ext/openssl/win32/include/openssl/md4.h b/ext/openssl/windows/x64/include/openssl/md4.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/md4.h
rename to ext/openssl/windows/x64/include/openssl/md4.h
diff --git a/ext/openssl/win32/include/openssl/md5.h b/ext/openssl/windows/x64/include/openssl/md5.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/md5.h
rename to ext/openssl/windows/x64/include/openssl/md5.h
diff --git a/ext/openssl/win32/include/openssl/mdc2.h b/ext/openssl/windows/x64/include/openssl/mdc2.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/mdc2.h
rename to ext/openssl/windows/x64/include/openssl/mdc2.h
diff --git a/ext/openssl/win32/include/openssl/modes.h b/ext/openssl/windows/x64/include/openssl/modes.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/modes.h
rename to ext/openssl/windows/x64/include/openssl/modes.h
diff --git a/ext/openssl/win32/include/openssl/obj_mac.h b/ext/openssl/windows/x64/include/openssl/obj_mac.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/obj_mac.h
rename to ext/openssl/windows/x64/include/openssl/obj_mac.h
diff --git a/ext/openssl/win32/include/openssl/objects.h b/ext/openssl/windows/x64/include/openssl/objects.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/objects.h
rename to ext/openssl/windows/x64/include/openssl/objects.h
diff --git a/ext/openssl/win32/include/openssl/ocsp.h b/ext/openssl/windows/x64/include/openssl/ocsp.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ocsp.h
rename to ext/openssl/windows/x64/include/openssl/ocsp.h
diff --git a/ext/openssl/win64/include/openssl/opensslconf.h b/ext/openssl/windows/x64/include/openssl/opensslconf.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/opensslconf.h
rename to ext/openssl/windows/x64/include/openssl/opensslconf.h
diff --git a/ext/openssl/win32/include/openssl/opensslv.h b/ext/openssl/windows/x64/include/openssl/opensslv.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/opensslv.h
rename to ext/openssl/windows/x64/include/openssl/opensslv.h
diff --git a/ext/openssl/win32/include/openssl/ossl_typ.h b/ext/openssl/windows/x64/include/openssl/ossl_typ.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ossl_typ.h
rename to ext/openssl/windows/x64/include/openssl/ossl_typ.h
diff --git a/ext/openssl/win32/include/openssl/pem.h b/ext/openssl/windows/x64/include/openssl/pem.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/pem.h
rename to ext/openssl/windows/x64/include/openssl/pem.h
diff --git a/ext/openssl/win32/include/openssl/pem2.h b/ext/openssl/windows/x64/include/openssl/pem2.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/pem2.h
rename to ext/openssl/windows/x64/include/openssl/pem2.h
diff --git a/ext/openssl/win32/include/openssl/pkcs12.h b/ext/openssl/windows/x64/include/openssl/pkcs12.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/pkcs12.h
rename to ext/openssl/windows/x64/include/openssl/pkcs12.h
diff --git a/ext/openssl/win32/include/openssl/pkcs7.h b/ext/openssl/windows/x64/include/openssl/pkcs7.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/pkcs7.h
rename to ext/openssl/windows/x64/include/openssl/pkcs7.h
diff --git a/ext/openssl/win32/include/openssl/pqueue.h b/ext/openssl/windows/x64/include/openssl/pqueue.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/pqueue.h
rename to ext/openssl/windows/x64/include/openssl/pqueue.h
diff --git a/ext/openssl/win32/include/openssl/rand.h b/ext/openssl/windows/x64/include/openssl/rand.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/rand.h
rename to ext/openssl/windows/x64/include/openssl/rand.h
diff --git a/ext/openssl/win32/include/openssl/rc2.h b/ext/openssl/windows/x64/include/openssl/rc2.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/rc2.h
rename to ext/openssl/windows/x64/include/openssl/rc2.h
diff --git a/ext/openssl/win32/include/openssl/rc4.h b/ext/openssl/windows/x64/include/openssl/rc4.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/rc4.h
rename to ext/openssl/windows/x64/include/openssl/rc4.h
diff --git a/ext/openssl/win32/include/openssl/ripemd.h b/ext/openssl/windows/x64/include/openssl/ripemd.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ripemd.h
rename to ext/openssl/windows/x64/include/openssl/ripemd.h
diff --git a/ext/openssl/win32/include/openssl/rsa.h b/ext/openssl/windows/x64/include/openssl/rsa.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/rsa.h
rename to ext/openssl/windows/x64/include/openssl/rsa.h
diff --git a/ext/openssl/win32/include/openssl/safestack.h b/ext/openssl/windows/x64/include/openssl/safestack.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/safestack.h
rename to ext/openssl/windows/x64/include/openssl/safestack.h
diff --git a/ext/openssl/win32/include/openssl/seed.h b/ext/openssl/windows/x64/include/openssl/seed.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/seed.h
rename to ext/openssl/windows/x64/include/openssl/seed.h
diff --git a/ext/openssl/win32/include/openssl/sha.h b/ext/openssl/windows/x64/include/openssl/sha.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/sha.h
rename to ext/openssl/windows/x64/include/openssl/sha.h
diff --git a/ext/openssl/win32/include/openssl/srp.h b/ext/openssl/windows/x64/include/openssl/srp.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/srp.h
rename to ext/openssl/windows/x64/include/openssl/srp.h
diff --git a/ext/openssl/win32/include/openssl/srtp.h b/ext/openssl/windows/x64/include/openssl/srtp.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/srtp.h
rename to ext/openssl/windows/x64/include/openssl/srtp.h
diff --git a/ext/openssl/win32/include/openssl/ssl.h b/ext/openssl/windows/x64/include/openssl/ssl.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ssl.h
rename to ext/openssl/windows/x64/include/openssl/ssl.h
diff --git a/ext/openssl/win32/include/openssl/ssl2.h b/ext/openssl/windows/x64/include/openssl/ssl2.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ssl2.h
rename to ext/openssl/windows/x64/include/openssl/ssl2.h
diff --git a/ext/openssl/win32/include/openssl/ssl23.h b/ext/openssl/windows/x64/include/openssl/ssl23.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ssl23.h
rename to ext/openssl/windows/x64/include/openssl/ssl23.h
diff --git a/ext/openssl/win32/include/openssl/ssl3.h b/ext/openssl/windows/x64/include/openssl/ssl3.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ssl3.h
rename to ext/openssl/windows/x64/include/openssl/ssl3.h
diff --git a/ext/openssl/win32/include/openssl/stack.h b/ext/openssl/windows/x64/include/openssl/stack.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/stack.h
rename to ext/openssl/windows/x64/include/openssl/stack.h
diff --git a/ext/openssl/win32/include/openssl/symhacks.h b/ext/openssl/windows/x64/include/openssl/symhacks.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/symhacks.h
rename to ext/openssl/windows/x64/include/openssl/symhacks.h
diff --git a/ext/openssl/win32/include/openssl/tls1.h b/ext/openssl/windows/x64/include/openssl/tls1.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/tls1.h
rename to ext/openssl/windows/x64/include/openssl/tls1.h
diff --git a/ext/openssl/win32/include/openssl/ts.h b/ext/openssl/windows/x64/include/openssl/ts.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ts.h
rename to ext/openssl/windows/x64/include/openssl/ts.h
diff --git a/ext/openssl/win32/include/openssl/txt_db.h b/ext/openssl/windows/x64/include/openssl/txt_db.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/txt_db.h
rename to ext/openssl/windows/x64/include/openssl/txt_db.h
diff --git a/ext/openssl/win32/include/openssl/ui.h b/ext/openssl/windows/x64/include/openssl/ui.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ui.h
rename to ext/openssl/windows/x64/include/openssl/ui.h
diff --git a/ext/openssl/win32/include/openssl/ui_compat.h b/ext/openssl/windows/x64/include/openssl/ui_compat.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/ui_compat.h
rename to ext/openssl/windows/x64/include/openssl/ui_compat.h
diff --git a/ext/openssl/win32/include/openssl/whrlpool.h b/ext/openssl/windows/x64/include/openssl/whrlpool.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/whrlpool.h
rename to ext/openssl/windows/x64/include/openssl/whrlpool.h
diff --git a/ext/openssl/win32/include/openssl/x509.h b/ext/openssl/windows/x64/include/openssl/x509.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/x509.h
rename to ext/openssl/windows/x64/include/openssl/x509.h
diff --git a/ext/openssl/win32/include/openssl/x509_vfy.h b/ext/openssl/windows/x64/include/openssl/x509_vfy.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/x509_vfy.h
rename to ext/openssl/windows/x64/include/openssl/x509_vfy.h
diff --git a/ext/openssl/win32/include/openssl/x509v3.h b/ext/openssl/windows/x64/include/openssl/x509v3.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/x509v3.h
rename to ext/openssl/windows/x64/include/openssl/x509v3.h
diff --git a/ext/openssl/win64/lib/engines/4758cca.dll b/ext/openssl/windows/x64/lib/engines/4758cca.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/4758cca.dll
rename to ext/openssl/windows/x64/lib/engines/4758cca.dll
diff --git a/ext/openssl/win64/lib/engines/aep.dll b/ext/openssl/windows/x64/lib/engines/aep.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/aep.dll
rename to ext/openssl/windows/x64/lib/engines/aep.dll
diff --git a/ext/openssl/win64/lib/engines/atalla.dll b/ext/openssl/windows/x64/lib/engines/atalla.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/atalla.dll
rename to ext/openssl/windows/x64/lib/engines/atalla.dll
diff --git a/ext/openssl/win64/lib/engines/capi.dll b/ext/openssl/windows/x64/lib/engines/capi.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/capi.dll
rename to ext/openssl/windows/x64/lib/engines/capi.dll
diff --git a/ext/openssl/win64/lib/engines/chil.dll b/ext/openssl/windows/x64/lib/engines/chil.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/chil.dll
rename to ext/openssl/windows/x64/lib/engines/chil.dll
diff --git a/ext/openssl/win64/lib/engines/cswift.dll b/ext/openssl/windows/x64/lib/engines/cswift.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/cswift.dll
rename to ext/openssl/windows/x64/lib/engines/cswift.dll
diff --git a/ext/openssl/win64/lib/engines/gmp.dll b/ext/openssl/windows/x64/lib/engines/gmp.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/gmp.dll
rename to ext/openssl/windows/x64/lib/engines/gmp.dll
diff --git a/ext/openssl/win64/lib/engines/gost.dll b/ext/openssl/windows/x64/lib/engines/gost.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/gost.dll
rename to ext/openssl/windows/x64/lib/engines/gost.dll
diff --git a/ext/openssl/win64/lib/engines/nuron.dll b/ext/openssl/windows/x64/lib/engines/nuron.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/nuron.dll
rename to ext/openssl/windows/x64/lib/engines/nuron.dll
diff --git a/ext/openssl/win64/lib/engines/padlock.dll b/ext/openssl/windows/x64/lib/engines/padlock.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/padlock.dll
rename to ext/openssl/windows/x64/lib/engines/padlock.dll
diff --git a/ext/openssl/win64/lib/engines/sureware.dll b/ext/openssl/windows/x64/lib/engines/sureware.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/sureware.dll
rename to ext/openssl/windows/x64/lib/engines/sureware.dll
diff --git a/ext/openssl/win64/lib/engines/ubsec.dll b/ext/openssl/windows/x64/lib/engines/ubsec.dll
similarity index 100%
rename from ext/openssl/win64/lib/engines/ubsec.dll
rename to ext/openssl/windows/x64/lib/engines/ubsec.dll
diff --git a/ext/openssl/win64/lib/libeay32.lib b/ext/openssl/windows/x64/lib/libeay32.lib
similarity index 100%
rename from ext/openssl/win64/lib/libeay32.lib
rename to ext/openssl/windows/x64/lib/libeay32.lib
diff --git a/ext/openssl/win64/lib/ssleay32.lib b/ext/openssl/windows/x64/lib/ssleay32.lib
similarity index 100%
rename from ext/openssl/win64/lib/ssleay32.lib
rename to ext/openssl/windows/x64/lib/ssleay32.lib
diff --git a/ext/openssl/win32/ssl/openssl.cnf b/ext/openssl/windows/x64/ssl/openssl.cnf
similarity index 100%
rename from ext/openssl/win32/ssl/openssl.cnf
rename to ext/openssl/windows/x64/ssl/openssl.cnf
diff --git a/ext/openssl/win32/bin/libeay32.dll b/ext/openssl/windows/x86/bin/libeay32.dll
similarity index 100%
rename from ext/openssl/win32/bin/libeay32.dll
rename to ext/openssl/windows/x86/bin/libeay32.dll
diff --git a/ext/openssl/win32/bin/openssl.exe b/ext/openssl/windows/x86/bin/openssl.exe
similarity index 100%
rename from ext/openssl/win32/bin/openssl.exe
rename to ext/openssl/windows/x86/bin/openssl.exe
diff --git a/ext/openssl/win32/bin/ssleay32.dll b/ext/openssl/windows/x86/bin/ssleay32.dll
similarity index 100%
rename from ext/openssl/win32/bin/ssleay32.dll
rename to ext/openssl/windows/x86/bin/ssleay32.dll
diff --git a/ext/openssl/win64/include/openssl/aes.h b/ext/openssl/windows/x86/include/openssl/aes.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/aes.h
rename to ext/openssl/windows/x86/include/openssl/aes.h
diff --git a/ext/openssl/win64/include/openssl/applink.c b/ext/openssl/windows/x86/include/openssl/applink.c
similarity index 100%
rename from ext/openssl/win64/include/openssl/applink.c
rename to ext/openssl/windows/x86/include/openssl/applink.c
diff --git a/ext/openssl/win64/include/openssl/asn1.h b/ext/openssl/windows/x86/include/openssl/asn1.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/asn1.h
rename to ext/openssl/windows/x86/include/openssl/asn1.h
diff --git a/ext/openssl/win64/include/openssl/asn1_mac.h b/ext/openssl/windows/x86/include/openssl/asn1_mac.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/asn1_mac.h
rename to ext/openssl/windows/x86/include/openssl/asn1_mac.h
diff --git a/ext/openssl/win64/include/openssl/asn1t.h b/ext/openssl/windows/x86/include/openssl/asn1t.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/asn1t.h
rename to ext/openssl/windows/x86/include/openssl/asn1t.h
diff --git a/ext/openssl/win64/include/openssl/bio.h b/ext/openssl/windows/x86/include/openssl/bio.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/bio.h
rename to ext/openssl/windows/x86/include/openssl/bio.h
diff --git a/ext/openssl/win64/include/openssl/blowfish.h b/ext/openssl/windows/x86/include/openssl/blowfish.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/blowfish.h
rename to ext/openssl/windows/x86/include/openssl/blowfish.h
diff --git a/ext/openssl/win64/include/openssl/bn.h b/ext/openssl/windows/x86/include/openssl/bn.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/bn.h
rename to ext/openssl/windows/x86/include/openssl/bn.h
diff --git a/ext/openssl/win64/include/openssl/buffer.h b/ext/openssl/windows/x86/include/openssl/buffer.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/buffer.h
rename to ext/openssl/windows/x86/include/openssl/buffer.h
diff --git a/ext/openssl/win64/include/openssl/camellia.h b/ext/openssl/windows/x86/include/openssl/camellia.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/camellia.h
rename to ext/openssl/windows/x86/include/openssl/camellia.h
diff --git a/ext/openssl/win64/include/openssl/cast.h b/ext/openssl/windows/x86/include/openssl/cast.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/cast.h
rename to ext/openssl/windows/x86/include/openssl/cast.h
diff --git a/ext/openssl/win64/include/openssl/cmac.h b/ext/openssl/windows/x86/include/openssl/cmac.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/cmac.h
rename to ext/openssl/windows/x86/include/openssl/cmac.h
diff --git a/ext/openssl/win64/include/openssl/cms.h b/ext/openssl/windows/x86/include/openssl/cms.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/cms.h
rename to ext/openssl/windows/x86/include/openssl/cms.h
diff --git a/ext/openssl/win64/include/openssl/comp.h b/ext/openssl/windows/x86/include/openssl/comp.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/comp.h
rename to ext/openssl/windows/x86/include/openssl/comp.h
diff --git a/ext/openssl/win64/include/openssl/conf.h b/ext/openssl/windows/x86/include/openssl/conf.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/conf.h
rename to ext/openssl/windows/x86/include/openssl/conf.h
diff --git a/ext/openssl/win64/include/openssl/conf_api.h b/ext/openssl/windows/x86/include/openssl/conf_api.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/conf_api.h
rename to ext/openssl/windows/x86/include/openssl/conf_api.h
diff --git a/ext/openssl/win64/include/openssl/crypto.h b/ext/openssl/windows/x86/include/openssl/crypto.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/crypto.h
rename to ext/openssl/windows/x86/include/openssl/crypto.h
diff --git a/ext/openssl/win64/include/openssl/des.h b/ext/openssl/windows/x86/include/openssl/des.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/des.h
rename to ext/openssl/windows/x86/include/openssl/des.h
diff --git a/ext/openssl/win64/include/openssl/des_old.h b/ext/openssl/windows/x86/include/openssl/des_old.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/des_old.h
rename to ext/openssl/windows/x86/include/openssl/des_old.h
diff --git a/ext/openssl/win64/include/openssl/dh.h b/ext/openssl/windows/x86/include/openssl/dh.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/dh.h
rename to ext/openssl/windows/x86/include/openssl/dh.h
diff --git a/ext/openssl/win64/include/openssl/dsa.h b/ext/openssl/windows/x86/include/openssl/dsa.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/dsa.h
rename to ext/openssl/windows/x86/include/openssl/dsa.h
diff --git a/ext/openssl/win64/include/openssl/dso.h b/ext/openssl/windows/x86/include/openssl/dso.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/dso.h
rename to ext/openssl/windows/x86/include/openssl/dso.h
diff --git a/ext/openssl/win64/include/openssl/dtls1.h b/ext/openssl/windows/x86/include/openssl/dtls1.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/dtls1.h
rename to ext/openssl/windows/x86/include/openssl/dtls1.h
diff --git a/ext/openssl/win64/include/openssl/e_os2.h b/ext/openssl/windows/x86/include/openssl/e_os2.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/e_os2.h
rename to ext/openssl/windows/x86/include/openssl/e_os2.h
diff --git a/ext/openssl/win64/include/openssl/ebcdic.h b/ext/openssl/windows/x86/include/openssl/ebcdic.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ebcdic.h
rename to ext/openssl/windows/x86/include/openssl/ebcdic.h
diff --git a/ext/openssl/win64/include/openssl/ec.h b/ext/openssl/windows/x86/include/openssl/ec.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ec.h
rename to ext/openssl/windows/x86/include/openssl/ec.h
diff --git a/ext/openssl/win64/include/openssl/ecdh.h b/ext/openssl/windows/x86/include/openssl/ecdh.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ecdh.h
rename to ext/openssl/windows/x86/include/openssl/ecdh.h
diff --git a/ext/openssl/win64/include/openssl/ecdsa.h b/ext/openssl/windows/x86/include/openssl/ecdsa.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ecdsa.h
rename to ext/openssl/windows/x86/include/openssl/ecdsa.h
diff --git a/ext/openssl/win64/include/openssl/engine.h b/ext/openssl/windows/x86/include/openssl/engine.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/engine.h
rename to ext/openssl/windows/x86/include/openssl/engine.h
diff --git a/ext/openssl/win64/include/openssl/err.h b/ext/openssl/windows/x86/include/openssl/err.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/err.h
rename to ext/openssl/windows/x86/include/openssl/err.h
diff --git a/ext/openssl/win64/include/openssl/evp.h b/ext/openssl/windows/x86/include/openssl/evp.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/evp.h
rename to ext/openssl/windows/x86/include/openssl/evp.h
diff --git a/ext/openssl/win64/include/openssl/hmac.h b/ext/openssl/windows/x86/include/openssl/hmac.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/hmac.h
rename to ext/openssl/windows/x86/include/openssl/hmac.h
diff --git a/ext/openssl/win64/include/openssl/idea.h b/ext/openssl/windows/x86/include/openssl/idea.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/idea.h
rename to ext/openssl/windows/x86/include/openssl/idea.h
diff --git a/ext/openssl/win64/include/openssl/krb5_asn.h b/ext/openssl/windows/x86/include/openssl/krb5_asn.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/krb5_asn.h
rename to ext/openssl/windows/x86/include/openssl/krb5_asn.h
diff --git a/ext/openssl/win64/include/openssl/kssl.h b/ext/openssl/windows/x86/include/openssl/kssl.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/kssl.h
rename to ext/openssl/windows/x86/include/openssl/kssl.h
diff --git a/ext/openssl/win64/include/openssl/lhash.h b/ext/openssl/windows/x86/include/openssl/lhash.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/lhash.h
rename to ext/openssl/windows/x86/include/openssl/lhash.h
diff --git a/ext/openssl/win64/include/openssl/md4.h b/ext/openssl/windows/x86/include/openssl/md4.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/md4.h
rename to ext/openssl/windows/x86/include/openssl/md4.h
diff --git a/ext/openssl/win64/include/openssl/md5.h b/ext/openssl/windows/x86/include/openssl/md5.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/md5.h
rename to ext/openssl/windows/x86/include/openssl/md5.h
diff --git a/ext/openssl/win64/include/openssl/mdc2.h b/ext/openssl/windows/x86/include/openssl/mdc2.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/mdc2.h
rename to ext/openssl/windows/x86/include/openssl/mdc2.h
diff --git a/ext/openssl/win64/include/openssl/modes.h b/ext/openssl/windows/x86/include/openssl/modes.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/modes.h
rename to ext/openssl/windows/x86/include/openssl/modes.h
diff --git a/ext/openssl/win64/include/openssl/obj_mac.h b/ext/openssl/windows/x86/include/openssl/obj_mac.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/obj_mac.h
rename to ext/openssl/windows/x86/include/openssl/obj_mac.h
diff --git a/ext/openssl/win64/include/openssl/objects.h b/ext/openssl/windows/x86/include/openssl/objects.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/objects.h
rename to ext/openssl/windows/x86/include/openssl/objects.h
diff --git a/ext/openssl/win64/include/openssl/ocsp.h b/ext/openssl/windows/x86/include/openssl/ocsp.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ocsp.h
rename to ext/openssl/windows/x86/include/openssl/ocsp.h
diff --git a/ext/openssl/win32/include/openssl/opensslconf.h b/ext/openssl/windows/x86/include/openssl/opensslconf.h
similarity index 100%
rename from ext/openssl/win32/include/openssl/opensslconf.h
rename to ext/openssl/windows/x86/include/openssl/opensslconf.h
diff --git a/ext/openssl/win64/include/openssl/opensslv.h b/ext/openssl/windows/x86/include/openssl/opensslv.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/opensslv.h
rename to ext/openssl/windows/x86/include/openssl/opensslv.h
diff --git a/ext/openssl/win64/include/openssl/ossl_typ.h b/ext/openssl/windows/x86/include/openssl/ossl_typ.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ossl_typ.h
rename to ext/openssl/windows/x86/include/openssl/ossl_typ.h
diff --git a/ext/openssl/win64/include/openssl/pem.h b/ext/openssl/windows/x86/include/openssl/pem.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/pem.h
rename to ext/openssl/windows/x86/include/openssl/pem.h
diff --git a/ext/openssl/win64/include/openssl/pem2.h b/ext/openssl/windows/x86/include/openssl/pem2.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/pem2.h
rename to ext/openssl/windows/x86/include/openssl/pem2.h
diff --git a/ext/openssl/win64/include/openssl/pkcs12.h b/ext/openssl/windows/x86/include/openssl/pkcs12.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/pkcs12.h
rename to ext/openssl/windows/x86/include/openssl/pkcs12.h
diff --git a/ext/openssl/win64/include/openssl/pkcs7.h b/ext/openssl/windows/x86/include/openssl/pkcs7.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/pkcs7.h
rename to ext/openssl/windows/x86/include/openssl/pkcs7.h
diff --git a/ext/openssl/win64/include/openssl/pqueue.h b/ext/openssl/windows/x86/include/openssl/pqueue.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/pqueue.h
rename to ext/openssl/windows/x86/include/openssl/pqueue.h
diff --git a/ext/openssl/win64/include/openssl/rand.h b/ext/openssl/windows/x86/include/openssl/rand.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/rand.h
rename to ext/openssl/windows/x86/include/openssl/rand.h
diff --git a/ext/openssl/win64/include/openssl/rc2.h b/ext/openssl/windows/x86/include/openssl/rc2.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/rc2.h
rename to ext/openssl/windows/x86/include/openssl/rc2.h
diff --git a/ext/openssl/win64/include/openssl/rc4.h b/ext/openssl/windows/x86/include/openssl/rc4.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/rc4.h
rename to ext/openssl/windows/x86/include/openssl/rc4.h
diff --git a/ext/openssl/win64/include/openssl/ripemd.h b/ext/openssl/windows/x86/include/openssl/ripemd.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ripemd.h
rename to ext/openssl/windows/x86/include/openssl/ripemd.h
diff --git a/ext/openssl/win64/include/openssl/rsa.h b/ext/openssl/windows/x86/include/openssl/rsa.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/rsa.h
rename to ext/openssl/windows/x86/include/openssl/rsa.h
diff --git a/ext/openssl/win64/include/openssl/safestack.h b/ext/openssl/windows/x86/include/openssl/safestack.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/safestack.h
rename to ext/openssl/windows/x86/include/openssl/safestack.h
diff --git a/ext/openssl/win64/include/openssl/seed.h b/ext/openssl/windows/x86/include/openssl/seed.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/seed.h
rename to ext/openssl/windows/x86/include/openssl/seed.h
diff --git a/ext/openssl/win64/include/openssl/sha.h b/ext/openssl/windows/x86/include/openssl/sha.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/sha.h
rename to ext/openssl/windows/x86/include/openssl/sha.h
diff --git a/ext/openssl/win64/include/openssl/srp.h b/ext/openssl/windows/x86/include/openssl/srp.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/srp.h
rename to ext/openssl/windows/x86/include/openssl/srp.h
diff --git a/ext/openssl/win64/include/openssl/srtp.h b/ext/openssl/windows/x86/include/openssl/srtp.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/srtp.h
rename to ext/openssl/windows/x86/include/openssl/srtp.h
diff --git a/ext/openssl/win64/include/openssl/ssl.h b/ext/openssl/windows/x86/include/openssl/ssl.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ssl.h
rename to ext/openssl/windows/x86/include/openssl/ssl.h
diff --git a/ext/openssl/win64/include/openssl/ssl2.h b/ext/openssl/windows/x86/include/openssl/ssl2.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ssl2.h
rename to ext/openssl/windows/x86/include/openssl/ssl2.h
diff --git a/ext/openssl/win64/include/openssl/ssl23.h b/ext/openssl/windows/x86/include/openssl/ssl23.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ssl23.h
rename to ext/openssl/windows/x86/include/openssl/ssl23.h
diff --git a/ext/openssl/win64/include/openssl/ssl3.h b/ext/openssl/windows/x86/include/openssl/ssl3.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ssl3.h
rename to ext/openssl/windows/x86/include/openssl/ssl3.h
diff --git a/ext/openssl/win64/include/openssl/stack.h b/ext/openssl/windows/x86/include/openssl/stack.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/stack.h
rename to ext/openssl/windows/x86/include/openssl/stack.h
diff --git a/ext/openssl/win64/include/openssl/symhacks.h b/ext/openssl/windows/x86/include/openssl/symhacks.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/symhacks.h
rename to ext/openssl/windows/x86/include/openssl/symhacks.h
diff --git a/ext/openssl/win64/include/openssl/tls1.h b/ext/openssl/windows/x86/include/openssl/tls1.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/tls1.h
rename to ext/openssl/windows/x86/include/openssl/tls1.h
diff --git a/ext/openssl/win64/include/openssl/ts.h b/ext/openssl/windows/x86/include/openssl/ts.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ts.h
rename to ext/openssl/windows/x86/include/openssl/ts.h
diff --git a/ext/openssl/win64/include/openssl/txt_db.h b/ext/openssl/windows/x86/include/openssl/txt_db.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/txt_db.h
rename to ext/openssl/windows/x86/include/openssl/txt_db.h
diff --git a/ext/openssl/win64/include/openssl/ui.h b/ext/openssl/windows/x86/include/openssl/ui.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ui.h
rename to ext/openssl/windows/x86/include/openssl/ui.h
diff --git a/ext/openssl/win64/include/openssl/ui_compat.h b/ext/openssl/windows/x86/include/openssl/ui_compat.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/ui_compat.h
rename to ext/openssl/windows/x86/include/openssl/ui_compat.h
diff --git a/ext/openssl/win64/include/openssl/whrlpool.h b/ext/openssl/windows/x86/include/openssl/whrlpool.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/whrlpool.h
rename to ext/openssl/windows/x86/include/openssl/whrlpool.h
diff --git a/ext/openssl/win64/include/openssl/x509.h b/ext/openssl/windows/x86/include/openssl/x509.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/x509.h
rename to ext/openssl/windows/x86/include/openssl/x509.h
diff --git a/ext/openssl/win64/include/openssl/x509_vfy.h b/ext/openssl/windows/x86/include/openssl/x509_vfy.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/x509_vfy.h
rename to ext/openssl/windows/x86/include/openssl/x509_vfy.h
diff --git a/ext/openssl/win64/include/openssl/x509v3.h b/ext/openssl/windows/x86/include/openssl/x509v3.h
similarity index 100%
rename from ext/openssl/win64/include/openssl/x509v3.h
rename to ext/openssl/windows/x86/include/openssl/x509v3.h
diff --git a/ext/openssl/win32/lib/engines/4758cca.dll b/ext/openssl/windows/x86/lib/engines/4758cca.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/4758cca.dll
rename to ext/openssl/windows/x86/lib/engines/4758cca.dll
diff --git a/ext/openssl/win32/lib/engines/aep.dll b/ext/openssl/windows/x86/lib/engines/aep.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/aep.dll
rename to ext/openssl/windows/x86/lib/engines/aep.dll
diff --git a/ext/openssl/win32/lib/engines/atalla.dll b/ext/openssl/windows/x86/lib/engines/atalla.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/atalla.dll
rename to ext/openssl/windows/x86/lib/engines/atalla.dll
diff --git a/ext/openssl/win32/lib/engines/capi.dll b/ext/openssl/windows/x86/lib/engines/capi.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/capi.dll
rename to ext/openssl/windows/x86/lib/engines/capi.dll
diff --git a/ext/openssl/win32/lib/engines/chil.dll b/ext/openssl/windows/x86/lib/engines/chil.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/chil.dll
rename to ext/openssl/windows/x86/lib/engines/chil.dll
diff --git a/ext/openssl/win32/lib/engines/cswift.dll b/ext/openssl/windows/x86/lib/engines/cswift.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/cswift.dll
rename to ext/openssl/windows/x86/lib/engines/cswift.dll
diff --git a/ext/openssl/win32/lib/engines/gmp.dll b/ext/openssl/windows/x86/lib/engines/gmp.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/gmp.dll
rename to ext/openssl/windows/x86/lib/engines/gmp.dll
diff --git a/ext/openssl/win32/lib/engines/gost.dll b/ext/openssl/windows/x86/lib/engines/gost.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/gost.dll
rename to ext/openssl/windows/x86/lib/engines/gost.dll
diff --git a/ext/openssl/win32/lib/engines/nuron.dll b/ext/openssl/windows/x86/lib/engines/nuron.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/nuron.dll
rename to ext/openssl/windows/x86/lib/engines/nuron.dll
diff --git a/ext/openssl/win32/lib/engines/padlock.dll b/ext/openssl/windows/x86/lib/engines/padlock.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/padlock.dll
rename to ext/openssl/windows/x86/lib/engines/padlock.dll
diff --git a/ext/openssl/win32/lib/engines/sureware.dll b/ext/openssl/windows/x86/lib/engines/sureware.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/sureware.dll
rename to ext/openssl/windows/x86/lib/engines/sureware.dll
diff --git a/ext/openssl/win32/lib/engines/ubsec.dll b/ext/openssl/windows/x86/lib/engines/ubsec.dll
similarity index 100%
rename from ext/openssl/win32/lib/engines/ubsec.dll
rename to ext/openssl/windows/x86/lib/engines/ubsec.dll
diff --git a/ext/openssl/win32/lib/libeay32.lib b/ext/openssl/windows/x86/lib/libeay32.lib
similarity index 100%
rename from ext/openssl/win32/lib/libeay32.lib
rename to ext/openssl/windows/x86/lib/libeay32.lib
diff --git a/ext/openssl/win32/lib/ssleay32.lib b/ext/openssl/windows/x86/lib/ssleay32.lib
similarity index 100%
rename from ext/openssl/win32/lib/ssleay32.lib
rename to ext/openssl/windows/x86/lib/ssleay32.lib
diff --git a/ext/openssl/win64/ssl/openssl.cnf b/ext/openssl/windows/x86/ssl/openssl.cnf
similarity index 100%
rename from ext/openssl/win64/ssl/openssl.cnf
rename to ext/openssl/windows/x86/ssl/openssl.cnf
diff --git a/src/setup/win32/Include.wxi.in b/src/setup/win32/Include.wxi.in
index 87a61d87..a32a7831 100644
--- a/src/setup/win32/Include.wxi.in
+++ b/src/setup/win32/Include.wxi.in
@@ -20,6 +20,6 @@
     <?endif ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
-    <?define OpenSSLPath="$(var.ExtPath)\openssl\$(var.Platform)" ?>
+    <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
     <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
 </Include>
\ No newline at end of file