diff --git a/crypto-js/aes/index.d.ts b/crypto-js/aes/index.d.ts
new file mode 100644
index 0000000000..4f435688c5
--- /dev/null
+++ b/crypto-js/aes/index.d.ts
@@ -0,0 +1,3 @@
+import { AES } from '../index';
+
+export = AES;
diff --git a/crypto-js/core/index.d.ts b/crypto-js/core/index.d.ts
new file mode 100644
index 0000000000..c5d6e00410
--- /dev/null
+++ b/crypto-js/core/index.d.ts
@@ -0,0 +1,3 @@
+import * as Core from '../index';
+
+export = Core;
diff --git a/crypto-js/enc-base64/index.d.ts b/crypto-js/enc-base64/index.d.ts
new file mode 100644
index 0000000000..55001a7115
--- /dev/null
+++ b/crypto-js/enc-base64/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Base64: typeof enc.Base64;
+export = Base64;
diff --git a/crypto-js/enc-hex/index.d.ts b/crypto-js/enc-hex/index.d.ts
new file mode 100644
index 0000000000..3718860123
--- /dev/null
+++ b/crypto-js/enc-hex/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Hex: typeof enc.Hex;
+export = Hex;
diff --git a/crypto-js/enc-latin1/index.d.ts b/crypto-js/enc-latin1/index.d.ts
new file mode 100644
index 0000000000..7f27822daf
--- /dev/null
+++ b/crypto-js/enc-latin1/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Latin1: typeof enc.Latin1;
+export = Latin1;
diff --git a/crypto-js/enc-utf16/index.d.ts b/crypto-js/enc-utf16/index.d.ts
new file mode 100644
index 0000000000..76fa98774a
--- /dev/null
+++ b/crypto-js/enc-utf16/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Utf16: typeof enc.Utf16;
+export = Utf16;
diff --git a/crypto-js/enc-utf8/index.d.ts b/crypto-js/enc-utf8/index.d.ts
new file mode 100644
index 0000000000..828dcb9391
--- /dev/null
+++ b/crypto-js/enc-utf8/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Utf8: typeof enc.Utf8;
+export = Utf8;
diff --git a/crypto-js/evpkdf/index.d.ts b/crypto-js/evpkdf/index.d.ts
new file mode 100644
index 0000000000..8946b9d3a1
--- /dev/null
+++ b/crypto-js/evpkdf/index.d.ts
@@ -0,0 +1,3 @@
+import { EvpKDF } from '../index';
+
+export = EvpKDF;
diff --git a/crypto-js/format-hex/index.d.ts b/crypto-js/format-hex/index.d.ts
new file mode 100644
index 0000000000..1b0f573824
--- /dev/null
+++ b/crypto-js/format-hex/index.d.ts
@@ -0,0 +1,4 @@
+import { format } from '../index';
+
+declare const Hex: typeof format.Hex;
+export = Hex;
diff --git a/crypto-js/format-openssl/index.d.ts b/crypto-js/format-openssl/index.d.ts
new file mode 100644
index 0000000000..02c35a3688
--- /dev/null
+++ b/crypto-js/format-openssl/index.d.ts
@@ -0,0 +1,4 @@
+import { format } from '../index';
+
+declare const OpenSSL: typeof format.OpenSSL;
+export = OpenSSL;
diff --git a/crypto-js/hmac-md5/index.d.ts b/crypto-js/hmac-md5/index.d.ts
new file mode 100644
index 0000000000..7240576710
--- /dev/null
+++ b/crypto-js/hmac-md5/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacMD5 } from '../index';
+
+export = HmacMD5;
diff --git a/crypto-js/hmac-ripemd160/index.d.ts b/crypto-js/hmac-ripemd160/index.d.ts
new file mode 100644
index 0000000000..6c371e9435
--- /dev/null
+++ b/crypto-js/hmac-ripemd160/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacRIPEMD160 } from '../index';
+
+export = HmacRIPEMD160;
diff --git a/crypto-js/hmac-sha1/index.d.ts b/crypto-js/hmac-sha1/index.d.ts
new file mode 100644
index 0000000000..1995cf87f6
--- /dev/null
+++ b/crypto-js/hmac-sha1/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA1 } from '../index';
+
+export = HmacSHA1;
diff --git a/crypto-js/hmac-sha224/index.d.ts b/crypto-js/hmac-sha224/index.d.ts
new file mode 100644
index 0000000000..f25334c64c
--- /dev/null
+++ b/crypto-js/hmac-sha224/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA224 } from '../index';
+
+export = HmacSHA224;
diff --git a/crypto-js/hmac-sha256/index.d.ts b/crypto-js/hmac-sha256/index.d.ts
new file mode 100644
index 0000000000..ca1a1ca267
--- /dev/null
+++ b/crypto-js/hmac-sha256/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA256 } from '../index';
+
+export = HmacSHA256;
diff --git a/crypto-js/hmac-sha3/index.d.ts b/crypto-js/hmac-sha3/index.d.ts
new file mode 100644
index 0000000000..0fa0db9321
--- /dev/null
+++ b/crypto-js/hmac-sha3/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA3 } from '../index';
+
+export = HmacSHA3;
diff --git a/crypto-js/hmac-sha384/index.d.ts b/crypto-js/hmac-sha384/index.d.ts
new file mode 100644
index 0000000000..2e17420c1b
--- /dev/null
+++ b/crypto-js/hmac-sha384/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA384 } from '../index';
+
+export = HmacSHA384;
diff --git a/crypto-js/hmac-sha512/index.d.ts b/crypto-js/hmac-sha512/index.d.ts
new file mode 100644
index 0000000000..439b2ffd5e
--- /dev/null
+++ b/crypto-js/hmac-sha512/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA512 } from '../index';
+
+export = HmacSHA512;
diff --git a/crypto-js/index.d.ts b/crypto-js/index.d.ts
index a2c0ee381d..a8068161e1 100644
--- a/crypto-js/index.d.ts
+++ b/crypto-js/index.d.ts
@@ -3,6 +3,9 @@
 // Definitions by: Michael Zabka <https://github.com/misak113/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export = CryptoJS;
+export as namespace CryptoJS;
+
 declare var CryptoJS: CryptoJS.Hashes;
 declare namespace CryptoJS {
 	type Hash = (message: string, key?: string, ...options: any[]) => string;
@@ -112,237 +115,3 @@ declare namespace CryptoJS {
 	}
 
 }
-
-declare module "crypto-js" {
-	var CryptoJS: CryptoJS.Hashes;
-	export = CryptoJS;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/core" {
-	var core: any;
-	export = core;
-}
-
-declare module "crypto-js/x64-core" {
-	var x64: any;
-	export = x64;
-}
-
-declare module "crypto-js/lib-typedarrays" {
-	var libWordArray: any;
-	export = libWordArray;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/md5" {
-	var MD5: CryptoJS.Hash;
-	export = MD5;
-}
-
-declare module "crypto-js/sha1" {
-	var SHA1: CryptoJS.Hash;
-	export = SHA1;
-}
-
-declare module "crypto-js/sha256" {
-	var SHA256: CryptoJS.Hash;
-	export = SHA256;
-}
-
-declare module "crypto-js/sha224" {
-	var SHA224: CryptoJS.Hash;
-	export = SHA224;
-}
-
-declare module "crypto-js/sha512" {
-	var SHA512: CryptoJS.Hash;
-	export = SHA512;
-}
-
-declare module "crypto-js/sha384" {
-	var SHA384: CryptoJS.Hash;
-	export = SHA384;
-}
-
-declare module "crypto-js/sha3" {
-	var SHA3: CryptoJS.Hash;
-	export = SHA3;
-}
-
-declare module "crypto-js/ripemd160" {
-	var RIPEMD160: CryptoJS.Hash;
-	export = RIPEMD160;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/hmac-md5" {
-	var HmacMD5: CryptoJS.Hash;
-	export = HmacMD5;
-}
-
-declare module "crypto-js/hmac-sha1" {
-	var HmacSHA1: CryptoJS.Hash;
-	export = HmacSHA1;
-}
-
-declare module "crypto-js/hmac-sha256" {
-	var HmacSHA256: CryptoJS.Hash;
-	export = HmacSHA256;
-}
-
-declare module "crypto-js/hmac-sha224" {
-	var HmacSHA224: CryptoJS.Hash;
-	export = HmacSHA224;
-}
-
-declare module "crypto-js/hmac-sha512" {
-	var HmacSHA512: CryptoJS.Hash;
-	export = HmacSHA512;
-}
-
-declare module "crypto-js/hmac-sha384" {
-	var HmacSHA384: CryptoJS.Hash;
-	export = HmacSHA384;
-}
-
-declare module "crypto-js/hmac-sha3" {
-	var HmacSHA3: CryptoJS.Hash;
-	export = HmacSHA3;
-}
-
-declare module "crypto-js/hmac-ripemd160" {
-	var HmacRIPEMD160: CryptoJS.Hash;
-	export = HmacRIPEMD160;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/pbkdf2" {
-	var PBKDF2: CryptoJS.Hash;
-	export = PBKDF2;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/aes" {
-	var AES: CryptoJS.Cipher;
-	export = AES;
-}
-
-declare module "crypto-js/tripledes" {
-	var TripleDES: CryptoJS.Cipher;
-	export = TripleDES;
-}
-
-declare module "crypto-js/rc4" {
-	var RC4: CryptoJS.Cipher;
-	export = RC4;
-}
-
-declare module "crypto-js/rabbit" {
-	var Rabbit: CryptoJS.Cipher;
-	export = Rabbit;
-}
-
-declare module "crypto-js/rabbit-legacy" {
-	var RabbitLegacy: CryptoJS.Cipher;
-	export = RabbitLegacy;
-}
-
-declare module "crypto-js/evpkdf" {
-	var EvpKDF: CryptoJS.Cipher;
-	export = EvpKDF;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/format-openssl" {
-	var FormatOpenssl: any;
-	export = FormatOpenssl;
-}
-
-declare module "crypto-js/format-hex" {
-	var FormatHex: any;
-	export = FormatHex;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/enc-latin1" {
-	var encLatin1: CryptoJS.Encoder;
-	export = encLatin1;
-}
-
-declare module "crypto-js/enc-utf8" {
-	var encUtf8: CryptoJS.Encoder;
-	export = encUtf8;
-}
-
-declare module "crypto-js/enc-hex" {
-	var encHex: CryptoJS.Encoder;
-	export = encHex;
-}
-
-declare module "crypto-js/enc-utf16" {
-	var encUtf16: CryptoJS.Encoder;
-	export = encUtf16;
-}
-
-declare module "crypto-js/enc-base64" {
-	var encBase64: CryptoJS.Encoder;
-	export = encBase64;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/mode-cfb" {
-	var modeCFB: CryptoJS.Mode;
-	export = modeCFB;
-}
-
-declare module "crypto-js/mode-ctr" {
-	var modeCTR: CryptoJS.Mode;
-	export = modeCTR;
-}
-
-declare module "crypto-js/mode-ctr-gladman" {
-	var modeCTRGladman: CryptoJS.Mode;
-	export = modeCTRGladman;
-}
-
-declare module "crypto-js/mode-ofb" {
-	var modeOFB: CryptoJS.Mode;
-	export = modeOFB;
-}
-
-declare module "crypto-js/mode-ecb" {
-	var modeECB: CryptoJS.Mode;
-	export = modeECB;
-}
-
-/* --------------------------------- */
-declare module "crypto-js/pad-pkcs7" {
-	var padPkcs7: CryptoJS.Padding;
-	export = padPkcs7;
-}
-
-declare module "crypto-js/pad-ansix923" {
-	var padAnsiX923: CryptoJS.Padding;
-	export = padAnsiX923;
-}
-
-declare module "crypto-js/pad-iso10126" {
-	var padIso10126: CryptoJS.Padding;
-	export = padIso10126;
-}
-
-declare module "crypto-js/pad-iso97971" {
-	var padIso97971: CryptoJS.Padding;
-	export = padIso97971;
-}
-
-declare module "crypto-js/pad-zeropadding" {
-	var padZeroPadding: CryptoJS.Padding;
-	export = padZeroPadding;
-}
-
-declare module "crypto-js/pad-nopadding" {
-	var padNoPadding: CryptoJS.Padding;
-	export = padNoPadding;
-}
diff --git a/crypto-js/lib-typedarrays/index.d.ts b/crypto-js/lib-typedarrays/index.d.ts
new file mode 100644
index 0000000000..91c5a7933b
--- /dev/null
+++ b/crypto-js/lib-typedarrays/index.d.ts
@@ -0,0 +1,2 @@
+declare const libWordArray: any;
+export = libWordArray;
diff --git a/crypto-js/md5/index.d.ts b/crypto-js/md5/index.d.ts
new file mode 100644
index 0000000000..faa064511e
--- /dev/null
+++ b/crypto-js/md5/index.d.ts
@@ -0,0 +1,3 @@
+import { MD5 } from '../index';
+
+export = MD5;
diff --git a/crypto-js/mode-cfb/index.d.ts b/crypto-js/mode-cfb/index.d.ts
new file mode 100644
index 0000000000..74c5c6e3d1
--- /dev/null
+++ b/crypto-js/mode-cfb/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const CFB: typeof mode.CFB;
+export = CFB;
diff --git a/crypto-js/mode-ctr-gladman/index.d.ts b/crypto-js/mode-ctr-gladman/index.d.ts
new file mode 100644
index 0000000000..3ca8f8b367
--- /dev/null
+++ b/crypto-js/mode-ctr-gladman/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const CTRGladman: typeof mode.CTRGladman;
+export = CTRGladman;
diff --git a/crypto-js/mode-ctr/index.d.ts b/crypto-js/mode-ctr/index.d.ts
new file mode 100644
index 0000000000..6007a4ca88
--- /dev/null
+++ b/crypto-js/mode-ctr/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const CTR: typeof mode.CTR;
+export = CTR;
diff --git a/crypto-js/mode-ecb/index.d.ts b/crypto-js/mode-ecb/index.d.ts
new file mode 100644
index 0000000000..569d2b2286
--- /dev/null
+++ b/crypto-js/mode-ecb/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const ECB: typeof mode.ECB;
+export = ECB;
diff --git a/crypto-js/mode-ofb/index.d.ts b/crypto-js/mode-ofb/index.d.ts
new file mode 100644
index 0000000000..484406979d
--- /dev/null
+++ b/crypto-js/mode-ofb/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const OFB: typeof mode.OFB;
+export = OFB;
diff --git a/crypto-js/pad-ansix923/index.d.ts b/crypto-js/pad-ansix923/index.d.ts
new file mode 100644
index 0000000000..2bb6c2dffb
--- /dev/null
+++ b/crypto-js/pad-ansix923/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const AnsiX923: typeof pad.AnsiX923;
+export = AnsiX923;
diff --git a/crypto-js/pad-iso10126/index.d.ts b/crypto-js/pad-iso10126/index.d.ts
new file mode 100644
index 0000000000..6e52e96197
--- /dev/null
+++ b/crypto-js/pad-iso10126/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const Iso10126: typeof pad.Iso10126;
+export = Iso10126;
diff --git a/crypto-js/pad-iso97971/index.d.ts b/crypto-js/pad-iso97971/index.d.ts
new file mode 100644
index 0000000000..0ab1cecbfb
--- /dev/null
+++ b/crypto-js/pad-iso97971/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const Iso97971: typeof pad.Iso97971;
+export = Iso97971;
diff --git a/crypto-js/pad-nopadding/index.d.ts b/crypto-js/pad-nopadding/index.d.ts
new file mode 100644
index 0000000000..f71bb2de73
--- /dev/null
+++ b/crypto-js/pad-nopadding/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const NoPadding: typeof pad.NoPadding;
+export = NoPadding;
diff --git a/crypto-js/pad-pkcs7/index.d.ts b/crypto-js/pad-pkcs7/index.d.ts
new file mode 100644
index 0000000000..1b194673a2
--- /dev/null
+++ b/crypto-js/pad-pkcs7/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const Pkcs7: typeof pad.Pkcs7;
+export = Pkcs7;
diff --git a/crypto-js/pad-zeropadding/index.d.ts b/crypto-js/pad-zeropadding/index.d.ts
new file mode 100644
index 0000000000..cf481402ab
--- /dev/null
+++ b/crypto-js/pad-zeropadding/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const ZeroPadding: typeof pad.ZeroPadding;
+export = ZeroPadding;
diff --git a/crypto-js/pbkdf2/index.d.ts b/crypto-js/pbkdf2/index.d.ts
new file mode 100644
index 0000000000..e242e6fe05
--- /dev/null
+++ b/crypto-js/pbkdf2/index.d.ts
@@ -0,0 +1,3 @@
+import { PBKDF2 } from '../index';
+
+export = PBKDF2;
diff --git a/crypto-js/rabbit-legacy/index.d.ts b/crypto-js/rabbit-legacy/index.d.ts
new file mode 100644
index 0000000000..6befe37563
--- /dev/null
+++ b/crypto-js/rabbit-legacy/index.d.ts
@@ -0,0 +1,3 @@
+import { RabbitLegacy } from '../index';
+
+export = RabbitLegacy;
diff --git a/crypto-js/rabbit/index.d.ts b/crypto-js/rabbit/index.d.ts
new file mode 100644
index 0000000000..f708a6f20b
--- /dev/null
+++ b/crypto-js/rabbit/index.d.ts
@@ -0,0 +1,3 @@
+import { Rabbit } from '../index';
+
+export = Rabbit;
diff --git a/crypto-js/rc4/index.d.ts b/crypto-js/rc4/index.d.ts
new file mode 100644
index 0000000000..38a929f490
--- /dev/null
+++ b/crypto-js/rc4/index.d.ts
@@ -0,0 +1,3 @@
+import { RC4 } from '../index';
+
+export = RC4;
diff --git a/crypto-js/ripemd160/index.d.ts b/crypto-js/ripemd160/index.d.ts
new file mode 100644
index 0000000000..90e3e770ce
--- /dev/null
+++ b/crypto-js/ripemd160/index.d.ts
@@ -0,0 +1,3 @@
+import { RIPEMD160 } from '../index';
+
+export = RIPEMD160;
diff --git a/crypto-js/sha1/index.d.ts b/crypto-js/sha1/index.d.ts
new file mode 100644
index 0000000000..14fb4d2a6b
--- /dev/null
+++ b/crypto-js/sha1/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA1 } from '../index';
+
+export = SHA1;
diff --git a/crypto-js/sha224/index.d.ts b/crypto-js/sha224/index.d.ts
new file mode 100644
index 0000000000..3ff1ff4596
--- /dev/null
+++ b/crypto-js/sha224/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA224 } from '../index';
+
+export = SHA224;
diff --git a/crypto-js/sha256/index.d.ts b/crypto-js/sha256/index.d.ts
new file mode 100644
index 0000000000..59781b01f3
--- /dev/null
+++ b/crypto-js/sha256/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA256 } from '../index';
+
+export = SHA256;
diff --git a/crypto-js/sha3/index.d.ts b/crypto-js/sha3/index.d.ts
new file mode 100644
index 0000000000..241574a711
--- /dev/null
+++ b/crypto-js/sha3/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA3 } from '../index';
+
+export = SHA3;
diff --git a/crypto-js/sha384/index.d.ts b/crypto-js/sha384/index.d.ts
new file mode 100644
index 0000000000..5bad55498a
--- /dev/null
+++ b/crypto-js/sha384/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA384 } from '../index';
+
+export = SHA384;
diff --git a/crypto-js/sha512/index.d.ts b/crypto-js/sha512/index.d.ts
new file mode 100644
index 0000000000..0f764329e2
--- /dev/null
+++ b/crypto-js/sha512/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA512 } from '../index';
+
+export = SHA512;
diff --git a/crypto-js/tripledes/index.d.ts b/crypto-js/tripledes/index.d.ts
new file mode 100644
index 0000000000..ea22173d98
--- /dev/null
+++ b/crypto-js/tripledes/index.d.ts
@@ -0,0 +1,3 @@
+import { TripleDES } from '../index';
+
+export = TripleDES;
diff --git a/crypto-js/x64-core/index.d.ts b/crypto-js/x64-core/index.d.ts
new file mode 100644
index 0000000000..1ef7a67477
--- /dev/null
+++ b/crypto-js/x64-core/index.d.ts
@@ -0,0 +1,3 @@
+import * as X64Core  from '../index';
+
+export = X64Core;