diff --git a/.gitignore b/.gitignore
index b8eb41e..6e1f706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Generated version file
-/source/deimos/openssl/version_.d
+/source/deimos/openssl/version_.di
 
 # DUB artifacts
 /.dub/
diff --git a/scripts/generate_version.d b/scripts/generate_version.d
index 6471eca..ae19cea 100644
--- a/scripts/generate_version.d
+++ b/scripts/generate_version.d
@@ -13,7 +13,7 @@
  *
  * It is called directly as a `preGenerateCommand` (see dub.sdl).
  * To use it with another build system, pass the directory in which to write
- * the `version_.d` file as first and only argument. The directory
+ * the `version_.di` file as first and only argument. The directory
  * must exist, this script will not create it.
  */
 module generate_version;
@@ -42,14 +42,14 @@ void main(string[] args)
     {
         assert(args[1].isDir(),
                "OpenSSL version detection: Argument '" ~ args[1] ~ "' is not a directory");
-        target = args[1].buildPath("version_.d");
+        target = args[1].buildPath("version_.di");
     }
     else
     {
         assert(args.length == 1,
                "OpenSSL version detection expects only one argument, " ~
-               "a directory path where to write `version_.d`");
-        target = TARGET_DIR_PATH.buildPath("version_.d");
+               "a directory path where to write `version_.di`");
+        target = TARGET_DIR_PATH.buildPath("version_.di");
     }
 
     string opensslVersion;
diff --git a/source/deimos/openssl/_d_util.d b/source/deimos/openssl/_d_util.di
similarity index 100%
rename from source/deimos/openssl/_d_util.d
rename to source/deimos/openssl/_d_util.di
diff --git a/source/deimos/openssl/aes.d b/source/deimos/openssl/aes.di
similarity index 100%
rename from source/deimos/openssl/aes.d
rename to source/deimos/openssl/aes.di
diff --git a/source/deimos/openssl/applink.d b/source/deimos/openssl/applink.di
similarity index 100%
rename from source/deimos/openssl/applink.d
rename to source/deimos/openssl/applink.di
diff --git a/source/deimos/openssl/asn1.d b/source/deimos/openssl/asn1.di
similarity index 100%
rename from source/deimos/openssl/asn1.d
rename to source/deimos/openssl/asn1.di
diff --git a/source/deimos/openssl/asn1_mac.d b/source/deimos/openssl/asn1_mac.di
similarity index 100%
rename from source/deimos/openssl/asn1_mac.d
rename to source/deimos/openssl/asn1_mac.di
diff --git a/source/deimos/openssl/asn1t.d b/source/deimos/openssl/asn1t.di
similarity index 100%
rename from source/deimos/openssl/asn1t.d
rename to source/deimos/openssl/asn1t.di
diff --git a/source/deimos/openssl/bio.d b/source/deimos/openssl/bio.di
similarity index 100%
rename from source/deimos/openssl/bio.d
rename to source/deimos/openssl/bio.di
diff --git a/source/deimos/openssl/blowfish.d b/source/deimos/openssl/blowfish.di
similarity index 100%
rename from source/deimos/openssl/blowfish.d
rename to source/deimos/openssl/blowfish.di
diff --git a/source/deimos/openssl/bn.d b/source/deimos/openssl/bn.di
similarity index 100%
rename from source/deimos/openssl/bn.d
rename to source/deimos/openssl/bn.di
diff --git a/source/deimos/openssl/buffer.d b/source/deimos/openssl/buffer.di
similarity index 100%
rename from source/deimos/openssl/buffer.d
rename to source/deimos/openssl/buffer.di
diff --git a/source/deimos/openssl/camellia.d b/source/deimos/openssl/camellia.di
similarity index 100%
rename from source/deimos/openssl/camellia.d
rename to source/deimos/openssl/camellia.di
diff --git a/source/deimos/openssl/cast_.d b/source/deimos/openssl/cast_.di
similarity index 100%
rename from source/deimos/openssl/cast_.d
rename to source/deimos/openssl/cast_.di
diff --git a/source/deimos/openssl/cmac.d b/source/deimos/openssl/cmac.di
similarity index 100%
rename from source/deimos/openssl/cmac.d
rename to source/deimos/openssl/cmac.di
diff --git a/source/deimos/openssl/cms.d b/source/deimos/openssl/cms.di
similarity index 100%
rename from source/deimos/openssl/cms.d
rename to source/deimos/openssl/cms.di
diff --git a/source/deimos/openssl/comp.d b/source/deimos/openssl/comp.di
similarity index 100%
rename from source/deimos/openssl/comp.d
rename to source/deimos/openssl/comp.di
diff --git a/source/deimos/openssl/conf.d b/source/deimos/openssl/conf.di
similarity index 100%
rename from source/deimos/openssl/conf.d
rename to source/deimos/openssl/conf.di
diff --git a/source/deimos/openssl/conf_api.d b/source/deimos/openssl/conf_api.di
similarity index 100%
rename from source/deimos/openssl/conf_api.d
rename to source/deimos/openssl/conf_api.di
diff --git a/source/deimos/openssl/crypto.d b/source/deimos/openssl/crypto.di
similarity index 100%
rename from source/deimos/openssl/crypto.d
rename to source/deimos/openssl/crypto.di
diff --git a/source/deimos/openssl/des.d b/source/deimos/openssl/des.di
similarity index 100%
rename from source/deimos/openssl/des.d
rename to source/deimos/openssl/des.di
diff --git a/source/deimos/openssl/dh.d b/source/deimos/openssl/dh.di
similarity index 100%
rename from source/deimos/openssl/dh.d
rename to source/deimos/openssl/dh.di
diff --git a/source/deimos/openssl/dsa.d b/source/deimos/openssl/dsa.di
similarity index 100%
rename from source/deimos/openssl/dsa.d
rename to source/deimos/openssl/dsa.di
diff --git a/source/deimos/openssl/dso.d b/source/deimos/openssl/dso.di
similarity index 100%
rename from source/deimos/openssl/dso.d
rename to source/deimos/openssl/dso.di
diff --git a/source/deimos/openssl/dtls1.d b/source/deimos/openssl/dtls1.di
similarity index 100%
rename from source/deimos/openssl/dtls1.d
rename to source/deimos/openssl/dtls1.di
diff --git a/source/deimos/openssl/e_os2.d b/source/deimos/openssl/e_os2.di
similarity index 100%
rename from source/deimos/openssl/e_os2.d
rename to source/deimos/openssl/e_os2.di
diff --git a/source/deimos/openssl/ebcdic.d b/source/deimos/openssl/ebcdic.di
similarity index 100%
rename from source/deimos/openssl/ebcdic.d
rename to source/deimos/openssl/ebcdic.di
diff --git a/source/deimos/openssl/ec.d b/source/deimos/openssl/ec.di
similarity index 100%
rename from source/deimos/openssl/ec.d
rename to source/deimos/openssl/ec.di
diff --git a/source/deimos/openssl/ecdh.d b/source/deimos/openssl/ecdh.di
similarity index 100%
rename from source/deimos/openssl/ecdh.d
rename to source/deimos/openssl/ecdh.di
diff --git a/source/deimos/openssl/ecdsa.d b/source/deimos/openssl/ecdsa.di
similarity index 100%
rename from source/deimos/openssl/ecdsa.d
rename to source/deimos/openssl/ecdsa.di
diff --git a/source/deimos/openssl/engine.d b/source/deimos/openssl/engine.di
similarity index 100%
rename from source/deimos/openssl/engine.d
rename to source/deimos/openssl/engine.di
diff --git a/source/deimos/openssl/err.d b/source/deimos/openssl/err.di
similarity index 100%
rename from source/deimos/openssl/err.d
rename to source/deimos/openssl/err.di
diff --git a/source/deimos/openssl/evp.d b/source/deimos/openssl/evp.di
similarity index 100%
rename from source/deimos/openssl/evp.d
rename to source/deimos/openssl/evp.di
diff --git a/source/deimos/openssl/hmac.d b/source/deimos/openssl/hmac.di
similarity index 100%
rename from source/deimos/openssl/hmac.d
rename to source/deimos/openssl/hmac.di
diff --git a/source/deimos/openssl/idea.d b/source/deimos/openssl/idea.di
similarity index 100%
rename from source/deimos/openssl/idea.d
rename to source/deimos/openssl/idea.di
diff --git a/source/deimos/openssl/kdf.d b/source/deimos/openssl/kdf.di
similarity index 100%
rename from source/deimos/openssl/kdf.d
rename to source/deimos/openssl/kdf.di
diff --git a/source/deimos/openssl/krb5_asn.d b/source/deimos/openssl/krb5_asn.di
similarity index 100%
rename from source/deimos/openssl/krb5_asn.d
rename to source/deimos/openssl/krb5_asn.di
diff --git a/source/deimos/openssl/kssl.d b/source/deimos/openssl/kssl.di
similarity index 100%
rename from source/deimos/openssl/kssl.d
rename to source/deimos/openssl/kssl.di
diff --git a/source/deimos/openssl/lhash.d b/source/deimos/openssl/lhash.di
similarity index 100%
rename from source/deimos/openssl/lhash.d
rename to source/deimos/openssl/lhash.di
diff --git a/source/deimos/openssl/md4.d b/source/deimos/openssl/md4.di
similarity index 100%
rename from source/deimos/openssl/md4.d
rename to source/deimos/openssl/md4.di
diff --git a/source/deimos/openssl/md5.d b/source/deimos/openssl/md5.di
similarity index 100%
rename from source/deimos/openssl/md5.d
rename to source/deimos/openssl/md5.di
diff --git a/source/deimos/openssl/mdc2.d b/source/deimos/openssl/mdc2.di
similarity index 100%
rename from source/deimos/openssl/mdc2.d
rename to source/deimos/openssl/mdc2.di
diff --git a/source/deimos/openssl/modes.d b/source/deimos/openssl/modes.di
similarity index 100%
rename from source/deimos/openssl/modes.d
rename to source/deimos/openssl/modes.di
diff --git a/source/deimos/openssl/obj_mac.d b/source/deimos/openssl/obj_mac.di
similarity index 100%
rename from source/deimos/openssl/obj_mac.d
rename to source/deimos/openssl/obj_mac.di
diff --git a/source/deimos/openssl/objects.d b/source/deimos/openssl/objects.di
similarity index 100%
rename from source/deimos/openssl/objects.d
rename to source/deimos/openssl/objects.di
diff --git a/source/deimos/openssl/ocsp.d b/source/deimos/openssl/ocsp.di
similarity index 100%
rename from source/deimos/openssl/ocsp.d
rename to source/deimos/openssl/ocsp.di
diff --git a/source/deimos/openssl/opensslconf.d b/source/deimos/openssl/opensslconf.di
similarity index 100%
rename from source/deimos/openssl/opensslconf.d
rename to source/deimos/openssl/opensslconf.di
diff --git a/source/deimos/openssl/opensslv.d b/source/deimos/openssl/opensslv.di
similarity index 100%
rename from source/deimos/openssl/opensslv.d
rename to source/deimos/openssl/opensslv.di
diff --git a/source/deimos/openssl/ossl_typ.d b/source/deimos/openssl/ossl_typ.di
similarity index 100%
rename from source/deimos/openssl/ossl_typ.d
rename to source/deimos/openssl/ossl_typ.di
diff --git a/source/deimos/openssl/pem.d b/source/deimos/openssl/pem.di
similarity index 100%
rename from source/deimos/openssl/pem.d
rename to source/deimos/openssl/pem.di
diff --git a/source/deimos/openssl/pem2.d b/source/deimos/openssl/pem2.di
similarity index 100%
rename from source/deimos/openssl/pem2.d
rename to source/deimos/openssl/pem2.di
diff --git a/source/deimos/openssl/pkcs12.d b/source/deimos/openssl/pkcs12.di
similarity index 100%
rename from source/deimos/openssl/pkcs12.d
rename to source/deimos/openssl/pkcs12.di
diff --git a/source/deimos/openssl/pkcs7.d b/source/deimos/openssl/pkcs7.di
similarity index 100%
rename from source/deimos/openssl/pkcs7.d
rename to source/deimos/openssl/pkcs7.di
diff --git a/source/deimos/openssl/pqueue.d b/source/deimos/openssl/pqueue.di
similarity index 100%
rename from source/deimos/openssl/pqueue.d
rename to source/deimos/openssl/pqueue.di
diff --git a/source/deimos/openssl/rand.d b/source/deimos/openssl/rand.di
similarity index 100%
rename from source/deimos/openssl/rand.d
rename to source/deimos/openssl/rand.di
diff --git a/source/deimos/openssl/rc2.d b/source/deimos/openssl/rc2.di
similarity index 100%
rename from source/deimos/openssl/rc2.d
rename to source/deimos/openssl/rc2.di
diff --git a/source/deimos/openssl/rc4.d b/source/deimos/openssl/rc4.di
similarity index 100%
rename from source/deimos/openssl/rc4.d
rename to source/deimos/openssl/rc4.di
diff --git a/source/deimos/openssl/ripemd.d b/source/deimos/openssl/ripemd.di
similarity index 100%
rename from source/deimos/openssl/ripemd.d
rename to source/deimos/openssl/ripemd.di
diff --git a/source/deimos/openssl/rsa.d b/source/deimos/openssl/rsa.di
similarity index 100%
rename from source/deimos/openssl/rsa.d
rename to source/deimos/openssl/rsa.di
diff --git a/source/deimos/openssl/safestack.d b/source/deimos/openssl/safestack.di
similarity index 100%
rename from source/deimos/openssl/safestack.d
rename to source/deimos/openssl/safestack.di
diff --git a/source/deimos/openssl/seed.d b/source/deimos/openssl/seed.di
similarity index 100%
rename from source/deimos/openssl/seed.d
rename to source/deimos/openssl/seed.di
diff --git a/source/deimos/openssl/sha.d b/source/deimos/openssl/sha.di
similarity index 100%
rename from source/deimos/openssl/sha.d
rename to source/deimos/openssl/sha.di
diff --git a/source/deimos/openssl/srp.d b/source/deimos/openssl/srp.di
similarity index 100%
rename from source/deimos/openssl/srp.d
rename to source/deimos/openssl/srp.di
diff --git a/source/deimos/openssl/srtp.d b/source/deimos/openssl/srtp.di
similarity index 100%
rename from source/deimos/openssl/srtp.d
rename to source/deimos/openssl/srtp.di
diff --git a/source/deimos/openssl/ssl.d b/source/deimos/openssl/ssl.di
similarity index 100%
rename from source/deimos/openssl/ssl.d
rename to source/deimos/openssl/ssl.di
diff --git a/source/deimos/openssl/ssl2.d b/source/deimos/openssl/ssl2.di
similarity index 100%
rename from source/deimos/openssl/ssl2.d
rename to source/deimos/openssl/ssl2.di
diff --git a/source/deimos/openssl/ssl23.d b/source/deimos/openssl/ssl23.di
similarity index 100%
rename from source/deimos/openssl/ssl23.d
rename to source/deimos/openssl/ssl23.di
diff --git a/source/deimos/openssl/ssl3.d b/source/deimos/openssl/ssl3.di
similarity index 100%
rename from source/deimos/openssl/ssl3.d
rename to source/deimos/openssl/ssl3.di
diff --git a/source/deimos/openssl/stack.d b/source/deimos/openssl/stack.di
similarity index 100%
rename from source/deimos/openssl/stack.d
rename to source/deimos/openssl/stack.di
diff --git a/source/deimos/openssl/symhacks.d b/source/deimos/openssl/symhacks.di
similarity index 100%
rename from source/deimos/openssl/symhacks.d
rename to source/deimos/openssl/symhacks.di
diff --git a/source/deimos/openssl/tls1.d b/source/deimos/openssl/tls1.di
similarity index 100%
rename from source/deimos/openssl/tls1.d
rename to source/deimos/openssl/tls1.di
diff --git a/source/deimos/openssl/ts.d b/source/deimos/openssl/ts.di
similarity index 100%
rename from source/deimos/openssl/ts.d
rename to source/deimos/openssl/ts.di
diff --git a/source/deimos/openssl/txt_db.d b/source/deimos/openssl/txt_db.di
similarity index 100%
rename from source/deimos/openssl/txt_db.d
rename to source/deimos/openssl/txt_db.di
diff --git a/source/deimos/openssl/types.d b/source/deimos/openssl/types.di
similarity index 100%
rename from source/deimos/openssl/types.d
rename to source/deimos/openssl/types.di
diff --git a/source/deimos/openssl/ui.d b/source/deimos/openssl/ui.di
similarity index 100%
rename from source/deimos/openssl/ui.d
rename to source/deimos/openssl/ui.di
diff --git a/source/deimos/openssl/ui_compat.d b/source/deimos/openssl/ui_compat.di
similarity index 100%
rename from source/deimos/openssl/ui_compat.d
rename to source/deimos/openssl/ui_compat.di
diff --git a/source/deimos/openssl/whrlpool.d b/source/deimos/openssl/whrlpool.di
similarity index 100%
rename from source/deimos/openssl/whrlpool.d
rename to source/deimos/openssl/whrlpool.di
diff --git a/source/deimos/openssl/x509.d b/source/deimos/openssl/x509.di
similarity index 100%
rename from source/deimos/openssl/x509.d
rename to source/deimos/openssl/x509.di
diff --git a/source/deimos/openssl/x509_vfy.d b/source/deimos/openssl/x509_vfy.di
similarity index 100%
rename from source/deimos/openssl/x509_vfy.d
rename to source/deimos/openssl/x509_vfy.di
diff --git a/source/deimos/openssl/x509v3.d b/source/deimos/openssl/x509v3.di
similarity index 100%
rename from source/deimos/openssl/x509v3.d
rename to source/deimos/openssl/x509v3.di