diff --git a/ext/openssl-osx/i386/include/openssl/asn1.h b/ext/openssl/osx/i386/include/openssl/asn1.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/asn1.h
rename to ext/openssl/osx/i386/include/openssl/asn1.h
diff --git a/ext/openssl-osx/i386/include/openssl/asn1_mac.h b/ext/openssl/osx/i386/include/openssl/asn1_mac.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/asn1_mac.h
rename to ext/openssl/osx/i386/include/openssl/asn1_mac.h
diff --git a/ext/openssl-osx/i386/include/openssl/bio.h b/ext/openssl/osx/i386/include/openssl/bio.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/bio.h
rename to ext/openssl/osx/i386/include/openssl/bio.h
diff --git a/ext/openssl-osx/i386/include/openssl/bn.h b/ext/openssl/osx/i386/include/openssl/bn.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/bn.h
rename to ext/openssl/osx/i386/include/openssl/bn.h
diff --git a/ext/openssl-osx/i386/include/openssl/buffer.h b/ext/openssl/osx/i386/include/openssl/buffer.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/buffer.h
rename to ext/openssl/osx/i386/include/openssl/buffer.h
diff --git a/ext/openssl-osx/i386/include/openssl/comp.h b/ext/openssl/osx/i386/include/openssl/comp.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/comp.h
rename to ext/openssl/osx/i386/include/openssl/comp.h
diff --git a/ext/openssl-osx/i386/include/openssl/crypto.h b/ext/openssl/osx/i386/include/openssl/crypto.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/crypto.h
rename to ext/openssl/osx/i386/include/openssl/crypto.h
diff --git a/ext/openssl-osx/i386/include/openssl/dh.h b/ext/openssl/osx/i386/include/openssl/dh.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/dh.h
rename to ext/openssl/osx/i386/include/openssl/dh.h
diff --git a/ext/openssl-osx/i386/include/openssl/dsa.h b/ext/openssl/osx/i386/include/openssl/dsa.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/dsa.h
rename to ext/openssl/osx/i386/include/openssl/dsa.h
diff --git a/ext/openssl-osx/i386/include/openssl/dtls1.h b/ext/openssl/osx/i386/include/openssl/dtls1.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/dtls1.h
rename to ext/openssl/osx/i386/include/openssl/dtls1.h
diff --git a/ext/openssl-osx/i386/include/openssl/e_os2.h b/ext/openssl/osx/i386/include/openssl/e_os2.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/e_os2.h
rename to ext/openssl/osx/i386/include/openssl/e_os2.h
diff --git a/ext/openssl-osx/i386/include/openssl/ec.h b/ext/openssl/osx/i386/include/openssl/ec.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ec.h
rename to ext/openssl/osx/i386/include/openssl/ec.h
diff --git a/ext/openssl-osx/i386/include/openssl/ecdh.h b/ext/openssl/osx/i386/include/openssl/ecdh.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ecdh.h
rename to ext/openssl/osx/i386/include/openssl/ecdh.h
diff --git a/ext/openssl-osx/i386/include/openssl/ecdsa.h b/ext/openssl/osx/i386/include/openssl/ecdsa.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ecdsa.h
rename to ext/openssl/osx/i386/include/openssl/ecdsa.h
diff --git a/ext/openssl-osx/i386/include/openssl/err.h b/ext/openssl/osx/i386/include/openssl/err.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/err.h
rename to ext/openssl/osx/i386/include/openssl/err.h
diff --git a/ext/openssl-osx/i386/include/openssl/evp.h b/ext/openssl/osx/i386/include/openssl/evp.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/evp.h
rename to ext/openssl/osx/i386/include/openssl/evp.h
diff --git a/ext/openssl-osx/i386/include/openssl/hmac.h b/ext/openssl/osx/i386/include/openssl/hmac.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/hmac.h
rename to ext/openssl/osx/i386/include/openssl/hmac.h
diff --git a/ext/openssl-osx/i386/include/openssl/kssl.h b/ext/openssl/osx/i386/include/openssl/kssl.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/kssl.h
rename to ext/openssl/osx/i386/include/openssl/kssl.h
diff --git a/ext/openssl-osx/i386/include/openssl/lhash.h b/ext/openssl/osx/i386/include/openssl/lhash.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/lhash.h
rename to ext/openssl/osx/i386/include/openssl/lhash.h
diff --git a/ext/openssl-osx/i386/include/openssl/obj_mac.h b/ext/openssl/osx/i386/include/openssl/obj_mac.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/obj_mac.h
rename to ext/openssl/osx/i386/include/openssl/obj_mac.h
diff --git a/ext/openssl-osx/i386/include/openssl/objects.h b/ext/openssl/osx/i386/include/openssl/objects.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/objects.h
rename to ext/openssl/osx/i386/include/openssl/objects.h
diff --git a/ext/openssl-osx/i386/include/openssl/opensslconf.h b/ext/openssl/osx/i386/include/openssl/opensslconf.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/opensslconf.h
rename to ext/openssl/osx/i386/include/openssl/opensslconf.h
diff --git a/ext/openssl-osx/i386/include/openssl/opensslv.h b/ext/openssl/osx/i386/include/openssl/opensslv.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/opensslv.h
rename to ext/openssl/osx/i386/include/openssl/opensslv.h
diff --git a/ext/openssl-osx/i386/include/openssl/ossl_typ.h b/ext/openssl/osx/i386/include/openssl/ossl_typ.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ossl_typ.h
rename to ext/openssl/osx/i386/include/openssl/ossl_typ.h
diff --git a/ext/openssl-osx/i386/include/openssl/pem.h b/ext/openssl/osx/i386/include/openssl/pem.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/pem.h
rename to ext/openssl/osx/i386/include/openssl/pem.h
diff --git a/ext/openssl-osx/i386/include/openssl/pem2.h b/ext/openssl/osx/i386/include/openssl/pem2.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/pem2.h
rename to ext/openssl/osx/i386/include/openssl/pem2.h
diff --git a/ext/openssl-osx/i386/include/openssl/pkcs7.h b/ext/openssl/osx/i386/include/openssl/pkcs7.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/pkcs7.h
rename to ext/openssl/osx/i386/include/openssl/pkcs7.h
diff --git a/ext/openssl-osx/i386/include/openssl/pqueue.h b/ext/openssl/osx/i386/include/openssl/pqueue.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/pqueue.h
rename to ext/openssl/osx/i386/include/openssl/pqueue.h
diff --git a/ext/openssl-osx/i386/include/openssl/rsa.h b/ext/openssl/osx/i386/include/openssl/rsa.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/rsa.h
rename to ext/openssl/osx/i386/include/openssl/rsa.h
diff --git a/ext/openssl-osx/i386/include/openssl/safestack.h b/ext/openssl/osx/i386/include/openssl/safestack.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/safestack.h
rename to ext/openssl/osx/i386/include/openssl/safestack.h
diff --git a/ext/openssl-osx/i386/include/openssl/sha.h b/ext/openssl/osx/i386/include/openssl/sha.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/sha.h
rename to ext/openssl/osx/i386/include/openssl/sha.h
diff --git a/ext/openssl-osx/i386/include/openssl/srtp.h b/ext/openssl/osx/i386/include/openssl/srtp.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/srtp.h
rename to ext/openssl/osx/i386/include/openssl/srtp.h
diff --git a/ext/openssl-osx/i386/include/openssl/ssl.h b/ext/openssl/osx/i386/include/openssl/ssl.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ssl.h
rename to ext/openssl/osx/i386/include/openssl/ssl.h
diff --git a/ext/openssl-osx/i386/include/openssl/ssl2.h b/ext/openssl/osx/i386/include/openssl/ssl2.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ssl2.h
rename to ext/openssl/osx/i386/include/openssl/ssl2.h
diff --git a/ext/openssl-osx/i386/include/openssl/ssl23.h b/ext/openssl/osx/i386/include/openssl/ssl23.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ssl23.h
rename to ext/openssl/osx/i386/include/openssl/ssl23.h
diff --git a/ext/openssl-osx/i386/include/openssl/ssl3.h b/ext/openssl/osx/i386/include/openssl/ssl3.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/ssl3.h
rename to ext/openssl/osx/i386/include/openssl/ssl3.h
diff --git a/ext/openssl-osx/i386/include/openssl/stack.h b/ext/openssl/osx/i386/include/openssl/stack.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/stack.h
rename to ext/openssl/osx/i386/include/openssl/stack.h
diff --git a/ext/openssl-osx/i386/include/openssl/symhacks.h b/ext/openssl/osx/i386/include/openssl/symhacks.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/symhacks.h
rename to ext/openssl/osx/i386/include/openssl/symhacks.h
diff --git a/ext/openssl-osx/i386/include/openssl/tls1.h b/ext/openssl/osx/i386/include/openssl/tls1.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/tls1.h
rename to ext/openssl/osx/i386/include/openssl/tls1.h
diff --git a/ext/openssl-osx/i386/include/openssl/x509.h b/ext/openssl/osx/i386/include/openssl/x509.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/x509.h
rename to ext/openssl/osx/i386/include/openssl/x509.h
diff --git a/ext/openssl-osx/i386/include/openssl/x509_vfy.h b/ext/openssl/osx/i386/include/openssl/x509_vfy.h
similarity index 100%
rename from ext/openssl-osx/i386/include/openssl/x509_vfy.h
rename to ext/openssl/osx/i386/include/openssl/x509_vfy.h
diff --git a/ext/openssl-osx/i386/libcrypto.a b/ext/openssl/osx/i386/libcrypto.a
similarity index 100%
rename from ext/openssl-osx/i386/libcrypto.a
rename to ext/openssl/osx/i386/libcrypto.a
diff --git a/ext/openssl-osx/i386/libssl.a b/ext/openssl/osx/i386/libssl.a
similarity index 100%
rename from ext/openssl-osx/i386/libssl.a
rename to ext/openssl/osx/i386/libssl.a
diff --git a/ext/openssl-osx/x86_64/include/openssl/asn1.h b/ext/openssl/osx/x86_64/include/openssl/asn1.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/asn1.h
rename to ext/openssl/osx/x86_64/include/openssl/asn1.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/asn1_mac.h b/ext/openssl/osx/x86_64/include/openssl/asn1_mac.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/asn1_mac.h
rename to ext/openssl/osx/x86_64/include/openssl/asn1_mac.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/bio.h b/ext/openssl/osx/x86_64/include/openssl/bio.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/bio.h
rename to ext/openssl/osx/x86_64/include/openssl/bio.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/bn.h b/ext/openssl/osx/x86_64/include/openssl/bn.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/bn.h
rename to ext/openssl/osx/x86_64/include/openssl/bn.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/buffer.h b/ext/openssl/osx/x86_64/include/openssl/buffer.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/buffer.h
rename to ext/openssl/osx/x86_64/include/openssl/buffer.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/comp.h b/ext/openssl/osx/x86_64/include/openssl/comp.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/comp.h
rename to ext/openssl/osx/x86_64/include/openssl/comp.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/crypto.h b/ext/openssl/osx/x86_64/include/openssl/crypto.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/crypto.h
rename to ext/openssl/osx/x86_64/include/openssl/crypto.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/dh.h b/ext/openssl/osx/x86_64/include/openssl/dh.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/dh.h
rename to ext/openssl/osx/x86_64/include/openssl/dh.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/dsa.h b/ext/openssl/osx/x86_64/include/openssl/dsa.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/dsa.h
rename to ext/openssl/osx/x86_64/include/openssl/dsa.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/dtls1.h b/ext/openssl/osx/x86_64/include/openssl/dtls1.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/dtls1.h
rename to ext/openssl/osx/x86_64/include/openssl/dtls1.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/e_os2.h b/ext/openssl/osx/x86_64/include/openssl/e_os2.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/e_os2.h
rename to ext/openssl/osx/x86_64/include/openssl/e_os2.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ec.h b/ext/openssl/osx/x86_64/include/openssl/ec.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ec.h
rename to ext/openssl/osx/x86_64/include/openssl/ec.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ecdh.h b/ext/openssl/osx/x86_64/include/openssl/ecdh.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ecdh.h
rename to ext/openssl/osx/x86_64/include/openssl/ecdh.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ecdsa.h b/ext/openssl/osx/x86_64/include/openssl/ecdsa.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ecdsa.h
rename to ext/openssl/osx/x86_64/include/openssl/ecdsa.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/err.h b/ext/openssl/osx/x86_64/include/openssl/err.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/err.h
rename to ext/openssl/osx/x86_64/include/openssl/err.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/evp.h b/ext/openssl/osx/x86_64/include/openssl/evp.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/evp.h
rename to ext/openssl/osx/x86_64/include/openssl/evp.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/hmac.h b/ext/openssl/osx/x86_64/include/openssl/hmac.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/hmac.h
rename to ext/openssl/osx/x86_64/include/openssl/hmac.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/kssl.h b/ext/openssl/osx/x86_64/include/openssl/kssl.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/kssl.h
rename to ext/openssl/osx/x86_64/include/openssl/kssl.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/lhash.h b/ext/openssl/osx/x86_64/include/openssl/lhash.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/lhash.h
rename to ext/openssl/osx/x86_64/include/openssl/lhash.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/obj_mac.h b/ext/openssl/osx/x86_64/include/openssl/obj_mac.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/obj_mac.h
rename to ext/openssl/osx/x86_64/include/openssl/obj_mac.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/objects.h b/ext/openssl/osx/x86_64/include/openssl/objects.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/objects.h
rename to ext/openssl/osx/x86_64/include/openssl/objects.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/opensslconf.h b/ext/openssl/osx/x86_64/include/openssl/opensslconf.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/opensslconf.h
rename to ext/openssl/osx/x86_64/include/openssl/opensslconf.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/opensslv.h b/ext/openssl/osx/x86_64/include/openssl/opensslv.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/opensslv.h
rename to ext/openssl/osx/x86_64/include/openssl/opensslv.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ossl_typ.h b/ext/openssl/osx/x86_64/include/openssl/ossl_typ.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ossl_typ.h
rename to ext/openssl/osx/x86_64/include/openssl/ossl_typ.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/pem.h b/ext/openssl/osx/x86_64/include/openssl/pem.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/pem.h
rename to ext/openssl/osx/x86_64/include/openssl/pem.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/pem2.h b/ext/openssl/osx/x86_64/include/openssl/pem2.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/pem2.h
rename to ext/openssl/osx/x86_64/include/openssl/pem2.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/pkcs7.h b/ext/openssl/osx/x86_64/include/openssl/pkcs7.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/pkcs7.h
rename to ext/openssl/osx/x86_64/include/openssl/pkcs7.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/pqueue.h b/ext/openssl/osx/x86_64/include/openssl/pqueue.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/pqueue.h
rename to ext/openssl/osx/x86_64/include/openssl/pqueue.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/rsa.h b/ext/openssl/osx/x86_64/include/openssl/rsa.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/rsa.h
rename to ext/openssl/osx/x86_64/include/openssl/rsa.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/safestack.h b/ext/openssl/osx/x86_64/include/openssl/safestack.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/safestack.h
rename to ext/openssl/osx/x86_64/include/openssl/safestack.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/sha.h b/ext/openssl/osx/x86_64/include/openssl/sha.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/sha.h
rename to ext/openssl/osx/x86_64/include/openssl/sha.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/srtp.h b/ext/openssl/osx/x86_64/include/openssl/srtp.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/srtp.h
rename to ext/openssl/osx/x86_64/include/openssl/srtp.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ssl.h b/ext/openssl/osx/x86_64/include/openssl/ssl.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ssl.h
rename to ext/openssl/osx/x86_64/include/openssl/ssl.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ssl2.h b/ext/openssl/osx/x86_64/include/openssl/ssl2.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ssl2.h
rename to ext/openssl/osx/x86_64/include/openssl/ssl2.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ssl23.h b/ext/openssl/osx/x86_64/include/openssl/ssl23.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ssl23.h
rename to ext/openssl/osx/x86_64/include/openssl/ssl23.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/ssl3.h b/ext/openssl/osx/x86_64/include/openssl/ssl3.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/ssl3.h
rename to ext/openssl/osx/x86_64/include/openssl/ssl3.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/stack.h b/ext/openssl/osx/x86_64/include/openssl/stack.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/stack.h
rename to ext/openssl/osx/x86_64/include/openssl/stack.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/symhacks.h b/ext/openssl/osx/x86_64/include/openssl/symhacks.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/symhacks.h
rename to ext/openssl/osx/x86_64/include/openssl/symhacks.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/tls1.h b/ext/openssl/osx/x86_64/include/openssl/tls1.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/tls1.h
rename to ext/openssl/osx/x86_64/include/openssl/tls1.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/x509.h b/ext/openssl/osx/x86_64/include/openssl/x509.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/x509.h
rename to ext/openssl/osx/x86_64/include/openssl/x509.h
diff --git a/ext/openssl-osx/x86_64/include/openssl/x509_vfy.h b/ext/openssl/osx/x86_64/include/openssl/x509_vfy.h
similarity index 100%
rename from ext/openssl-osx/x86_64/include/openssl/x509_vfy.h
rename to ext/openssl/osx/x86_64/include/openssl/x509_vfy.h
diff --git a/ext/openssl-osx/x86_64/libcrypto.a b/ext/openssl/osx/x86_64/libcrypto.a
similarity index 100%
rename from ext/openssl-osx/x86_64/libcrypto.a
rename to ext/openssl/osx/x86_64/libcrypto.a
diff --git a/ext/openssl-osx/x86_64/libssl.a b/ext/openssl/osx/x86_64/libssl.a
similarity index 100%
rename from ext/openssl-osx/x86_64/libssl.a
rename to ext/openssl/osx/x86_64/libssl.a