diff --git a/types/bitcore-lib/index.d.ts b/types/bitcore-lib/index.d.ts
index e0c86e53f2..9b0a925bbf 100644
--- a/types/bitcore-lib/index.d.ts
+++ b/types/bitcore-lib/index.d.ts
@@ -1,142 +1,128 @@
-// Type definitions for bitcore-lib 0.15.0
+// Type definitions for bitcore-lib 0.15
 // Project: https://github.com/bitpay/bitcore-lib
 // Definitions by: Lautaro Dragan <https://github.com/lautarodragan/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// TypeScript Version: 2.2
+
 /// <reference types="node" />
 
-declare namespace bitcoreLib {
-  export const Block: Block
-  export const util: Util
-  export const Script: Script
-  export const PrivateKey: PrivateKey
-
-  export namespace crypto {
+export namespace crypto {
     class BN { }
     namespace ECDSA {
-      function sign(message: Buffer, key: PrivateKey): Signature
-      function verify(hashbuf: Buffer, sig: Signature, pubkey: PublicKey, endian?: 'little'): boolean
+        function sign(message: Buffer, key: PrivateKey): Signature;
+        function verify(hashbuf: Buffer, sig: Signature, pubkey: PublicKey, endian?: 'little'): boolean;
     }
-    export namespace Hash {
-      function sha256(buffer: Buffer): Uint8Array
+    namespace Hash {
+        function sha256(buffer: Buffer): Uint8Array;
     }
-    export const Random: RandomInterface
-    export const Point: PointInterface
+    const Random: RandomInterface;
+    const Point: PointInterface;
 
     class Signature {
-      static fromDER(sig: Buffer): Signature
-      static fromString(data: string): Signature
-      SIGHASH_ALL: number
-      toString(): string
+        static fromDER(sig: Buffer): Signature;
+        static fromString(data: string): Signature;
+        SIGHASH_ALL: number;
+        toString(): string;
     }
-  }
+}
 
-  class Transaction {
-    inputs: Input[]
-    outputs: Output[]
-    readonly id: string
-    readonly hash: string
-    nid: string
+export class Transaction {
+    inputs: Input[];
+    outputs: Output[];
+    readonly id: string;
+    readonly hash: string;
+    nid: string;
 
-    constructor(serialized?: any)
+    constructor(serialized?: any);
 
-    from(utxos: Transaction.UnspentOutput[]): Transaction
-    to(address: Address | string, amount: number): Transaction
-    change(address: Address | string): Transaction
-    sign(privateKey: PrivateKey | string): Transaction
-    applySignature(sig: crypto.Signature): Transaction
-    addData(data: Buffer): this
-    serialize(): string
-  }
+    from(utxos: Transaction.UnspentOutput[]): Transaction;
+    to(address: Address | string, amount: number): Transaction;
+    change(address: Address | string): Transaction;
+    sign(privateKey: PrivateKey | string): Transaction;
+    applySignature(sig: crypto.Signature): Transaction;
+    addData(data: Buffer): this;
+    serialize(): string;
+}
 
-  export namespace Transaction {
+export namespace Transaction {
     class UnspentOutput {
-      static fromObject(o: object): UnspentOutput
+        static fromObject(o: object): UnspentOutput;
 
-      readonly address: Address
-      readonly txId: string
-      readonly outputIndex: number
-      readonly script: Script
-      readonly satoshis: number
+        readonly address: Address;
+        readonly txId: string;
+        readonly outputIndex: number;
+        readonly script: Script;
+        readonly satoshis: number;
 
-      constructor(data: object)
+        constructor(data: object);
 
-      inspect(): string
-      toObject(): this
-      toString(): string
+        inspect(): string;
+        toObject(): this;
+        toString(): string;
     }
-  }
+}
 
-  interface Block {
-    hash: string
-    height: number
-    transactions: Transaction[]
+export class Block {
+    hash: string;
+    height: number;
+    transactions: Transaction[];
     header: {
-      time: number
-      prevHash: string
-    }
+        time: number;
+        prevHash: string;
+    };
 
-    new(data: Buffer | object): Block
-    (data: Buffer | object): Block
-  }
+    constructor(data: Buffer | object);
+}
 
-  interface PrivateKey {
-    readonly publicKey: PublicKey
+export class PrivateKey {
+    readonly publicKey: PublicKey;
 
-    new(key: string): this
-    (source: string): this
-  }
+    constructor(key: string);
+}
 
-  class PublicKey {
-    constructor(source: string)
-  }
+export class PublicKey {
+    constructor(source: string);
+}
 
-  interface Output {
-    readonly script: any
-  }
+export interface Output {
+    readonly script: any;
+}
 
-  interface Script {
-    types: {
-      DATA_OUT: string
-    }
-    buildPublicKeyHashOut(address: Address): Script
-  }
+export namespace Script {
+    const types: {
+        DATA_OUT: string;
+    };
+    function buildPublicKeyHashOut(address: Address): Script;
+}
 
-  interface Util {
+export class Script { }
+
+export interface Util {
     readonly buffer: {
-      reverse(a: any): any
+        reverse(a: any): any;
     }
-  }
-
-  export namespace Networks {
+}
 
+export namespace Networks {
     interface Network {
-      readonly name: string
-      readonly alias: string
+        readonly name: string;
+        readonly alias: string;
     }
 
-    export const livenet: Network
-    export const mainnet: Network
-    export const testnet: Network
-
-    export function add(data: any): Network
-    export function remove(network: Network): void
-    export function get(args: string | number | Network, keys: string | string[]): Network
-  }
+    const livenet: Network;
+    const mainnet: Network;
+    const testnet: Network;
 
+    function add(data: any): Network;
+    function remove(network: Network): void;
+    function get(args: string | number | Network, keys: string | string[]): Network;
 }
 
-interface Address {
+interface Address {}
 
-}
+interface Input {}
 
-interface Input {
+interface RandomInterface {}
 
-}
-
-interface RandomInterface {
-}
-interface PointInterface {
-}
-
-export = bitcoreLib
\ No newline at end of file
+interface PointInterface {}